From 812f0d69ffa861e31678f4a93e241af644cca1c8 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Feb 2021 08:56:05 +0100 Subject: gnu: postgresql-11: Update to 11.11. * gnu/packages/databases.scm (postgresql-11): Update to 11.11. Signed-off-by: Leo Famulari --- 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 e0577f1567..b065e14b8f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1246,14 +1246,14 @@ pictures, sounds, or video.") (package (inherit postgresql-13) (name "postgresql") - (version "11.6") + (version "11.11") (source (origin (inherit (package-source postgresql-13)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9")))))) + "0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20")))))) (define-public postgresql-10 (package -- cgit 1.4.1 From e55812e68538ffa5987a8acdcabd7262fb0e4d52 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Feb 2021 08:56:06 +0100 Subject: gnu: postgresql-10: Update to 10.16. * gnu/packages/databases.scm (postgresql-10): Update to 10.16. Signed-off-by: Leo Famulari --- 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 b065e14b8f..31aaf4895c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1258,14 +1258,14 @@ pictures, sounds, or video.") (define-public postgresql-10 (package (inherit postgresql-11) - (version "10.13") + (version "10.16") (source (origin (inherit (package-source postgresql-11)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d")))))) + "1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53")))))) (define-public postgresql-9.6 (package -- cgit 1.4.1 From 6941dbf958a2294e0a058af3498df9c46a6a1e50 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Feb 2021 08:56:07 +0100 Subject: gnu: postgresql-9.6: Update to 9.6.21. * gnu/packages/databases.scm (postgresql-9.6): Update to 9.6.21. Signed-off-by: Leo Famulari --- 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 31aaf4895c..9e7e11b380 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1270,14 +1270,14 @@ pictures, sounds, or video.") (define-public postgresql-9.6 (package (inherit postgresql-10) - (version "9.6.16") + (version "9.6.21") (source (origin (inherit (package-source postgresql-10)) (uri (string-append "https://ftp.postgresql.org/pub/source/v" version "/postgresql-" version ".tar.bz2")) (sha256 (base32 - "1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w")))))) + "0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk")))))) (define-public postgresql postgresql-13) -- cgit 1.4.1 From 79a641a8c553d3632f66db0bb86f72cab6b1a73d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 14 Feb 2021 21:06:29 +0100 Subject: gnu: xfce4-kbdleds-plugin: Remove package. This package never made the transition to GTK+ 3 and doesn't build since Xfce 4.16. The last upstream release was in 2011. * gnu/packages/xfce.scm (xfce4-kbdleds-plugin): Remove variable. Signed-off-by: Leo Famulari --- gnu/packages/xfce.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e0e1d60f36..bb4b66cd0c 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1648,34 +1648,6 @@ The string can also contain markup to displayed an image, a bar, a button and a personalized tooltip.") (license gpl2+))) -(define-public xfce4-kbdleds-plugin - (package - (name "xfce4-kbdleds-plugin") - (version "0.0.6") - (source (origin - (method url-fetch) - (uri (string-append "https://archive.xfce.org/src/panel-plugins/" - "xfce4-kbdleds-plugin/" - (version-major+minor version) - "/xfce4-kbdleds-plugin-" version ".tar.bz2")) - (sha256 - (base32 - "1k810asjjxwix1c7ixl7bqr97zc4j2mw7797gk49rjvv43bhla3d")))) - (build-system gnu-build-system) - (native-inputs - `(("intltool" ,intltool) - ("pkg-config" ,pkg-config))) - (inputs - `(("gtk+-2" ,gtk+-2) - ("libxfce4ui" ,libxfce4ui) - ("xfce4-panel" ,xfce4-panel))) - (home-page - "https://goodies.xfce.org/projects/panel-plugins/xfce4-kbdleds-plugin") - (synopsis "Display keyboard LEDs in the Xfce panel") - (description "This plugin shows the state of your keyboard LEDs: -Caps, Scroll and Num Lock in Xfce panel.") - (license gpl2+))) - (define-public xfce4-mailwatch-plugin (package (name "xfce4-mailwatch-plugin") -- cgit 1.4.1 From 392e230d5e63fe0f5d7aa9b5085516250630d879 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 14 Feb 2021 22:09:13 +0100 Subject: gnu: postgresql: Update to 13.2 [security fixes]. Fixes CVE-2021-3393 and CVE-2021-20229. * gnu/packages/databases.scm (postgresql-13.2): New variable. (postgresql-13)[replacement]: New field. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 9e7e11b380..3694a93df2 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1194,6 +1194,7 @@ developed in C/C++ to MariaDB and MySQL databases.") (define-public postgresql-13 (package (name "postgresql") + (replacement postgresql-13.2) (version "13.1") (source (origin (method url-fetch) @@ -1242,6 +1243,20 @@ TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video.") (license (license:x11-style "file://COPYRIGHT")))) +(define-public postgresql-13.2 + (package + (inherit postgresql-13) + (name "postgresql") + (version "13.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ftp.postgresql.org/pub/source/v" + version "/postgresql-" version ".tar.bz2")) + (sha256 + (base32 + "1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz")) + (patches (search-patches "postgresql-disable-resolve_symlinks.patch")))))) + (define-public postgresql-11 (package (inherit postgresql-13) -- cgit 1.4.1 From 5b401ed050f8a6efff5a515d497fbb460bd7628c Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 14 Feb 2021 22:50:37 +0100 Subject: gnu: bpytop: Add phase to install themes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by bdju in #guix. * gnu/packages/admin.scm (bpytop)[arguments]: Add install-themes phase. Signed-off-by: 宋文武 --- gnu/packages/admin.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8dc6a4f303..71595750f2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2019, 2020 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> @@ -591,6 +591,18 @@ memory, disks, network and processes.") (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-themes + (lambda* (#:key outputs #:allow-other-keys) + (let ((themes (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages/bpytop-themes"))) + (mkdir-p themes) + (copy-recursively "bpytop-themes" themes))))))) (home-page "https://github.com/aristocratos/bpytop") (synopsis "Resource monitor") -- cgit 1.4.1 From dd5e879c3a41909b991e5841934251f538c6257c Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Mon, 15 Feb 2021 08:47:48 +0800 Subject: gnu: bpytop: Update to 1.0.62. * gnu/packages/admin.scm (bpytop): Update to 1.0.62. --- 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 71595750f2..0258126ce9 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -580,14 +580,14 @@ memory, disks, network and processes.") (define-public bpytop (package (name "bpytop") - (version "1.0.61") + (version "1.0.62") (source (origin (method url-fetch) (uri (pypi-uri "bpytop" version)) (sha256 (base32 - "1p5jrrvj68v6cby8w7zms138xm1g5j2q58951lji0qlqr8145jjb")))) + "02d9gdnnx45lnhx0bgg4wz9bdrkg40mm6pi1443f5i3mcpz8yh4s")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil))) -- cgit 1.4.1 From 8af48c146dd7506f5c697e6a2981c43cb2885246 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 13:48:19 +0200 Subject: gnu: python-tzlocal: Update to 2.1. * gnu/packages/time.scm (python-tzlocal): Update to 2.1. [arguments]: Adjust custom 'fix-symlink-tests phase for code changes. Also skip other known-to-fail test. --- gnu/packages/time.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 746ba97c0f..73e7f04834 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -269,14 +269,14 @@ Python datetime objects.") (define-public python-tzlocal (package (name "python-tzlocal") - (version "1.5.1") + (version "2.1") (source (origin (method url-fetch) (uri (pypi-uri "tzlocal" version)) (sha256 (base32 - "0kiciwiqx0bv0fbc913idxibc4ygg4cb7f8rcpd9ij2shi4bigjf")))) + "0i1fm4sl04y65qnaqki0w75j34w863gxjj8ag0vwgvaa572rfg34")))) (build-system python-build-system) (arguments `(#:phases @@ -284,9 +284,12 @@ Python datetime objects.") (add-before 'check 'fix-symlink-test ;; see: https://github.com/regebro/tzlocal/issues/53 (lambda _ - (delete-file "tzlocal/test_data/symlink_localtime/etc/localtime") + (delete-file "tests/test_data/symlink_localtime/etc/localtime") (symlink "../usr/share/zoneinfo/Africa/Harare" - "tzlocal/test_data/symlink_localtime/etc/localtime") + "tests/test_data/symlink_localtime/etc/localtime") + ;; And skip the test_fail test, it is known to fail + (substitute* "tests/tests.py" + (("def test_fail") "def _test_fail")) #t))))) (propagated-inputs `(("python-pytz" ,python-pytz))) -- cgit 1.4.1 From 3bab95940578e0777d68c204acd14a4307af2450 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:04:57 +0200 Subject: gnu: python-jeepney: Update to 0.6.0. * gnu/packages/python-crypto.scm (python-jeepney): Update to 0.6.0. [native-inputs]: Add python-trio, python-pytest-trio. --- gnu/packages/python-crypto.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1f491cc972..9613cf3af2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Eric Dvorsak -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2017 Ben Sturmfels @@ -1571,18 +1571,20 @@ certificates, signing and building trust bundles.") (define-public python-jeepney (package (name "python-jeepney") - (version "0.4.3") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "jeepney" version)) (sha256 - (base32 "0vp3p1lqhqk2kd3254q5sxr50znmm2hmysc8a7g0fr1brihvhy9l")))) + (base32 "0mw6ch5s4czpmsiwqwhcidgk27858pl8vlvb7acrxjkm4ribcnbx")))) (build-system python-build-system) (native-inputs `(("python-testpath" ,python-testpath) ("python-tornado" ,python-tornado) - ("python-pytest" ,python-pytest))) + ("python-trio" ,python-trio) + ("python-pytest" ,python-pytest) + ("python-pytest-trio" ,python-pytest-trio))) (home-page "https://gitlab.com/takluyver/jeepney") (synopsis "Low-level, pure Python DBus protocol wrapper") (description -- cgit 1.4.1 From 78b043bb908813c01b2c6dbde16b310971ca85f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:07:09 +0200 Subject: gnu: python-secretstorage: Update to 3.3.1. * gnu/packages/python-crypto.scm (python-secretstorage): Update to 3.3.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 9613cf3af2..91b10e91ad 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1483,14 +1483,14 @@ and Backlog for a list of what is and is not currently supported.") (define-public python-secretstorage (package (name "python-secretstorage") - (version "3.1.2") + (version "3.3.1") (source (origin (method url-fetch) (uri (pypi-uri "SecretStorage" version)) (sha256 (base32 - "1xmzr0j3066s220bss4nkgqbiwb5k4kkp2rkpqlqwjb5kfc8mnhm")))) + "15ginv4gzxrx77n7517xnvf2jcpqc6ran12s951hc85zlr8nqrpx")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a running dbus service. -- cgit 1.4.1 From bab0c30be31944a3f2ea3fe99269859db192ffea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:08:58 +0200 Subject: gnu: Add python-structlog. * gnu/packages/python-xyz.scm (python-structlog): New variable. --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc21caa721..d0548c2ac2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10785,6 +10785,41 @@ applications.") (home-page "https://github.com/click-contrib/click-log") (license license:expat))) +(define-public python-structlog + (package + (name "python-structlog") + (version "20.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "structlog" version)) + (sha256 + (base32 + "0x1i21vn3xjfa3j9ijbblia5z0jlzc9aqvpqc26sy16i8yjxyydg")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest")) + #t))))) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-freezegun" ,python-freezegun) + ("python-pretend" ,python-pretend) + ("python-pytest" ,python-pytest) + ("python-pytest-asyncio" ,python-pytest-asyncio) + ("python-simplejson" ,python-simplejson) + ("python-twisted" ,python-twisted))) + (home-page "https://www.structlog.org/") + (synopsis "Structured Logging for Python") + (description "@code{structlog} changes logging in Python by adding structure +to your log entries.") + (license (list license:asl2.0 license:expat)))) + (define-public python-apipkg (package (name "python-apipkg") -- cgit 1.4.1 From d9784b1a63ad26b5b54ef605f77933eea6de44a7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:18:08 +0200 Subject: gnu: python-keyring: Update to 22.0.1. * gnu/packages/python-crypto.scm (python-keyring): Update to 22.0.1. [source]: Remove snippet. [arguments]: Adjust custom 'check phase to just run tests. [native-inputs]: Add python-toml, python-setuptools. [propagated-inputs]: Remove python-importlib-metadata. --- gnu/packages/python-crypto.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 91b10e91ad..9739de1dde 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -369,39 +369,31 @@ do what is needed for client/server Kerberos authentication based on (define-public python-keyring (package (name "python-keyring") - (version "21.0.0") + (version "22.0.1") (source (origin (method url-fetch) (uri (pypi-uri "keyring" version)) (sha256 (base32 - "1k0w3yh3fz0qp0cvkxdiinq9jzbrnc6bd88qpjz34x3cgcr94psz")) - (modules '((guix build utils))) - (snippet - ;; https://github.com/jaraco/keyring/issues/414 - '(begin (substitute* "tests/test_packaging.py" - (("ep, =") "(ep,) =")) #t)))) + "1pvqc6may03did0iz98gasg7cy4h8ljzs4ibh927bfzda8a3xjws")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - ;; Not clear why this test fails. - (delete-file "tests/test_packaging.py") - (substitute* "pytest.ini" - (("--black ") "")) (invoke "pytest")))))) (native-inputs - `(("python-pytest" ,python-pytest) + `(("python-toml" ,python-toml) + ("python-pytest" ,python-pytest) ("python-pytest-checkdocs" ,python-pytest-checkdocs) ("python-pytest-cov" ,python-pytest-cov) ("python-pytest-flake8" ,python-pytest-flake8) + ("python-setuptools" ,python-setuptools) ("python-setuptools-scm" ,python-setuptools-scm))) (propagated-inputs - `(("python-importlib-metadata" ,python-importlib-metadata) - ("python-secretstorage" ,python-secretstorage))) + `(("python-secretstorage" ,python-secretstorage))) (home-page "https://github.com/jaraco/keyring") (synopsis "Store and access your passwords safely") (description -- cgit 1.4.1 From f7c966ae02b4915d968b8f9769c506b1c77a17ff Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:19:21 +0200 Subject: gnu: python-keyring: Make tests skippable. * gnu/packages/python-crypto.scm (python-keyring)[arguments]: In custom 'check phase only run tests when tests? is #true. --- gnu/packages/python-crypto.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 9739de1dde..bf39f124a1 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -382,8 +382,10 @@ do what is needed for client/server Kerberos authentication based on `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (invoke "pytest")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")) + #t))))) (native-inputs `(("python-toml" ,python-toml) ("python-pytest" ,python-pytest) -- cgit 1.4.1 From 906476e002c5a935c0e82080d9f7d02f28714e9e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Feb 2021 14:40:03 +0200 Subject: gnu: python-pyxdg: Update to 0.27. * gnu/packages/freedesktop.scm (python-pyxdg): Update to 0.27. [arguments]: Adjust custom 'check phase. --- gnu/packages/freedesktop.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 56e53a73e2..e00454f7b3 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès ;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 David Hashe -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018 Mark H Weaver @@ -769,14 +769,14 @@ manager for the current system.") (define-public python-pyxdg (package (name "python-pyxdg") - (version "0.25") + (version "0.27") (source (origin (method url-fetch) (uri (pypi-uri "pyxdg" version)) (sha256 (base32 - "179767h8m634ydlm4v8lnz01ba42gckfp684id764zaip7h87s41")))) + "19f5j5mxp7ff0vp33s32qbpdi65iiwha0bj641gl70pdwnm97gc0")))) (build-system python-build-system) (arguments '(#:phases @@ -789,15 +789,16 @@ manager for the current system.") (substitute* "test/test-icon.py" (("/usr/share/icons/hicolor/index.theme") (string-append (assoc-ref inputs "hicolor-icon-theme") - "/share/icons/hicolor/index.theme")) - ;; FIXME: This test fails because the theme contains the unknown - ;; key "Scale". - (("theme.validate\\(\\)") "#")) + "/share/icons/hicolor/index.theme"))) - ;; One test fails with: - ;; AssertionError: 'x-apple-ios-png' != 'png' + ;; These two tests are known to fail in strange ways. (substitute* "test/test-mime.py" - (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#")) + (("def test_get_type\\(self") "def _test_get_type(self") + (("def test_get_type2\\(self") "def _test_get_type2(self")) + + ;; There are test files not shipped in the release tarball + (substitute* "test/test-icon.py" + (("def test_validate_icon_theme") "def _test_validate_icon_theme")) (invoke "nosetests" "-v")))))) (native-inputs ;; For tests. -- cgit 1.4.1 From 92bae0136cd755b268b4a52f1ab790759234da15 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2021 09:56:53 +0200 Subject: gnu: poetry: Adjust for newer python-keyring. * gnu/packages/python-xyz.scm (poetry)[arguments]: Adjust custom 'patch-setup-py phase to allow newer versions of python-keyring. --- gnu/packages/python-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d0548c2ac2..a504bb521b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13379,9 +13379,8 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (add-before 'build 'patch-setup-py (lambda _ (substitute* "setup.py" - ;; Newer versions of keyring produce a package with version "0.0.0" - ;; Reported upstream: - (("keyring>=21.2.0,<22.0.0") "keyring>=21.0.0,<22.0.0") + ;; Allow newer versions of python-keyring. + (("(keyring>=21.2.0),<22.0.0" _ keyring) keyring) ;; TODO: remove after the next release cycle, ;; when packaging has been updated. (("packaging>=20.4,<21.0") "packaging>=20.0,<21.0")) -- cgit 1.4.1 From 80005d038c534ae8eb30b32d275c27ce361f1271 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Feb 2021 10:30:24 +0200 Subject: gnu: Add openconnect-sso. * gnu/packages/vpn.scm (openconnect-sso): New variable. --- gnu/packages/vpn.scm | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index ba19f4aebc..76af7582fc 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2016, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2021 Efraim Flashner ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2020 Pierre Langlois @@ -49,6 +49,7 @@ #:use-module (gnu packages dns) #:use-module (gnu packages autotools) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages guile) @@ -59,8 +60,11 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages samba) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) @@ -286,6 +290,73 @@ and probably others.") (license license:lgpl2.1) (home-page "https://www.infradead.org/openconnect/"))) +(define-public openconnect-sso + (package + (name "openconnect-sso") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "openconnect-sso" version)) + (sha256 + (base32 + "1yybmscka3m5yxfkp1m5pqz2m8jlwdq9b0hx2w5l1jj6bzpl9fsf")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ; Tests not included, building from git requires poetry. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'adjust-package-version-requirements + (lambda _ + (substitute* "setup.py" + (("(pyxdg>=0.26),<0.27" _ pyxdg) pyxdg)) + #t)) + (add-after 'unpack 'patch-openconnect + (lambda _ + (substitute* "openconnect_sso/app.py" + (("\"openconnect\"") + (string-append "\"" (which "openconnect") "\""))) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-v")) + #t)) + (add-after 'install 'wrap-qt-process-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/openconnect-sso")) + (qt-process-path (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (wrap-program bin + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) + #t)))))) + (inputs + `(("openconnect" ,openconnect) + ("python-attrs" ,python-attrs) + ("python-colorama" ,python-colorama) + ("python-keyring" ,python-keyring) + ("python-lxml" ,python-lxml) + ("python-prompt-toolkit" ,python-prompt-toolkit) + ("python-requests" ,python-requests) + ("python-pyqt" ,python-pyqt) + ("python-pyqtwebengine" ,python-pyqtwebengine) + ("python-pysocks" ,python-pysocks) + ("python-pyxdg" ,python-pyxdg) + ("python-structlog" ,python-structlog) + ("python-toml" ,python-toml) + ("qtwebengine" ,qtwebengine))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/vlaci/openconnect-sso") + (synopsis "OpenConnect wrapper script supporting Azure AD (SAMLv2)") + (description + "This package provides a wrapper script for OpenConnect supporting Azure AD +(SAMLv2) authentication to Cisco SSL-VPNs.") + (license license:gpl3))) + (define-public openfortivpn (package (name "openfortivpn") -- cgit 1.4.1 From 70d16d283571b8976b3329a239a19e59d64d18f2 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Fri, 12 Feb 2021 06:06:11 +0000 Subject: gnu: esbuild: Update to 0.8.44. * gnu/packages/web.scm (esbuild): Update to 0.8.44. Signed-off-by: Nicolas Goaziou --- 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 4345905f2e..96d5f8f0b3 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1478,7 +1478,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.43") + (version "0.8.44") (source (origin (method git-fetch) @@ -1487,7 +1487,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ab8xpbh39nvrq1302qld692i4xy2mgynk6hjkwhlrziybj74njp")) + (base32 "1zx0bajw2gi3z5liq6wdd2hp2liw02s0i81kzq51csixv66ghm9s")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 8acedeb3a97e00eaaba6c1b58eae931d039c76a6 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 12 Feb 2021 22:51:53 +0100 Subject: gnu: Add go-github-com-tekwizely-go-parsing. * gnu/packages/golang.scm (go-github-com-tekwizely-go-parsing): New variable. Signed-off-by: Nicolas Goaziou --- 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 d34bb1acb7..1d3fa59ce9 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6644,6 +6644,31 @@ modifying them.") @end itemize") (license license:expat))) +(define-public go-github-com-tekwizely-go-parsing + (let ((commit "1548cfb17df54d365ce9febed0677c06a40a8ceb") + (revision "0")) + (package + (name "go-github-com-tekwizely-go-parsing") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tekwizely/go-parsing") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bv5amka8hb9crc7qvlzi2kbycqrnh9d46b9wgcs8wqzl0z7w609")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/tekwizely/go-parsing")) + (home-page "https://github.com/tekwizely/go-parsing") + (synopsis "Text parsing, with lexers, parsers, and related tools") + (description + "This package provides Go modules focused on text parsing, with lexers, +parsers, and related tools.") + (license license:expat)))) + (define-public go-github.com-ulikunitz-xz (package (name "go-github.com-ulikunitz-xz") -- cgit 1.4.1 From adae5d75b6029b5d034030cff24e1ba4d8b3144a Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 12 Feb 2021 22:51:54 +0100 Subject: gnu: Add run. * gnu/packages/task-runners.scm (run): New variable. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/task-runners.scm | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 gnu/packages/task-runners.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ad6e02116e..250901f6d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -533,6 +533,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/synergy.scm \ %D%/packages/syndication.scm \ %D%/packages/task-management.scm \ + %D%/packages/task-runners.scm \ %D%/packages/tbb.scm \ %D%/packages/tcl.scm \ %D%/packages/telegram.scm \ diff --git a/gnu/packages/task-runners.scm b/gnu/packages/task-runners.scm new file mode 100644 index 0000000000..49a07fa3bd --- /dev/null +++ b/gnu/packages/task-runners.scm @@ -0,0 +1,49 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Stefan Reichör +;;; +;;; 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 task-runners) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (gnu packages golang) + #:use-module (guix build-system go)) + +(define-public run + (package + (name "run") + (version "0.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/TekWizely/run") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17n11lqhywq4z62w2rakdq80v7mxf83rgln19vj4v4nxpwd2hjjw")))) + (build-system go-build-system) + (propagated-inputs + `(("go-github-com-tekwizely-go-parsing" ,go-github-com-tekwizely-go-parsing))) + (arguments + `(#:import-path "github.com/tekwizely/run")) + (synopsis "Easily manage and invoke small scripts and wrappers") + (description + "Run is a tool to easily manage and invoke small scripts and wrappers by +using a Runfile.") + (home-page "https://github.com/TekWizely/run") + (license license:expat))) -- cgit 1.4.1 From f2f2bea795d305d971ec7fc35f4a799a83e1e049 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Mon, 15 Feb 2021 13:10:48 +0100 Subject: gnu: emacs-ccls: Update to 0.1-5.675a570. * gnu/packages/emacs-xyz.scm (emacs-ccls): Update to 0.1-5.675a570. [propagated-inputs]: Remove emacs-projectile. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32df03b1e2..3116125cb2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -90,6 +90,7 @@ ;;; Copyright © 2020 Jonathan Rostran ;;; Copyright © 2020, 2021 Noah Evans ;;; Copyright © 2020 Brit Butler +;;; Copyright © 2021 Alexandr Vityazev avityazew@gmail.com ;;; ;;; This file is part of GNU Guix. ;;; @@ -19472,8 +19473,8 @@ Pandoc, the document-conversion tool.") (license license:expat)))) (define-public emacs-ccls - (let ((commit "aab3e31fd716daf59f9794e62d473357263e8cc0") - (revision "4")) + (let ((commit "675a5704c14a27931e835a431beea3631d92e8e6") + (revision "5")) (package (name "emacs-ccls") (version (git-version "0.1" revision commit)) @@ -19486,12 +19487,11 @@ Pandoc, the document-conversion tool.") (file-name (git-file-name name version)) (sha256 (base32 - "1ykgw21ypyhwlyflppjcgqrj1xw4d9rld4z65qvwhk3f12cv113j")))) + "0l4bhyr9d8ljz1f0cfg1s2cjcmh6fiwbk5mdlvc7rrwz5hxc21is")))) (build-system emacs-build-system) (propagated-inputs `(("ccls" ,ccls) ("emacs-dash" ,emacs-dash) - ("emacs-projectile" ,emacs-projectile) ("emacs-lsp-mode" ,emacs-lsp-mode))) (home-page "https://github.com/MaskRay/emacs-ccls") (synopsis "Emacs support for the @code{ccls} language server") -- cgit 1.4.1 From 1e711be47baacfb6bace1bf42e8aa6ad9a2722a9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Feb 2021 13:13:22 +0100 Subject: gnu: Fix copyright line. * gnu/packages/emacs-xyz.scm: Add angle brackets around email address. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3116125cb2..3c1d0fc981 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -90,7 +90,7 @@ ;;; Copyright © 2020 Jonathan Rostran ;;; Copyright © 2020, 2021 Noah Evans ;;; Copyright © 2020 Brit Butler -;;; Copyright © 2021 Alexandr Vityazev avityazew@gmail.com +;;; Copyright © 2021 Alexandr Vityazev ;;; ;;; This file is part of GNU Guix. ;;; -- cgit 1.4.1 From 17d25e0d04c59698e292fb8dfb4c0092212cb718 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:26 +0200 Subject: gnu: Add rust-rustls-0.19. * gnu/packages/crates-io.scm (rust-rustls-0.19): New variable. (rust-rustls-0.18): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a5ea75a594..5de013dfab 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 aecepoglu ;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -33794,8 +33795,37 @@ rustc compiler.") "Automatically apply the suggestions made by rustc.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustls-0.19 + (package + (name "rust-rustls") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02wqas2pcxk75s9l9c9f1r5am7258bmqprh68pnqfvkwz0gx4kq6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-log" ,rust-log-0.4) + ("rust-ring" ,rust-ring-0.16) + ("rust-sct" ,rust-sct-0.6) + ("rust-webpki" ,rust-webpki-0.21)))) + (home-page "https://github.com/ctz/rustls") + (synopsis "Modern TLS library written in Rust") + (description + "This package provides a modern TLS library written in Rust.") + (license + (list license:asl2.0 license:isc license:expat)))) + (define-public rust-rustls-0.18 (package + (inherit rust-rustls-0.19) (name "rust-rustls") (version "0.18.1") (source @@ -33807,7 +33837,6 @@ rustc compiler.") (sha256 (base32 "108cf3bfw5high066shz9xrfv4jz7djdmnwqs3kwx4wfypf2c4ax")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.12) @@ -33819,13 +33848,7 @@ rustc compiler.") (("rust-criterion" ,rust-criterion-0.3) ("rust-env-logger" ,rust-env-logger-0.7) ("rust-log" ,rust-log-0.4) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) - (home-page "https://github.com/ctz/rustls") - (synopsis "Modern TLS library written in Rust.") - (description "This package provides a modern TLS library written in -Rust.") - (license - (list license:asl2.0 license:isc license:expat)))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) (define-public rust-rustls-0.17 (package -- cgit 1.4.1 From 3cd66f0c79310d4d9ddc5b5ab6e421f406157e58 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:27 +0200 Subject: gnu: rust-tokio-macros-1: Update to 1.1.0. * gnu/packages/crates-io.scm (rust-tokio-macros-1): Update to 1.1.0. [arguments]: Skip build. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5de013dfab..00cae5536b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41936,17 +41936,18 @@ futures efficiently") (define-public rust-tokio-macros-1 (package (name "rust-tokio-macros") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "150l6wfcqw2rcjaf22qk3z6ca794x0s2c68n5ar18cfafllpsla2")))) + (base32 + "0mys5zm2gcdgc0iq8nqipzn703q26x1bpw59m04shikgacdb3xya")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: undeclared type `tokio` + `(#:skip-build? #t #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) -- cgit 1.4.1 From 8637004a11e4f72d8a6af5818449627fe3c85f95 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:28 +0200 Subject: gnu: rust-tokio-1: Update to 1.2.0. * gnu/packages/crates-io.scm (rust-tokio-1): Update to 1.2.0. [arguments]: Skip build. Remove Cargo development inputs. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 00cae5536b..2e2d1ecc6b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41496,17 +41496,18 @@ Fireball''.") (define-public rust-tokio-1 (package (name "rust-tokio") - (version "1.0.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gd6qc9xvm568kicbkch40kjn5w0q2nsn527gcy80v3baqgj4n6j")))) + (base32 + "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: unresolved import + `(#:skip-build? #t #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1) ("rust-bytes" ,rust-bytes-1) @@ -41520,15 +41521,7 @@ Fireball''.") ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) ("rust-tokio-macros" ,rust-tokio-macros-1) ("rust-tracing" ,rust-tracing-0.1) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-async-stream" ,rust-async-stream-0.3) - ("rust-futures" ,rust-futures-0.3) - ("rust-loom" ,rust-loom-0.4) - ("rust-nix" ,rust-nix-0.19) - ("rust-proptest" ,rust-proptest-0.10) - ("rust-tokio-stream" ,rust-tokio-stream-0.1) - ("rust-tokio-test" ,rust-tokio-test-0.4)))) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://tokio.rs") (synopsis "Event-driven, non-blocking I/O platform") (description -- cgit 1.4.1 From 7fc85a8d4639f377adb6d10373d6ddeba831bdbf Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:29 +0200 Subject: gnu: Add rust-tokio-rustls-0.22. * gnu/packages/crates-io.scm (rust-tokio-rustls-0.22): New variable. (rust-tokio-rustls-0.14): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2e2d1ecc6b..6202326a34 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42294,8 +42294,35 @@ servers.") "Event loop that drives Tokio I/O resources.") (license license:expat))) +(define-public rust-tokio-rustls-0.22 + (package + (name "rust-tokio-rustls") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-rustls" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dp1s2kai081f3fn9gjq92x2lw7lm7iqpcsl02cg2zg5fbg48s5w")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-rustls" ,rust-rustls-0.19) + ("rust-tokio" ,rust-tokio-1) + ("rust-webpki" ,rust-webpki-0.21)))) + (home-page "https://github.com/tokio-rs/tls") + (synopsis "Asynchronous TLS/SSL streams for Tokio") + (description + "This package provides asynchronous TLS/SSL streams for Tokio using +Rustls.") + (license (list license:expat license:asl2.0)))) + (define-public rust-tokio-rustls-0.14 (package + (inherit rust-tokio-rustls-0.22) (name "rust-tokio-rustls") (version "0.14.1") (source @@ -42306,7 +42333,6 @@ servers.") (sha256 (base32 "16l8kx3j7i3jxq36qs3hnmys6cd2zqcixc1n0kf3kymwanr32a71")))) - (build-system cargo-build-system) (arguments `(;; These tests require network access. #:cargo-test-flags '("--release" "--" "--skip=tls12" "--skip=modern") @@ -42320,12 +42346,7 @@ servers.") (("rust-futures-util" ,rust-futures-util-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-tokio" ,rust-tokio-0.2) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) - (home-page "https://github.com/tokio-rs/tls") - (synopsis "Asynchronous TLS/SSL streams for Tokio") - (description "This package provides asynchronous TLS/SSL streams for Tokio -using Rustls.") - (license (list license:expat license:asl2.0)))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) (define-public rust-tokio-rustls-0.13 (package -- cgit 1.4.1 From a6a566f20c2a75b29d02b19eaa9404e91381ba19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Feb 2021 13:28:02 +0100 Subject: gnu: Add rust-configparser-2. * gnu/packages/crates-io.scm (rust-configparser-2): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6202326a34..5c0a2b5923 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7632,6 +7632,27 @@ queue.") applications.") (license (list license:expat license:asl2.0)))) +(define-public rust-configparser-2 + (package + (name "rust-configparser") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "configparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qdaggalm3js86s2i11pjjcndrrvpk0pw1lfvmv7v25z3y66sqg2")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/mexili/configparser-rs") + (synopsis "Simple parsing utility for INI and ini-style syntax") + (description + "This package provides a simple configuration parsing utility with no +dependencies that allows you to parse INI and ini-style syntax. You can use +this to write Rust programs which can be customized by end users easily.") + (license (list license:expat license:lgpl3+)))) + (define-public rust-console-0.14 (package (name "rust-console") -- cgit 1.4.1 From c1ee055cba50a4f6ab236d15cf3a417eed856ae3 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:30 +0200 Subject: gnu: Add agate. * gnu/packages/rust-apps.scm (agate): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9511cbf308..d10008c9ca 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,6 +44,41 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) +(define-public agate + (package + (name "agate") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "agate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mhrl4j5r6wzsnwpqsbgzny5vqschyjm3gnk4y88har7skk7j19v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-configparser" ,rust-configparser-2) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-glob" ,rust-glob-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-url" ,rust-url-2)))) + (home-page "https://github.com/mbrubeck/agate") + (synopsis "Very simple server for the Gemini hypertext protocol") + (description + "Agate is a server for the Gemini network protocol, built with the Rust +programming language. It has very few features, and can only serve static +files. It uses async I/O, and should be quite efficient even when running on +low-end hardware and serving many concurrent requests.") + (license (list license:expat license:asl2.0)))) + (define-public bat (package (name "bat") -- cgit 1.4.1 From 2b5a81dfd3f7a633f4137d31060d0fa82c5e89f6 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 14 Feb 2021 20:57:31 +0200 Subject: services: Add Agate Gemini service. * gnu/services/web.scm (): New record type. (agate-accounts, agate-shepherd-service): New procedures. (agate-service-type): New variable. * doc/guix.texi (Web Services): Document it. Signed-off-by: Nicolas Goaziou --- doc/guix.texi | 89 +++++++++++++++++++++++++++++++++++++++- gnu/services/web.scm | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 198 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index d1c6acddcf..535c98a453 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -81,7 +81,7 @@ Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* -Copyright @copyright{} 2020 Alexandru-Sergiu Marton@* +Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* @@ -25322,6 +25322,93 @@ gmnisrv} and @command{man gmnisrv.ini}. @end table @end deftp +@subsubheading Agate + +@cindex agate +The @uref{gemini://qwertqwefsday.eu/agate.gmi, Agate} +(@uref{https://github.com/mbrubeck/agate, GitHub page over HTTPS}) +program is a simple @uref{https://gemini.circumlunar.space/, Gemini} +protocol server written in Rust. + +@deffn {Scheme Variable} agate-service-type +This is the type of the agate service, whose value should be an +@code{agate-service-type} object, as in this example: + +@lisp +(service agate-service-type + (agate-configuration + (content "/srv/gemini") + (cert "/srv/cert.pem") + (key "/srv/key.rsa"))) +@end lisp + +The example above represents the minimal tweaking necessary to get Agate +up and running. Specifying the path to the certificate and key is +always necessary, as the Gemini protocol requires TLS by default. + +To obtain a certificate and a key, you could, for example, use OpenSSL, +running a command similar to the following example: + +@example +openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \ + -days 3650 -nodes -subj "/CN=example.com" +@end example + +Of course, you'll have to replace @i{example.com} with your own domain +name, and then point the Agate configuration towards the path of the +generated key and certificate. + +@end deffn + +@deftp {Data Type} agate-configuration +Data type representing the configuration of Agate. + +@table @asis +@item @code{package} (default: @code{agate}) +The package object of the Agate server. + +@item @code{content} (default: @file{"/srv/gemini"}) +The directory from which Agate will serve files. + +@item @code{cert} (default: @code{#f}) +The path to the TLS certificate PEM file to be used for encrypted +connections. Must be filled in with a value from the user. + +@item @code{key} (default: @code{#f}) +The path to the PKCS8 private key file to be used for encrypted +connections. Must be filled in with a value from the user. + +@item @code{addr} (default: @code{'("0.0.0.0:1965" "[::]:1965")}) +A list of the addresses to listen on. + +@item @code{hostname} (default: @code{#f}) +The domain name of this Gemini server. Optional. + +@item @code{lang} (default: @code{#f}) +RFC 4646 language code(s) for text/gemini documents. Optional. + +@item @code{silent?} (default: @code{#f}) +Set to @code{#t} to disable logging output. + +@item @code{serve-secret?} (default: @code{#f}) +Set to @code{#t} to serve secret files (files/directories starting with +a dot). + +@item @code{log-ip?} (default: @code{#t}) +Whether or not to output IP addresses when logging. + +@item @code{user} (default: @code{"agate"}) +Owner of the @code{agate} process. + +@item @code{group} (default: @code{"agate"}) +Owner's group of the @code{agate} process. + +@item @code{log-file} (default: @file{"/var/log/agate.log"}) +The file which should store the logging output of Agate. + +@end table +@end deftp + @node Certificate Services @subsection Certificate Services diff --git a/gnu/services/web.scm b/gnu/services/web.scm index ff7b262b6a..aa688a4328 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Oleg Pykhalov -;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2020, 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,6 +50,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages logging) #:use-module (gnu packages mail) + #:use-module (gnu packages rust-apps) #:use-module (guix packages) #:use-module (guix records) #:use-module (guix modules) @@ -263,7 +264,25 @@ gmnisrv-configuration-package gmnisrv-configuration-config-file - gmnisrv-service-type)) + gmnisrv-service-type + + agate-configuration + agate-configuration? + agate-configuration-package + agate-configuration-content + agate-configuration-cert + agate-configuration-key + agate-configuration-addr + agate-configuration-hostname + agate-configuration-lang + agate-configuration-silent + agate-configuration-serve-secret + agate-configuration-log-ip + agate-configuration-user + agate-configuration-group + agate-configuration-log-file + + agate-service-type)) ;;; Commentary: ;;; @@ -1885,3 +1904,92 @@ root=/srv/gemini "Run the gmnisrv Gemini server.") (default-value (gmnisrv-configuration)))) + +(define-record-type* + agate-configuration make-agate-configuration + agate-configuration? + (package agate-configuration-package + (default agate)) + (content agate-configuration-content + (default "/srv/gemini")) + (cert agate-configuration-cert + (default #f)) + (key agate-configuration-key + (default #f)) + (addr agate-configuration-addr + (default '("0.0.0.0:1965" "[::]:1965"))) + (hostname agate-configuration-hostname + (default #f)) + (lang agate-configuration-lang + (default #f)) + (silent? agate-configuration-silent + (default #f)) + (serve-secret? agate-configuration-serve-secret + (default #f)) + (log-ip? agate-configuration-log-ip + (default #t)) + (user agate-configuration-user + (default "agate")) + (group agate-configuration-group + (default "agate")) + (log-file agate-configuration-log + (default "/var/log/agate.log"))) + +(define agate-shepherd-service + (match-lambda + (($ package content cert key addr + hostname lang silent? serve-secret? + log-ip? user group log-file) + (list (shepherd-service + (provision '(agate)) + (requirement '(networking)) + (documentation "Run the agate Gemini server.") + (start (let ((agate (file-append package "/bin/agate"))) + #~(make-forkexec-constructor + (list #$agate + "--content" #$content + "--cert" #$cert + "--key" #$key + "--addr" #$@addr + #$@(if lang + (list "--lang" lang) + '()) + #$@(if hostname + (list "--hostname" hostname) + '()) + #$@(if silent? '("--silent") '()) + #$@(if serve-secret? '("--serve-secret") '()) + #$@(if log-ip? '("--log-ip") '())) + #:user #$user #:group #$group + #:log-file #$log-file))) + (stop #~(make-kill-destructor))))))) + +(define agate-accounts + (match-lambda + (($ _ _ _ _ _ + _ _ _ _ + _ user group _) + `(,@(if (equal? group "agate") + '() + (list (user-group (name "agate") (system? #t)))) + ,(user-group + (name group) + (system? #t)) + ,(user-account + (name user) + (group group) + (supplementary-groups '("agate")) + (system? #t) + (comment "agate server user") + (home-directory "/var/empty") + (shell (file-append shadow "/sbin/nologin"))))))) + +(define agate-service-type + (service-type + (name 'guix) + (extensions + (list (service-extension account-service-type + agate-accounts) + (service-extension shepherd-root-service-type + agate-shepherd-service))) + (default-value (agate-configuration)))) -- cgit 1.4.1 From 71533bb49da6fc058f6a5e8142cbf612380813ef Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Mon, 15 Feb 2021 13:48:44 +0100 Subject: gnu: Add emacs-theme-sorcery. * gnu/packages/emacs-xyz.scm (emacs-theme-sorcery): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c1d0fc981..0ac391985b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -805,6 +805,30 @@ theme and apply them to the rest of Linux with Pywal. Pywal only applies your theme to the current session.") (license license:gpl3+)))) +(define-public emacs-theme-sorcery + (let ((revision "0") + (commit "5a1c4445b9e6e09589a299a9962a6973272a0c2f")) + (package + (name "emacs-theme-sorcery") + (version "1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mtreca/emacs-theme-sorcery") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1b858049n6nw4qf60fmszjrhl80x7ssh32f7glj722kwy7404kdh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-autothemer" ,emacs-autothemer))) + (home-page "https://github.com/mtreca/emacs-theme-sorcery") + (synopsis "Dark and low-contrast Emacs theme") + (description "Sorcery is a dark and low-contrast Emacs theme inspired by +Apprentice and Sourcerer.") + (license license:gpl3+)))) + (define-public emacs-treepy (package (name "emacs-treepy") -- cgit 1.4.1 From 8116c9d77dc3b07fa3ccfbda21da0cdf883441c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Feb 2021 13:50:53 +0100 Subject: gnu: Add java-args4j. * gnu/packages/java.scm (java-args4j): New variable. --- gnu/packages/java.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2f0eef3d57..9c46551202 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro @@ -13333,6 +13333,60 @@ into the file itself. The XMP Toolkit for Java is based on the C++ XMPCore library and the API is similar.") (license license:bsd-3))) +(define-public java-args4j + (package + (name "java-args4j") + (version "2.33") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kohsuke/args4j") + (commit (string-append "args4j-site-" version)))) + (sha256 + (base32 + "0w061fg65qrsm1a0lz0vyprsyidj31krjb459qi2lw0y78xza26s")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "args4j.jar" + #:source-dir "args4j/src" + #:test-dir "args4j/test" + #:test-exclude + (list "**/ExampleTest.*" + "**/ExternalConfiguredTest.*" ; fails to find a file + ;; We still don't want to run abstract classes + "**/Abstract*.*") + #:phases + (modify-phases %standard-phases + (add-before 'check 'fix-test-dir + (lambda _ + (substitute* "build.xml" + (("/java\">") "\">")) + #t)) + (add-before 'build 'copy-resources + (lambda _ + (let ((from-prefix "args4j/src/org/kohsuke/args4j/") + (to-prefix "build/classes/org/kohsuke/args4j/")) + (for-each (lambda (f) + (install-file + (string-append from-prefix f) + (string-append to-prefix (dirname f)))) + (list "Messages.properties" + "Messages_de.properties" + "Messages_en.properties" + "Messages_ru.properties" + "spi/Messages.properties" + "spi/Messages_de.properties" + "spi/Messages_en.properties" + "spi/Messages_ru.properties"))) + #t))))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://args4j.kohsuke.org/") + (synopsis "Command line parser library") + (description "Args4j is a small Java class library that makes it easy to +parse command line options/arguments in your CUI application.") + (license license:expat))) + (define-public java-metadata-extractor (package (name "java-metadata-extractor") -- cgit 1.4.1 From 9904a15a4c838362673c1affdbaf1e83d92fe8ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Feb 2021 13:51:25 +0100 Subject: gnu: Add indelfixer. * gnu/packages/bioinformatics.scm (indelfixer): New variable. --- gnu/packages/bioinformatics.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6f835b3875..f3e0e41e4d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15570,6 +15570,41 @@ manipulation of hierarchical features (e.g., genes, transcripts, and exons) than is possible with plain-text methods alone.") (license license:expat)))) +(define-public indelfixer + (package + (name "indelfixer") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cbg-ethz/InDelFixer/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10ak05x8i1bx2p7rriv2rglqg1wr7c8wrhjrqlq1wm7ka99w8i79")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "InDelFixer.jar" + #:source-dir "src/main/java" + #:test-dir "src/test")) + (inputs + `(("java-commons-lang2" ,java-commons-lang) + ("java-args4j" ,java-args4j))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/cbg-ethz/InDelFixer/") + (synopsis "Iterative and sensitive NGS sequence aligner") + (description "InDelFixer is a sensitive aligner for 454, Illumina and +PacBio data, employing a full Smith-Waterman alignment against a reference. +This Java command line application aligns Next-Generation Sequencing (NGS) and +third-generation reads to a set of reference sequences, by a prior fast k-mer +matching and removes indels, causing frame shifts. In addition, only a +specific region can be considered. An iterative refinement of the alignment +can be performed, by alignment against the consensus sequence with wobbles. +The output is in SAM format.") + (license license:gpl3+))) + (define-public libsbml (package (name "libsbml") -- cgit 1.4.1 From ca372a49452c2ab340c350f5854d0fec049dc9f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Feb 2021 17:05:08 +0100 Subject: gnu: r-with-tests: Update to 4.0.4. * gnu/packages/statistics.scm (r-with-tests): Update to 4.0.4. [arguments]: Update phase "build-reproducibly". --- gnu/packages/statistics.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 7a5f319ed7..3821c86da9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -184,7 +184,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "4.0.3") + (version "4.0.4") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -192,7 +192,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "03cypg2qf7v9mq9mr9alz9w5y9m5kdgwbc97bp26pyymg253m609")))) + "0bl098xcv8v316kqnf43v6gb4kcsv31ydqfm1f7qr824jzb2fgsj")))) (build-system gnu-build-system) (arguments `(#:disallowed-references (,tzdata-for-tests) @@ -272,12 +272,11 @@ as.POSIXct(if (\"\" != Sys.getenv(\"SOURCE_DATE_EPOCH\")) {\ ;; The "References" section of this file when converted to ;; package.rds is sometimes stored with a newline, sometimes with - ;; a space. We avoid this problem by adding characters to break - ;; up the series of line break and spaces that is suspected to be - ;; the culprit. + ;; a space. We avoid this problem by removing the line break + ;; that is suspected to be the culprit. (substitute* "src/library/methods/DESCRIPTION.in" - ((" ``Software") - " -- ``Software")) + (("\\(2008\\)\n") "(2008) ") + ((" ``Software") "``Software")) #t)) (add-before 'build 'set-locales (lambda _ -- cgit 1.4.1 From 24d7dee75d84fced96eca9f8f0de0a4ee1f9f0c4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:09:18 +0100 Subject: gnu: emacs-exec-path-from-shell: Fix Texinfo mark-up. * gnu/packages/emacs-xyz.scm (emacs-exec-path-from-shell) [synopsis, description]: Use @env and @code instead of @var. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0ac391985b..59adefeef0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Peter Mikkelsen -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Mike Gerwitz ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2018 Sohom Bhattacharjee @@ -14690,10 +14690,10 @@ functionality is inherited from @code{hcl-mode}.") "1ga8bpxngd3ph2hdiik92c612ki71qxw818i6rgx6f6a5r0sbf3p")))) (build-system emacs-build-system) (home-page "https://github.com/purcell/exec-path-from-shell") - (synopsis "Get environment variables such as @var{PATH} from the shell") + (synopsis "Get environment variables such as @env{PATH} from the shell") (description - "This library allows the user to set Emacs @var{exec-path} and @var{PATH} -from the shell @var{PATH}, so that @code{shell-command}, @code{compile} and + "This library allows the user to set Emacs @code{exec-path} and @env{PATH} +from the shell's @env{PATH}, so that @code{shell-command}, @code{compile} and the like work as expected on systems on which Emacs is not guaranteed to inherit a login shell's environment variables. It also allows other environment variables to be retrieved from the shell, so that Emacs will see -- cgit 1.4.1 From 37495db6cf3cc09f9da91938b7c500c7e378fa74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 13:36:02 +0100 Subject: gnu: Fix copyright notice. * gnu/packages/file-systems.scm: Fix copyright notice for raid5atemyhomework. --- gnu/packages/file-systems.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index c8a5df37cd..83ce711d9e 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Morgan Smith -;;; Copyright © 2021 raid5atemyhoemwork +;;; Copyright © 2021 raid5atemyhomework ;;; ;;; This file is part of GNU Guix. ;;; -- cgit 1.4.1 From f4c4a9fde542bb394c1c581ddf381f04aa16678e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:20:27 +0100 Subject: gnu: w3m: Update to 0.5.3+git20210102. * gnu/packages/w3m.scm (w3m): Update to 0.5.3+git20210102. --- gnu/packages/w3m.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 934a6d9e38..c883cb5918 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20200502") + (version "0.5.3+git20210102") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -50,7 +50,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0yyfhwcwy1dvdbirj6zqwk4gl8z9npfavs0k7ipcg5fd16vnx7mi")))) + "0amq1wfjp5mhqjmvrc0yhxjlx1335p78d7ap8iykfjn5h8yhmrg5")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 096a66c60adc28b38875d86ac05ca053047f15ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:20:55 +0100 Subject: gnu: exfatprogs: Update to 1.1.0. * gnu/packages/file-systems.scm (exfatprogs): Update to 1.1.0. --- 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 83ce711d9e..ef4b831373 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -463,7 +463,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.") (define-public exfatprogs (package (name "exfatprogs") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -472,7 +472,7 @@ from the bcachefs-tools package. It is meant to be used in initrds.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1braffz1wc4ki3nb42q85l5zg2dl2hwjr64rk27nc85wcsrbavnl")))) + (base32 "1ciy28lx7c1vr1f138qi0mkz88pzlkay6nlwmp1yjzd830x48549")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 641fc7c13c35216f8ad14589c178695a134a291b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:22:06 +0100 Subject: gnu: nsd: Update to 4.3.5. * gnu/packages/dns.scm (nsd): Update to 4.3.5. --- 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 9583cd3af9..38a5553654 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -536,14 +536,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.3.4") + (version "4.3.5") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0l4ba80ihwg3s2ifhnkmk7rjabrcy5zw6sz4hn0vm9sif6lk9s1v")))) + (base32 "0wj490rxqs86z8s4lxjwk06ry5pvkdqqyq1cf83z7mxk60zb98kx")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 902d76c839e325cd452a71332b50a657df5f02c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 14:49:49 +0100 Subject: gnu: sane-backends-minimal: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scanner.scm (sane-backends-minimal)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: [native-inputs]: Add autoconf, autoconf-archive, automake, gettext-minimal, libtool, and python-wrapper. [arguments]: Add ‘zap-unnecessary-git-dependency’, ‘build-pixma_sane_options.c’, and ‘make-reproducible’ phases. --- gnu/packages/scanner.scm | 55 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 5a69d923bf..0db373eb04 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -22,12 +22,15 @@ (define-module (gnu packages scanner) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages libusb) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages xml) #:use-module (guix build-system gnu) #:use-module (guix download) @@ -42,13 +45,13 @@ (name "sane-backends-minimal") (version "1.0.31") (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.com/sane-project/backends/uploads/" - "8bf1cae2e1803aefab9e5331550e5d5d/" - "sane-backends-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sane-project/backends") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1am5w92zyybs26wx4brgmky6dzpd8n34jyfrfx3qbvcqngy10fsa")) + (base32 "161hh2zcs2fh6vxxgavf3m0xbm1gbxkasp10p8964pkzxax8rwqp")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a @@ -60,12 +63,24 @@ #t)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ;; For scripts/pixma_gen_options.py. + ("python" ,python-wrapper))) (inputs `(("libusb" ,libusb))) (arguments `(#:phases (modify-phases %standard-phases + (add-before 'bootstrap 'zap-unnecessary-git-dependency + (lambda _ + (substitute* "configure.ac" + (("git describe --dirty") + (string-append "echo " ,version))))) (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") @@ -74,7 +89,7 @@ (substitute* "testsuite/Makefile.in" ((" backend ") " ")) #t)) - (add-after 'unpack 'disable-failing-tests + (add-before 'configure 'disable-failing-tests (lambda _ ;; Disable unmaintained tests that that fail with errors resembling: ;; @@ -96,6 +111,11 @@ (substitute* "testsuite/sanei/Makefile.in" (("sanei_usb_test\\$\\(EXEEXT\\) ") "")) #t)) + (add-before 'build 'build-pixma_sane_options.c + ;; "No rule to make target '../backend/pixma/pixma_sane_options.c', + ;; needed by 'sane-backends.pot-update'." + (lambda _ + (invoke "make" "-C" "backend" "pixma/pixma_sane_options.c"))) (add-after 'install 'install-udev-rules (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -104,7 +124,18 @@ (string-append out "/lib/udev/rules.d/" "60-libsane.rules")) - #t)))))) + #t))) + (add-after 'install 'make-reproducible + ;; XXX Work around an old bug . + ;; Then work around "Throw to key `decoding-error' ..." by using sed. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (locale (string-append out "/share/locale"))) + (with-directory-excursion locale + (for-each (lambda (file) + (invoke "sed" "-i" "/^PO-Revision-Date:/d" file)) + (list "en@boldquot/LC_MESSAGES/sane-backends.mo" + "en@quot/LC_MESSAGES/sane-backends.mo"))))))))) (home-page "http://www.sane-project.org") (synopsis "Raster image scanner library and drivers, without scanner support") @@ -114,9 +145,9 @@ hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The package contains the library, but no drivers.") (license licence:gpl2+))) ; plus linking exception -;; This variant links in the hpaio backend, provided by hplip, which adds -;; support for HP scanners whose backends are not maintained by -;; 'sane-backends'. It also builds all of those backends. +;; This variant links in the hpaio backend provided by hplip, which adds +;; support for HP scanners whose backends are not maintained by the SANE +;; project, and builds all of those backends. (define-public sane-backends (package (inherit sane-backends-minimal) -- cgit 1.4.1 From cf9047b222934a3e4455cb1e1058d21c94b7214d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 15:54:39 +0100 Subject: gnu: sane-backends-minimal: Remove obsolete #t return values. * gnu/packages/scanner.scm (sane-backends-minimal)[source, arguments]: Don't return #t from snippet or phases. --- gnu/packages/scanner.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 0db373eb04..08dd871bc2 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -59,8 +59,7 @@ '(begin (substitute* "tools/sane-desc.c" (("asctime \\(localtime \\(¤t_time\\)\\)") - "\"1970-01-01\"")) - #t)))) + "\"1970-01-01\"")))))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -87,8 +86,7 @@ ;; Disable tests that may require back ends to be built. (substitute* "testsuite/Makefile.in" - ((" backend ") " ")) - #t)) + ((" backend ") " ")))) (add-before 'configure 'disable-failing-tests (lambda _ ;; Disable unmaintained tests that that fail with errors resembling: @@ -109,8 +107,7 @@ ;; sanei_usb_test: sanei_usb_test.c:849: main: Assertion ;; `test_init (1)' failed. (substitute* "testsuite/sanei/Makefile.in" - (("sanei_usb_test\\$\\(EXEEXT\\) ") "")) - #t)) + (("sanei_usb_test\\$\\(EXEEXT\\) ") "")))) (add-before 'build 'build-pixma_sane_options.c ;; "No rule to make target '../backend/pixma/pixma_sane_options.c', ;; needed by 'sane-backends.pot-update'." @@ -123,8 +120,7 @@ (copy-file "tools/udev/libsane.rules" (string-append out "/lib/udev/rules.d/" - "60-libsane.rules")) - #t))) + "60-libsane.rules"))))) (add-after 'install 'make-reproducible ;; XXX Work around an old bug . ;; Then work around "Throw to key `decoding-error' ..." by using sed. -- cgit 1.4.1 From 78ce446b20f132025389bff122fb1166b3a3a911 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 16:20:39 +0100 Subject: gnu: sane-backends-minimal: Update to 1.0.32. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scanner.scm (sane-backends-minimal): Update to 1.0.32. [arguments]: Adapt the ‘zap-unnecessary-git-dependency’ phase to the new tools/git-version-gen script. --- gnu/packages/scanner.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 08dd871bc2..a97131b362 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -43,7 +43,7 @@ (define-public sane-backends-minimal (package (name "sane-backends-minimal") - (version "1.0.31") + (version "1.0.32") (source (origin (method git-fetch) (uri (git-reference @@ -51,7 +51,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "161hh2zcs2fh6vxxgavf3m0xbm1gbxkasp10p8964pkzxax8rwqp")) + (base32 "13jlqdp7n7z2n78v6idl3ri5idk7ddk9j8wrmh73lba8l9y8xnsi")) (modules '((guix build utils))) (snippet ;; Generated HTML files and udev rules normally embed a @@ -77,9 +77,11 @@ (modify-phases %standard-phases (add-before 'bootstrap 'zap-unnecessary-git-dependency (lambda _ - (substitute* "configure.ac" - (("git describe --dirty") - (string-append "echo " ,version))))) + ;; This runs before default patch-shebangs phase. + (substitute* "tools/git-version-gen" + (("/bin/sh") (which "sh"))) + (with-output-to-file ".tarball-version" + (lambda _ (format #t ,version))))) (add-before 'configure 'disable-backends (lambda _ (setenv "BACKENDS" " ") -- cgit 1.4.1 From 203c23cb365b04d356bd6e2df3cdda5a9b7c53fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:35:28 +0100 Subject: gnu: font-dseg: Update to 0.46. * gnu/packages/fonts.scm (font-dseg): Update to 0.46. --- gnu/packages/fonts.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index fd21e0471d..c47940ba85 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1825,7 +1825,7 @@ have been designed to be very distinguishable from each other.") (define-public font-dseg (package (name "font-dseg") - (version "0.45") + (version "0.46") (source (origin (method url-fetch/zipbomb) @@ -1836,8 +1836,7 @@ have been designed to be very distinguishable from each other.") (string-concatenate (string-split version #\.)) ".zip")) (sha256 - (base32 - "0v8sghh4vl286faf8pvi74znz07pyf0qii8z4wjllisqwc35sx72")))) + (base32 "13133kpa1ndsji9yq5ppkds5yq2y094qvrv2f83ah74p40sz9hm6")))) (build-system font-build-system) (arguments `(#:phases -- cgit 1.4.1 From 3ddb2dec2a45e6674388be101e4d7a6248e358e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:36:06 +0100 Subject: gnu: dosfstools: Update to 4.2. * gnu/packages/disk.scm (dosfstools): Update to 4.2. [source]: Code name hard. --- gnu/packages/disk.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index f02e83a378..110eb83d62 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -376,16 +376,15 @@ to recover data more efficiently by only reading the necessary blocks.") (define-public dosfstools (package (name "dosfstools") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) - (uri (string-append "https://github.com/" name "/" name + (uri (string-append "https://github.com/dosfstools/dosfstools" "/releases/download/v" version "/" - name "-" version ".tar.xz")) + "dosfstools-" version ".tar.gz")) (sha256 - (base32 - "0wy13i3i4x2bw1hf5m4fd0myh61f9bcrs035fdlf6gyc1jksrcp6")))) + (base32 "09xm1540h9npqw0s5s2335xqxfdp059rl98l3fidr4h0z7mnx4k4")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-compat-symlinks") -- cgit 1.4.1 From b77a690d53f61fd2e878adfeb6c86d2479d22fcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:42:31 +0100 Subject: gnu: dosfstools: Fetch sources from git. * gnu/packages/disk.scm (dosfstools)[source]: Use GIT-FETCH and GIT-FILE-NAME. [native-inputs]: Add autoconf & automake. --- gnu/packages/disk.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 110eb83d62..7ad57f1bbb 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -379,19 +379,23 @@ to recover data more efficiently by only reading the necessary blocks.") (version "4.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/dosfstools/dosfstools" - "/releases/download/v" version "/" - "dosfstools-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dosfstools/dosfstools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "09xm1540h9npqw0s5s2335xqxfdp059rl98l3fidr4h0z7mnx4k4")))) + (base32 "1xygsixmmc9l7drxylggnzkqqiks8zmlsbhg3z723ii2ak94236s")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-compat-symlinks") #:make-flags (list (string-append "PREFIX=" %output) "CC=gcc"))) (native-inputs - `(("xxd" ,xxd))) ; for tests + `(("autoconf" ,autoconf) + ("automake" ,automake) + ;; For tests. + ("xxd" ,xxd))) (home-page "https://github.com/dosfstools/dosfstools") (synopsis "Utilities for making and checking MS-DOS FAT file systems") (description -- cgit 1.4.1 From 10e318bdbd7f0d502359fbc7b33f53c2bd496086 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:47:58 +0100 Subject: gnu: tllist: Update to 1.0.5. * gnu/packages/datastructures.scm (tllist): Update to 1.0.5. --- gnu/packages/datastructures.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index 2911a0c550..f4f51fc6a4 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2016, 2017, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Meiyo Peng ;;; Copyright © 2019, 2020 Efraim Flashner ;;; Copyright © 2020 Mark H Weaver @@ -286,7 +286,7 @@ equivalent succinct data structure are (most of the time) identical.") (define-public tllist (package (name "tllist") - (version "1.0.4") + (version "1.0.5") (home-page "https://codeberg.org/dnkl/tllist") (source (origin (method git-fetch) @@ -294,7 +294,7 @@ equivalent succinct data structure are (most of the time) identical.") (file-name (git-file-name name version)) (sha256 (base32 - "1a26vwb7ll6mv3h8rbafsdx4vic1f286hiqn8s359sw8b7yjkvzs")))) + "061mkg6hc9x89zya3bw18ymxlzd8fbhjipxpva8x01lh2vp1d4f0")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55)) -- cgit 1.4.1 From 4bf11e250d775a224358a477b275fad83216109d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:50:12 +0100 Subject: gnu: lunzip: Update to 1.12. * gnu/packages/compression.scm (lunzip): Update to 1.12. --- 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 c502b37b9f..ecf3b2700b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1807,14 +1807,14 @@ of archives.") (define-public lunzip (package (name "lunzip") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/lunzip/" "lunzip-" version ".tar.gz")) (sha256 - (base32 "19zq3gmlbia2krq4k4zs1j0xjdv7nsdzqvfb0pyca5n53h2mzb91")))) + (base32 "1liaynyy3qcs29hfk1pnb7i9r1mnmpw557j5v356qsv6qnm4lnz5")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 26688b8dc407e3c7b51001e7b8c8d5314a3e44b5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 17:52:50 +0100 Subject: gnu: libjcat: Update to 0.1.6. * gnu/packages/compression.scm (libjcat): Update to 0.1.6. --- 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 ecf3b2700b..890f51c788 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1037,7 +1037,7 @@ smaller than those produced by @code{Xdelta}.") (define-public libjcat (package (name "libjcat") - (version "0.1.5") + (version "0.1.6") (source (origin (method git-fetch) @@ -1047,7 +1047,7 @@ smaller than those produced by @code{Xdelta}.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rxyqikdhkh2nq1y0hy05df2kkxf3d2cp6lm5x1s5i717k6y3zy5")))) + (base32 "1a2z34m8611xvna9kwch8ralxx7c9mk4rm9vrxx7p9hr8sbqbsaz")))) (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From dbbc6c0059e7f9543e1cfc8a07140237c3e79401 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:05:29 +0100 Subject: gnu: ropgadget: Update to 6.5. * gnu/packages/cybersecurity.scm (ropgadget): Update to 6.5. --- gnu/packages/cybersecurity.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm index b77d714ec8..e13c342342 100644 --- a/gnu/packages/cybersecurity.scm +++ b/gnu/packages/cybersecurity.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,13 +27,13 @@ (define-public ropgadget (package (name "ropgadget") - (version "6.4") + (version "6.5") (source (origin (method url-fetch) (uri (pypi-uri "ROPGadget" version)) (sha256 - (base32 "1hz6y5a8d4gc2sryz5alpz9mivrk8kj4l3dw00zkz2xca7gwpmsi")))) + (base32 "0p4h8xi27xcicz8sq6xi40hbj99mcsnnla6ar2r17vqapbr5c3jc")))) (build-system python-build-system) (propagated-inputs `(("python-capstone" ,python-capstone))) -- cgit 1.4.1 From 43e09b4340a0ed13ec9f2f490e2dd378995dc8a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:05:40 +0100 Subject: gnu: xarchiver: Update to 0.5.4.17. * gnu/packages/compression.scm (xarchiver): Update to 0.5.4.17. --- 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 890f51c788..89107141ec 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2246,7 +2246,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.16") + (version "0.5.4.17") (source (origin (method git-fetch) @@ -2255,7 +2255,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nblyk65w1in0zpfbyzy6dw4x0fzx3q7xs85dby5ap4w0gjz9s44")))) + (base32 "00adrjpxqlaccrwjf65w3vhxfswdj0as8aj263c6f9b85llypc5v")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From 236d121502dabeeba4c941f8580f680926e1139c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:06:48 +0100 Subject: gnu: knot: Update to 3.0.4. * gnu/packages/dns.scm (knot): Update to 3.0.4. --- 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 38a5553654..bbf43542b7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -810,7 +810,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.3") + (version "3.0.4") (source (origin (method git-fetch) @@ -819,7 +819,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xzig9l91wj6x23mh75vw2r51ihrgx916c7wxvpcfnwrqsv4f3hy")) + (base32 "1mbjl18zi8yxs7pa3395lqjwdw0agjbfpl32x42i6d9zb8fsblzs")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 6412b01a616ea3da29d060e903c63a039efd657a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:07:54 +0100 Subject: gnu: man-db: Update to 2.9.4. * gnu/packages/man.scm (man-db): Update to 2.9.4. --- gnu/packages/man.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 894272b2b9..21a9c73892 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost ;;; Copyright © 2015, 2016, 2020 Efraim Flashner -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2020 Vincent Legoll @@ -121,14 +121,14 @@ a flexible and convenient way.") (define-public man-db (package (name "man-db") - (version "2.9.3") + (version "2.9.4") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/man-db/man-db-" version ".tar.xz")) (sha256 (base32 - "1f4palf5bdyf3f8sa0981cqxn9cjcr2pz53ngrrsybb9n0da2nps")))) + "0mk7n7yn6scy785jhg1j14b3q9l0cgvpry49r0ldjsnizbnrjv5n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 4468c657991e1396625094e27af4d84bcf6c7b2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:09:16 +0100 Subject: gnu: facter: Update to 4.0.51. * gnu/packages/admin.scm (facter): Update to 4.0.51. --- 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 0258126ce9..77386d6033 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -459,7 +459,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.49") + (version "4.0.51") (source (origin (method git-fetch) (uri (git-reference @@ -468,7 +468,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "0l7gic5ql5xiy5s6rb0j9ydyaal5bcxl10bx45khcgdr9zg16pb1")))) + "1s98rq2wjmh8bqdfdibvfp9j2ynd97k0c4hairryrzl9nna3j542")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit 1.4.1 From d42f01fe996098002b41bb25924cba9ca02c4666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 18:29:11 +0100 Subject: Revert "gnu: w3m: Update to 0.5.3+git20210102." This reverts commit f4c4a9fde542bb394c1c581ddf381f04aa16678e. w3m is a staging package, which I did not expect. --- gnu/packages/w3m.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index c883cb5918..934a6d9e38 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016, 2019 Efraim Flashner ;;; Copyright © 2018 Rutger Helling -;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,7 +40,7 @@ (define-public w3m (package (name "w3m") - (version "0.5.3+git20210102") + (version "0.5.3+git20200502") (source (origin (method git-fetch) ;; Debian's fork of w3m is the only one that is still maintained. @@ -50,7 +50,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0amq1wfjp5mhqjmvrc0yhxjlx1335p78d7ap8iykfjn5h8yhmrg5")))) + "0yyfhwcwy1dvdbirj6zqwk4gl8z9npfavs0k7ipcg5fd16vnx7mi")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 060ea698b3c81426a99689396a7565a87815d022 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Feb 2021 18:31:49 +0100 Subject: gnu: emacs-transpose-frame: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-transpose-frame): Update to 0.2.0. [source]: Change URI to GitHub. --- gnu/packages/emacs-xyz.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59adefeef0..d03eb3bf36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12656,15 +12656,16 @@ and supports the use of a mouse.") (define-public emacs-transpose-frame (package (name "emacs-transpose-frame") - (version "0.1.0") + (version "0.2.0") (source (origin - (method url-fetch) - (uri "https://www.emacswiki.org/emacs/download/transpose-frame.el") - (file-name (string-append "transpose-frame-" version ".el")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/transpose-frame.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4")))) + (base32 "01j4ci0c52r2c31hc9r4p7nsb6s8blmvg50g9n5v5h3afjl1c35v")))) (build-system emacs-build-system) (home-page "https://www.emacswiki.org/emacs/TransposeFrame") (synopsis "Transpose window arrangement in current frame") -- cgit 1.4.1 From 6e1a88756c2958b33cdb7a010d195bdc426ee896 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Feb 2021 18:34:17 +0100 Subject: gnu: emacs-transpose-frame: Remove ".git" suffix from source URI. * gnu/packages/emacs-xyz.scm (emacs-transpose-frame): Remove ".git" suffix from source URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d03eb3bf36..c55f5508e0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12661,7 +12661,7 @@ and supports the use of a mouse.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/emacsorphanage/transpose-frame.git") + (url "https://github.com/emacsorphanage/transpose-frame") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 -- cgit 1.4.1 From 0696bd210e0f1dfc73856f534b1b14c5f21cd6f0 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 12 Feb 2021 12:03:38 +0100 Subject: gnu: komikku: Update to 0.26.1. * gnu/packages/gnome.scm (komikku): Update to 0.26.1. --- 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 f7838f85a5..ebb21c08ce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11902,7 +11902,7 @@ integrated profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.26.0") + (version "0.26.1") (source (origin (method git-fetch) @@ -11912,7 +11912,7 @@ integrated profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "1g5rhp3d97v0s8nk536vqpv6qd4gha4h27bfdkypcqa42h8wyxm2")))) + "1mas409c14p6g0v10w4cf5hsjbs0922h6h9k9pyj9s8y7yi2ikz2")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit 1.4.1 From 8bd0632a02c84ff6ca4e3fc3708657633ec10f08 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Feb 2021 10:03:09 -0500 Subject: gnu: cmake-shared: Update to 1.1.0-32. * gnu/packages/cmake.scm (cmake-shared): Update to 1.1.0-32. [source]: Add snippet to remove bundled sources. Signed-off-by: Leo Prikler --- gnu/packages/cmake.scm | 56 ++++++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index ab74650066..65580c9ff7 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -55,31 +55,39 @@ #:use-module (srfi srfi-1)) (define-public cmake-shared - (package - (name "cmake-shared") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/lirios/cmake-shared.git") - (commit - (string-append "v" version)))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "1srd3jmlalf0szgyp88ymhbnwds4qiywmf8lq1pif9g8irjjhdry")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f)) ; No target - (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules))) - (synopsis "Shared CMake functions and macros") - (description "CMake-Shared are shared functions and macros for projects + (let ((commit "8122f2b96c8da38ea41b653cf69958e75fe2129d") + (revision "32")) + (package + (name "cmake-shared") + (version + (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/cmake-shared.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "05avwzqcnliwx9h7qi1kl0iz4smqmxc4vkavyjbmlc6h2b97i58g")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (delete-file-recursively "3rdparty"))))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; No target + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (synopsis "Shared CMake functions and macros") + (description "CMake-Shared are shared functions and macros for projects using the CMake build system.") - (home-page "https://github.com/lirios/cmake-shared/") - (license license:bsd-3))) + (home-page "https://github.com/lirios/cmake-shared/") + (license license:bsd-3)))) ;;; Build phases shared between 'cmake-bootstrap' and the later variants ;;; that use cmake-build-system. -- cgit 1.4.1 From 3775eb7fc413bd1b150994f92fdf7e89378ecaf7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Feb 2021 11:19:32 -0500 Subject: gnu: materialdecoration: Update to 1.1.0-9. * gnu/packages/qt.scm (materialdecoration): Update to 1.1.0-9. [source]: Add snippet to remove bundled sources. [arguments]<#:configure-flags>: Add -DCMAKE_CXX_FLAGS. [inputs]: Add libxkbcommon. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 72 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 4fbb157600..11e69ff5db 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -161,34 +161,52 @@ window managers, that don't provide Qt integration by themselves.") (license license:bsd-2))) (define-public materialdecoration - (package - (name "materialdecoration") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/lirios/materialdecoration.git") - (commit "2079487116c6c794af3a15452342a69293039b46"))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "1pczmxbmnsgj9s1g6ap55qq2q4ccibcnhsw9b6cl5rzgc48izy06")))) - (build-system qt-build-system) - (native-inputs - `(("cmake-shared" ,cmake-shared) - ("extra-cmake-modules" ,extra-cmake-modules) - ("pkg-config" ,pkg-config))) - (inputs - `(("qtbase" ,qtbase) - ("qtwayland" ,qtwayland) - ("wayland" ,wayland))) - (synopsis "Material Decoration for Qt") - (description "MaterialDecoration is a client-side decoration for Qt + (let ((commit "6a5de23f2e5162fbee39d16f938473ff970a2ec0") + (revision "9")) + (package + (name "materialdecoration") + (version + (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/lirios/materialdecoration.git") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1zdrcb39fhhmn76w8anv1dnspz26pdl6izmj1mlm02aza4y8ffp4")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + `(begin + (delete-file-recursively "cmake/3rdparty"))))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs "qtbase") + "/include/qt5/QtXkbCommonSupport/" + ,(package-version qtbase))))) + (native-inputs + `(("cmake-shared" ,cmake-shared) + ("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config))) + (inputs + `(("qtbase" ,qtbase) + ("qtwayland" ,qtwayland) + ("wayland" ,wayland) + ("xkbcommon" ,libxkbcommon))) + (synopsis "Material Decoration for Qt") + (description "MaterialDecoration is a client-side decoration for Qt applications on Wayland.") - (home-page "https://github.com/lirios/materialdecoration") - (license license:lgpl3+))) + (home-page "https://github.com/lirios/materialdecoration") + (license license:lgpl3+)))) (define-public grantlee (package -- cgit 1.4.1 From d1f94000bc5c2dfed1a6ad9e7ac83e67c1b1a6fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Feb 2021 20:00:07 +0100 Subject: gnu: tor: Update to 0.4.5.6. * gnu/packages/tor.scm (tor): Update to 0.4.5.6. --- 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 677d31eb14..c08be1d2f9 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -54,14 +54,14 @@ (define-public tor (package (name "tor") - (version "0.4.4.7") + (version "0.4.5.6") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1vh5kdx7s74il8a6gr7jydbpv0an01nla4y2r8w7h33z2wk2jv9j")))) + "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From c9419d58da15dbccceab852933aae337e5cfad55 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 15 Feb 2021 19:50:56 +0100 Subject: gnu: wsjtx: Update to 2.3.0. * gnu/packages/radio.scm (wsjtx-hamlib): Update to 2.3.0. (wsjtx): Update to 2.3.0. [source]: Remove obsolete snippet. --- gnu/packages/radio.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 55756c5e93..af6d852a98 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -815,7 +815,7 @@ users.") (package (inherit hamlib) (name "wsjtx-hamlib") - (version "2.2.2") + (version "2.3.0") (source (origin (method git-fetch) @@ -824,7 +824,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01h5ps0yq5vi1x9rkw742gx6a5fj02zhbpi89i412qdfbnyk35cv")))) + (base32 "0ampwqs7p0g8pdnwpdrbvwyqag065n96amgb3v4z332nw0nxvm10")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -849,7 +849,7 @@ users.") (define-public wsjtx (package (name "wsjtx") - (version "2.2.2") + (version "2.3.0") (source (origin (method git-fetch) @@ -858,13 +858,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fhws44gg05d9y2al0pcdnxwxwh4bazcfl0g5mq2ks1r7w23wi5x")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled boost to use the shared one. - (delete-file-recursively "boost") - #t)))) + (base32 "1qf8r88ssara3pddvd3jpv5phzxwnanvdj00dxgmzq0c2jqcy2a8")))) (build-system qt-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit 1.4.1 From 75b01d6dfd7188e0bd5536308bf0c4c35f455ed0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Feb 2021 21:59:08 +0100 Subject: gnu: Add passage. * gnu/packages/games.scm (passage): New variable. --- gnu/packages/games.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bf6b79370a..1d10c0d101 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015, 2017, 2018 Christopher Lemmer Webber -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2021 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017 Alex Kost ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2017 Rodger Fox @@ -12170,6 +12170,63 @@ such as GnuGo. @end itemize") (license license:gpl2+))) +(define-public passage + (package + (name "passage") + (version "4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/hcsoftware/Passage/v" + version "/Passage_v" version "_UnixSource.tar.gz")) + (sha256 + (base32 "02ky4a4xdjvr71r58339jjrjyz76b5skcnbq4f8707mrln9vhby3")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #false ; there are none + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "gamma256/gameSource") + (system "cat Makefile.GnuLinux Makefile.all > Makefile"))) + (replace 'configure + (lambda* (#:key outputs inputs #:allow-other-keys) + (setenv "CPATH" + (string-append + (assoc-ref inputs "sdl") "/include/SDL:" + (or (getenv "CPATH") ""))) + (let* ((out (assoc-ref outputs "out")) + (assets (string-append out "/share/passage"))) + (substitute* "common.cpp" + (("readTGA\\( \"graphics\"") + (format #false "readTGA(\"~a/graphics\"" assets))) + (substitute* "musicPlayer.cpp" + (("readTGA\\( \"music\"") + (format #false "readTGA(\"~a/music\"" assets)))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (assets (string-append out "/share/passage/"))) + (install-file "Passage" bin) + (install-file "../documentation/Readme.txt" assets) + (copy-recursively "graphics" (string-append assets "graphics")) + (copy-recursively "music" (string-append assets "music")) + (copy-recursively "settings" (string-append assets "settings")))))))) + (inputs + `(("sdl" ,(sdl-union (list sdl sdl-mixer))))) + (native-inputs + `(("imagemagick" ,imagemagick))) + (home-page "http://hcsoftware.sourceforge.net/passage/") + (synopsis "Memento mori game") + (description "Passage is meant to be a memento mori game. It presents an +entire life, from young adulthood through old age and death, in the span of +five minutes. Of course, it's a game, not a painting or a film, so the +choices that you make as the player are crucial. There's no \"right\" way to +play Passage, just as there's no right way to interpret it.") + (license license:public-domain))) + (define-public paperview (let ((commit "9f8538eb6734c76877b878b8f1e52587f2ae19e6") (revision "1")) -- cgit 1.4.1 From 1bab55202c0c31f698f02bd2525b0a919a252b95 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2021 17:48:27 -0500 Subject: gnu: bootterm: Update to 0.4. * gnu/packages/terminals.scm (bootterm): Update to 0.4. --- 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 a9897ec623..c53774b20c 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1345,7 +1345,7 @@ terminal. Note that you need support for OpenGL 3.2 or higher.") (define-public bootterm (package (name "bootterm") - (version "0.2") + (version "0.4") (source (origin (method git-fetch) (uri (git-reference @@ -1354,7 +1354,7 @@ terminal. Note that you need support for OpenGL 3.2 or higher.") (file-name (git-file-name name version)) (sha256 (base32 - "08yb4kiid3028cqsx7wzyrzk46asphxlxlj1y141hi245wbql55n")))) + "1k3jacld98za41dbpr10sjms77hrw91sb10m0cnwv3h7aifiwmrs")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit 1.4.1 From 61361ef2646cc59f18fd1d33d9d13348930255b7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2021 20:26:59 -0500 Subject: gnu: ghostwriter: Update to 2.0.0-rc4. * gnu/packages/text-editors.scm (ghostwriter): Update to 2.0.0-rc4. --- gnu/packages/text-editors.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 9e81333865..0cce85a223 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -600,16 +600,17 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (define-public ghostwriter (package (name "ghostwriter") - (version "1.8.1") + ;; XXX We use a release candidate to fix incompatibility with Qt 5.15. + (version "2.0.0-rc4") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/wereturtle/ghostwriter") - (commit (string-append "v" version)))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0jc6szfh5sdnafhwsr1xv7cn1fznniq58bix41hb9wlbkvq7wzi6")))) + "07547503a209hc0fcg902w3x0s1m899c10nj3gqz3hak0cmrasi3")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 2a4e1ace1900311519def33a281612c55bd0e58d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 16 Feb 2021 01:14:49 +0100 Subject: Revert "gnu: telegram-desktop: Comment materialdecoration input." This reverts commit 5da7b2d05092829f922512a0674810f3895d88b3. --- gnu/packages/telegram.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 00aabbde6c..9b27b86e50 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -520,8 +520,7 @@ Telegram project, for its use in telegram desktop client.") ("libjpeg" ,libjpeg-turbo) ("libtgvoip" ,libtgvoip-for-telegram-desktop) ("lz4" ,lz4) - ;; TODO: Uncomment materialdecoration if build successfully. - ;; ("materialdecoration" ,materialdecoration) + ("materialdecoration" ,materialdecoration) ("minizip" ,minizip) ("nimf" ,nimf) ("openal" ,openal) -- cgit 1.4.1 From 2820b1f97e31a08e43ae15d92a389382251aeb4a Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Mon, 15 Feb 2021 21:03:30 +0100 Subject: gnu: remind: Update to 3.3.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/calendar.scm (remind): Update to 3.3.5. Signed-off-by: 宋文武 --- gnu/packages/calendar.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 93303d632f..4e1e4f05b6 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016, 2017, 2020 Efraim Flashner ;;; Copyright © 2016 Troy Sankey -;;; Copyright © 2016 Stefan Reichoer +;;; Copyright © 2016, 2021 Stefan Reichoer ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke @@ -226,7 +226,7 @@ able to synchronize with CalDAV servers through vdirsyncer.") (define-public remind (package (name "remind") - (version "3.1.17") + (version "3.3.5") (source (origin (method url-fetch) @@ -237,7 +237,7 @@ able to synchronize with CalDAV servers through vdirsyncer.") ".") ".tar.gz")) (sha256 - (base32 "0lgyc2j69aqqk4knywr8inz4fsnni0zq54dgqh7p4s6kzybc2mf9")))) + (base32 "1hbfsq6444abkiws28xqy0k9cwzgzfi1hwfmd1rgm4yydgc1gvb1")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit 1.4.1 From 0205cc298259712454f0f671113c134e27ede776 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Mon, 15 Feb 2021 20:54:42 +0100 Subject: gnu: Add pup. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (pup): New variable. Signed-off-by: 宋文武 --- gnu/packages/web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 96d5f8f0b3..0b7e2b299b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020, 2021 Ryan Prior ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -4869,6 +4870,33 @@ little effort, and the program to do so is often shorter and simpler than you'd expect.") (license (list license:expat license:cc-by3.0)))) +(define-public pup + (let ((revision "1") + (commit "681d7bb639334bf485476f5872c5bdab10931f9a")) + (package + (name "pup") + (version (git-version "0.4.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ericchiang/pup") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hx1k0qlc1bq6gg5d4yprn4d7kvqzagg6mi5mvb39zdq6c4y17vr")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/ericchiang/pup")) + (home-page "https://github.com/ericchiang/pup") + (synopsis "Parse HTML at the command line") + (description + "@command{pup} is a command line tool for processing HTML. It reads +from stdin, prints to stdout, and allows the user to filter parts of the page +using CSS selectors. Inspired by @command{jq}, @command{pup} aims to be a +fast and flexible way of exploring HTML from the terminal.") + (license license:expat)))) + (define-public uhttpmock (package (name "uhttpmock") -- cgit 1.4.1 From 34f2a60875ceba552599b6e97e99e979571e64cb Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Mon, 15 Feb 2021 00:52:12 -0500 Subject: gnu: picom: Fix man pages generation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/compton.scm (picom)[arguments]: Change flag 'build_docs' to 'with_docs'. Signed-off-by: 宋文武 --- gnu/packages/compton.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compton.scm b/gnu/packages/compton.scm index 60eae9f1cd..2a5f3bff27 100644 --- a/gnu/packages/compton.scm +++ b/gnu/packages/compton.scm @@ -146,7 +146,7 @@ performance). ("xorgproto" ,xorgproto))) (arguments `(#:build-type "release" - #:configure-flags '("-Dbuild_docs=true"))) + #:configure-flags '("-Dwith_docs=true"))) (home-page "https://github.com/yshui/picom") (synopsis "Compositor for X11, forked from Compton") (description -- cgit 1.4.1 From ea6b4b909f5fa784261c8fbc1973811672b048d7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Feb 2021 21:19:48 +0000 Subject: gnu: sbcl-cl-rdkafka: Update to 1.1.0. * gnu/packages/lisp-xyz.scm (sbcl-cl-rdkafka): Update to 1.1.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 81cbc28d71..3843fd373b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10699,7 +10699,7 @@ tables.") (define-public sbcl-cl-rdkafka (package (name "sbcl-cl-rdkafka") - (version "1.0.2") + (version "1.1.0") (source (origin (method git-fetch) @@ -10709,7 +10709,7 @@ tables.") (file-name (git-file-name name version)) (sha256 (base32 - "1qcgfd4h7syilzmrmd4z2vknbvawda3q3ykw7xm8n381syry4g82")))) + "0z2g0k0xy8k1p9g93h8dy9wbygaq7ziwagm4yz93zk67mhc0b84v")))) (build-system asdf-build-system/sbcl) (arguments `(#:tests? #f ; Attempts to connect to locally running Kafka -- cgit 1.4.1 From f65b1b5232838d6f435e8779e599cfe8121ee576 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Feb 2021 21:54:34 +0000 Subject: gnu: Add cl-pcg. * gnu/packages/lisp-xyz.scm (cl-pcg, ecl-cl-pcg, sbcl-cl-pcg): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3843fd373b..100a34e283 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1420,6 +1420,37 @@ and macros, primarily for software projects written in CL by the author.") (define-public cl-piping (sbcl-package->cl-source-package sbcl-piping)) +(define-public sbcl-cl-pcg + (let ((commit "8263d85ab0ca17fb05637a4430c2d564456bce8f") + (revision "1")) + (package + (name "sbcl-cl-pcg") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sjl/cl-pcg") + (commit commit))) + (file-name (git-file-name "cl-pcg" version)) + (sha256 + (base32 "0s57wvvlvshp1gcp9i9d3qcmqhswnxps3i0y7wbb0v8i1a3p46m4")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("1am" ,sbcl-1am))) + (home-page "https://github.com/sjl/cl-pcg") + (synopsis "Permuted congruential generators in Common Lisp") + (description + "This is a bare-bones Permuted Congruential Generator implementation in +pure Common Lisp.") + (license license:expat)))) + +(define-public ecl-cl-pcg + (sbcl-package->ecl-package sbcl-cl-pcg)) + +(define-public cl-pcg + (sbcl-package->cl-source-package sbcl-cl-pcg)) + (define-public sbcl-jpl-queues (package (name "sbcl-jpl-queues") -- cgit 1.4.1 From 9fcd3e4c9191cea8c2920f6bde582ed14e91515b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Feb 2021 21:57:43 +0000 Subject: gnu: Add cl-seedable-rng. * gnu/packages/lisp-xyz.scm (cl-seedable-rng, ecl-seedable-rng, sbcl-seedable-rng): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 100a34e283..5c305e1508 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1451,6 +1451,40 @@ pure Common Lisp.") (define-public cl-pcg (sbcl-package->cl-source-package sbcl-cl-pcg)) +(define-public sbcl-seedable-rng + (let ((commit "aa1a1564b6e07e2698df37c7a98348c4f762cb15") + (revision "1")) + (package + (name "sbcl-seedable-rng") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/seedable-rng") + (commit commit))) + (file-name (git-file-name "seedable-rng" version)) + (sha256 + (base32 "1ldpsbp3qrfzvknclsxj3sdyms1jf9ad20dvh4w0kw3zgahn2nr5")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-pcg" ,sbcl-cl-pcg) + ("golden-utils" ,sbcl-golden-utils) + ("ironclad" ,sbcl-ironclad))) + (home-page "https://git.mfiano.net/mfiano/seedable-rng") + (synopsis "Common Lisp random number generator") + (description + "SEEDABLE-RNG provides a convenient means of generating random numbers +that are seedable with deterministic results across hardware and Common Lisp +implementations.") + (license license:expat)))) + +(define-public ecl-seedable-rng + (sbcl-package->ecl-package sbcl-seedable-rng)) + +(define-public cl-seedable-rng + (sbcl-package->cl-source-package sbcl-seedable-rng)) + (define-public sbcl-jpl-queues (package (name "sbcl-jpl-queues") -- cgit 1.4.1 From 0852113136170489a8c6419e1d99d82f25c5f0d8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Mon, 15 Feb 2021 22:30:51 +0000 Subject: gnu: sbcl-mgl-pax: Update to 0.0.3-1.61ce874. * gnu/packages/lisp-xyz.scm (sbcl-mgl-pax): Update to 0.0.3-1.61ce874. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5c305e1508..5f1db87794 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2092,10 +2092,10 @@ processes that doesn't run under Emacs. Lisp processes created by (sbcl-package->ecl-package sbcl-slime-swank)) (define-public sbcl-mgl-pax - (let ((commit "818448418d6b9de74620f606f5b23033c6082769")) + (let ((commit "61ce8741f8920bd2faa425c5de4a99afdbc506c2")) (package (name "sbcl-mgl-pax") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.0.3" "1" commit)) (source (origin (method git-fetch) @@ -2103,8 +2103,7 @@ processes that doesn't run under Emacs. Lisp processes created by (url "https://github.com/melisgl/mgl-pax") (commit commit))) (sha256 - (base32 - "1p97zfkh130bdxqqxwaw2j9psv58751wakx7czbfpq410lg7dd7i")) + (base32 "1zm3j9vzd38b9pq7wmamj0pm1v5i13339mkbywyv0jzb5n1hz9s1")) (file-name (git-file-name "mgl-pax" version)))) (build-system asdf-build-system/sbcl) (inputs -- cgit 1.4.1 From 68193bef2eac7dc4c8e69ed962adc34bc712bffb Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 15 Feb 2021 06:00:44 +0000 Subject: gnu: esbuild: Update to 0.8.46. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (esbuild): Update to 0.8.46. Signed-off-by: 宋文武 --- 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 0b7e2b299b..d55e3ac70c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1479,7 +1479,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.44") + (version "0.8.46") (source (origin (method git-fetch) @@ -1488,7 +1488,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zx0bajw2gi3z5liq6wdd2hp2liw02s0i81kzq51csixv66ghm9s")) + (base32 "00mfw812ssvlflzy9rbxbn2srlyzwix2kjv0gbaqv9qazi7vrgdl")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From c10945eae5d29ac34145dbcb10b73b34d03bd532 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 09:56:37 +0100 Subject: gnu: passage: Fix typo in description. * gnu/packages/games.scm (passage): Add missing space after full stop, and correct double quotes. --- gnu/packages/games.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1d10c0d101..d8c98a9a2f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12183,7 +12183,7 @@ such as GnuGo. (base32 "02ky4a4xdjvr71r58339jjrjyz76b5skcnbq4f8707mrln9vhby3")))) (build-system gnu-build-system) (arguments - `(#:tests? #false ; there are none + `(#:tests? #false ; there are none #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir @@ -12220,11 +12220,12 @@ such as GnuGo. `(("imagemagick" ,imagemagick))) (home-page "http://hcsoftware.sourceforge.net/passage/") (synopsis "Memento mori game") - (description "Passage is meant to be a memento mori game. It presents an -entire life, from young adulthood through old age and death, in the span of -five minutes. Of course, it's a game, not a painting or a film, so the -choices that you make as the player are crucial. There's no \"right\" way to -play Passage, just as there's no right way to interpret it.") + (description + "Passage is meant to be a memento mori game. It presents an entire life, +from young adulthood through old age and death, in the span of five minutes. +Of course, it's a game, not a painting or a film, so the choices that you make +as the player are crucial. There's no ``right'' way to play Passage, just as +there's no right way to interpret it.") (license license:public-domain))) (define-public paperview -- cgit 1.4.1 From c896d4655dd0fdab86d7f6b15379eeec8cdf510d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 14 Feb 2021 00:46:30 -0500 Subject: gnu: gandi.cli: Update to 1.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (gandi.cli): Update to 1.6. [native-inputs]: Add python-pytest. [propagated-inputs]: Add openssh. Signed-off-by: 宋文武 --- gnu/packages/networking.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 5e0022ac76..804d4dce0c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1454,13 +1454,13 @@ round-robin fashion.") (define-public gandi.cli (package (name "gandi.cli") - (version "1.5") + (version "1.6") (source (origin (method url-fetch) (uri (pypi-uri name version)) (sha256 - (base32 "110wc9zgxsrvw4yzp21p0ian5lcf7vhcpxhnmsc4fg9pzl2bwxd5")))) + (base32 "1h36jahbp7273wn3yd747kbiwjc0bm3sja67bcxdsd54ln0vyndg")))) (build-system python-build-system) (arguments `(#:phases @@ -1484,8 +1484,11 @@ round-robin fashion.") #t)))))) (native-inputs `(("python-docutils" ,python-docutils) ; for rst2man.py + ("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) ("python-tox" ,python-tox))) + (propagated-inputs + `(("openssh" ,openssh))) ; used by gandi/cli/modules/iass.py (inputs `(("openssl" ,openssl) ("python-click" ,python-click) -- cgit 1.4.1 From 1535c07e92bb52ca207d5915dfe141e5acac2528 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Feb 2021 11:18:52 +0200 Subject: gnu: java-args4j: Use a source file-name. * gnu/packages/java.scm (java-args4j)[source]: Add file-name field. --- gnu/packages/java.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 9c46551202..7ba8b46226 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -13342,6 +13342,7 @@ library and the API is similar.") (uri (git-reference (url "https://github.com/kohsuke/args4j") (commit (string-append "args4j-site-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "0w061fg65qrsm1a0lz0vyprsyidj31krjb459qi2lw0y78xza26s")))) -- cgit 1.4.1 From a3be53efb6245120ca7f4b26535a11b88750a4f1 Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Thu, 24 Dec 2020 21:28:06 +0530 Subject: gnu: i2pd: Update to 2.36.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/i2p.scm (i2pd): Update to 2.36.0. [arguments]: Enable the 'x25519' test. Remove 'install-headers' and 'remove-source' phases. Co-authored-by: 宋文武 --- gnu/packages/i2p.scm | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/i2p.scm b/gnu/packages/i2p.scm index 537aeaf76c..5698e6362c 100644 --- a/gnu/packages/i2p.scm +++ b/gnu/packages/i2p.scm @@ -30,7 +30,7 @@ (define-public i2pd (package (name "i2pd") - (version "2.31.0") + (version "2.36.0") (source (origin (method git-fetch) @@ -39,7 +39,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q2gxz041ha9n5lfn91iy11sdf3z7d806vcq4z43m7lf92m7i4nn")))) + (base32 "0gx7y0vrg9lsl7m1r6c8xyyqmaqn900kms4g0941g0gd5zdb0mvz")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ("miniupnpc" ,miniupnpc) @@ -66,39 +66,13 @@ "./tests") (with-directory-excursion "tests" (substitute* "Makefile" - (("../libi2pd/") (string-append source "/libi2pd/")) - ;; Disable the x25519 test, which only compiles if - ;; openssl doesn't have X25519 support, but the - ;; version we use has it. - (("test-base-64 test-x25519 test-aeadchacha20poly1305") - "test-base-64 test-aeadchacha20poly1305")) + (("../libi2pd/") (string-append source "/libi2pd/"))) (apply invoke "make" "all" `(,@(if parallel-tests? `("-j" ,(number->string (parallel-job-count))) '()) - ,@make-flags)))))) - (add-after 'install 'install-headers - (lambda* (#:key outputs #:allow-other-keys) - (let* ((install-dir (assoc-ref outputs "out")) - (src-dir (string-append install-dir "/src")) - (include-dir - (string-append install-dir "/include"))) - (mkdir-p include-dir) - ;; This is the only header file that's relevant to the - ;; public interface. - ;; - (install-file (string-append src-dir "/api.h") - include-dir) - #t))) - (add-after 'install-headers 'remove-source - (lambda* (#:key outputs #:allow-other-keys) - (let* ((install-dir (assoc-ref outputs "out")) - (src-dir (string-append install-dir "/src"))) - (delete-file-recursively src-dir) - (delete-file (string-append install-dir - "/LICENSE")) - #t)))))) + ,@make-flags))))))))) (home-page "https://i2pd.website/") (synopsis "Router for an end-to-end encrypted and anonymous internet") (description "i2pd is a client for the anonymous I2P network, upon which -- cgit 1.4.1 From 13354b3f08bb4a7e3c43057ee98aae416b55409a Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 16 Feb 2021 14:33:30 +0000 Subject: gnu: Add texlive-arev. * gnu/packages/tex.scm (texlive-arev): New variable. --- gnu/packages/tex.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4858ba5100..6a40fb4c76 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2018, 2020 Arun Isaac ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Paul Garlick +;;; Copyright © 2020, 2021 Paul Garlick ;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -7765,3 +7765,34 @@ Adobe. LaTeX use is enabled by the mathpazo package, which is part of the @code{psnfss} distribution.") ;; Either LPPL version 1.0 or later, or GPL version 2 (license (list license:lppl1.0+ license:gpl2)))) + +(define-public texlive-arev + (package + (inherit (simple-texlive-package + "texlive-arev" + (list "/doc/fonts/arev/" + "/fonts/afm/public/arev/" + "/fonts/enc/dvips/arev/" + "/fonts/map/dvips/arev/" + "/fonts/tfm/public/arev/" + "/fonts/type1/public/arev/" + "/fonts/vf/public/arev/" + "/tex/latex/arev/") + (base32 + "15wkgc48r52mjpymv6l7j9bl99kwxbvg3g1mi3qyq7nfm799dkxy") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/arev") + (synopsis "Fonts and LaTeX support files for Arev Sans") + (description "The @code{arev} package provides type 1 fonts, +virtual fonts and LaTeX packages for using Arev Sans in both text and +mathematics. Arev Sans is a derivative of Bitstream Vera Sans, adding +support for Greek and Cyrillic characters and a few variant letters +appropriate for mathematics. The font is primarily used in LaTeX for +presentations, particularly when using a computer projector. Arev +Sans has large x-height, \"open letters\", wide spacing and thick +stems. The style is very similar to the SliTeX font lcmss but +heavier. Arev is one of a very small number of sans-font mathematics +support packages. Others are cmbright, hvmath and kerkis.") + (license (list license:silofl1.1 ;for Arev Sans + license:lppl1.3a ;for TeX support files + license:gpl2)))) ;fora ms-mdbch.sty -- cgit 1.4.1 From a6f8e8200f2a3885cda41520b9f8d2e2a1350cbe Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 16 Feb 2021 14:45:19 +0000 Subject: gnu: texlive-arev: Fix typo. * gnu/packages/tex.scm (texlive-arev)[license]: Fix filename. --- 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 6a40fb4c76..c0f4ff0fcd 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7795,4 +7795,4 @@ heavier. Arev is one of a very small number of sans-font mathematics support packages. Others are cmbright, hvmath and kerkis.") (license (list license:silofl1.1 ;for Arev Sans license:lppl1.3a ;for TeX support files - license:gpl2)))) ;fora ms-mdbch.sty + license:gpl2)))) ;for ams-mdbch.sty -- cgit 1.4.1 From 4390934f0b4a0d9208423e3b261e0f09b40eeb39 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Feb 2021 16:37:52 +0100 Subject: gnu: alacritty: Run on Wayland once more. This restores most of commit 3bbe2806bf11f6e95be42b1a21d79bd557f68d0b to fix . * gnu/packages/terminals.scm (alacritty)[arguments]: Patch in absolute references to LIBXKBCOMMON and WAYLAND libraries. --- gnu/packages/terminals.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index c53774b20c..831e10a8e3 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1261,7 +1261,42 @@ made by suckless.") (glutin-version ,(package-version rust-glutin-0.26)) (glutin-api (string-append glutin-name "-" glutin-version ".tar.gz/src/api/")) + (smithay-client-toolkit-name + ,(package-name rust-smithay-client-toolkit-0.12)) + (smithay-client-toolkit-version + ,(package-version rust-smithay-client-toolkit-0.12)) + (smithay-client-toolkit-src + (string-append smithay-client-toolkit-name "-" + smithay-client-toolkit-version ".tar.gz/src")) + (wayland-sys-name ,(package-name rust-wayland-sys-0.28)) + (wayland-sys-version ,(package-version rust-wayland-sys-0.28)) + (wayland-sys-src (string-append wayland-sys-name "-" + wayland-sys-version + ".tar.gz/src")) + (libxkbcommon (assoc-ref inputs "libxkbcommon")) + (libwayland (assoc-ref inputs "wayland")) (mesa (assoc-ref inputs "mesa"))) + (substitute* (string-append vendor-dir "/" + smithay-client-toolkit-src + "/seat/keyboard/ffi.rs") + (("libxkbcommon\\.so") + (string-append libxkbcommon "/lib/libxkbcommon.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/server.rs") + (("libwayland-server\\.so") + (string-append libwayland "/lib/libwayland-server.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/cursor.rs") + (("libwayland-cursor\\.so") + (string-append libwayland "/lib/libwayland-cursor.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/egl.rs") + (("libwayland-egl\\.so") + (string-append libwayland "/lib/libwayland-egl.so"))) + (substitute* (string-append vendor-dir "/" wayland-sys-src + "/client.rs") + (("libwayland-client\\.so") + (string-append libwayland "/lib/libwayland-client.so"))) (substitute* (string-append vendor-dir "/" glutin-api "glx/mod.rs") (("libGL.so") (string-append mesa "/lib/libGL.so"))) -- cgit 1.4.1 From 8f710cc598fb675d267f49a82cffc197f03ad52c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 16 Feb 2021 16:38:15 +0100 Subject: gnu: Add ocaml-llvm. * gnu/packages/ocaml.scm (make-ocaml-llvm, ocaml-llvm, ocaml-llvm-9) (ocaml-llvm-10, ocaml-llvm-11): New variables. --- gnu/packages/ocaml.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 03895d0a53..dec1f8405e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6197,3 +6197,44 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+))) + +(define (make-ocaml-llvm llvm) + (package + (inherit llvm) + (name "ocaml-llvm") + (outputs '("out")) + (arguments + `(#:configure-flags + (list + (string-append "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=" + (assoc-ref %build-inputs "llvm") "/lib") + "-DBUILD_SHARED_LIBS=TRUE" + "-DLLVM_OCAML_OUT_OF_TREE=TRUE" + (string-append "-DLLVM_OCAML_INSTALL_PATH=" + (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "make" "ocaml_all"))) + (replace 'install + (lambda _ + (invoke "cmake" "-P" "bindings/ocaml/cmake_install.cmake")))))) + (inputs + `(("llvm" ,llvm))) + (native-inputs + `(("ocaml" ,ocaml) + ("ocaml-findlib" ,ocaml-findlib) + ("ocaml-ounit" ,ocaml-ounit) + ("python" ,python))) + (propagated-inputs + `(("ocaml-integers" ,ocaml-integers) + ("ocaml-ctypes" ,ocaml-ctypes))) + (synopsis "OCaml bindings to LLVM") + (description "This package contains the OCaml bindings distributed with +LLVM."))) + +(define-public ocaml-llvm (make-ocaml-llvm llvm)) +(define-public ocaml-llvm-9 (make-ocaml-llvm llvm-9)) +(define-public ocaml-llvm-10 (make-ocaml-llvm llvm-10)) +(define-public ocaml-llvm-11 (make-ocaml-llvm llvm-11)) -- cgit 1.4.1 From bd32f85bfa502d92bf9370986b2ebfa8d75d74ed Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sat, 13 Feb 2021 15:49:42 +0000 Subject: gnu: apache-thrift: Update to 0.14.0. * gnu/packages/rpc.scm (apache-thrift): Update to 0.14.0. Signed-off-by: Leo Famulari --- gnu/packages/rpc.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index a0d979e3bb..8036998910 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Brett Gilio +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -207,7 +208,7 @@ with the HTTP/2-based RPC framework gRPC.") (define-public apache-thrift (package (name "apache-thrift") - (version "0.13.0") + (version "0.14.0") (source (origin (method git-fetch) @@ -217,7 +218,7 @@ with the HTTP/2-based RPC framework gRPC.") (file-name (git-file-name name version)) (sha256 (base32 - "17ckl7p7s3ga33yrjisilsimp80ansqxl54wvpkv0j7vx2zvc13y")))) + "09s8j95vc18117ahyl34gbd0gdxijkf0krrd3mp47vl08lcvi4kc")))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit 1.4.1 From 23af76f136591122b7fdd25a984319795419e081 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 12 Feb 2021 17:28:14 +0000 Subject: gnu: apache-arrow: Sort inputs alphabetically. * gnu/packages/databases.scm (apache-arrow)[inputs]: Sort inputs. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 3694a93df2..3be3a14ded 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -3874,23 +3875,23 @@ Monitor read/write activity on a mongo server ;;"-DBENCHMARK_ENABLE_TESTING=OFF" "-DARROW_BUILD_STATIC=OFF"))) (inputs - `(("boost" ,boost) + `(("apache-thrift" ,apache-thrift "lib") + ("boost" ,boost) ("brotli" ,google-brotli) + ("bzip2" ,bzip2) ("double-conversion" ,double-conversion) - ("snappy" ,snappy) ("gflags" ,gflags) ("glog" ,glog) - ("apache-thrift" ,apache-thrift "lib") + ("grpc" ,grpc) + ("lz4" ,lz4) ("protobuf" ,protobuf) + ("python-3" ,python) + ("python-numpy" ,python-numpy) ("rapidjson" ,rapidjson) - ("zlib" ,zlib) - ("bzip2" ,bzip2) - ("lz4" ,lz4) - ("zstd" ,zstd "lib") ("re2" ,re2) - ("grpc" ,grpc) - ("python-3" ,python) - ("python-numpy" ,python-numpy))) + ("snappy" ,snappy) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (native-inputs `(("pkg-config" ,pkg-config))) (outputs '("out" "lib" "include")) -- cgit 1.4.1 From 9757e5464038daa25290b5ab552f94d825c9f5aa Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 16 Feb 2021 08:28:11 -0500 Subject: gnu: apache-arrow: Update to 3.0.0. * gnu/packages/databases.scm (apache-arrow): Update to 3.0.0. [inputs]: Add utf8proc. Signed-off-by: Leo Famulari --- 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 3be3a14ded..6024d6eb5f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3787,7 +3787,7 @@ Monitor read/write activity on a mongo server (define-public apache-arrow (package (name "apache-arrow") - (version "0.17.1") + (version "3.0.0") (source (origin (method git-fetch) @@ -3797,7 +3797,7 @@ Monitor read/write activity on a mongo server (file-name (git-file-name name version)) (sha256 (base32 - "02r6yx3yhywzikd3b0vfkjgddhfiriyx2vpm3jf5880wq59x798a")))) + "03ngddh3r1g6f9aja2jlfksgvgyzmxmfy4bxvzjrcv5fvl5x8ii0")))) (build-system cmake-build-system) (arguments `(#:tests? #f @@ -3890,6 +3890,7 @@ Monitor read/write activity on a mongo server ("rapidjson" ,rapidjson) ("re2" ,re2) ("snappy" ,snappy) + ("utf8proc" ,utf8proc) ("zlib" ,zlib) ("zstd" ,zstd "lib"))) (native-inputs -- cgit 1.4.1 From 1a6f1072395be3d1bab9635feb7b5ae9fe917aab Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Feb 2021 20:09:35 +0200 Subject: gnu: perl-time-duration-parse: Update to 0.15. * gnu/packages/perl.scm (perl-time-duration-parse): Update to 0.15. --- 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 51ca2822c6..e279562b32 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -10288,14 +10288,14 @@ rounded or exact terms.") (define-public perl-time-duration-parse (package (name "perl-time-duration-parse") - (version "0.14") + (version "0.15") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/N/NE/NEILB/" "Time-Duration-Parse-" version ".tar.gz")) (sha256 - (base32 "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc")))) + (base32 "10g39bbrxkabbsfq4rv7f5b5x7h3jba08j4pg8gwr0b9iqx19n31")))) (build-system perl-build-system) (native-inputs `(("perl-time-duration" ,perl-time-duration))) -- cgit 1.4.1 From e4fb673a75c7a254070a8c27b8789b0e2e1f1a84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Feb 2021 20:12:35 +0200 Subject: gnu: ruby-gem-hadar: Update to 1.11.0. * gnu/packages/ruby.scm (ruby-gem-hadar): Update to 1.11.0. --- 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 9d855aeca0..90f885a379 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2019, 2020 Marius Bakke -;;; Copyright © 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Christopher Baines @@ -5852,13 +5852,13 @@ documentation for Ruby code.") (define-public ruby-gem-hadar (package (name "ruby-gem-hadar") - (version "1.9.1") + (version "1.11.0") (source (origin (method url-fetch) (uri (rubygems-uri "gem_hadar" version)) (sha256 (base32 - "1zxvd9l95rbks7x3cxn396w0sn7nha5542bf97v8akkn4vm7nby9")))) + "160abb3l4n3gkhd86f22n981bhqxkbf5ym6fhsk796pix6696pd5")))) (build-system ruby-build-system) ;; This gem needs itself at development time. We disable rebuilding of the ;; gemspec to avoid this loop. -- cgit 1.4.1 From d103cc6a02afcd6f1ff034371e349731cd0f6046 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 21:46:24 +0100 Subject: gnu: emacs-dash: Update to 2.18.0. * gnu/packages/emacs-xyz.scm (emacs-dash): Update to 2.18.0. [arguments]: Remove #:test-command keyword. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c55f5508e0..4d302a3f96 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2905,7 +2905,7 @@ and stored in memory.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.17.0") + (version "2.18.0") (source (origin (method git-fetch) (uri (git-reference @@ -2914,11 +2914,9 @@ and stored in memory.") (file-name (git-file-name name version)) (sha256 (base32 - "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n")))) + "190v264wj5cdm109ippzx2vc64hvfzmh5nbx4f2w09hn0hwfqipm")))) (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("./run-tests.sh"))) + (arguments `(#:tests? #t)) (home-page "https://github.com/magnars/dash.el") (synopsis "Modern list library for Emacs") (description "This package provides a modern list API library for Emacs.") -- cgit 1.4.1 From b819512ca2cce1051c5fea26328da2e5d6a9a101 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Feb 2021 02:34:06 -0500 Subject: gnu: Add linux-libre 5.11. * gnu/packages/linux.scm (linux-libre-5.11-version, deblob-scripts-5.11, linux-libre-5.11-pristine-source, linux-libre-5.11-source, linux-libre-5.11): New variables. * gnu/packages/aux-files/linux-libre/5.11-x86_64.conf, gnu/packages/aux-files/linux-libre/5.11-i686.conf, gnu/packages/aux-files/linux-libre/5.11-arm.conf, gnu/packages/aux-files/linux-libre/5.11-arm64.conf: New files. * Makefile.am (AUX_FILES): Add them. --- Makefile.am | 4 + gnu/packages/aux-files/linux-libre/5.11-arm.conf | 9944 +++++++++++++++++ gnu/packages/aux-files/linux-libre/5.11-arm64.conf | 10140 +++++++++++++++++ gnu/packages/aux-files/linux-libre/5.11-i686.conf | 10792 ++++++++++++++++++ .../aux-files/linux-libre/5.11-x86_64.conf | 10828 +++++++++++++++++++ gnu/packages/linux.scm | 28 + 6 files changed, 41736 insertions(+) create mode 100644 gnu/packages/aux-files/linux-libre/5.11-arm.conf create mode 100644 gnu/packages/aux-files/linux-libre/5.11-arm64.conf create mode 100644 gnu/packages/aux-files/linux-libre/5.11-i686.conf create mode 100644 gnu/packages/aux-files/linux-libre/5.11-x86_64.conf (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 52537fb53d..394d2ef75e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -360,6 +360,10 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/guix.vim \ + gnu/packages/aux-files/linux-libre/5.11-arm.conf \ + gnu/packages/aux-files/linux-libre/5.11-arm64.conf \ + gnu/packages/aux-files/linux-libre/5.11-i686.conf \ + gnu/packages/aux-files/linux-libre/5.11-x86_64.conf \ gnu/packages/aux-files/linux-libre/5.10-arm.conf \ gnu/packages/aux-files/linux-libre/5.10-arm64.conf \ gnu/packages/aux-files/linux-libre/5.10-i686.conf \ diff --git a/gnu/packages/aux-files/linux-libre/5.11-arm.conf b/gnu/packages/aux-files/linux-libre/5.11-arm.conf new file mode 100644 index 0000000000..9f09e6b1b3 --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/5.11-arm.conf @@ -0,0 +1,9944 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm 5.11.0 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=231010000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_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_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_WATCH_QUEUE=y +CONFIG_CROSS_MEMORY_ATTACH=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=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_GENERIC_IRQ_INJECTION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_IRQ_IPI=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 +# end of IRQ subsystem + +CONFIG_GENERIC_IRQ_MULTI_HANDLER=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 +# end of Timers subsystem + +# 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_SCHED_THERMAL_PRESSURE=y +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_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TASKS_TRACE_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKHEADERS 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 + +# +# Scheduler features +# +# CONFIG_UCLAMP_TASK is not set +# end of Scheduler features + +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +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_RD_ZSTD=y +CONFIG_BOOT_CONFIG=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=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_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_IO_URING=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_LSM=y +CONFIG_BPF_SYSCALL=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +# CONFIG_BPF_PRELOAD 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 +# end of Kernel Performance Events And Counters + +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_SLAB_FREELIST_HARDENED=y +CONFIG_SHUFFLE_PAGE_ALLOCATOR=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_ARM=y +CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_DMA_USE_IOMMU=y +CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 +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_ARCH_HAS_BANDGAP=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=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_EP93XX is not set +# CONFIG_ARCH_FOOTBRIDGE is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IXP4XX is not set +# CONFIG_ARCH_DOVE 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_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 +# end of Multiple platform selection + +CONFIG_ARCH_VIRT=y +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_ARTPEC is not set +# CONFIG_ARCH_ASPEED 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_EXYNOS_MCPM=y +CONFIG_EXYNOS_CPU_SUSPEND=y +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 + +# +# 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_IMX7ULP 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_MILBEAUT is not set +# CONFIG_ARCH_MMP is not set +CONFIG_ARCH_MSTARV7=y +CONFIG_MACH_INFINITY=y +CONFIG_MACH_MERCURY=y +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 +# end of TI OMAP Common Features + +CONFIG_MACH_OMAP_GENERIC=y + +# +# TI OMAP/AM/DM/DRA Family +# +CONFIG_OMAP_HWMOD=y +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 +# end of TI OMAP2/3/4 Specific Features + +# CONFIG_OMAP5_ERRATA_801819 is not set +# end of TI OMAP/AM/DM/DRA Family + +# CONFIG_ARCH_SIRF is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RDA is not set +CONFIG_ARCH_REALTEK=y +# 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 + +# +# 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_ICACHE_MISMATCH_WORKAROUND 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_857271=y +# CONFIG_ARM_ERRATA_852421 is not set +# CONFIG_ARM_ERRATA_852423 is not set +CONFIG_ARM_ERRATA_857272=y +# end of System Type + +# +# Bus support +# +CONFIG_ARM_ERRATA_814220=y +# end of Bus support + +# +# 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_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_ENABLE=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_PARAVIRT=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_XEN_DOM0=y +CONFIG_XEN=y +# end of Kernel Features + +# +# 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 +# end of Boot options + +# +# 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_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m +CONFIG_ARM_ARMADA_37XX_CPUFREQ=m +CONFIG_ARM_ARMADA_8K_CPUFREQ=m +CONFIG_ARM_HIGHBANK_CPUFREQ=m +CONFIG_ARM_IMX6Q_CPUFREQ=m +CONFIG_ARM_IMX_CPUFREQ_DT=m +CONFIG_ARM_OMAP2PLUS_CPUFREQ=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=m +CONFIG_ARM_SCMI_CPUFREQ=m +CONFIG_ARM_TEGRA20_CPUFREQ=m +CONFIG_ARM_TEGRA124_CPUFREQ=y +# CONFIG_ARM_TI_CPUFREQ is not set +# end of CPU Frequency scaling + +# +# CPU Idle +# +# CONFIG_CPU_IDLE is not set +CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y +# end of CPU Idle +# end of CPU Power Management + +# +# 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 +# end of Floating point emulation + +# +# 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_HIBERNATION_SNAPSHOT_DEV=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_ENERGY_MODEL=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +# end of Power management options + +# +# Firmware Drivers +# +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_TRUSTED_FOUNDATIONS=y +# CONFIG_TURRIS_MOX_RWTM is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_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 +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +# CONFIG_IMX_DSP is not set +# CONFIG_IMX_SCU is not set +CONFIG_ARM_PSCI_FW=y +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y +CONFIG_ARM_SMCCC_SOC_ID=y + +# +# Tegra firmware driver +# +# CONFIG_TEGRA_IVC is not set +# end of Tegra firmware driver +# end of Firmware Drivers + +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_SHA256_ARM=m +CONFIG_CRYPTO_SHA512_ARM=m +CONFIG_CRYPTO_AES_ARM=m +CONFIG_CRYPTO_CHACHA20_NEON=m +CONFIG_CRYPTO_POLY1305_ARM=m + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_SET_FS=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_KEEPINITRD=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=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=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_STACKPROTECTOR=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_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=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_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_HAVE_ARCH_PFN_VALID=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +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=y +CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_RQ_ALLOC_TIME=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_CGROUP_RWSTAT=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_INTEGRITY_T10=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_CGROUP_IOCOST=y +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=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 +# end of Partition Types + +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +CONFIG_BFQ_GROUP_IOSCHED=y +# CONFIG_BFQ_CGROUP_DEBUG is not set +# end of IO Schedulers + +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_HAS_NON_OVERLAPPING_ADDRESS_SPACE=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_ARCH_HAS_BINFMT_FLAT=y +# CONFIG_BINFMT_FLAT is not set +CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_FLATMEM_MANUAL=y +# CONFIG_SPARSEMEM_MANUAL is not set +CONFIG_FLATMEM=y +CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_CONTIG_ALLOC=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_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_DEFAULT_ON is not set +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +# CONFIG_Z3FOLD is not set +CONFIG_ZSMALLOC=m +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_HMM_MIRROR=y +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +CONFIG_KMAP_LOCAL=y +# end of Memory Management options + +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_NET_REDIRECT=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_SCM=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_AH=m +CONFIG_XFRM_ESP=m +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +# CONFIG_SMC is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m +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_ESPINTCP is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=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_ESPINTCP 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_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_IPV6_RPL_LWTUNNEL is not set +# CONFIG_NETLABEL is not set +CONFIG_MPTCP=y +CONFIG_INET_MPTCP_DIAG=m +CONFIG_MPTCP_IPV6=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=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=y +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_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_NF_NAT_MASQUERADE=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y +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_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NFT_XFRM=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=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_MASQUERADE=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 +# end of Core Netfilter Configuration + +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=y +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=y +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_SNMP_BASIC=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 +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +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 +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_NF_CONNTRACK_BRIDGE=m +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 +# end of DCCP CCIDs Configuration + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +# end of DCCP Kernel Hacking + +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_CRYPTO=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_BRIDGE_MRP=y +CONFIG_BRIDGE_CFM=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_8021Q=m +CONFIG_NET_DSA_TAG_AR9331=m +CONFIG_NET_DSA_TAG_BRCM_COMMON=m +CONFIG_NET_DSA_TAG_BRCM=m +CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +CONFIG_NET_DSA_TAG_HELLCREEK=m +CONFIG_NET_DSA_TAG_GSWIP=m +CONFIG_NET_DSA_TAG_DSA_COMMON=m +CONFIG_NET_DSA_TAG_DSA=m +CONFIG_NET_DSA_TAG_EDSA=m +CONFIG_NET_DSA_TAG_MTK=m +CONFIG_NET_DSA_TAG_KSZ=m +CONFIG_NET_DSA_TAG_RTL4_A=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_NET_DSA_TAG_QCA=m +CONFIG_NET_DSA_TAG_LAN9303=m +CONFIG_NET_DSA_TAG_SJA1105=m +CONFIG_NET_DSA_TAG_TRAILER=m +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_TAPRIO=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_FQ_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +CONFIG_NET_SCH_ETS=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_MPLS=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_GATE=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_TC_SKB_EXT is not set +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_DEBUG is not set +# CONFIG_BATMAN_ADV_TRACING 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_VSOCKETS_LOOPBACK=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=m +CONFIG_QRTR_TUN=m +CONFIG_QRTR_MHI=m +# 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_NET_FLOW_LIMIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_DROP_MONITOR=y +# end of Network testing +# end of Networking options + +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m +CONFIG_CAN_J1939=m +CONFIG_CAN_ISOTP=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_KVASER_PCIEFD=m +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_EMS_PCI=m +CONFIG_CAN_F81601=m +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_HI311X is not set +# CONFIG_CAN_MCP251X is not set +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +# end of CAN SPI interfaces + +# +# 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 +# end of CAN USB interfaces + +# CONFIG_CAN_DEBUG_DEVICES is not set +# end of CAN Device Drivers + +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_MSFTEXT=y +CONFIG_BT_DEBUGFS=y +# CONFIG_BT_SELFTEST is not set + +# +# 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_MTK=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_MTKSDIO=m +CONFIG_BT_HCIRSI=m +# end of Bluetooth device drivers + +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_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_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 +# end of Near Field Communication (NFC) devices + +# 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=y +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=m +CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_TEGRA_AHB=y +CONFIG_HAVE_PCI=y +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_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_PCIE_BW is not set +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_MSI_ARCH_FALLBACKS=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_STUB=m +CONFIG_PCI_ECAM=y +CONFIG_PCI_BRIDGE_EMUL=y +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y +# CONFIG_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +# CONFIG_HOTPLUG_PCI is not set + +# +# PCI controller drivers +# +CONFIG_PCI_MVEBU=y +# 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 +CONFIG_PCIE_BRCMSTB=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_EXYNOS=m +CONFIG_PCI_IMX6=y +# CONFIG_PCI_LAYERSCAPE is not set +# CONFIG_PCIE_ARMADA_8K is not set +# CONFIG_PCI_MESON is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +CONFIG_PCIE_CADENCE=y +CONFIG_PCIE_CADENCE_HOST=y +CONFIG_PCIE_CADENCE_PLAT=y +CONFIG_PCIE_CADENCE_PLAT_HOST=y +# CONFIG_PCI_J721E_HOST is not set +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# end of PCI switch controller drivers + +# CONFIG_PCCARD is not set +# CONFIG_RAPIDIO is not set + +# +# Generic Driver Options +# +CONFIG_AUXILIARY_BUS=y +# 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_FW_LOADER_PAGED_BUF=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y +# end of Firmware loader + +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_REGMAP_SCCB=m +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_GENERIC_ARCH_TOPOLOGY=y +# end of Generic Driver Options + +# +# 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_MOXTET 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=y +CONFIG_SUN50I_DE2_BUS=y +CONFIG_SUNXI_RSB=y +# CONFIG_TEGRA_GMI is not set +CONFIG_TI_PWMSS=y +CONFIG_TI_SYSC=y +CONFIG_VEXPRESS_CONFIG=y +CONFIG_MHI_BUS=m +# CONFIG_MHI_BUS_DEBUG is not set +CONFIG_MHI_BUS_PCI_GENERIC=m +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_MTD=y +# CONFIG_MTD_TESTS is not set + +# +# Partition parsers +# +CONFIG_MTD_AR7_PARTS=m +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# end of 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=m +# CONFIG_MTD_JEDECPROBE is not set +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 is not set +# CONFIG_MTD_ABSENT is not set +# end of RAM/ROM/Flash chip drivers + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +# CONFIG_MTD_PHYSMAP_OF is not set +CONFIG_MTD_PHYSMAP_GPIO_ADDR=y +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +# end of Mapping drivers for chip access + +# +# 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_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 +# end of Self-contained MTD device drivers + +# +# NAND +# +CONFIG_MTD_NAND_CORE=y +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_RAW_NAND=m + +# +# Raw/parallel NAND flash controllers +# +# CONFIG_MTD_NAND_DENALI_PCI is not set +# CONFIG_MTD_NAND_DENALI_DT is not set +CONFIG_MTD_NAND_OMAP2=m +# CONFIG_MTD_NAND_OMAP_BCH is not set +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_ORION=m +CONFIG_MTD_NAND_MARVELL=m +# CONFIG_MTD_NAND_BRCMNAND is not set +CONFIG_MTD_NAND_GPMI_NAND=m +CONFIG_MTD_NAND_MXC=m +CONFIG_MTD_NAND_SUNXI=m +CONFIG_MTD_NAND_MXIC=m +CONFIG_MTD_NAND_TEGRA=m +# CONFIG_MTD_NAND_GPIO is not set +# CONFIG_MTD_NAND_PLATFORM is not set +CONFIG_MTD_NAND_CADENCE=m +CONFIG_MTD_NAND_ARASAN=m +# CONFIG_MTD_NAND_INTEL_LGM is not set +CONFIG_MTD_NAND_ROCKCHIP=m + +# +# Misc +# +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_NANDSIM=m +CONFIG_MTD_NAND_RICOH=m +# CONFIG_MTD_NAND_DISKONCHIP is not set +CONFIG_MTD_SPI_NAND=m + +# +# ECC engine support +# +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# end of ECC engine support +# end of NAND + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +# CONFIG_MTD_LPDDR2_NVM is not set +# end of LPDDR & LPDDR2 PCM memory drivers + +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP 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_MTD_HYPERBUS=m +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_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_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING 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_BLK_DEV_RBD=m +# CONFIG_BLK_DEV_RSXX is not set +CONFIG_BLK_DEV_RNBD=y +CONFIG_BLK_DEV_RNBD_CLIENT=m +CONFIG_BLK_DEV_RNBD_SERVER=m + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_HWMON=y +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +# CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_PASSTHRU is not set +# CONFIG_NVME_TARGET_LOOP is not set +CONFIG_NVME_TARGET_RDMA=m +# CONFIG_NVME_TARGET_FC is not set +# CONFIG_NVME_TARGET_TCP is not set +# end of NVME Support + +# +# 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_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_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +CONFIG_SRAM_EXEC=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_XILINX_SDFEC=m +CONFIG_MISC_RTSX=m +# CONFIG_PVPANIC is not set +CONFIG_HISI_HIKEY_USB=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_EEPROM_EE1004 is not set +# end of EEPROM support + +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 +# end of Texas Instruments shared transport line discipline + +# CONFIG_SENSORS_LIS3_SPI is not set +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +# CONFIG_ECHO is not set +CONFIG_MISC_ALCOR_PCI=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +# CONFIG_HABANA_AI is not set +CONFIG_UACCE=m +# end of Misc devices + +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_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=m +CONFIG_CHR_DEV_ST=m +CONFIG_BLK_DEV_SR=m +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 +# end of SCSI Transports + +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_UFS_BSG is not set +CONFIG_SCSI_UFS_CRYPTO=y +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_MYRB is not set +# CONFIG_SCSI_MYRS 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_FDOMAIN=m +CONFIG_SCSI_FDOMAIN_PCI=m +# CONFIG_SCSI_GDTH is not set +# 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 +# end of SCSI device support + +CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_ATA=m +CONFIG_SATA_HOST=y +CONFIG_PATA_TIMINGS=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_FORCE=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_BCACHE_ASYNC_REGISTRATION is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +# 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_EBS is not set +CONFIG_DM_ERA=m +CONFIG_DM_CLONE=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_MULTIPATH_HST=m +CONFIG_DM_MULTIPATH_IOA=m +CONFIG_DM_DELAY=m +CONFIG_DM_DUST=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y +# 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 +# end of IEEE 1394 (FireWire) support + +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set +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_L3S=y +CONFIG_IPVLAN=m +# CONFIG_IPVTAP is not set +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_BAREUDP=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=m +CONFIG_MHI_NET=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 + +# +# 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_B53_SERDES is not set +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set +# CONFIG_NET_DSA_MT7530 is not set +CONFIG_NET_DSA_MV88E6060=m +# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set +# CONFIG_NET_DSA_MICROCHIP_KSZ8795 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_MSCC_FELIX=m +CONFIG_NET_DSA_MSCC_SEVILLE=m +CONFIG_NET_DSA_AR9331=m +CONFIG_NET_DSA_SJA1105=m +CONFIG_NET_DSA_SJA1105_PTP=y +# CONFIG_NET_DSA_SJA1105_TAS 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_NET_DSA_VITESSE_VSC73XX_SPI=m +CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m +# end of Distributed Switch Architecture drivers + +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_ENA_ETHERNET=m +CONFIG_NET_VENDOR_AMD=y +# CONFIG_AMD8111_ETH is not set +CONFIG_PCNET32=m +CONFIG_NET_VENDOR_AQUANTIA=y +CONFIG_AQTION=m +# 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_CHELSIO_INLINE_CRYPTO=y +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_FSL_ENETC=m +CONFIG_FSL_ENETC_VF=m +CONFIG_FSL_ENETC_MDIO=m +CONFIG_FSL_ENETC_PTP_CLOCK=m +CONFIG_FSL_ENETC_QOS=y +CONFIG_NET_VENDOR_GOOGLE=y +CONFIG_GVE=m +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_DSAF is not set +# CONFIG_HNS_ENET is not set +# CONFIG_HNS3 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_IAVF=m +CONFIG_I40EVF=m +# CONFIG_ICE is not set +# CONFIG_FM10K is not set +# CONFIG_IGC 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_PRESTERA=m +CONFIG_PRESTERA_PCI=m +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_CLS_ACT=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLX5_SW_STEERING=y +# 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_LIB=m +CONFIG_MSCC_OCELOT_SWITCH=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_NI_XGE_MANAGEMENT_ENET is not set +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_PENSANDO=y +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +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_SELFTESTS is not set +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_DWMAC_IMX8=m +# CONFIG_DWMAC_INTEL_PLAT is not set +# 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_CPSW_PHY_SEL=y +CONFIG_TI_CPSW=m +CONFIG_TI_CPSW_SWITCHDEV=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_NET_VENDOR_XILINX=y +CONFIG_XILINX_AXI_EMAC=m +CONFIG_XILINX_LL_TEMAC=m +CONFIG_FDDI=y +CONFIG_DEFXX=m +# CONFIG_DEFXX_MMIO is not set +CONFIG_SKFP=m +# CONFIG_HIPPI is not set +CONFIG_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set +CONFIG_FIXED_PHY=y +CONFIG_SFP=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_ADIN_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AX88796B_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM54140_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM84881_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_CICADA_PHY=m +# CONFIG_CORTINA_PHY is not set +CONFIG_DAVICOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_LXT_PHY=m +# CONFIG_INTEL_XWAY_PHY is not set +CONFIG_LSI_ET1011C_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_NXP_TJA11XX_PHY=m +CONFIG_AT803X_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_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_DP83869_PHY=m +CONFIG_VITESSE_PHY=m +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA is not set +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_OF_MDIO=y +CONFIG_MDIO_DEVRES=y +CONFIG_MDIO_SUN4I=y +# CONFIG_MDIO_BITBANG is not set +CONFIG_MDIO_BCM_UNIMAC=m +# CONFIG_MDIO_HISI_FEMAC is not set +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MVUSB=m +# CONFIG_MDIO_MSCC_MIIM is not set +# CONFIG_MDIO_IPQ4019 is not set +CONFIG_MDIO_IPQ8064=m + +# +# MDIO Multiplexers +# +CONFIG_MDIO_BUS_MUX=m +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set + +# +# PCS device drivers +# +CONFIG_PCS_XPCS=m +CONFIG_PCS_LYNX=m +# end of PCS device drivers + +# 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_USB_NET_AQC111=m +CONFIG_USB_RTL8153_ECM=m +CONFIG_WLAN=y +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_PCI_NO_EEPROM=m +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_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_DEBUG is not set +# CONFIG_ATH11K_TRACING 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 +# end of iwl3945 / iwl4965 Debugging Options + +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 + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +# end of Debugging Options + +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_MT76x0U is not set +# CONFIG_MT76x0E is not set +# CONFIG_MT76x2E is not set +# CONFIG_MT76x2U is not set +# CONFIG_MT7603E is not set +# CONFIG_MT7615E is not set +# CONFIG_MT7663U is not set +# CONFIG_MT7663S is not set +# CONFIG_MT7915E is not set +CONFIG_WLAN_VENDOR_MICROCHIP=y +# CONFIG_WILC1000_SDIO is not set +# CONFIG_WILC1000_SPI 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_RTW88 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_PCIE is not set +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_VIRT_WIFI=m +# 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_USB4_NET=m +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_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_QT1050=m +# 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_SNVS_PWRKEY=m +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_IQS62X=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_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_CY8CTMA140 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_RASPBERRYPI_FW=m +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_TOUCHSCREEN_IQS5XX is not set +CONFIG_TOUCHSCREEN_ZINITIX=m +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_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +# CONFIG_INPUT_GPIO_VIBRA 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_DA7280_HAPTICS 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_IQS269A is not set +# CONFIG_INPUT_CMA3000 is not set +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +# 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_F3A=y +# 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 +# end of Hardware I/O ports +# end of Input device support + +# +# 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_LDISC_AUTOLOAD=y + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +CONFIG_SERIAL_8250_16550A_VARIANTS=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_DWLIB=y +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_TEGRA=y +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_IMX_EARLYCON=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_SIFIVE is not set +# 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_FSL_LINFLEXUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +# CONFIG_SERIAL_ST_ASC is not set +# CONFIG_SERIAL_SPRD is not set +# CONFIG_SERIAL_MVEBU_UART is not set +# end of Serial drivers + +CONFIG_SERIAL_MCTRL_GPIO=y +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_N_GSM=m +CONFIG_NOZOMI=m +CONFIG_NULL_TTY=m +# CONFIG_TRACE_SINK 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_SERIAL_DEV_BUS is not set +CONFIG_TTY_PRINTK=m +CONFIG_TTY_PRINTK_LEVEL=6 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_VIRTIO_CONSOLE=m +# CONFIG_IPMI_HANDLER is not set +CONFIG_IPMB_DEVICE_INTERFACE=m +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BA431=m +CONFIG_HW_RANDOM_BCM2835=m +CONFIG_HW_RANDOM_IPROC_RNG200=m +CONFIG_HW_RANDOM_OMAP=m +CONFIG_HW_RANDOM_OMAP3_ROM=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_EXYNOS=m +CONFIG_HW_RANDOM_CCTRNG=m +CONFIG_HW_RANDOM_XIPHERA=m +# CONFIG_APPLICOM is not set +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set +# CONFIG_RAW_DRIVER is not set +CONFIG_DEVPORT=y +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_XILLYBUS is not set +# end of Character devices + +# CONFIG_RANDOM_TRUST_BOOTLOADER 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 +# end of Multiplexer I2C Chip support + +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_NVIDIA_GPU 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_BRCMSTB=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_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 +# end of I2C Hardware Bus support + +# CONFIG_I2C_STUB is not set +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_SLAVE_TESTUNIT is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +# CONFIG_I3C 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_CADENCE_QUADSPI is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_FSL_LPSPI is not set +# CONFIG_SPI_FSL_QUADSPI is not set +# CONFIG_SPI_NXP_FLEXSPI 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_SIFIVE is not set +CONFIG_SPI_SUN4I=m +CONFIG_SPI_SUN6I=m +CONFIG_SPI_MXIC=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 +# CONFIG_SPI_AMD is not set + +# +# SPI Multiplexer support +# +CONFIG_SPI_MUX=m + +# +# 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_SPI_DYNAMIC=y +# 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 +CONFIG_PTP_1588_CLOCK_QORIQ=m + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_IDT82P33=m +CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_OCP=m +# end of PTP clock support + +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_MCP23S08_I2C=m +CONFIG_PINCTRL_MCP23S08_SPI=m +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_ROCKCHIP=y +CONFIG_PINCTRL_SINGLE=y +# CONFIG_PINCTRL_SX150X is not set +# CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_PALMAS=y +CONFIG_PINCTRL_RK805=m +# CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set +CONFIG_PINCTRL_BCM2835=y +CONFIG_PINCTRL_IMX=y +CONFIG_PINCTRL_IMX51=y +CONFIG_PINCTRL_IMX53=y +CONFIG_PINCTRL_IMX6Q=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y +CONFIG_PINCTRL_IMX8MQ=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 + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +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_SUN50I_A64 is not set +# CONFIG_PINCTRL_SUN50I_A64_R is not set +# CONFIG_PINCTRL_SUN50I_A100 is not set +# CONFIG_PINCTRL_SUN50I_A100_R is not set +# CONFIG_PINCTRL_SUN50I_H5 is not set +# CONFIG_PINCTRL_SUN50I_H6 is not set +# CONFIG_PINCTRL_SUN50I_H6_R is not set +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_CDEV=y +CONFIG_GPIO_CDEV_V1=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_CADENCE=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_LOGICVC=m +CONFIG_GPIO_MB86S7X=m +# CONFIG_GPIO_MPC8XXX is not set +CONFIG_GPIO_MVEBU=y +CONFIG_GPIO_MXC=y +CONFIG_GPIO_OMAP=y +CONFIG_GPIO_PL061=y +# CONFIG_GPIO_SAMA5D2_PIOBU is not set +CONFIG_GPIO_SIFIVE=y +# CONFIG_GPIO_SYSCON is not set +CONFIG_GPIO_TEGRA=y +# CONFIG_GPIO_TS4800 is not set +CONFIG_GPIO_XILINX=m +# CONFIG_GPIO_ZEVIO is not set +# CONFIG_GPIO_AMD_FCH is not set +CONFIG_GPIO_MSC313=y +# end of Memory mapped GPIO drivers + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_GW_PLD is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_PCA9570=m +CONFIG_GPIO_PCF857X=m +# CONFIG_GPIO_TPIC2810 is not set +# CONFIG_GPIO_TS4900 is not set +# end of I2C GPIO expanders + +# +# MFD GPIO expanders +# +CONFIG_GPIO_BD70528=m +CONFIG_GPIO_BD71828=m +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 +# end of MFD GPIO expanders + +# +# 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 +# end of PCI GPIO expanders + +# +# 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 +# end of SPI GPIO expanders + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +# end of USB GPIO expanders + +# +# Virtual GPIO drivers +# +CONFIG_GPIO_AGGREGATOR=m +# CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + +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 +# CONFIG_W1_MASTER_SGI is not set +# end of 1-wire Bus Masters + +# +# 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_DS2430=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_DS250X 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 +# end of 1-wire Slaves + +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_LINKSTATION is not set +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_QNAP is not set +CONFIG_POWER_RESET_REGULATOR=y +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_REBOOT_MODE=m +# CONFIG_SYSCON_REBOOT_MODE is not set +CONFIG_NVMEM_REBOOT_MODE=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y +# 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_CW2015=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_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_LT3651 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_BQ2515X is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 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_CHARGER_UCS1002 is not set +# CONFIG_CHARGER_BD70528 is not set +CONFIG_CHARGER_BD99954=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_ADM1177=m +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_AS370 is not set +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_AXI_FAN_CONTROL=m +CONFIG_SENSORS_ARM_SCMI=m +# CONFIG_SENSORS_ASPEED is not set +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CORSAIR_CPRO=m +CONFIG_SENSORS_CORSAIR_PSU=m +CONFIG_SENSORS_DRIVETEMP=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_LTC2947=m +CONFIG_SENSORS_LTC2947_I2C=m +CONFIG_SENSORS_LTC2947_SPI=m +# CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 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_MAX127=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_MAX31730=m +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_MR75203 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_OCC_P8_I2C 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_SBTSI=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_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_TMP513=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_NETLINK=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_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_CPU_FREQ_THERMAL=y +# CONFIG_DEVFREQ_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_THERMAL_MMIO is not set +# CONFIG_IMX_THERMAL is not set +CONFIG_IMX8MM_THERMAL=m +CONFIG_SUN8I_THERMAL=m +CONFIG_ROCKCHIP_THERMAL=m +CONFIG_ARMADA_THERMAL=y + +# +# Broadcom thermal drivers +# +CONFIG_BCM2711_THERMAL=m +CONFIG_BCM2835_THERMAL=m +# end of Broadcom thermal drivers + +# +# 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 +# end of Texas Instruments thermal drivers + +# +# Samsung thermal drivers +# +CONFIG_EXYNOS_THERMAL=y +# end of Samsung thermal drivers + +# +# NVIDIA Tegra thermal drivers +# +CONFIG_TEGRA_SOCTHERM=y +# end of NVIDIA Tegra thermal drivers + +# CONFIG_GENERIC_ADC_THERMAL is not set +CONFIG_KHADAS_MCU_FAN_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_OPEN_TIMEOUT=0 +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_BD70528_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_ARMADA_37XX_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set +CONFIG_FTWDT010_WATCHDOG=m +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_IMX7ULP_WDT=m +CONFIG_TEGRA_WATCHDOG=m +CONFIG_ARM_SMC_WATCHDOG=m +CONFIG_RTD119X_WATCHDOG=y +# 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 +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_ALTERA_SYSMGR 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_DEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L15 is not set +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_MFD_CS47L92 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_GATEWORKS_GSC is not set +CONFIG_MFD_MC13XXX=m +CONFIG_MFD_MC13XXX_SPI=m +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_MFD_MP2629=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_INTEL_PMT is not set +CONFIG_MFD_IQS62X=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_MAX77650 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_MT6360=m +# 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_ABX500_CORE is not set +CONFIG_MFD_STMPE=y + +# +# STMicroelectronics STMPE Interface Drivers +# +CONFIG_STMPE_I2C=y +# CONFIG_STMPE_SPI is not set +# end of STMicroelectronics STMPE Interface Drivers + +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_TQMX86 is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_LOCHNAGAR 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_ROHM_BD70528=m +CONFIG_MFD_ROHM_BD71828=m +# CONFIG_MFD_STPMIC1 is not set +# CONFIG_MFD_STMFX is not set +CONFIG_MFD_KHADAS_MCU=m +CONFIG_MFD_VEXPRESS_SYSREG=y +# CONFIG_MFD_INTEL_M10_BMC is not set +# end of Multifunction device drivers + +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_ARIZONA_LDO1=m +CONFIG_REGULATOR_ARIZONA_MICSUPP=m +CONFIG_REGULATOR_ARM_SCMI=m +CONFIG_REGULATOR_AS3722=y +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BD70528=m +CONFIG_REGULATOR_BD71828=m +CONFIG_REGULATOR_BD718XX=m +CONFIG_REGULATOR_BD9571MWV=m +CONFIG_REGULATOR_CROS_EC=m +CONFIG_REGULATOR_DA9052=m +CONFIG_REGULATOR_DA9121=m +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_FAN53880=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_MAX77826 is not set +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +# CONFIG_REGULATOR_MCP16502 is not set +CONFIG_REGULATOR_MP5416=m +CONFIG_REGULATOR_MP8859=m +CONFIG_REGULATOR_MP886X=m +CONFIG_REGULATOR_MPQ7920=m +# CONFIG_REGULATOR_MT6311 is not set +CONFIG_REGULATOR_MT6360=m +CONFIG_REGULATOR_PALMAS=y +CONFIG_REGULATOR_PBIAS=m +CONFIG_REGULATOR_PCA9450=m +CONFIG_REGULATOR_PF8X00=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_RASPBERRYPI_TOUCHSCREEN_ATTINY=m +CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_ROHM=m +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_SLG51000=m +CONFIG_REGULATOR_TI_ABB=m +CONFIG_REGULATOR_SY8106A=m +CONFIG_REGULATOR_SY8824X=m +CONFIG_REGULATOR_SY8827N=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_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_IR_RCMM_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_RC_XBOX_DVD=m +CONFIG_IR_TOY=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_CEC_CH7322=m +CONFIG_CEC_CROS_EC=m +CONFIG_CEC_SAMSUNG_S5P=m +CONFIG_CEC_TEGRA=m +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_SUPPORT=y +# CONFIG_MEDIA_SUPPORT_FILTER is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y + +# +# Media device types +# +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_PLATFORM_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +# end of Media device types + +# +# Media core support +# +CONFIG_VIDEO_DEV=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_DVB_CORE=y +# end of Media core support + +# +# Video4Linux options +# +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L2_I2C=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES 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 +# end of Video4Linux options + +# +# Media controller options +# +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# +# end of Media controller options + +# +# Digital TV options +# +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +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 +# end of Digital TV options + +# +# Media drivers +# +CONFIG_TTPCI_EEPROM=m +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_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_CXUSB_ANALOG=y +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 +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 +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_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 +CONFIG_RADIO_WL128X=m +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 +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_ASPEED=m +# CONFIG_VIDEO_MUX is not set +CONFIG_VIDEO_OMAP3=m +# CONFIG_VIDEO_OMAP3_DEBUG is not set +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set +# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set +# CONFIG_VIDEO_XILINX is not set +CONFIG_VIDEO_SUN4I_CSI=m +CONFIG_VIDEO_SUN6I_CSI=m +# CONFIG_VIDEO_TI_CAL is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +# CONFIG_VIDEO_CODA is not set +CONFIG_VIDEO_IMX_PXP=m +# 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_ROCKCHIP_RGA=m +CONFIG_VIDEO_TI_VPE=m +# CONFIG_VIDEO_TI_VPE_DEBUG is not set +CONFIG_VIDEO_SUN8I_DEINTERLACE=m +CONFIG_VIDEO_SUN8I_ROTATE=m +CONFIG_VIDEO_TI_VPDMA=m +CONFIG_VIDEO_TI_SC=m +CONFIG_VIDEO_TI_CSC=m +# CONFIG_DVB_PLATFORM_DRIVERS is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=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_TEST_DRIVERS is not set + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=y + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA1997X=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_TLV320AIC23B=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_ADV748X=m +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7604_CEC=y +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_ADV7842_CEC=y +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_ML86V7667=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TC358743=m +CONFIG_VIDEO_TC358743_CEC=y +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_TW9910=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_MAX9286=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_ADV7511=m +CONFIG_VIDEO_ADV7511_CEC=y +CONFIG_VIDEO_AD9389B=m +CONFIG_VIDEO_AK881X=m +CONFIG_VIDEO_THS8200=m +# end of Video encoders + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +CONFIG_SDR_MAX2175=m +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_I2C=m +CONFIG_VIDEO_ST_MIPID02=m +# end of Miscellaneous helper chips + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_HI556=m +CONFIG_VIDEO_IMX214=m +CONFIG_VIDEO_IMX219=m +CONFIG_VIDEO_IMX258=m +CONFIG_VIDEO_IMX274=m +CONFIG_VIDEO_IMX290=m +CONFIG_VIDEO_IMX319=m +CONFIG_VIDEO_IMX355=m +CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV2659=m +CONFIG_VIDEO_OV2680=m +CONFIG_VIDEO_OV2685=m +CONFIG_VIDEO_OV5640=m +CONFIG_VIDEO_OV5645=m +CONFIG_VIDEO_OV5647=m +CONFIG_VIDEO_OV6650=m +CONFIG_VIDEO_OV5670=m +CONFIG_VIDEO_OV5675=m +CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV7251=m +CONFIG_VIDEO_OV772X=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV7740=m +CONFIG_VIDEO_OV8856=m +CONFIG_VIDEO_OV9640=m +CONFIG_VIDEO_OV9650=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_RDACM20=m +CONFIG_VIDEO_RJ54N1=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K4ECGX=m +CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_CCS=m +CONFIG_VIDEO_ET8EK8=m +CONFIG_VIDEO_S5C73M3=m +# end of Camera sensor devices + +# +# Lens drivers +# +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_AK7375=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9768=m +CONFIG_VIDEO_DW9807_VCM=m +# end of Lens drivers + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_LM3560=m +CONFIG_VIDEO_LM3646=m +# end of Flash devices + +# +# SPI helper chips +# +CONFIG_VIDEO_GS1662=m +# end of SPI helper chips + +# +# Media SPI Adapters +# +# CONFIG_CXD2880_SPI_DRV is not set +# end of Media SPI Adapters + +CONFIG_MEDIA_TUNER=y + +# +# Customize TV tuners +# +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 +# end of Customize TV tuners + +# +# Customise DVB Frontends +# + +# +# 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_S5H1432=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_DIB9000=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 +CONFIG_DVB_CXD2880=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 +CONFIG_DVB_MN88443X=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_LNBH29=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_LGS8GL5=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 +# end of Customise DVB Frontends + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +# end of Media ancillary drivers + +# +# 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_DBI=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_DEBUG_DP_MST_TOPOLOGY_REFS is not set +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VRAM_HELPER=m +CONFIG_DRM_TTM_HELPER=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_GEM_SHMEM_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 +# end of I2C encoder or helper chips + +# +# ARM devices +# +# CONFIG_DRM_HDLCD is not set +# CONFIG_DRM_MALI_DISPLAY is not set +# CONFIG_DRM_KOMEDA is not set +# end of ARM devices + +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_AMDGPU is not set +# 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 is not set +# CONFIG_ROCKCHIP_RGB is not set +CONFIG_ROCKCHIP_RK3066_HDMI=y +CONFIG_DRM_UDL=m +# CONFIG_DRM_AST is not set +# CONFIG_DRM_MGAG200 is not set +# 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_PANEL_DSI_CM is not set +# end of OMAPDRM External Display Device Drivers + +CONFIG_DRM_TILCDC=m +CONFIG_DRM_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_MSM=m +CONFIG_DRM_MSM_GPU_STATE=y +# CONFIG_DRM_MSM_REGISTER_LOGGING is not set +# CONFIG_DRM_MSM_GPU_SUDO is not set +CONFIG_DRM_MSM_DP=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_MSM_DSI_7NM_PHY=y +# 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_ABT_Y030XX067A is not set +CONFIG_DRM_PANEL_ARM_VERSATILE=m +CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m +CONFIG_DRM_PANEL_BOE_HIMAX8279D=m +CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m +# CONFIG_DRM_PANEL_LVDS is not set +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_ELIDA_KD35T133=m +CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m +# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +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_KINGDISPLAY_KD097D04 is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set +CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LB035Q02 is not set +# CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +CONFIG_DRM_PANEL_NOVATEK_NT35510=m +# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set +CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m +# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set +CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m +# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set +# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +CONFIG_DRM_PANEL_SONY_ACX424AKP=m +# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set +# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set +# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set +# CONFIG_DRM_PANEL_TPO_TPG110 is not set +# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +CONFIG_DRM_PANEL_XINPENG_XPP055C272=m +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_CDNS_DSI=m +CONFIG_DRM_CHRONTEL_CH7033=m +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_LONTIUM_LT9611=m +CONFIG_DRM_LONTIUM_LT9611UXC=m +CONFIG_DRM_LVDS_CODEC=m +# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_NWL_MIPI_DSI=m +# CONFIG_DRM_NXP_PTN3460 is not set +# CONFIG_DRM_PARADE_PS8622 is not set +CONFIG_DRM_PARADE_PS8640=m +# CONFIG_DRM_SIL_SII8620 is not set +# CONFIG_DRM_SII902X is not set +# CONFIG_DRM_SII9234 is not set +CONFIG_DRM_SIMPLE_BRIDGE=m +# CONFIG_DRM_THINE_THC63LVD1024 is not set +CONFIG_DRM_TOSHIBA_TC358762=m +# CONFIG_DRM_TOSHIBA_TC358764 is not set +# CONFIG_DRM_TOSHIBA_TC358767 is not set +CONFIG_DRM_TOSHIBA_TC358768=m +CONFIG_DRM_TOSHIBA_TC358775=m +# CONFIG_DRM_TI_TFP410 is not set +# CONFIG_DRM_TI_SN65DSI86 is not set +CONFIG_DRM_TI_TPD12S015=m +CONFIG_DRM_ANALOGIX_ANX6345=m +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +CONFIG_DRM_ANALOGIX_DP=m +# CONFIG_DRM_ANALOGIX_ANX7625 is not set +# CONFIG_DRM_I2C_ADV7511 is not set +CONFIG_DRM_CDNS_MHDP8546=m +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_DW_MIPI_DSI=m +# end of Display Interface Bridges + +# 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_MXSFB is not set +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_GM12U320=m +# CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9225 is not set +# CONFIG_TINYDRM_ILI9341 is not set +CONFIG_TINYDRM_ILI9486=m +# CONFIG_TINYDRM_MI0283QT is not set +# CONFIG_TINYDRM_REPAPER is not set +# CONFIG_TINYDRM_ST7586 is not set +# CONFIG_TINYDRM_ST7735R is not set +# CONFIG_DRM_PL111 is not set +# CONFIG_DRM_TVE200 is not set +# CONFIG_DRM_XEN is not set +CONFIG_DRM_LIMA=m +CONFIG_DRM_PANFROST=m +CONFIG_DRM_MCDE=m +CONFIG_DRM_TIDSS=m +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_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=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=m +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_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_SIMPLE=y +# CONFIG_FB_SSD1307 is not set +# CONFIG_FB_SM712 is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_PWM=m +# CONFIG_BACKLIGHT_DA9052 is not set +CONFIG_BACKLIGHT_QCOM_WLED=m +# 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_BACKLIGHT_LED=m +# end of Backlight & LCD device support + +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 +# end of Console display driver support + +# CONFIG_LOGO is not set +# end of Graphics support + +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_SEQ_VIRMIDI=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_ALS300=m +CONFIG_SND_ALI5451=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_AZT3328=m +# 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_EMU10K1=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_EMU10K1X=m +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=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_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +# 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_SONICVIBES=m +CONFIG_SND_TRIDENT=m +# 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_GENERIC_LEDS=y +# 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 +# end of HD-Audio + +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_ALIGNED_MMIO=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_AUDIO_USE_MEDIA_CONTROLLER=y +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_ADI=m +CONFIG_SND_SOC_ADI_AXI_I2S=m +CONFIG_SND_SOC_ADI_AXI_SPDIF=m +# CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_SND_BCM63XX_I2S_WHISTLER=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=m +CONFIG_SND_SOC_FSL_SAI=m +CONFIG_SND_SOC_FSL_MQS=m +CONFIG_SND_SOC_FSL_AUDMIX=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +# CONFIG_SND_SOC_FSL_ESAI is not set +CONFIG_SND_SOC_FSL_MICFIL=m +CONFIG_SND_SOC_FSL_EASRC=m +CONFIG_SND_SOC_FSL_XCVR=m +CONFIG_SND_SOC_FSL_AUD2HTX=m +CONFIG_SND_SOC_IMX_PCM_DMA=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_IMX_SOC=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_FSL_ASOC_CARD is not set +CONFIG_SND_SOC_IMX_AUDMIX=m +CONFIG_SND_SOC_IMX_HDMI=m +# end of SoC Audio for Freescale CPUs + +# CONFIG_SND_I2S_HI6210_I2S is not set +# CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_SND_SOC_IMG is not set +# CONFIG_SND_SOC_MTK_BTCVSD 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 +# CONFIG_SND_SOC_SOF_TOPLEVEL is not set + +# +# STMicroelectronics STM32 SOC audio support +# +# end of 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 +# end of Allwinner SoC Audio support + +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_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF 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=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 + +# +# Audio support for Texas Instruments SoCs +# +CONFIG_SND_SOC_TI_EDMA_PCM=m +CONFIG_SND_SOC_TI_SDMA_PCM=m +CONFIG_SND_SOC_TI_UDMA_PCM=m + +# +# Texas Instruments DAI support for: +# +CONFIG_SND_SOC_DAVINCI_MCASP=m +CONFIG_SND_SOC_OMAP_DMIC=m +CONFIG_SND_SOC_OMAP_MCBSP=m +CONFIG_SND_SOC_OMAP_MCPDM=m + +# +# Audio support for boards with Texas Instruments SoCs +# +CONFIG_SND_SOC_NOKIA_RX51=m +CONFIG_SND_SOC_OMAP3_PANDORA=m +CONFIG_SND_SOC_OMAP3_TWL4030=m +CONFIG_SND_SOC_OMAP_ABE_TWL6040=m +CONFIG_SND_SOC_OMAP_HDMI=m +# end of Audio support for Texas Instruments SoCs + +# CONFIG_SND_SOC_XILINX_I2S is not set +# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set +# CONFIG_SND_SOC_XILINX_SPDIF 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_ADAU1372_I2C is not set +# CONFIG_SND_SOC_ADAU1372_SPI 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_ADAU7118=m +CONFIG_SND_SOC_ADAU7118_HW=m +CONFIG_SND_SOC_ADAU7118_I2C=m +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4118 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_CROS_EC_CODEC=m +# 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_CS35L36 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_CS4234 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_CS4341 is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +# CONFIG_SND_SOC_CX2072X is not set +CONFIG_SND_SOC_DA7213=m +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_MAX98088 is not set +CONFIG_SND_SOC_MAX98090=m +# CONFIG_SND_SOC_MAX98357A is not set +# 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=m +CONFIG_SND_SOC_MAX98373_I2C=m +# CONFIG_SND_SOC_MAX98390 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_PCM3060_I2C is not set +# CONFIG_SND_SOC_PCM3060_SPI is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM5102A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RK3328=m +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_SIMPLE_MUX 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_TAS2562 is not set +# CONFIG_SND_SOC_TAS2764 is not set +# CONFIG_SND_SOC_TAS2770 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_TLV320ADCX140 is not set +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_UDA1334 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_WM8904=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_ZL38060 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_MT6358 is not set +# CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_NAU8824 is not set +CONFIG_SND_SOC_TPA6130A2=m +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# end of CODEC drivers + +CONFIG_SND_SIMPLE_CARD_UTILS=m +CONFIG_SND_SIMPLE_CARD=m +# CONFIG_SND_AUDIO_GRAPH_CARD is not set +CONFIG_SND_SYNTH_EMUX=m +# 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_BIGBEN_FF is not set +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_MACALLY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CREATIVE_SB0540=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_GLORIOUS=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +# CONFIG_HID_GOOGLE_HAMMER is not set +# CONFIG_HID_VIVALDI 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_VIEWSONIC is not set +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_MALTRON is not set +# 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_U2FZERO=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 +CONFIG_HID_MCP2221=m +# end of Special HID drivers + +# +# 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 +# end of USB HID Boot Protocol drivers +# end of USB HID support + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +# end of I2C HID support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_CONN_GPIO=m +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_FEW_INIT_RETRIES is not set +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_MON=m + +# +# 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_PCI_RENESAS is not set +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_FSL=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_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_CDNS3=m +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +CONFIG_USB_CDNS3_IMX=m +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 + +# +# 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_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_IMX=m +CONFIG_USB_CHIPIDEA_GENERIC=m +CONFIG_USB_CHIPIDEA_TEGRA=m +# 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_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_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_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_SISUSBVGA=m +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 +# end of USB Physical Layer drivers + +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_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_MAX3420_UDC=m +CONFIG_USB_TEGRA_XUDC=m +# CONFIG_USB_DUMMY_HCD is not set +# end of USB Peripheral Controller + +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 + +# +# USB Gadget precomposed configurations +# +# 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_USB_RAW_GADGET=m +# end of USB Gadget precomposed configurations + +# CONFIG_TYPEC is not set +CONFIG_USB_ROLE_SWITCH=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_STM32_SDMMC=y +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_ASPEED 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_MILBEAUT is not set +CONFIG_MMC_SDHCI_IPROC=m +CONFIG_MMC_OMAP=m +CONFIG_MMC_OMAP_HS=m +CONFIG_MMC_ALCOR=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_HSQ=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_MMC_SDHCI_AM654=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 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_CLASS_MULTICOLOR=m +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +# CONFIG_LEDS_AN30259A is not set +# CONFIG_LEDS_AW2013 is not set +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_CR0014114 is not set +# CONFIG_LEDS_EL15203000 is not set +# CONFIG_LEDS_TURRIS_OMNIA is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3532 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_LP50XX=m +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 +CONFIG_LEDS_SPI_BYTE=m +CONFIG_LEDS_TI_LMU_COMMON=m +CONFIG_LEDS_LM3697=m + +# +# Flash and Torch LED drivers +# + +# +# 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 is not set +# CONFIG_LEDS_TRIGGER_PATTERN is not set +CONFIG_LEDS_TRIGGER_AUDIO=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y + +# +# 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 +# end of Speakup console speech + +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +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_INFINIBAND_RTRS=m +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=m +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_ABEOZ9 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_BD70528=m +# 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_RV3028 is not set +# CONFIG_RTC_DRV_RV3032 is not set +# CONFIG_RTC_DRV_RV8803 is not set +CONFIG_RTC_DRV_S5M=y +# CONFIG_RTC_DRV_SD3078 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_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 +# CONFIG_RTC_DRV_RX6110 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_CADENCE is not set +# 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 +CONFIG_RTC_DRV_RTD119X=y + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +# CONFIG_RTC_DRV_GOLDFISH 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_FSL_QDMA 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_PLX_DMA=m +CONFIG_TEGRA20_APB_DMA=y +CONFIG_XILINX_ZYNQMP_DPDMA=m +# 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_DW_EDMA=m +CONFIG_DW_EDMA_PCIE=m +CONFIG_SF_PDMA=m +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_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# end of DMABUF options + +# 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_IRQ_BYPASS_MANAGER=m +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VIRTIO_DMA_SHARED_BUFFER=m +CONFIG_VDPA=m +# CONFIG_VDPA_SIM is not set +CONFIG_IFCVF=m +CONFIG_MLX5_VDPA=y +CONFIG_MLX5_VDPA_NET=m +CONFIG_VHOST_IOTLB=m +CONFIG_VHOST=m +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST_VDPA=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +# end of 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 +# end of Xen driver support + +# CONFIG_GREYBUS is not set +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_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 +# end of Accelerometers + +# +# Analog to digital converters +# +# CONFIG_AD7816 is not set +# CONFIG_AD7280 is not set +# end of Analog to digital converters + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set +# end of Analog digital bi-direction converters + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7746 is not set +# end of Capacitance to digital converters + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# end of Direct Digital Synthesis + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set +# end of Network Analyzer, Impedance Converters + +# +# Active energy metering IC +# +# CONFIG_ADE7854 is not set +# end of Active energy metering IC + +# +# Resolver to digital converters +# +# CONFIG_AD2S1210 is not set +# end of Resolver to digital converters +# end of IIO staging drivers + +# CONFIG_FB_SM750 is not set +# CONFIG_MFD_NVEC is not set +# CONFIG_STAGING_MEDIA is not set + +# +# Android +# +# end of Android + +# CONFIG_STAGING_BOARD is not set +# CONFIG_LTE_GDM724X is not set +# CONFIG_FIREWIRE_SERIAL is not set +# CONFIG_GS_FPGABOOT is not set +# CONFIG_UNISYSSPAR is not set +# CONFIG_FB_TFT is not set +# CONFIG_KS7010 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 + +# +# Gasket devices +# +# end of Gasket devices + +# CONFIG_XIL_AXIS_FIFO is not set +# CONFIG_FIELDBUS_DEV is not set +# CONFIG_KPC2000 is not set +CONFIG_QLGE=m +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WFX=m +# CONFIG_GOLDFISH is not set +CONFIG_CHROME_PLATFORMS=y +CONFIG_CROS_EC=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_EC_CHARDEV=m +# CONFIG_CROS_EC_LIGHTBAR is not set +CONFIG_CROS_EC_VBC=m +CONFIG_CROS_EC_DEBUGFS=m +CONFIG_CROS_EC_SENSORHUB=m +CONFIG_CROS_EC_SYSFS=m +CONFIG_CROS_USBPD_LOGGER=m +CONFIG_CROS_USBPD_NOTIFY=m +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_HAVE_CLK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Clock driver for ARM Reference designs +# +CONFIG_ICST=y +CONFIG_CLK_SP810=y +CONFIG_CLK_VEXPRESS_OSC=y +# end of Clock driver for ARM Reference designs + +CONFIG_COMMON_CLK_MAX77686=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_SCMI=m +CONFIG_COMMON_CLK_SI5341=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_COMMON_CLK_PALMAS=m +# CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_VC5 is not set +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_COMMON_CLK_FIXED_MMIO is not set +CONFIG_CLK_BCM2711_DVP=y +# CONFIG_CLK_BCM2835 is not set +CONFIG_CLK_RASPBERRYPI=m +CONFIG_MXC_CLK=y +CONFIG_CLK_IMX5=y +CONFIG_CLK_IMX6Q=y +# CONFIG_CLK_IMX8MM is not set +# CONFIG_CLK_IMX8MN is not set +# CONFIG_CLK_IMX8MP is not set +# CONFIG_CLK_IMX8MQ is not set +CONFIG_MVEBU_CLK_COMMON=y +CONFIG_MVEBU_CLK_CPU=y +CONFIG_MVEBU_CLK_COREDIV=y +CONFIG_ARMADA_AP_CP_HELPER=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_ARMADA_AP_CPU_CLK=y +CONFIG_COMMON_CLK_ROCKCHIP=y +CONFIG_CLK_RV110X=y +CONFIG_CLK_RK3036=y +CONFIG_CLK_RK312X=y +CONFIG_CLK_RK3188=y +CONFIG_CLK_RK322X=y +CONFIG_CLK_RK3288=y +CONFIG_COMMON_CLK_SAMSUNG=y +CONFIG_EXYNOS_4_COMMON_CLK=y +CONFIG_EXYNOS_5250_COMMON_CLK=y +CONFIG_EXYNOS_5260_COMMON_CLK=y +CONFIG_EXYNOS_5410_COMMON_CLK=y +CONFIG_EXYNOS_5420_COMMON_CLK=y +CONFIG_EXYNOS_AUDSS_CLK_CON=y +CONFIG_EXYNOS_CLKOUT=y +CONFIG_CLK_SUNXI=y +CONFIG_CLK_SUNXI_CLOCKS=y +CONFIG_CLK_SUNXI_PRCM_SUN6I=y +CONFIG_CLK_SUNXI_PRCM_SUN8I=y +CONFIG_CLK_SUNXI_PRCM_SUN9I=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_DFLL=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_MICROCHIP_PIT64B is not set +# end of Clock Source drivers + +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +# CONFIG_ARM_MHU_V2 is not set +CONFIG_IMX_MBOX=m +# CONFIG_PLATFORM_MHU is not set +CONFIG_PL320_MBOX=y +# CONFIG_ARMADA_37XX_RWTM_MBOX is not set +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_SUN6I_MSGBOX=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 +# end of Generic IOMMU Pagetable Support + +# 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_SUN50I_IOMMU is not set +CONFIG_TEGRA_IOMMU_SMMU=y +# CONFIG_EXYNOS_IOMMU is not set +# CONFIG_ARM_SMMU is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +CONFIG_BCM2835_POWER=y +CONFIG_RASPBERRYPI_POWER=y +# CONFIG_SOC_BRCMSTB is not set +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# CONFIG_QUICC_ENGINE is not set +CONFIG_FSL_RCPM=y +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +CONFIG_IMX_GPCV2_PM_DOMAINS=y +CONFIG_SOC_IMX8M=y +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# CONFIG_LITEX_SOC_CONTROLLER is not set +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +CONFIG_QCOM_QMI_HELPERS=m +# end of Qualcomm SoC drivers + +CONFIG_ROCKCHIP_GRF=y +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_SOC_SAMSUNG=y +CONFIG_EXYNOS_ASV=y +CONFIG_EXYNOS_ASV_ARM=y +CONFIG_EXYNOS_CHIPID=y +CONFIG_EXYNOS_PMU=y +CONFIG_EXYNOS_PMU_ARM_DRIVERS=y +CONFIG_EXYNOS_PM_DOMAINS=y +CONFIG_EXYNOS_REGULATOR_COUPLER=y +CONFIG_SUNXI_MBUS=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 +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +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=m +# CONFIG_DEVFREQ_GOV_PASSIVE is not set + +# +# DEVFREQ Drivers +# +# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set +CONFIG_ARM_IMX_BUS_DEVFREQ=m +CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m +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_FSA9480=m +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +CONFIG_EXTCON_PALMAS=m +CONFIG_EXTCON_PTN5150=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_EXTCON_USBC_TUSB320=m +CONFIG_MEMORY=y +CONFIG_DDR=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_PL353_SMC=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_DMA=m +CONFIG_IIO_BUFFER_DMAENGINE=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 +# CONFIG_IIO_TRIGGERED_EVENT 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_ADXL372_SPI is not set +# CONFIG_ADXL372_I2C is not set +# CONFIG_BMA180 is not set +# CONFIG_BMA220 is not set +CONFIG_BMA400=m +CONFIG_BMA400_I2C=m +CONFIG_BMA400_SPI=m +# 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_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 +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD7091R5=m +# CONFIG_AD7124 is not set +# CONFIG_AD7192 is not set +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7292 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7606_IFACE_PARALLEL is not set +# CONFIG_AD7606_IFACE_SPI is not set +# CONFIG_AD7766 is not set +# CONFIG_AD7768_1 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD7949 is not set +# CONFIG_AD799X is not set +# CONFIG_AD9467 is not set +# CONFIG_ADI_AXI_ADC 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_LTC2496 is not set +# CONFIG_LTC2497 is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX11100 is not set +# CONFIG_MAX1118 is not set +# CONFIG_MAX1241 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MAX9611 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_MCP3911 is not set +# CONFIG_MEDIATEK_MT6360_ADC is not set +# CONFIG_MP2629_ADC is not set +# CONFIG_NAU7802 is not set +# CONFIG_PALMAS_GPADC is not set +CONFIG_ROCKCHIP_SARADC=m +CONFIG_SD_ADC_MODULATOR=m +# CONFIG_STMPE_ADC is not set +# 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_ADS8344 is not set +# CONFIG_TI_ADS8688 is not set +# CONFIG_TI_ADS124S08 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 +CONFIG_XILINX_XADC=m +# end of Analog to digital converters + +# +# Analog Front Ends +# +# CONFIG_IIO_RESCALE is not set +# end of Analog Front Ends + +# +# Amplifiers +# +# CONFIG_AD8366 is not set +# CONFIG_HMC425 is not set +# end of Amplifiers + +# +# Chemical Sensors +# +# CONFIG_ATLAS_PH_SENSOR is not set +# CONFIG_ATLAS_EZO_SENSOR is not set +# CONFIG_BME680 is not set +CONFIG_CCS811=m +# CONFIG_IAQCORE is not set +CONFIG_SCD30_CORE=m +CONFIG_SCD30_I2C=m +# CONFIG_SENSIRION_SGP30 is not set +# CONFIG_SPS30 is not set +# CONFIG_VZ89X is not set +# end of Chemical Sensors + +# 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 +# end of Hid Sensor IIO Common + +# +# SSP Sensor Common +# +# CONFIG_IIO_SSP_SENSORHUB is not set +# end of SSP Sensor Common + +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# 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_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_AD5770R 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_LTC1660 is not set +# CONFIG_LTC2632 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_TI_DAC7311 is not set +# CONFIG_TI_DAC7612 is not set +# CONFIG_VF610_DAC is not set +# end of Digital to analog converters + +# +# IIO dummy driver +# +# end of IIO dummy driver + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set +# end of Clock Generator/Distribution + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set +CONFIG_ADF4371=m +# end of Phase-Locked Loop (PLL) frequency synthesizers +# end of Frequency Synthesizers DDS/PLL + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +# CONFIG_ADXRS290 is not set +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +# CONFIG_FXAS21002C 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 +# end of Digital gyroscope sensors + +# +# 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 +# end of Heart Rate Monitors +# end of Health Sensors + +# +# Humidity sensors +# +# CONFIG_AM2315 is not set +# CONFIG_DHT11 is not set +# CONFIG_HDC100X is not set +# CONFIG_HDC2010 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 +# end of Humidity sensors + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16460 is not set +# CONFIG_ADIS16475 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set +# CONFIG_FXOS8700_I2C is not set +# CONFIG_FXOS8700_SPI is not set +# CONFIG_KMX61 is not set +CONFIG_INV_ICM42600=m +CONFIG_INV_ICM42600_I2C=m +CONFIG_INV_ICM42600_SPI=m +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set +# CONFIG_IIO_ST_LSM6DSX is not set +# end of Inertial measurement units + +# +# Light sensors +# +# CONFIG_ADJD_S311 is not set +# CONFIG_ADUX1020 is not set +# CONFIG_AL3010 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set +# CONFIG_AS73211 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_GP2AP002 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_IQS621_ALS 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_MAX44009 is not set +# CONFIG_NOA1305 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_VCNL4035 is not set +# CONFIG_VEML6030 is not set +# CONFIG_VEML6070 is not set +# CONFIG_VL6180 is not set +# CONFIG_ZOPT2201 is not set +# end of Light sensors + +# +# 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 +# CONFIG_SENSORS_RM3100_I2C is not set +# CONFIG_SENSORS_RM3100_SPI is not set +# end of Magnetometer sensors + +# +# Multiplexers +# +# CONFIG_IIO_MUX is not set +# end of Multiplexers + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m +# end of Inclinometer sensors + +# +# Triggers - standalone +# +# CONFIG_IIO_INTERRUPT_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set +# end of Triggers - standalone + +# +# Linear and angular position sensors +# +# CONFIG_IQS624_POS is not set +# end of Linear and angular position sensors + +# +# Digital potentiometers +# +# CONFIG_AD5272 is not set +# CONFIG_DS1803 is not set +# CONFIG_MAX5432 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_MCP41010 is not set +# CONFIG_TPL0102 is not set +# end of Digital potentiometers + +# +# Digital potentiostats +# +# CONFIG_LMP91000 is not set +# end of Digital potentiostats + +# +# Pressure sensors +# +# CONFIG_ABP060MG is not set +# CONFIG_BMP280 is not set +# CONFIG_DLHL60D is not set +CONFIG_DPS310=m +CONFIG_HID_SENSOR_PRESS=m +# CONFIG_HP03 is not set +# CONFIG_ICP10100 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 +# end of Pressure sensors + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set +# end of Lightning sensors + +# +# Proximity and distance sensors +# +# CONFIG_ISL29501 is not set +# CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_MB1232 is not set +# CONFIG_PING is not set +# CONFIG_RFD77402 is not set +# CONFIG_SRF04 is not set +# CONFIG_SX9310 is not set +# CONFIG_SX9500 is not set +# CONFIG_SRF08 is not set +# CONFIG_VCNL3020 is not set +# CONFIG_VL53L0X_I2C is not set +# end of Proximity and distance sensors + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# end of Resolver to digital converters + +# +# Temperature sensors +# +# CONFIG_IQS620AT_TEMP is not set +# CONFIG_LTC2983 is not set +# 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_MAX31856 is not set +# end of Temperature sensors + +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +# CONFIG_PWM_DEBUG is not set +CONFIG_PWM_ATMEL_TCB=m +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_CROS_EC is not set +CONFIG_PWM_DWC=m +# CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_IMX1 is not set +# CONFIG_PWM_IMX27 is not set +CONFIG_PWM_IMX_TPM=m +# CONFIG_PWM_IQS620A is not set +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_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_AL_FIC is not set +CONFIG_MADERA_IRQ=m +CONFIG_OMAP_IRQCHIP=y +# CONFIG_TS4800_IRQ is not set +CONFIG_IRQ_CROSSBAR=y +CONFIG_PARTITION_PERCPU=y +CONFIG_IMX_IRQSTEER=y +CONFIG_IMX_INTMUX=y +CONFIG_EXYNOS_IRQ_COMBINER=y +CONFIG_MST_IRQ=y +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_INTEL_GW=y +# CONFIG_RESET_RASPBERRYPI is not set +CONFIG_RESET_SCMI=y +CONFIG_RESET_SIMPLE=y +CONFIG_RESET_SOCFPGA=y +CONFIG_RESET_SUNXI=y +# CONFIG_RESET_TI_SYSCON is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_GENERIC_PHY_MIPI_DPHY=y +# CONFIG_USB_LGM_PHY is not set +CONFIG_PHY_SUN4I_USB=m +CONFIG_PHY_SUN6I_MIPI_DPHY=m +CONFIG_PHY_SUN9I_USB=m +CONFIG_PHY_SUN50I_USB3=m +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_CADENCE_TORRENT=m +# CONFIG_PHY_CADENCE_DPHY is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_CADENCE_SALVO is not set +# CONFIG_PHY_FSL_IMX8MQ_USB is not set +CONFIG_PHY_MIXEL_MIPI_DPHY=m +CONFIG_ARMADA375_USBCLUSTER_PHY=y +CONFIG_PHY_MVEBU_A3700_COMPHY=m +CONFIG_PHY_MVEBU_A3700_UTMI=m +CONFIG_PHY_MVEBU_A38X_COMPHY=m +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_OCELOT_SERDES is not set +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_ROCKCHIP_DP=m +# CONFIG_PHY_ROCKCHIP_DPHY_RX0 is not set +CONFIG_PHY_ROCKCHIP_EMMC=m +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY 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_UFS=m +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_PHY_TI_GMII_SEL=m +# end of PHY Subsystem + +# 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_FSL_IMX8_DDR_PMU=m +# end of Performance monitor support + +CONFIG_RAS=y +CONFIG_USB4=m +# CONFIG_USB4_DEBUGFS_WRITE is not set +# CONFIG_USB4_DMA_TEST is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +CONFIG_DAX=m +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +# CONFIG_NVMEM_IMX_IIM is not set +CONFIG_NVMEM_IMX_OCOTP=m +CONFIG_ROCKCHIP_EFUSE=m +CONFIG_ROCKCHIP_OTP=m +CONFIG_NVMEM_SUNXI_SID=m +CONFIG_NVMEM_SNVS_LPGPR=m + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# end of HW tracing support + +# CONFIG_FPGA is not set +# CONFIG_FSI is not set +# CONFIG_TEE is not set +CONFIG_MULTIPLEXER=m + +# +# Multiplexer drivers +# +# CONFIG_MUX_ADG792A is not set +# CONFIG_MUX_ADGS1408 is not set +# CONFIG_MUX_GPIO is not set +# CONFIG_MUX_MMIO is not set +# end of Multiplexer drivers + +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +CONFIG_INTERCONNECT=y +CONFIG_INTERCONNECT_IMX=m +# CONFIG_INTERCONNECT_IMX8MM is not set +# CONFIG_INTERCONNECT_IMX8MN is not set +# CONFIG_INTERCONNECT_IMX8MQ is not set +CONFIG_INTERCONNECT_SAMSUNG=y +CONFIG_INTERCONNECT_EXYNOS=m +CONFIG_COUNTER=m +CONFIG_TI_EQEP=m +CONFIG_FTM_QUADDEC=m +CONFIG_MICROCHIP_TCB_CAPTURE=m +# CONFIG_MOST is not set +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_VALIDATE_FS_PARSER=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_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_SUPPORT_V4=y +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_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +# CONFIG_F2FS_FS_COMPRESSION 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 is not set +CONFIG_FS_VERITY=y +# CONFIG_FS_VERITY_DEBUG is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +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_VIRTIO_FS=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_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 +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/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_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# 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 +# end of Pseudo filesystems + +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_FS_ZSTD=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_UBIFS_FS_AUTHENTICATION=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_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_ZIP is not set +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_NFS_DISABLE_UDP_SUPPORT is not set +# CONFIG_NFS_V4_2_READ_PLUS is not set +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_2_INTER_SSC is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +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_DISABLE_INSECURE_ENCTYPES=y +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CEPH_FS_SECURITY_LABEL=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_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SWN_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_AFS_DEBUG_CURSOR is not set +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 +# CONFIG_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_REQUEST_CACHE=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_TRUSTED_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_KEY_NOTIFICATIONS=y +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_SELINUX_SIDTAB_HASH_BITS=9 +CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# 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_TOMOYO_INSECURE_BUILTIN_SETTING is not set +CONFIG_SECURITY_APPARMOR=y +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_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +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_ARCH_POLICY is not set +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +# CONFIG_IMA_APPRAISE_MODSIG is not set +CONFIG_IMA_TRUSTED_KEYRING=y +# CONFIG_IMA_BLACKLIST_KEYRING is not set +# CONFIG_IMA_LOAD_X509 is not set +CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y +# 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_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +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_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=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_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_ENGINE=m + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_DH is not set +CONFIG_CRYPTO_ECC=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECRDSA=m +CONFIG_CRYPTO_SM2=m +CONFIG_CRYPTO_CURVE25519=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=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_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +# CONFIG_CRYPTO_KEYWRAP is not set +CONFIG_CRYPTO_NHPOLY1305=m +CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_ESSIV=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_CRC32=m +CONFIG_CRYPTO_XXHASH=m +CONFIG_CRYPTO_BLAKE2B=m +CONFIG_CRYPTO_BLAKE2S=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=m +CONFIG_CRYPTO_STREEBOG=m +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_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_RNG_CAVP is not set +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +# CONFIG_CRYPTO_STATS is not set +CONFIG_CRYPTO_HASH_INFO=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=m +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m +CONFIG_CRYPTO_LIB_BLAKE2S=m +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m +CONFIG_CRYPTO_LIB_CURVE25519=m +CONFIG_CRYPTO_LIB_DES=m +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m +CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_ALLWINNER=y +CONFIG_CRYPTO_DEV_SUN4I_SS=m +# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set +CONFIG_CRYPTO_DEV_SUN8I_CE=m +# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set +CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y +CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y +CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y +CONFIG_CRYPTO_DEV_SUN8I_SS=m +# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set +CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG=y +CONFIG_CRYPTO_DEV_SUN8I_SS_HASH=y +# 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_EXYNOS_RNG is not set +# CONFIG_CRYPTO_DEV_S5P is not set +CONFIG_CRYPTO_DEV_ATMEL_I2C=m +CONFIG_CRYPTO_DEV_ATMEL_ECC=m +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m +# CONFIG_CRYPTO_DEV_MXS_DCP is not set +CONFIG_CRYPTO_DEV_MARVELL=m +CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set +CONFIG_CRYPTO_DEV_CHELSIO=m +CONFIG_CRYPTO_DEV_VIRTIO=m +# CONFIG_CRYPTO_DEV_SAFEXCEL is not set +# CONFIG_CRYPTO_DEV_CCREE is not set +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=m +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 +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_RAID6_PQ_BENCHMARK=y +CONFIG_LINEAR_RANGES=y +CONFIG_PACKING=y +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_CORDIC=m +CONFIG_PRIME_NUMBERS=m +CONFIG_RATIONAL=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=y +CONFIG_AUDIT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +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=y +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_DECOMPRESS_ZSTD=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_INTERVAL_TREE=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DMA_DECLARE_COHERENT=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y +CONFIG_SWIOTLB=y +CONFIG_DMA_NONCOHERENT_MMAP=y +CONFIG_DMA_REMAP=y +CONFIG_DMA_CMA=y +CONFIG_DMA_PERNUMA_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_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +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_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_DIMLIB=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_32=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y +CONFIG_FONT_6x8=y +CONFIG_SG_SPLIT=y +CONFIG_SG_POOL=y +CONFIG_SBITMAP=y +# CONFIG_STRING_SELFTEST is not set +# end of Library routines + +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DYNAMIC_DEBUG_CORE=y +CONFIG_SYMBOLIC_ERRNAME=y +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_COMPRESSED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set +CONFIG_FRAME_WARN=1024 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +# CONFIG_UBSAN is not set +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_PAGE_OWNER is not set +CONFIG_PAGE_POISONING=y +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_DEBUG_WX=y +# 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_SCHED_STACK_END_CHECK=y +# 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_KMAP_LOCAL is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +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_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# 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_SCF_TORTURE_TEST is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set + +# +# Debug kernel data structures +# +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PLIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# 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_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_BOOTTIME_TRACING is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_STACK_TRACER=y +# 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_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_SYNTH_EVENTS=y +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_SYNTH_EVENT_GEN_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_SAMPLES is not set +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y + +# +# arm Debugging +# +CONFIG_ARM_PTDUMP_CORE=y +# CONFIG_ARM_PTDUMP_DEBUGFS is not set +CONFIG_UNWINDER_FRAME_POINTER=y +# CONFIG_DEBUG_USER is not set +# CONFIG_DEBUG_LL is not set +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 +# end of arm Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT 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_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_MIN_HEAP 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_REED_SOLOMON_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_STRSCPY=m +# 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_XARRAY=m +# 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_BITOPS=m +CONFIG_TEST_VMALLOC=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_TEST_BLACKHOLE_DEV=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_TEST_MEMCAT_P is not set +# CONFIG_TEST_STACKINIT is not set +# CONFIG_TEST_MEMINIT is not set +# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_MEMTEST is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/gnu/packages/aux-files/linux-libre/5.11-arm64.conf b/gnu/packages/aux-files/linux-libre/5.11-arm64.conf new file mode 100644 index 0000000000..46acc0ea36 --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/5.11-arm64.conf @@ -0,0 +1,10140 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 5.11.0 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=231010000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_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_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_WATCH_QUEUE=y +CONFIG_CROSS_MEMORY_ATTACH=y +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=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_GENERIC_IRQ_INJECTION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_IRQ_FASTEOI_HIERARCHY_HANDLERS=y +CONFIG_GENERIC_IRQ_IPI=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_GENERIC_MSI_IRQ_DOMAIN=y +CONFIG_IRQ_MSI_IOMMU=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +# end of IRQ subsystem + +CONFIG_GENERIC_IRQ_MULTI_HANDLER=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 +# end of Timers subsystem + +# 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_SCHED_THERMAL_PRESSURE=y +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_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TASKS_TRACE_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKHEADERS 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 + +# +# Scheduler features +# +# CONFIG_UCLAMP_TASK is not set +# end of Scheduler features + +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_CC_HAS_INT128=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_KMEM=y +CONFIG_BLK_CGROUP=y +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_TIME_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_RD_ZSTD=y +CONFIG_BOOT_CONFIG=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=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_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_HAVE_FUTEX_CMPXCHG=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +CONFIG_IO_URING=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_BPF_LSM=y +CONFIG_BPF_SYSCALL=y +CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y +# CONFIG_BPF_JIT_ALWAYS_ON is not set +CONFIG_BPF_JIT_DEFAULT_ON=y +# CONFIG_BPF_PRELOAD 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 +# end of Kernel Performance Events And Counters + +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_SHUFFLE_PAGE_ALLOCATOR=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_ARM64=y +CONFIG_64BIT=y +CONFIG_MMU=y +CONFIG_ARM64_PAGE_SHIFT=12 +CONFIG_ARM64_CONT_PTE_SHIFT=4 +CONFIG_ARM64_CONT_PMD_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_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CSUM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y +CONFIG_ZONE_DMA32=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=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_BROKEN_GAS_INST=y + +# +# Platform selection +# +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_AGILEX is not set +CONFIG_ARCH_SUNXI=y +# CONFIG_ARCH_ALPINE is not set +CONFIG_ARCH_BCM2835=y +CONFIG_ARCH_BCM4908=y +# CONFIG_ARCH_BCM_IPROC is not set +# CONFIG_ARCH_BERLIN is not set +CONFIG_ARCH_BITMAIN=y +# CONFIG_ARCH_BRCMSTB is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_SPARX5 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_KEEMBAY=y +# CONFIG_ARCH_MEDIATEK is not set +CONFIG_ARCH_MESON=y +CONFIG_ARCH_MVEBU=y +CONFIG_ARCH_MXC=y +CONFIG_ARCH_QCOM=y +# CONFIG_ARCH_REALTEK is not set +# CONFIG_ARCH_RENESAS is not set +CONFIG_ARCH_ROCKCHIP=y +# CONFIG_ARCH_S32 is not set +CONFIG_ARCH_SEATTLE=y +# CONFIG_ARCH_STRATIX10 is not set +CONFIG_ARCH_SYNQUACER=y +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_VISCONTI=y +CONFIG_ARCH_XGENE=y +# CONFIG_ARCH_ZX is not set +# CONFIG_ARCH_ZYNQMP is not set +# end of Platform selection + +# +# Kernel Features +# + +# +# ARM errata workarounds via the alternatives framework +# +CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y +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=y +CONFIG_ARM64_ERRATUM_1024718=y +CONFIG_ARM64_ERRATUM_1418040=y +CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y +CONFIG_ARM64_ERRATUM_1165522=y +CONFIG_ARM64_ERRATUM_1319367=y +CONFIG_ARM64_ERRATUM_1530923=y +CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y +CONFIG_ARM64_ERRATUM_1286807=y +CONFIG_ARM64_ERRATUM_1463225=y +CONFIG_ARM64_ERRATUM_1542419=y +CONFIG_ARM64_ERRATUM_1508412=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_CAVIUM_TX2_ERRATUM_219=y +CONFIG_FUJITSU_ERRATUM_010001=y +CONFIG_HISILICON_ERRATUM_161600802=y +CONFIG_QCOM_FALKOR_ERRATUM_1003=y +CONFIG_QCOM_FALKOR_ERRATUM_1009=y +CONFIG_QCOM_QDF2400_ERRATUM_0065=y +CONFIG_QCOM_FALKOR_ERRATUM_E1041=y +CONFIG_SOCIONEXT_SYNQUACER_PREITS=y +# end of ARM errata workarounds via the alternatives framework + +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_CPU_LITTLE_ENDIAN=y +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_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=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_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_PARAVIRT=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_KEXEC=y +CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_SIG is not set +CONFIG_CRASH_DUMP=y +CONFIG_XEN_DOM0=y +CONFIG_XEN=y +CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_RODATA_FULL_DEFAULT_ENABLED=y +# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_TAGGED_ADDR_ABI=y +CONFIG_COMPAT=y +CONFIG_KUSER_HELPERS=y +CONFIG_ARMV8_DEPRECATED=y +CONFIG_SWP_EMULATION=y +CONFIG_CP15_BARRIER_EMULATION=y +CONFIG_SETEND_EMULATION=y + +# +# ARMv8.1 architectural features +# +CONFIG_ARM64_HW_AFDBM=y +CONFIG_ARM64_PAN=y +CONFIG_ARM64_USE_LSE_ATOMICS=y +CONFIG_ARM64_VHE=y +# end of ARMv8.1 architectural features + +# +# ARMv8.2 architectural features +# +CONFIG_ARM64_PMEM=y +CONFIG_ARM64_RAS_EXTN=y +CONFIG_ARM64_CNP=y +# end of ARMv8.2 architectural features + +# +# ARMv8.3 architectural features +# +# end of ARMv8.3 architectural features + +# +# ARMv8.4 architectural features +# +CONFIG_ARM64_AMU_EXTN=y +# end of ARMv8.4 architectural features + +# +# ARMv8.5 architectural features +# +CONFIG_ARM64_BTI=y +CONFIG_ARM64_E0PD=y +CONFIG_ARCH_RANDOM=y +# end of ARMv8.5 architectural features + +CONFIG_ARM64_SVE=y +CONFIG_ARM64_MODULE_PLTS=y +# CONFIG_ARM64_PSEUDO_NMI is not set +CONFIG_RELOCATABLE=y +CONFIG_RANDOMIZE_BASE=y +CONFIG_RANDOMIZE_MODULE_REGION_FULL=y +# end of Kernel Features + +# +# Boot options +# +CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y +CONFIG_CMDLINE="" +CONFIG_EFI_STUB=y +CONFIG_EFI=y +CONFIG_DMI=y +# end of Boot options + +CONFIG_SYSVIPC_COMPAT=y +CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y +CONFIG_ARCH_ENABLE_THP_MIGRATION=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_HIBERNATION_SNAPSHOT_DEV=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_ENERGY_MODEL=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_HIBERNATION_HEADER=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# end of Power management options + +# +# 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_CPU_IDLE_GOV_TEO=y +CONFIG_DT_IDLE_STATES=y + +# +# ARM CPU Idle Drivers +# +CONFIG_ARM_CPUIDLE=y +# CONFIG_ARM_PSCI_CPUIDLE is not set +# end of ARM CPU Idle Drivers +# end of CPU Idle + +# +# 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_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m +# CONFIG_ARM_ARMADA_37XX_CPUFREQ is not set +# CONFIG_ARM_ARMADA_8K_CPUFREQ is not set +CONFIG_ARM_IMX_CPUFREQ_DT=m +# CONFIG_ARM_QCOM_CPUFREQ_HW is not set +CONFIG_ARM_RASPBERRYPI_CPUFREQ=m +CONFIG_ARM_SCMI_CPUFREQ=m +CONFIG_ARM_TEGRA20_CPUFREQ=m +CONFIG_ARM_TEGRA124_CPUFREQ=y +# CONFIG_ARM_TEGRA186_CPUFREQ is not set +CONFIG_ARM_TEGRA194_CPUFREQ=m +# end of CPU Frequency scaling +# end of CPU Power Management + +# +# Firmware Drivers +# +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_ISCSI_IBFT=m +CONFIG_RASPBERRYPI_FIRMWARE=y +# CONFIG_FW_CFG_SYSFS is not set +CONFIG_QCOM_SCM=y +# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set +# CONFIG_TURRIS_MOX_RWTM is not set +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_ESRT=y +CONFIG_EFI_VARS_PSTORE=m +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_SOFT_RESERVE=y +CONFIG_EFI_PARAMS_FROM_FDT=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB=y +CONFIG_EFI_ARMSTUB_DTB_LOADER=y +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_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_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y +# CONFIG_IMX_DSP is not set +CONFIG_IMX_SCU=y +CONFIG_IMX_SCU_PD=y +CONFIG_MESON_SM=y +CONFIG_ARM_PSCI_FW=y +# CONFIG_ARM_PSCI_CHECKER is not set +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y +CONFIG_ARM_SMCCC_SOC_ID=y + +# +# Tegra firmware driver +# +CONFIG_TEGRA_IVC=y +CONFIG_TEGRA_BPMP=y +# end of Tegra firmware driver +# end of Firmware Drivers + +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_AC=m +CONFIG_ACPI_BATTERY=m +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_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_NFIT_SECURITY_DEBUG is not set +CONFIG_ACPI_NUMA=y +CONFIG_ACPI_HMAT=y +CONFIG_HAVE_ACPI_APEI=y +# CONFIG_ACPI_APEI is not set +# CONFIG_ACPI_CONFIGFS is not set +CONFIG_ACPI_IORT=y +CONFIG_ACPI_GTDT=y +CONFIG_ACPI_PPTT=y +# CONFIG_PMIC_OPREGION is not set +CONFIG_IRQ_BYPASS_MANAGER=y +CONFIG_VIRTUALIZATION=y +CONFIG_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_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_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_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=m +CONFIG_CRYPTO_POLY1305_NEON=m +CONFIG_CRYPTO_NHPOLY1305_NEON=m +# CONFIG_CRYPTO_AES_ARM64_BS is not set + +# +# 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_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_GENERIC_IDLE_POLL_SETUP=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_KEEPINITRD=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=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_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_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=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=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_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=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_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y +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_HAVE_ARCH_COMPILER_H=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_RELR=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +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_ASM_MODVERSIONS=y +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_COMPRESS=y +CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_RQ_ALLOC_TIME=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_CGROUP_RWSTAT=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_INTEGRITY_T10=m +# 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_CGROUP_IOCOST=y +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_SED_OPAL=y +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=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 +# end of Partition Types + +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +CONFIG_BFQ_GROUP_IOSCHED=y +# CONFIG_BFQ_CGROUP_DEBUG is not set +# end of IO Schedulers + +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_NON_OVERLAPPING_ADDRESS_SPACE=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_HAVE_ELF_PROT=y +CONFIG_ARCH_USE_GNU_PROPERTY=y +CONFIG_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_MEMORY_HOTPLUG is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_CONTIG_ALLOC=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_BOUNCE=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_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_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_DEFAULT_ON is not set +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +# CONFIG_Z3FOLD is not set +CONFIG_ZSMALLOC=m +# 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_ARCH_HAS_PTE_DEVMAP=y +CONFIG_HMM_MIRROR=y +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +# end of Memory Management options + +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_NET_REDIRECT=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_SCM=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_AH=m +CONFIG_XFRM_ESP=m +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +CONFIG_NET_KEY_MIGRATE=y +# CONFIG_SMC is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m +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_ESPINTCP is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=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_ESPINTCP 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_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_IPV6_RPL_LWTUNNEL is not set +# CONFIG_NETLABEL is not set +CONFIG_MPTCP=y +CONFIG_INET_MPTCP_DIAG=m +CONFIG_MPTCP_IPV6=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=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=y +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_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_NF_NAT_MASQUERADE=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +# CONFIG_NFT_FLOW_OFFLOAD is not set +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_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NFT_XFRM=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=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_MASQUERADE=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 +# end of Core Netfilter Configuration + +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=y +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=y +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_SNMP_BASIC=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 +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +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 +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=m +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_NF_CONNTRACK_BRIDGE=m +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 +# end of DCCP CCIDs Configuration + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +# end of DCCP Kernel Hacking + +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_CRYPTO=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_BRIDGE_MRP=y +CONFIG_BRIDGE_CFM=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_8021Q=m +CONFIG_NET_DSA_TAG_AR9331=m +CONFIG_NET_DSA_TAG_BRCM_COMMON=m +CONFIG_NET_DSA_TAG_BRCM=m +CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +CONFIG_NET_DSA_TAG_HELLCREEK=m +CONFIG_NET_DSA_TAG_GSWIP=m +CONFIG_NET_DSA_TAG_DSA_COMMON=m +CONFIG_NET_DSA_TAG_DSA=m +CONFIG_NET_DSA_TAG_EDSA=m +CONFIG_NET_DSA_TAG_MTK=m +CONFIG_NET_DSA_TAG_KSZ=m +CONFIG_NET_DSA_TAG_RTL4_A=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_NET_DSA_TAG_QCA=m +CONFIG_NET_DSA_TAG_LAN9303=m +CONFIG_NET_DSA_TAG_SJA1105=m +CONFIG_NET_DSA_TAG_TRAILER=m +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_TAPRIO=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_FQ_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +CONFIG_NET_SCH_ETS=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_MPLS=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_GATE=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_TC_SKB_EXT is not set +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_DEBUG is not set +# CONFIG_BATMAN_ADV_TRACING 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_VSOCKETS_LOOPBACK=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=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m +CONFIG_QRTR_MHI=m +# 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=y +# end of Network testing +# end of Networking options + +# CONFIG_HAMRADIO is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m +CONFIG_CAN_J1939=m +CONFIG_CAN_ISOTP=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=m +# CONFIG_CAN_GRCAN is not set +CONFIG_CAN_KVASER_PCIEFD=m +# 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_EMS_PCI=m +CONFIG_CAN_F81601=m +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SJA1000_ISA=m +# CONFIG_CAN_SJA1000_PLATFORM is not set +CONFIG_CAN_SOFTING=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_HI311X is not set +# CONFIG_CAN_MCP251X is not set +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +# end of CAN SPI interfaces + +# +# 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 +# end of CAN USB interfaces + +# CONFIG_CAN_DEBUG_DEVICES is not set +# end of CAN Device Drivers + +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_MSFTEXT=y +CONFIG_BT_DEBUGFS=y +# CONFIG_BT_SELFTEST is not set + +# +# 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_MTK=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_MTKSDIO=m +CONFIG_BT_MTKUART=m +CONFIG_BT_QCOMSMD=m +CONFIG_BT_HCIRSI=m +# end of Bluetooth device drivers + +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_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_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_PN532_UART is not set +# CONFIG_NFC_ST95HF is not set +# end of Near Field Communication (NFC) devices + +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=y +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=m +CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_TEGRA_AHB=y +CONFIG_HAVE_PCI=y +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_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_PCIE_BW is not set +# CONFIG_PCIE_EDR is not set +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_MSI_ARCH_FALLBACKS=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_BRIDGE_EMUL=y +CONFIG_PCI_IOV=y +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +CONFIG_PCI_LABEL=y +# CONFIG_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +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 +# 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_PCIE_ALTERA is not set +CONFIG_PCI_HOST_THUNDER_PEM=y +CONFIG_PCI_HOST_THUNDER_ECAM=y +CONFIG_PCIE_ROCKCHIP=y +CONFIG_PCIE_ROCKCHIP_HOST=m +CONFIG_PCIE_BRCMSTB=m + +# +# DesignWare PCI Core Support +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +# CONFIG_PCIE_DW_PLAT_HOST is not set +CONFIG_PCI_IMX6=y +CONFIG_PCI_HISI=y +CONFIG_PCIE_QCOM=y +CONFIG_PCIE_ARMADA_8K=y +CONFIG_PCIE_KIRIN=y +# CONFIG_PCIE_HISI_STB is not set +# CONFIG_PCI_MESON is not set +CONFIG_PCIE_TEGRA194=m +CONFIG_PCIE_TEGRA194_HOST=m +# CONFIG_PCIE_AL is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# CONFIG_PCIE_LAYERSCAPE_GEN4 is not set +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +# CONFIG_PCIE_CADENCE_PLAT_HOST is not set +# CONFIG_PCI_J721E_HOST is not set +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# end of PCI switch controller drivers + +# CONFIG_PCCARD is not set +# CONFIG_RAPIDIO is not set + +# +# Generic Driver Options +# +CONFIG_AUXILIARY_BUS=y +# 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_FW_LOADER_PAGED_BUF=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y +# end of Firmware loader + +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_HMEM_REPORTING=y +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_SYS_HYPERVISOR=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_SPI=m +CONFIG_REGMAP_SPMI=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_IRQ=y +CONFIG_REGMAP_SCCB=m +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_GENERIC_ARCH_TOPOLOGY=y +# end of Generic Driver Options + +# +# Bus devices +# +# CONFIG_BRCMSTB_GISB_ARB is not set +CONFIG_MOXTET=m +# CONFIG_HISILICON_LPC is not set +# CONFIG_IMX_WEIM 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_FSL_MC_BUS is not set +CONFIG_MHI_BUS=m +# CONFIG_MHI_BUS_DEBUG is not set +CONFIG_MHI_BUS_PCI_GENERIC=m +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_MTK_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set + +# +# Partition parsers +# +CONFIG_MTD_AR7_PARTS=m +# CONFIG_MTD_CMDLINE_PARTS is not set +CONFIG_MTD_OF_PARTS=m +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# end of 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_PSTORE=m +CONFIG_MTD_SWAP=m +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +CONFIG_MTD_CFI=m +# CONFIG_MTD_JEDECPROBE is not set +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 is not set +# CONFIG_MTD_ABSENT is not set +# end of RAM/ROM/Flash chip drivers + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +# CONFIG_MTD_PHYSMAP is not set +CONFIG_MTD_PCI=m +CONFIG_MTD_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +# end of Mapping drivers for chip access + +# +# 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_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 +# end of Self-contained MTD device drivers + +# +# NAND +# +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_RAW_NAND=m + +# +# Raw/parallel NAND flash controllers +# +CONFIG_MTD_NAND_DENALI=m +# CONFIG_MTD_NAND_DENALI_PCI is not set +CONFIG_MTD_NAND_DENALI_DT=m +# CONFIG_MTD_NAND_CAFE is not set +CONFIG_MTD_NAND_MARVELL=m +CONFIG_MTD_NAND_BRCMNAND=m +CONFIG_MTD_NAND_MXC=m +CONFIG_MTD_NAND_SUNXI=m +CONFIG_MTD_NAND_HISI504=m +CONFIG_MTD_NAND_QCOM=m +CONFIG_MTD_NAND_MXIC=m +CONFIG_MTD_NAND_TEGRA=m +CONFIG_MTD_NAND_MESON=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_NAND_CADENCE=m +CONFIG_MTD_NAND_ARASAN=m +# CONFIG_MTD_NAND_INTEL_LGM is not set +CONFIG_MTD_NAND_ROCKCHIP=m + +# +# Misc +# +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_NANDSIM=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_SPI_NAND=m + +# +# ECC engine support +# +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# end of ECC engine support +# end of NAND + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +# end of LPDDR & LPDDR2 PCM memory drivers + +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP 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_MTD_HYPERBUS=m +CONFIG_HBMC_AM654=m +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_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_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING 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_BLK_DEV_RBD=m +# CONFIG_BLK_DEV_RSXX is not set +CONFIG_BLK_DEV_RNBD=y +CONFIG_BLK_DEV_RNBD_CLIENT=m +CONFIG_BLK_DEV_RNBD_SERVER=m + +# +# NVME Support +# +CONFIG_NVME_CORE=m +CONFIG_BLK_DEV_NVME=m +CONFIG_NVME_MULTIPATH=y +CONFIG_NVME_HWMON=y +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TCP=m +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_PASSTHRU is not set +# CONFIG_NVME_TARGET_LOOP is not set +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +# CONFIG_NVME_TARGET_FCLOOP is not set +CONFIG_NVME_TARGET_TCP=m +# end of NVME Support + +# +# 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_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_QCOM_FASTRPC 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_LATTICE_ECP3_CONFIG is not set +CONFIG_SRAM=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_XILINX_SDFEC=m +CONFIG_MISC_RTSX=m +CONFIG_PVPANIC=m +CONFIG_HISI_HIKEY_USB=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_EEPROM_EE1004 is not set +# end of EEPROM support + +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 +# end of Texas Instruments shared transport line discipline + +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +# CONFIG_GENWQE is not set +# CONFIG_ECHO is not set +CONFIG_MISC_ALCOR_PCI=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HABANA_AI=m +CONFIG_UACCE=m +# end of Misc devices + +# +# SCSI device support +# +CONFIG_SCSI_MOD=m +CONFIG_RAID_ATTRS=m +CONFIG_SCSI=m +CONFIG_SCSI_DMA=y +CONFIG_SCSI_NETLINK=y +# 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_BLK_DEV_SR=m +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 +# end of SCSI Transports + +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_UFS_BSG is not set +CONFIG_SCSI_UFS_CRYPTO=y +CONFIG_SCSI_HPTIOP=m +# CONFIG_SCSI_MYRB is not set +# CONFIG_SCSI_MYRS 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_FDOMAIN=m +CONFIG_SCSI_FDOMAIN_PCI=m +# CONFIG_SCSI_GDTH is not set +# 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_DH=y +CONFIG_SCSI_DH_RDAC=m +CONFIG_SCSI_DH_HP_SW=m +CONFIG_SCSI_DH_EMC=m +CONFIG_SCSI_DH_ALUA=m +# end of SCSI device support + +CONFIG_HAVE_PATA_PLATFORM=y +CONFIG_ATA=m +CONFIG_SATA_HOST=y +CONFIG_PATA_TIMINGS=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_FORCE=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_IMX=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_IMX 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_BCACHE_ASYNC_REGISTRATION is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=m +# 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_EBS is not set +CONFIG_DM_ERA=m +CONFIG_DM_CLONE=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_MULTIPATH_HST=m +CONFIG_DM_MULTIPATH_IOA=m +CONFIG_DM_DELAY=m +CONFIG_DM_DUST=m +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y +# 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 +# end of IEEE 1394 (FireWire) support + +CONFIG_NETDEVICES=y +CONFIG_MII=m +CONFIG_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set +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_L3S=y +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_BAREUDP=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_MHI_NET=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 + +# +# 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_HIRSCHMANN_HELLCREEK=m +# CONFIG_NET_DSA_LANTIQ_GSWIP is not set +# CONFIG_NET_DSA_MT7530 is not set +CONFIG_NET_DSA_MV88E6060=m +# CONFIG_NET_DSA_MICROCHIP_KSZ9477 is not set +# CONFIG_NET_DSA_MICROCHIP_KSZ8795 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_MSCC_FELIX=m +CONFIG_NET_DSA_MSCC_SEVILLE=m +CONFIG_NET_DSA_AR9331=m +CONFIG_NET_DSA_SJA1105=m +CONFIG_NET_DSA_SJA1105_PTP=y +# CONFIG_NET_DSA_SJA1105_TAS 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_NET_DSA_VITESSE_VSC73XX_SPI=m +CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m +# end of Distributed Switch Architecture drivers + +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_ENA_ETHERNET=m +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_AQTION=m +# 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_CHELSIO_INLINE_CRYPTO=y +# CONFIG_CHELSIO_IPSEC_INLINE is not set +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_FREESCALE=y +CONFIG_FEC=m +CONFIG_FSL_PQ_MDIO=m +CONFIG_FSL_XGMAC_MDIO=m +CONFIG_GIANFAR=m +CONFIG_FSL_ENETC=m +CONFIG_FSL_ENETC_VF=m +CONFIG_FSL_ENETC_MDIO=m +CONFIG_FSL_ENETC_PTP_CLOCK=m +CONFIG_FSL_ENETC_QOS=y +CONFIG_NET_VENDOR_GOOGLE=y +CONFIG_GVE=m +CONFIG_NET_VENDOR_HISILICON=y +CONFIG_HIX5HD2_GMAC=m +CONFIG_HISI_FEMAC=m +CONFIG_HIP04_ETH=m +CONFIG_HI13X1_GMAC=y +CONFIG_HNS_MDIO=m +CONFIG_HNS=m +CONFIG_HNS_DSAF=m +CONFIG_HNS_ENET=m +# CONFIG_HNS3 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_IXGBE_IPSEC=y +CONFIG_IXGBEVF=m +CONFIG_IXGBEVF_IPSEC=y +CONFIG_I40E=m +CONFIG_I40E_DCB=y +# CONFIG_I40EVF is not set +# CONFIG_ICE is not set +# CONFIG_FM10K is not set +# CONFIG_IGC 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_OCTEONTX2_MBOX=m +# CONFIG_OCTEONTX2_AF is not set +CONFIG_OCTEONTX2_PF=m +CONFIG_OCTEONTX2_VF=m +CONFIG_PRESTERA=m +CONFIG_PRESTERA_PCI=m +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_ACCEL=y +# 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_CLS_ACT=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLX5_IPSEC=y +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_SW_STEERING=y +# 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_LIB=m +CONFIG_MSCC_OCELOT_SWITCH=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_NI_XGE_MANAGEMENT_ENET is not set +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_PENSANDO=y +CONFIG_IONIC=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_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_SELFTESTS is not set +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_QCOM_ETHQOS=m +CONFIG_DWMAC_ROCKCHIP=m +CONFIG_DWMAC_SUNXI=m +CONFIG_DWMAC_SUN8I=m +CONFIG_DWMAC_IMX8=m +# CONFIG_DWMAC_INTEL_PLAT is not set +# 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_PHY_SEL 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_NET_VENDOR_XILINX=y +CONFIG_XILINX_AXI_EMAC=m +CONFIG_XILINX_LL_TEMAC=m +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_PHYLINK=m +CONFIG_PHYLIB=m +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set +CONFIG_FIXED_PHY=m +# CONFIG_SFP is not set + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_MESON_GXL_PHY=m +CONFIG_ADIN_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AX88796B_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM54140_PHY=m +# CONFIG_BCM7XXX_PHY is not set +CONFIG_BCM84881_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_CICADA_PHY=m +# CONFIG_CORTINA_PHY is not set +CONFIG_DAVICOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_LXT_PHY=m +# CONFIG_INTEL_XWAY_PHY is not set +CONFIG_LSI_ET1011C_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_NXP_TJA11XX_PHY=m +CONFIG_AT803X_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_DP83822_PHY is not set +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_DP83869_PHY=m +CONFIG_VITESSE_PHY=m +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA is not set +CONFIG_MDIO_DEVICE=m +CONFIG_MDIO_BUS=m +CONFIG_OF_MDIO=m +CONFIG_MDIO_DEVRES=m +# CONFIG_MDIO_SUN4I is not set +CONFIG_MDIO_XGENE=m +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BCM_UNIMAC is not set +CONFIG_MDIO_CAVIUM=m +CONFIG_MDIO_HISI_FEMAC=m +CONFIG_MDIO_MVUSB=m +CONFIG_MDIO_MSCC_MIIM=m +# CONFIG_MDIO_OCTEON is not set +# CONFIG_MDIO_IPQ4019 is not set +CONFIG_MDIO_IPQ8064=m +CONFIG_MDIO_THUNDER=m + +# +# MDIO Multiplexers +# +CONFIG_MDIO_BUS_MUX=m +CONFIG_MDIO_BUS_MUX_MESON_G12A=m +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set +CONFIG_MDIO_BUS_MUX_MMIOREG=m + +# +# PCS device drivers +# +CONFIG_PCS_XPCS=m +CONFIG_PCS_LYNX=m +# end of PCS device drivers + +# 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_USB_NET_AQC111=m +CONFIG_USB_RTL8153_ECM=m +CONFIG_WLAN=y +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_PCI_NO_EEPROM=m +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_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_DEBUG is not set +# CONFIG_ATH11K_TRACING 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 +# end of iwl3945 / iwl4965 Debugging Options + +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 + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set +# end of Debugging Options + +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_MT76x0U is not set +# CONFIG_MT76x0E is not set +# CONFIG_MT76x2E is not set +# CONFIG_MT76x2U is not set +# CONFIG_MT7603E is not set +# CONFIG_MT7615E is not set +# CONFIG_MT7663U is not set +# CONFIG_MT7663S is not set +# CONFIG_MT7915E is not set +CONFIG_WLAN_VENDOR_MICROCHIP=y +# CONFIG_WILC1000_SDIO is not set +# CONFIG_WILC1000_SPI 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_RTW88=m +CONFIG_RTW88_CORE=m +CONFIG_RTW88_PCI=m +CONFIG_RTW88_8822B=m +CONFIG_RTW88_8822C=m +CONFIG_RTW88_8723D=m +CONFIG_RTW88_8821C=m +CONFIG_RTW88_8822BE=m +CONFIG_RTW88_8822CE=m +CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8821CE=m +# CONFIG_RTW88_DEBUG is not set +# CONFIG_RTW88_DEBUGFS 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=m +CONFIG_QTNFMAC_PCIE=m +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_VIRT_WIFI=m +# 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_USB4_NET=m +# 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_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_QT1050=m +# 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_SNVS_PWRKEY=m +CONFIG_KEYBOARD_IMX=m +CONFIG_KEYBOARD_IMX_SC_KEY=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_SUN4I_LRADC is not set +CONFIG_KEYBOARD_IQS62X=m +# 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_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_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +# CONFIG_INPUT_GPIO_VIBRA 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_DA7280_HAPTICS=m +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +CONFIG_INPUT_IQS269A=m +# 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_F3A=y +# 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 +# end of Hardware I/O ports +# end of Input device support + +# +# 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_LDISC_AUTOLOAD=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_16550A_VARIANTS=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_DWLIB=y +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_TEGRA=y +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_TEGRA_TCU=m +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +CONFIG_SERIAL_IMX=m +CONFIG_SERIAL_IMX_CONSOLE=m +CONFIG_SERIAL_IMX_EARLYCON=y +# 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_QCOM_GENI_CONSOLE is not set +# CONFIG_SERIAL_SIFIVE is not set +# 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 is not set +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +# CONFIG_SERIAL_SPRD is not set +CONFIG_SERIAL_MVEBU_UART=y +CONFIG_SERIAL_MVEBU_CONSOLE=y +# end of Serial drivers + +CONFIG_SERIAL_MCTRL_GPIO=y +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_N_GSM=m +CONFIG_NOZOMI=m +CONFIG_NULL_TTY=m +# CONFIG_TRACE_SINK 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_SERIAL_DEV_BUS=m +CONFIG_TTY_PRINTK=m +CONFIG_TTY_PRINTK_LEVEL=6 +# CONFIG_PRINTER is not set +# CONFIG_PPDEV is not set +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +CONFIG_IPMI_PLAT_DATA=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_IPMB_DEVICE_INTERFACE=m +CONFIG_HW_RANDOM=m +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +CONFIG_HW_RANDOM_BA431=m +CONFIG_HW_RANDOM_BCM2835=m +CONFIG_HW_RANDOM_IPROC_RNG200=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_HW_RANDOM_OPTEE=m +CONFIG_HW_RANDOM_CCTRNG=m +CONFIG_HW_RANDOM_XIPHERA=m +# CONFIG_APPLICOM is not set +CONFIG_DEVMEM=y +# CONFIG_RAW_DRIVER is not set +CONFIG_DEVPORT=y +# CONFIG_TCG_TPM is not set +# CONFIG_XILLYBUS is not set +# end of Character devices + +# CONFIG_RANDOM_TRUST_CPU is not set +# CONFIG_RANDOM_TRUST_BOOTLOADER 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 +# end of Multiplexer I2C Chip support + +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_AMD_MP2 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_NVIDIA_GPU 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_BRCMSTB=m +# CONFIG_I2C_CADENCE is not set +# CONFIG_I2C_CBUS_GPIO is not set +CONFIG_I2C_DESIGNWARE_CORE=m +# CONFIG_I2C_DESIGNWARE_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_IMX=m +CONFIG_I2C_IMX_LPI2C=m +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_CCI 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_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 +# end of I2C Hardware Bus support + +# CONFIG_I2C_STUB is not set +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_SLAVE_TESTUNIT is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +CONFIG_I3C=m +CONFIG_CDNS_I3C_MASTER=m +CONFIG_DW_I3C_MASTER=m +# CONFIG_MIPI_I3C_HCI 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_CADENCE_QUADSPI is not set +# CONFIG_SPI_DESIGNWARE is not set +CONFIG_SPI_FSL_LPSPI=m +CONFIG_SPI_FSL_QUADSPI=m +CONFIG_SPI_HISI_SFC_V3XX=m +CONFIG_SPI_NXP_FLEXSPI=m +# CONFIG_SPI_GPIO is not set +CONFIG_SPI_IMX=m +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_QCOM_QSPI is not set +CONFIG_SPI_QUP=m +# CONFIG_SPI_QCOM_GENI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_SIFIVE is not set +# CONFIG_SPI_SUN4I is not set +# CONFIG_SPI_SUN6I is not set +CONFIG_SPI_SYNQUACER=m +# CONFIG_SPI_MXIC 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 +CONFIG_SPI_AMD=m + +# +# SPI Multiplexer support +# +CONFIG_SPI_MUX=m + +# +# 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_SPI_DYNAMIC=y +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 +CONFIG_PTP_1588_CLOCK_QORIQ=m + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +CONFIG_PTP_1588_CLOCK_IDT82P33=m +CONFIG_PTP_1588_CLOCK_IDTCM=m +CONFIG_PTP_1588_CLOCK_OCP=m +# end of PTP clock support + +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_BM1880=y +# CONFIG_PINCTRL_MCP23S08 is not set +CONFIG_PINCTRL_ROCKCHIP=y +CONFIG_PINCTRL_SINGLE=y +# CONFIG_PINCTRL_SX150X is not set +# CONFIG_PINCTRL_STMFX is not set +CONFIG_PINCTRL_MAX77620=y +# CONFIG_PINCTRL_RK805 is not set +# CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set +CONFIG_PINCTRL_BCM2835=y +CONFIG_PINCTRL_IMX=y +CONFIG_PINCTRL_IMX_SCU=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y +CONFIG_PINCTRL_IMX8MQ=y +CONFIG_PINCTRL_IMX8QM=y +CONFIG_PINCTRL_IMX8QXP=y +CONFIG_PINCTRL_IMX8DXL=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_IPQ6018 is not set +CONFIG_PINCTRL_MSM8226=m +# 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_MSM8953 is not set +# CONFIG_PINCTRL_MSM8976 is not set +# CONFIG_PINCTRL_MSM8994 is not set +CONFIG_PINCTRL_MSM8996=y +# CONFIG_PINCTRL_MSM8998 is not set +# CONFIG_PINCTRL_QCS404 is not set +# CONFIG_PINCTRL_QDF2XXX is not set +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y +CONFIG_PINCTRL_QCOM_SSBI_PMIC=y +# CONFIG_PINCTRL_SC7180 is not set +# CONFIG_PINCTRL_SC7280 is not set +# CONFIG_PINCTRL_SDM660 is not set +# CONFIG_PINCTRL_SDM845 is not set +# CONFIG_PINCTRL_SDX55 is not set +CONFIG_PINCTRL_SM8150=m +CONFIG_PINCTRL_SM8250=m +# CONFIG_PINCTRL_LPASS_LPI is not set + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +CONFIG_PINCTRL_SUNXI=y +# CONFIG_PINCTRL_SUN4I_A10 is not set +# CONFIG_PINCTRL_SUN5I is not set +# CONFIG_PINCTRL_SUN6I_A31 is not set +# CONFIG_PINCTRL_SUN6I_A31_R is not set +# CONFIG_PINCTRL_SUN8I_A23 is not set +# CONFIG_PINCTRL_SUN8I_A33 is not set +# CONFIG_PINCTRL_SUN8I_A83T is not set +# CONFIG_PINCTRL_SUN8I_A83T_R is not set +# CONFIG_PINCTRL_SUN8I_A23_R is not set +# CONFIG_PINCTRL_SUN8I_H3 is not set +CONFIG_PINCTRL_SUN8I_H3_R=y +# CONFIG_PINCTRL_SUN8I_V3S is not set +# CONFIG_PINCTRL_SUN9I_A80 is not set +# CONFIG_PINCTRL_SUN9I_A80_R is not set +CONFIG_PINCTRL_SUN50I_A64=y +CONFIG_PINCTRL_SUN50I_A64_R=y +CONFIG_PINCTRL_SUN50I_A100=y +CONFIG_PINCTRL_SUN50I_A100_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_TEGRA194=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_MESON_G12A=y +CONFIG_PINCTRL_MESON_A1=y +CONFIG_PINCTRL_MADERA=m +CONFIG_PINCTRL_VISCONTI=y +CONFIG_PINCTRL_TMPV7700=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_CDEV=y +CONFIG_GPIO_CDEV_V1=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_CADENCE=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_HISI=m +# CONFIG_GPIO_HLWD is not set +CONFIG_GPIO_LOGICVC=m +CONFIG_GPIO_MB86S7X=m +CONFIG_GPIO_MVEBU=y +CONFIG_GPIO_MXC=y +CONFIG_GPIO_PL061=y +# CONFIG_GPIO_SAMA5D2_PIOBU is not set +CONFIG_GPIO_SIFIVE=y +# CONFIG_GPIO_SYSCON is not set +CONFIG_GPIO_TEGRA=y +CONFIG_GPIO_TEGRA186=y +# CONFIG_GPIO_THUNDERX is not set +CONFIG_GPIO_XGENE=y +CONFIG_GPIO_XGENE_SB=m +CONFIG_GPIO_XILINX=m +CONFIG_GPIO_XLP=y +# CONFIG_GPIO_AMD_FCH is not set +# end of Memory mapped GPIO drivers + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_GW_PLD 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_PCA9570=m +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_TPIC2810 is not set +# end of I2C GPIO expanders + +# +# MFD GPIO expanders +# +CONFIG_GPIO_BD70528=m +CONFIG_GPIO_BD71828=m +CONFIG_GPIO_MADERA=m +CONFIG_GPIO_MAX77620=y +# end of MFD GPIO expanders + +# +# 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 +# end of PCI GPIO expanders + +# +# 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 +CONFIG_GPIO_MOXTET=m +# end of SPI GPIO expanders + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +# end of USB GPIO expanders + +# +# Virtual GPIO drivers +# +CONFIG_GPIO_AGGREGATOR=m +# CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + +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=m +# CONFIG_W1_MASTER_DS1WM is not set +CONFIG_W1_MASTER_GPIO=m +# CONFIG_W1_MASTER_SGI is not set +# end of 1-wire Bus Masters + +# +# 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_DS2430=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_DS250X is not set +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +# end of 1-wire Slaves + +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_LINKSTATION is not set +CONFIG_POWER_RESET_MSM=y +CONFIG_POWER_RESET_QCOM_PON=m +# CONFIG_POWER_RESET_LTC2952 is not set +CONFIG_POWER_RESET_REGULATOR=y +# 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_NVMEM_REBOOT_MODE=m +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y +# 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_CW2015=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_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_LT3651 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_BQ2515X is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 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_CHARGER_UCS1002 is not set +# CONFIG_CHARGER_BD70528 is not set +CONFIG_CHARGER_BD99954=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_ADM1177=m +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_AS370 is not set +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_AXI_FAN_CONTROL=m +CONFIG_SENSORS_ARM_SCMI=m +# CONFIG_SENSORS_ASPEED is not set +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CORSAIR_CPRO=m +CONFIG_SENSORS_CORSAIR_PSU=m +CONFIG_SENSORS_DRIVETEMP=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_LTC2947=m +CONFIG_SENSORS_LTC2947_I2C=m +CONFIG_SENSORS_LTC2947_SPI=m +# CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 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_MAX127=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_MAX31730=m +# 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_MR75203 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_OCC_P8_I2C 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_SBTSI=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_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_TMP513=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_NETLINK=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_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_CPU_FREQ_THERMAL=y +# CONFIG_DEVFREQ_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_THERMAL_MMIO is not set +CONFIG_HISI_THERMAL=m +CONFIG_IMX_THERMAL=m +CONFIG_IMX_SC_THERMAL=m +CONFIG_IMX8MM_THERMAL=m +# CONFIG_MAX77620_THERMAL is not set +# CONFIG_QORIQ_THERMAL is not set +CONFIG_SUN8I_THERMAL=m +# CONFIG_ROCKCHIP_THERMAL is not set +CONFIG_ARMADA_THERMAL=m +CONFIG_AMLOGIC_THERMAL=y + +# +# Broadcom thermal drivers +# +CONFIG_BCM2711_THERMAL=m +CONFIG_BCM2835_THERMAL=m +# end of Broadcom thermal drivers + +# +# NVIDIA Tegra thermal drivers +# +CONFIG_TEGRA_SOCTHERM=y +# CONFIG_TEGRA_BPMP_THERMAL is not set +# end of NVIDIA Tegra thermal drivers + +# CONFIG_GENERIC_ADC_THERMAL is not set + +# +# Qualcomm thermal drivers +# +CONFIG_QCOM_TSENS=m +CONFIG_QCOM_SPMI_TEMP_ALARM=m +# end of Qualcomm thermal drivers + +CONFIG_KHADAS_MCU_FAN_THERMAL=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_OPEN_TIMEOUT=0 +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_BD70528_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_ARMADA_37XX_WATCHDOG is not set +# 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_IMX2_WDT=m +CONFIG_IMX_SC_WDT=m +CONFIG_IMX7ULP_WDT=m +CONFIG_TEGRA_WATCHDOG=m +CONFIG_QCOM_WDT=m +CONFIG_MESON_GXBB_WATCHDOG=m +CONFIG_MESON_WATCHDOG=m +CONFIG_ARM_SMC_WATCHDOG=m +CONFIG_PM8916_WATCHDOG=m +CONFIG_VISCONTI_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 +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_DEV=y +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L15 is not set +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_MFD_CS47L92 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_GATEWORKS_GSC is not set +# CONFIG_MFD_MC13XXX_SPI is not set +# CONFIG_MFD_MC13XXX_I2C is not set +CONFIG_MFD_MP2629=m +# 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_INTEL_PMT is not set +CONFIG_MFD_IQS62X=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_MAX77650 is not set +# 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_MT6360=m +# 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_ABX500_CORE is not set +# CONFIG_MFD_STMPE is not set +CONFIG_MFD_SUN6I_PRCM=y +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_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_TQMX86 is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_LOCHNAGAR 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_ROHM_BD70528=m +CONFIG_MFD_ROHM_BD71828=m +# CONFIG_MFD_STPMIC1 is not set +# CONFIG_MFD_STMFX is not set +CONFIG_MFD_KHADAS_MCU=m +CONFIG_MFD_VEXPRESS_SYSREG=y +# CONFIG_RAVE_SP_CORE is not set +# CONFIG_MFD_INTEL_M10_BMC is not set +# end of Multifunction device drivers + +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_ARIZONA_LDO1=m +CONFIG_REGULATOR_ARIZONA_MICSUPP=m +CONFIG_REGULATOR_ARM_SCMI=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_REGULATOR_BD70528=m +CONFIG_REGULATOR_BD71828=m +CONFIG_REGULATOR_BD718XX=m +CONFIG_REGULATOR_CROS_EC=m +CONFIG_REGULATOR_DA9121=m +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +CONFIG_REGULATOR_FAN53555=m +CONFIG_REGULATOR_FAN53880=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_MAX77826 is not set +# CONFIG_REGULATOR_MCP16502 is not set +CONFIG_REGULATOR_MP5416=m +CONFIG_REGULATOR_MP8859=m +CONFIG_REGULATOR_MP886X=m +CONFIG_REGULATOR_MPQ7920=m +# CONFIG_REGULATOR_MT6311 is not set +CONFIG_REGULATOR_MT6360=m +CONFIG_REGULATOR_PCA9450=m +CONFIG_REGULATOR_PF8X00=m +# 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_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m +CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_ROHM=m +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RTMV20=m +CONFIG_REGULATOR_SLG51000=m +CONFIG_REGULATOR_SY8106A=m +CONFIG_REGULATOR_SY8824X=m +CONFIG_REGULATOR_SY8827N=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_REGULATOR_VQMMC_IPQ4019 is not set +CONFIG_REGULATOR_QCOM_LABIBB=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_IR_RCMM_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_RC_XBOX_DVD=m +CONFIG_IR_TOY=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_CEC_CH7322=m +CONFIG_CEC_CROS_EC=m +CONFIG_CEC_MESON_AO=m +CONFIG_CEC_MESON_G12A_AO=m +CONFIG_CEC_TEGRA=m +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_SUPPORT=m +# CONFIG_MEDIA_SUPPORT_FILTER is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y + +# +# Media device types +# +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_PLATFORM_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +# end of Media device types + +# +# Media core support +# +CONFIG_VIDEO_DEV=m +CONFIG_MEDIA_CONTROLLER=y +CONFIG_DVB_CORE=m +# end of Media core support + +# +# Video4Linux options +# +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_JPEG_HELPER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_V4L2_FWNODE=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +# end of Video4Linux options + +# +# Media controller options +# +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# +# end of Media controller options + +# +# Digital TV options +# +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +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 +# end of Digital TV options + +# +# Media drivers +# +CONFIG_TTPCI_EEPROM=m +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_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_CXUSB_ANALOG=y +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 +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_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 +# CONFIG_RADIO_WL128X is not set +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 +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_ASPEED is not set +CONFIG_VIDEO_MUX=m +CONFIG_VIDEO_QCOM_CAMSS=m +CONFIG_VIDEO_ROCKCHIP_ISP1=m +# CONFIG_VIDEO_XILINX is not set +# CONFIG_VIDEO_SUN4I_CSI is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_IMX_PXP=m +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_MESON_GE2D=m +CONFIG_VIDEO_ROCKCHIP_RGA=m +CONFIG_VIDEO_QCOM_VENUS=m +CONFIG_VIDEO_SUN8I_DEINTERLACE=m +CONFIG_VIDEO_SUN8I_ROTATE=m +# CONFIG_DVB_PLATFORM_DRIVERS is not set +# CONFIG_SDR_PLATFORM_DRIVERS is not set + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=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_TEST_DRIVERS is not set + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA1997X=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_TLV320AIC23B=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_ADV748X=m +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7604_CEC=y +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_ADV7842_CEC=y +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_ML86V7667=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TC358743=m +CONFIG_VIDEO_TC358743_CEC=y +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_TW9910=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_MAX9286=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_AD9389B=m +CONFIG_VIDEO_AK881X=m +CONFIG_VIDEO_THS8200=m +# end of Video encoders + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +CONFIG_SDR_MAX2175=m +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_I2C=m +CONFIG_VIDEO_ST_MIPID02=m +# end of Miscellaneous helper chips + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_HI556=m +CONFIG_VIDEO_IMX214=m +CONFIG_VIDEO_IMX219=m +CONFIG_VIDEO_IMX258=m +CONFIG_VIDEO_IMX274=m +CONFIG_VIDEO_IMX290=m +CONFIG_VIDEO_IMX319=m +CONFIG_VIDEO_IMX355=m +CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV2659=m +CONFIG_VIDEO_OV2680=m +CONFIG_VIDEO_OV2685=m +CONFIG_VIDEO_OV2740=m +CONFIG_VIDEO_OV5640=m +CONFIG_VIDEO_OV5645=m +CONFIG_VIDEO_OV5647=m +CONFIG_VIDEO_OV6650=m +CONFIG_VIDEO_OV5670=m +CONFIG_VIDEO_OV5675=m +CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV7251=m +CONFIG_VIDEO_OV772X=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV7740=m +CONFIG_VIDEO_OV8856=m +CONFIG_VIDEO_OV9640=m +CONFIG_VIDEO_OV9650=m +CONFIG_VIDEO_OV9734=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_RDACM20=m +CONFIG_VIDEO_RJ54N1=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K4ECGX=m +CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_CCS=m +CONFIG_VIDEO_ET8EK8=m +CONFIG_VIDEO_S5C73M3=m +# end of Camera sensor devices + +# +# Lens drivers +# +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_AK7375=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9768=m +CONFIG_VIDEO_DW9807_VCM=m +# end of Lens drivers + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_LM3560=m +CONFIG_VIDEO_LM3646=m +# end of Flash devices + +# +# SPI helper chips +# +CONFIG_VIDEO_GS1662=m +# end of SPI helper chips + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +# end of Media SPI Adapters + +CONFIG_MEDIA_TUNER=m + +# +# Customize TV tuners +# +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 +# end of Customize TV tuners + +# +# Customise DVB Frontends +# + +# +# 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_S5H1432=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_DIB9000=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 +CONFIG_DVB_CXD2880=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 +CONFIG_DVB_MN88443X=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_LNBH29=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_LGS8GL5=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 +# end of Customise DVB Frontends + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +# end of Media ancillary drivers + +# +# 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_DBI=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_DEBUG_DP_MST_TOPOLOGY_REFS is not set +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VRAM_HELPER=m +CONFIG_DRM_TTM_HELPER=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_GEM_SHMEM_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 +# end of I2C encoder or helper chips + +# +# ARM devices +# +CONFIG_DRM_HDLCD=m +# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set +CONFIG_DRM_MALI_DISPLAY=m +CONFIG_DRM_KOMEDA=m +# end of ARM devices + +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 +# end of ACP (Audio CoProcessor) Configuration + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +# CONFIG_DRM_AMD_DC_HDCP is not set +CONFIG_DRM_AMD_DC_SI=y +# end of Display Engine Configuration + +# CONFIG_HSA_AMD is not set +CONFIG_DRM_NOUVEAU=m +# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set +CONFIG_NOUVEAU_PLATFORM_DRIVER=y +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +# CONFIG_NOUVEAU_DEBUG_PUSH is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +# CONFIG_DRM_KMB_DISPLAY is not set +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_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_GPU_STATE=y +# 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_DP=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_MSM_DSI_7NM_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_ABT_Y030XX067A is not set +CONFIG_DRM_PANEL_ARM_VERSATILE=m +CONFIG_DRM_PANEL_ASUS_Z00T_TM5P5_NT35596=m +CONFIG_DRM_PANEL_BOE_HIMAX8279D=m +CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m +# CONFIG_DRM_PANEL_LVDS is not set +CONFIG_DRM_PANEL_SIMPLE=m +CONFIG_DRM_PANEL_ELIDA_KD35T133=m +CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m +# CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D is not set +# 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_KINGDISPLAY_KD097D04 is not set +# CONFIG_DRM_PANEL_LEADTEK_LTK050H3146W is not set +CONFIG_DRM_PANEL_LEADTEK_LTK500HD1829=m +# CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set +# CONFIG_DRM_PANEL_LG_LB035Q02 is not set +# CONFIG_DRM_PANEL_LG_LG4573 is not set +# CONFIG_DRM_PANEL_NEC_NL8048HL11 is not set +CONFIG_DRM_PANEL_NOVATEK_NT35510=m +# CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set +# CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set +CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m +# CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set +# CONFIG_DRM_PANEL_ORISETECH_OTM8009A is not set +CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=m +# CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00 is not set +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM67191 is not set +# CONFIG_DRM_PANEL_RAYDIUM_RM68200 is not set +# CONFIG_DRM_PANEL_RONBO_RB070D30 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6D16D0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set +# CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set +CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01=m +# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set +# CONFIG_DRM_PANEL_SAMSUNG_SOFEF00 is not set +# CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set +# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set +# CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set +# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set +# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set +CONFIG_DRM_PANEL_SONY_ACX424AKP=m +# CONFIG_DRM_PANEL_SONY_ACX565AKM is not set +# CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set +# CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set +# CONFIG_DRM_PANEL_TPO_TD043MTEA1 is not set +# CONFIG_DRM_PANEL_TPO_TPG110 is not set +# CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set +# CONFIG_DRM_PANEL_VISIONOX_RM69299 is not set +CONFIG_DRM_PANEL_XINPENG_XPP055C272=m +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_CDNS_DSI=m +CONFIG_DRM_CHRONTEL_CH7033=m +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_LONTIUM_LT9611=m +CONFIG_DRM_LONTIUM_LT9611UXC=m +CONFIG_DRM_LVDS_CODEC=m +# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set +CONFIG_DRM_NWL_MIPI_DSI=m +# CONFIG_DRM_NXP_PTN3460 is not set +# CONFIG_DRM_PARADE_PS8622 is not set +CONFIG_DRM_PARADE_PS8640=m +# CONFIG_DRM_SIL_SII8620 is not set +# CONFIG_DRM_SII902X is not set +# CONFIG_DRM_SII9234 is not set +CONFIG_DRM_SIMPLE_BRIDGE=m +# CONFIG_DRM_THINE_THC63LVD1024 is not set +CONFIG_DRM_TOSHIBA_TC358762=m +# CONFIG_DRM_TOSHIBA_TC358764 is not set +# CONFIG_DRM_TOSHIBA_TC358767 is not set +# CONFIG_DRM_TOSHIBA_TC358768 is not set +CONFIG_DRM_TOSHIBA_TC358775=m +# CONFIG_DRM_TI_TFP410 is not set +# CONFIG_DRM_TI_SN65DSI86 is not set +CONFIG_DRM_TI_TPD12S015=m +CONFIG_DRM_ANALOGIX_ANX6345=m +# CONFIG_DRM_ANALOGIX_ANX78XX is not set +CONFIG_DRM_ANALOGIX_DP=m +CONFIG_DRM_ANALOGIX_ANX7625=m +CONFIG_DRM_I2C_ADV7511=m +CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_I2C_ADV7511_CEC=y +CONFIG_DRM_CDNS_MHDP8546=m +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 +# end of Display Interface Bridges + +CONFIG_DRM_IMX_DCSS=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=m +CONFIG_DRM_HISI_KIRIN=m +# CONFIG_DRM_MXSFB is not set +CONFIG_DRM_MESON=m +CONFIG_DRM_MESON_DW_HDMI=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_GM12U320=m +# CONFIG_TINYDRM_HX8357D is not set +# CONFIG_TINYDRM_ILI9225 is not set +# CONFIG_TINYDRM_ILI9341 is not set +CONFIG_TINYDRM_ILI9486=m +# CONFIG_TINYDRM_MI0283QT is not set +# CONFIG_TINYDRM_REPAPER is not set +# CONFIG_TINYDRM_ST7586 is not set +# CONFIG_TINYDRM_ST7735R is not set +# CONFIG_DRM_PL111 is not set +# CONFIG_DRM_XEN is not set +CONFIG_DRM_LIMA=m +CONFIG_DRM_PANFROST=m +CONFIG_DRM_TIDSS=m +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_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=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_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_IMX=m +# 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_MX3 is not set +CONFIG_FB_SIMPLE=y +# CONFIG_FB_SSD1307 is not set +# CONFIG_FB_SM712 is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +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_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_LCD_OTM3225A=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_KTD253=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_QCOM_WLED=m +# 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_BACKLIGHT_LED=m +# end of Backlight & LCD device support + +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 +# end of Console display driver support + +# CONFIG_LOGO is not set +# end of Graphics support + +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_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_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_ALS300=m +CONFIG_SND_ALI5451=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_AZT3328=m +# 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_EMU10K1=m +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_EMU10K1X=m +# CONFIG_SND_ENS1370 is not set +# CONFIG_SND_ENS1371 is not set +CONFIG_SND_ES1938=m +CONFIG_SND_ES1968=m +CONFIG_SND_ES1968_INPUT=y +CONFIG_SND_ES1968_RADIO=y +# CONFIG_SND_FM801 is not set +# CONFIG_SND_HDSP is not set +CONFIG_SND_HDSPM=m +CONFIG_SND_ICE1712=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_MAESTRO3=m +CONFIG_SND_MAESTRO3_INPUT=y +# 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_SONICVIBES=m +CONFIG_SND_TRIDENT=m +# 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_GENERIC_LEDS=y +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_INTEL_HDMI_SILENT_STREAM=y +# end of HD-Audio + +CONFIG_SND_HDA_CORE=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_ALIGNED_MMIO=y +CONFIG_SND_HDA_COMPONENT=y +CONFIG_SND_HDA_PREALLOC_SIZE=2048 +CONFIG_SND_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y +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_COMPRESS=y +CONFIG_SND_SOC_ADI=m +CONFIG_SND_SOC_ADI_AXI_I2S=m +CONFIG_SND_SOC_ADI_AXI_SPDIF=m +# CONFIG_SND_SOC_AMD_ACP is not set +# CONFIG_SND_ATMEL_SOC is not set +CONFIG_SND_BCM2835_SOC_I2S=m +CONFIG_SND_BCM63XX_I2S_WHISTLER=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=m +CONFIG_SND_SOC_FSL_MQS=m +CONFIG_SND_SOC_FSL_AUDMIX=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_ESAI=m +CONFIG_SND_SOC_FSL_MICFIL=m +CONFIG_SND_SOC_FSL_XCVR=m +CONFIG_SND_SOC_FSL_AUD2HTX=m +CONFIG_SND_SOC_IMX_PCM_DMA=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_IMX_SOC=m + +# +# SoC Audio support for Freescale i.MX boards: +# +CONFIG_SND_SOC_IMX_ES8328=m +CONFIG_SND_SOC_IMX_SGTL5000=m +CONFIG_SND_SOC_IMX_SPDIF=m +CONFIG_SND_SOC_FSL_ASOC_CARD=m +CONFIG_SND_SOC_IMX_AUDMIX=m +CONFIG_SND_SOC_IMX_HDMI=m +# end of SoC Audio for Freescale CPUs + +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_KIRKWOOD_SOC is not set +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_INTEL_KEEMBAY=m +# CONFIG_SND_SOC_MTK_BTCVSD is not set + +# +# ASoC support for Amlogic platforms +# +CONFIG_SND_MESON_AIU=m +# 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_MESON_AXG_SPDIFIN is not set +# CONFIG_SND_MESON_AXG_PDM is not set +CONFIG_SND_MESON_CODEC_GLUE=m +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +# CONFIG_SND_MESON_G12A_TOACODEC is not set +# CONFIG_SND_MESON_G12A_TOHDMITX is not set +CONFIG_SND_SOC_MESON_T9015=m +# end of ASoC support for Amlogic platforms + +CONFIG_SND_SOC_QCOM=m +CONFIG_SND_SOC_LPASS_CPU=m +CONFIG_SND_SOC_LPASS_HDMI=m +CONFIG_SND_SOC_LPASS_PLATFORM=m +CONFIG_SND_SOC_LPASS_APQ8016=m +CONFIG_SND_SOC_LPASS_SC7180=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_AFE_CLOCKS=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_SC7180=m +# CONFIG_SND_SOC_ROCKCHIP is not set +# CONFIG_SND_SOC_SOF_TOPLEVEL is not set + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +# +# Allwinner SoC Audio support +# +# CONFIG_SND_SUN4I_CODEC is not set +# CONFIG_SND_SUN8I_CODEC is not set +# CONFIG_SND_SUN8I_CODEC_ANALOG is not set +# CONFIG_SND_SUN50I_CODEC_ANALOG is not set +# CONFIG_SND_SUN4I_I2S is not set +# CONFIG_SND_SUN4I_SPDIF is not set +# end of Allwinner SoC Audio support + +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_TEGRA210_AHUB is not set +# CONFIG_SND_SOC_TEGRA210_DMIC is not set +# CONFIG_SND_SOC_TEGRA210_I2S is not set +# CONFIG_SND_SOC_TEGRA186_DSPK is not set +# CONFIG_SND_SOC_TEGRA210_ADMAIF 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_XILINX_I2S=m +# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set +# CONFIG_SND_SOC_XILINX_SPDIF 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_ADAU_UTILS=m +CONFIG_SND_SOC_ADAU1372=m +CONFIG_SND_SOC_ADAU1372_I2C=m +CONFIG_SND_SOC_ADAU1372_SPI=m +# 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=m +CONFIG_SND_SOC_ADAU7118=m +CONFIG_SND_SOC_ADAU7118_HW=m +CONFIG_SND_SOC_ADAU7118_I2C=m +# CONFIG_SND_SOC_AK4104 is not set +# CONFIG_SND_SOC_AK4118 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_CROS_EC_CODEC=m +# 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_CS35L36 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_CS4234 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_CS4341 is not set +# CONFIG_SND_SOC_CS4349 is not set +# CONFIG_SND_SOC_CS53L30 is not set +# CONFIG_SND_SOC_CX2072X is not set +# CONFIG_SND_SOC_DA7213 is not set +# CONFIG_SND_SOC_DMIC 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=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_MAX98088 is not set +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98357A=m +# CONFIG_SND_SOC_MAX98504 is not set +# CONFIG_SND_SOC_MAX9867 is not set +CONFIG_SND_SOC_MAX98927=m +CONFIG_SND_SOC_MAX98373=m +CONFIG_SND_SOC_MAX98373_I2C=m +# CONFIG_SND_SOC_MAX98390 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_PCM3060_I2C is not set +# CONFIG_SND_SOC_PCM3060_SPI is not set +# CONFIG_SND_SOC_PCM3168A_I2C is not set +# CONFIG_SND_SOC_PCM3168A_SPI is not set +# CONFIG_SND_SOC_PCM5102A is not set +# CONFIG_SND_SOC_PCM512x_I2C is not set +# CONFIG_SND_SOC_PCM512x_SPI is not set +CONFIG_SND_SOC_RK3328=m +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_RT5682=m +CONFIG_SND_SOC_RT5682_I2C=m +CONFIG_SND_SOC_SGTL5000=m +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m +CONFIG_SND_SOC_SIMPLE_MUX=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_TAS2562 is not set +# CONFIG_SND_SOC_TAS2764 is not set +# CONFIG_SND_SOC_TAS2770 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_TLV320ADCX140 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_UDA1334 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_WM8904=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_ZL38060 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_MT6358 is not set +# CONFIG_SND_SOC_MT6660 is not set +# CONFIG_SND_SOC_NAU8315 is not set +# CONFIG_SND_SOC_NAU8540 is not set +# CONFIG_SND_SOC_NAU8810 is not set +# CONFIG_SND_SOC_NAU8822 is not set +# CONFIG_SND_SOC_NAU8824 is not set +# CONFIG_SND_SOC_TPA6130A2 is not set +# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set +# CONFIG_SND_SOC_LPASS_VA_MACRO is not set +# end of CODEC drivers + +CONFIG_SND_SIMPLE_CARD_UTILS=m +# CONFIG_SND_SIMPLE_CARD is not set +# CONFIG_SND_AUDIO_GRAPH_CARD is not set +CONFIG_SND_SYNTH_EMUX=m +# 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_BIGBEN_FF is not set +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_MACALLY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CREATIVE_SB0540=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_GLORIOUS=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +# CONFIG_HID_GOOGLE_HAMMER is not set +CONFIG_HID_VIVALDI=m +# CONFIG_HID_GT683R is not set +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +# CONFIG_HID_VIEWSONIC is not set +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_MALTRON=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_LCD is not set +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_U2FZERO=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 +CONFIG_HID_MCP2221=m +# end of Special HID drivers + +# +# 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 +# end of USB HID Boot Protocol drivers +# end of USB HID support + +# +# I2C HID support +# +# CONFIG_I2C_HID is not set +# end of I2C HID support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_CONN_GPIO=m +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_FEW_INIT_RETRIES is not set +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_MON=m + +# +# 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_PCI_RENESAS is not set +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_FSL=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_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_CDNS3=m +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +CONFIG_USB_CDNS3_PCI_WRAP=m +CONFIG_USB_CDNS3_IMX=m +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_MESON_G12A=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_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_IMX=m +CONFIG_USB_CHIPIDEA_GENERIC=m +CONFIG_USB_CHIPIDEA_TEGRA=m +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_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_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_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_SISUSBVGA=m +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_MXS_PHY=m +CONFIG_USB_TEGRA_PHY=m +CONFIG_USB_ULPI=y +CONFIG_USB_ULPI_VIEWPORT=y +# end of USB Physical Layer drivers + +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_MAX3420_UDC=m +CONFIG_USB_TEGRA_XUDC=m +# CONFIG_USB_DUMMY_HCD is not set +# end of USB Peripheral Controller + +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 + +# +# USB Gadget precomposed configurations +# +# 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_USB_RAW_GADGET=m +# end of USB Gadget precomposed configurations + +# CONFIG_TYPEC is not set +CONFIG_USB_ROLE_SWITCH=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_STM32_SDMMC=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_ASPEED=m +# CONFIG_MMC_SDHCI_OF_AT91 is not set +CONFIG_MMC_SDHCI_OF_ESDHC=m +# 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_PXAV3 is not set +CONFIG_MMC_SDHCI_F_SDH30=m +# CONFIG_MMC_SDHCI_MILBEAUT is not set +CONFIG_MMC_SDHCI_IPROC=m +CONFIG_MMC_MESON_GX=m +# CONFIG_MMC_MESON_MX_SDIO is not set +CONFIG_MMC_ALCOR=m +CONFIG_MMC_SDHCI_MSM=m +CONFIG_MMC_MXC=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_HSQ=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_MMC_SDHCI_AM654=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 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_CLASS_MULTICOLOR=m +CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y + +# +# LED drivers +# +# CONFIG_LEDS_AN30259A is not set +# CONFIG_LEDS_AW2013 is not set +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_CR0014114 is not set +# CONFIG_LEDS_EL15203000 is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3532 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_LP50XX is not set +CONFIG_LEDS_LP55XX_COMMON=m +# 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 +CONFIG_LEDS_SPI_BYTE=m +CONFIG_LEDS_TI_LMU_COMMON=m +CONFIG_LEDS_LM3697=m + +# +# Flash and Torch LED drivers +# + +# +# 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_LEDS_TRIGGER_PATTERN is not set +CONFIG_LEDS_TRIGGER_AUDIO=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y + +# +# 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 +# end of Speakup console speech + +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_VIRT_DMA=y +CONFIG_INFINIBAND_MTHCA=m +CONFIG_INFINIBAND_MTHCA_DEBUG=y +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_EFA=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_OCRDMA=m +# CONFIG_INFINIBAND_HNS is not set +# CONFIG_INFINIBAND_BNXT_RE is not set +CONFIG_INFINIBAND_QEDR=m +CONFIG_RDMA_RXE=m +CONFIG_RDMA_SIW=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_INFINIBAND_RTRS=m +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=m +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_EDAC_QCOM is not set +CONFIG_EDAC_DMC520=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_ABEOZ9 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_BD70528=m +# 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_RV3028 is not set +# CONFIG_RTC_DRV_RV3032 is not set +# CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_SD3078 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_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 +# CONFIG_RTC_DRV_RX6110 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_IMXDI=m +CONFIG_RTC_DRV_MESON_VRTC=m +# 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_CADENCE=m +# CONFIG_RTC_DRV_FTRTC010 is not set +CONFIG_RTC_DRV_PM8XXX=m +CONFIG_RTC_DRV_TEGRA=y +CONFIG_RTC_DRV_MXC=m +CONFIG_RTC_DRV_MXC_V2=m +# CONFIG_RTC_DRV_SNVS is not set +CONFIG_RTC_DRV_IMX_SC=m +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_RTC_DRV_GOLDFISH 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_FSL_QDMA=m +CONFIG_HISI_DMA=m +CONFIG_IMX_DMA=m +CONFIG_IMX_SDMA=m +# CONFIG_INTEL_IDMA64 is not set +CONFIG_K3_DMA=m +CONFIG_MV_XOR=y +CONFIG_MV_XOR_V2=y +# CONFIG_MXS_DMA is not set +CONFIG_MX3_IPU=y +CONFIG_MX3_IPU_IRQS=4 +CONFIG_PL330_DMA=m +CONFIG_PLX_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_XILINX_ZYNQMP_DPDMA=m +CONFIG_QCOM_BAM_DMA=m +CONFIG_QCOM_GPI_DMA=m +CONFIG_QCOM_HIDMA_MGMT=m +CONFIG_QCOM_HIDMA=m +# CONFIG_DW_DMAC is not set +# CONFIG_DW_DMAC_PCI is not set +CONFIG_DW_EDMA=m +CONFIG_DW_EDMA_PCIE=m +CONFIG_SF_PDMA=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_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# end of DMABUF options + +# 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_VDPA=m +CONFIG_VIRTIO_PMEM=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=m +# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set +CONFIG_VIRTIO_DMA_SHARED_BUFFER=m +CONFIG_VDPA=m +# CONFIG_VDPA_SIM is not set +CONFIG_IFCVF=m +CONFIG_MLX5_VDPA=y +CONFIG_MLX5_VDPA_NET=m +CONFIG_VHOST_IOTLB=m +CONFIG_VHOST=m +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST_VDPA=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +# end of 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 +# end of Xen driver support + +# CONFIG_GREYBUS is not set +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_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 +# end of Accelerometers + +# +# Analog to digital converters +# +# CONFIG_AD7816 is not set +# CONFIG_AD7280 is not set +# end of Analog to digital converters + +# +# Analog digital bi-direction converters +# +# CONFIG_ADT7316 is not set +# end of Analog digital bi-direction converters + +# +# Capacitance to digital converters +# +# CONFIG_AD7150 is not set +# CONFIG_AD7746 is not set +# end of Capacitance to digital converters + +# +# Direct Digital Synthesis +# +# CONFIG_AD9832 is not set +# CONFIG_AD9834 is not set +# end of Direct Digital Synthesis + +# +# Network Analyzer, Impedance Converters +# +# CONFIG_AD5933 is not set +# end of Network Analyzer, Impedance Converters + +# +# Active energy metering IC +# +# CONFIG_ADE7854 is not set +# end of Active energy metering IC + +# +# Resolver to digital converters +# +# CONFIG_AD2S1210 is not set +# end of Resolver to digital converters +# end of IIO staging drivers + +# CONFIG_FB_SM750 is not set +# CONFIG_MFD_NVEC is not set +# CONFIG_STAGING_MEDIA is not set + +# +# Android +# +# end of Android + +# CONFIG_STAGING_BOARD is not set +# CONFIG_LTE_GDM724X is not set +# CONFIG_FIREWIRE_SERIAL is not set +# CONFIG_GS_FPGABOOT is not set +# CONFIG_UNISYSSPAR is not set +# CONFIG_FB_TFT is not set +# CONFIG_KS7010 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 + +# +# Gasket devices +# +# CONFIG_STAGING_GASKET_FRAMEWORK is not set +# end of Gasket devices + +# CONFIG_XIL_AXIS_FIFO is not set +# CONFIG_FIELDBUS_DEV is not set +# CONFIG_KPC2000 is not set +CONFIG_QLGE=m +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WFX=m +CONFIG_PHY_HI3670_USB=m +CONFIG_SPMI_HISI3670=m +CONFIG_MFD_HI6421_SPMI=m +CONFIG_REGULATOR_HI6421V600=m +# CONFIG_GOLDFISH is not set +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC=y +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_RPMSG=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_LIGHTBAR=m +CONFIG_CROS_EC_VBC=m +CONFIG_CROS_EC_DEBUGFS=m +CONFIG_CROS_EC_SENSORHUB=m +CONFIG_CROS_EC_SYSFS=m +CONFIG_CROS_USBPD_LOGGER=m +CONFIG_CROS_USBPD_NOTIFY=m +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_SURFACE_PLATFORMS=y +CONFIG_SURFACE_3_BUTTON=m +CONFIG_SURFACE_3_POWER_OPREGION=m +CONFIG_SURFACE_GPE=m +# CONFIG_SURFACE_PRO3_BUTTON is not set +CONFIG_HAVE_CLK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Clock driver for ARM Reference designs +# +CONFIG_ICST=y +CONFIG_CLK_SP810=y +CONFIG_CLK_VEXPRESS_OSC=y +# end of Clock driver for ARM Reference designs + +# 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_SI5341=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_BM1880=y +# 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_XGENE=y +# CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_VC5 is not set +# CONFIG_COMMON_CLK_BD718XX is not set +# CONFIG_COMMON_CLK_FIXED_MMIO is not set +CONFIG_CLK_BCM2711_DVP=y +# CONFIG_CLK_BCM2835 is not set +CONFIG_CLK_RASPBERRYPI=m +CONFIG_COMMON_CLK_HI3516CV300=y +CONFIG_COMMON_CLK_HI3519=y +CONFIG_COMMON_CLK_HI3660=y +CONFIG_COMMON_CLK_HI3670=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_MXC_CLK=y +CONFIG_MXC_CLK_SCU=y +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MN=y +CONFIG_CLK_IMX8MP=y +CONFIG_CLK_IMX8MQ=y +CONFIG_CLK_IMX8QXP=y + +# +# Clock support for Amlogic platforms +# +CONFIG_COMMON_CLK_MESON_REGMAP=y +CONFIG_COMMON_CLK_MESON_DUALDIV=y +CONFIG_COMMON_CLK_MESON_MPLL=y +CONFIG_COMMON_CLK_MESON_PHASE=m +CONFIG_COMMON_CLK_MESON_PLL=y +CONFIG_COMMON_CLK_MESON_SCLK_DIV=m +CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y +CONFIG_COMMON_CLK_MESON_AO_CLKC=y +CONFIG_COMMON_CLK_MESON_EE_CLKC=y +CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y +CONFIG_COMMON_CLK_GXBB=y +CONFIG_COMMON_CLK_AXG=y +CONFIG_COMMON_CLK_AXG_AUDIO=m +CONFIG_COMMON_CLK_G12A=y +# end of Clock support for Amlogic platforms + +CONFIG_ARMADA_AP_CP_HELPER=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_APCC_MSM8996=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_APSS_PLL is not set +# CONFIG_IPQ_APSS_6018 is not set +# CONFIG_IPQ_GCC_4019 is not set +# CONFIG_IPQ_GCC_6018 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_8939 is not set +# 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 is not set +# CONFIG_MSM_GPUCC_8998 is not set +# CONFIG_MSM_MMCC_8998 is not set +# CONFIG_QCS_GCC_404 is not set +# CONFIG_SC_CAMCC_7180 is not set +# CONFIG_SC_DISPCC_7180 is not set +CONFIG_SC_GCC_7180=m +CONFIG_SC_LPASS_CORECC_7180=m +# CONFIG_SC_GPUCC_7180 is not set +# CONFIG_SC_MSS_7180 is not set +# CONFIG_SC_VIDEOCC_7180 is not set +# CONFIG_SDM_CAMCC_845 is not set +# CONFIG_SDM_GCC_660 is not set +# CONFIG_QCS_TURING_404 is not set +# CONFIG_QCS_Q6SSTOP_404 is not set +CONFIG_SDM_GCC_845=m +CONFIG_SDM_GPUCC_845=m +CONFIG_SDM_VIDEOCC_845=m +CONFIG_SDM_DISPCC_845=m +CONFIG_SDM_LPASSCC_845=m +CONFIG_SDX_GCC_55=m +# CONFIG_SM_GCC_8150 is not set +# CONFIG_SM_GCC_8250 is not set +# CONFIG_SM_GPUCC_8150 is not set +# CONFIG_SM_GPUCC_8250 is not set +# CONFIG_SM_VIDEOCC_8150 is not set +# CONFIG_SM_VIDEOCC_8250 is not set +# CONFIG_SPMI_PMIC_CLKDIV is not set +# CONFIG_QCOM_HFPLL is not set +# CONFIG_KPSS_XCC is not set +# CONFIG_CLK_GFM_LPASS_SM8250 is not set +CONFIG_COMMON_CLK_ROCKCHIP=y +CONFIG_CLK_PX30=y +CONFIG_CLK_RK3308=y +CONFIG_CLK_RK3328=y +CONFIG_CLK_RK3368=y +CONFIG_CLK_RK3399=y +CONFIG_CLK_SUNXI=y +CONFIG_CLK_SUNXI_CLOCKS=y +CONFIG_CLK_SUNXI_PRCM_SUN6I=y +CONFIG_CLK_SUNXI_PRCM_SUN8I=y +CONFIG_CLK_SUNXI_PRCM_SUN9I=y +CONFIG_SUNXI_CCU=y +CONFIG_SUN50I_A64_CCU=y +CONFIG_SUN50I_A100_CCU=y +CONFIG_SUN50I_A100_R_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_TEGRA_CLK_DFLL=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_TEGRA_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_SUN50I_ERRATUM_UNKNOWN1=y +CONFIG_ARM_TIMER_SP804=y +CONFIG_TIMER_IMX_SYS_CTR=y +# CONFIG_MICROCHIP_PIT64B is not set +# end of Clock Source drivers + +CONFIG_MAILBOX=y +# CONFIG_ARM_MHU is not set +# CONFIG_ARM_MHU_V2 is not set +CONFIG_IMX_MBOX=m +# CONFIG_PLATFORM_MHU is not set +# CONFIG_PL320_MBOX is not set +CONFIG_ARMADA_37XX_RWTM_MBOX=m +# 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_SUN6I_MSGBOX=m +CONFIG_QCOM_IPCC=y +CONFIG_IOMMU_IOVA=y +CONFIG_IOASID=y +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 +# end of Generic IOMMU Pagetable Support + +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_OF_IOMMU=y +CONFIG_IOMMU_DMA=y +CONFIG_IOMMU_SVA_LIB=y +# CONFIG_ROCKCHIP_IOMMU is not set +CONFIG_SUN50I_IOMMU=y +CONFIG_TEGRA_IOMMU_SMMU=y +CONFIG_ARM_SMMU=y +# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +CONFIG_ARM_SMMU_V3=y +CONFIG_ARM_SMMU_V3_SVA=y +CONFIG_QCOM_IOMMU=y +CONFIG_VIRTIO_IOMMU=m + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_NS=m +CONFIG_RPMSG_QCOM_GLINK=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +CONFIG_MESON_CANVAS=m +CONFIG_MESON_CLK_MEASURE=y +CONFIG_MESON_GX_SOCINFO=y +CONFIG_MESON_GX_PM_DOMAINS=y +CONFIG_MESON_EE_PM_DOMAINS=y +CONFIG_MESON_SECURE_PM_DOMAINS=y +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +CONFIG_BCM2835_POWER=y +CONFIG_RASPBERRYPI_POWER=y +# CONFIG_SOC_BRCMSTB is not set +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# CONFIG_QUICC_ENGINE is not set +CONFIG_FSL_GUTS=y +CONFIG_FSL_RCPM=y +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +CONFIG_IMX_GPCV2_PM_DOMAINS=y +CONFIG_SOC_IMX8M=y +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# CONFIG_LITEX_SOC_CONTROLLER is not set +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +CONFIG_QCOM_AOSS_QMP=m +CONFIG_QCOM_COMMAND_DB=y +CONFIG_QCOM_CPR=m +CONFIG_QCOM_GENI_SE=m +CONFIG_QCOM_GSBI=m +CONFIG_QCOM_LLCC=m +CONFIG_QCOM_KRYO_L2_ACCESSORS=y +CONFIG_QCOM_MDT_LOADER=m +# CONFIG_QCOM_OCMEM is not set +CONFIG_QCOM_PDR_HELPERS=m +CONFIG_QCOM_QMI_HELPERS=m +# CONFIG_QCOM_RMTFS_MEM is not set +# CONFIG_QCOM_RPMH is not set +CONFIG_QCOM_RPMPD=m +CONFIG_QCOM_SMD_RPM=m +CONFIG_QCOM_WCNSS_CTRL=m +CONFIG_QCOM_APR=m +# end of Qualcomm SoC drivers + +CONFIG_ROCKCHIP_GRF=y +CONFIG_ROCKCHIP_IODOMAIN=m +CONFIG_ROCKCHIP_PM_DOMAINS=y +CONFIG_SUNXI_MBUS=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_ARCH_TEGRA_234_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 +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +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=m +# CONFIG_DEVFREQ_GOV_PASSIVE is not set + +# +# DEVFREQ Drivers +# +CONFIG_ARM_IMX_BUS_DEVFREQ=m +CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m +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_FSA9480=m +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +CONFIG_EXTCON_PTN5150=m +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_EXTCON_USBC_TUSB320=m +CONFIG_MEMORY=y +# CONFIG_ARM_PL172_MPMC is not set +CONFIG_TEGRA_MC=y +CONFIG_TEGRA210_EMC_TABLE=y +CONFIG_TEGRA210_EMC=m +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +# CONFIG_IIO_BUFFER_CB is not set +CONFIG_IIO_BUFFER_DMA=m +CONFIG_IIO_BUFFER_DMAENGINE=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 +CONFIG_IIO_TRIGGERED_EVENT=m + +# +# Accelerometers +# +# CONFIG_ADIS16201 is not set +# CONFIG_ADIS16209 is not set +# CONFIG_ADXL345_I2C is not set +# CONFIG_ADXL345_SPI is not set +# CONFIG_ADXL372_SPI is not set +# CONFIG_ADXL372_I2C is not set +# CONFIG_BMA180 is not set +# CONFIG_BMA220 is not set +CONFIG_BMA400=m +CONFIG_BMA400_I2C=m +CONFIG_BMA400_SPI=m +# 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_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 +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7091R5=m +CONFIG_AD7124=m +# CONFIG_AD7192 is not set +# CONFIG_AD7266 is not set +# CONFIG_AD7291 is not set +# CONFIG_AD7292 is not set +# CONFIG_AD7298 is not set +# CONFIG_AD7476 is not set +# CONFIG_AD7606_IFACE_PARALLEL is not set +# CONFIG_AD7606_IFACE_SPI is not set +# CONFIG_AD7766 is not set +# CONFIG_AD7768_1 is not set +# CONFIG_AD7780 is not set +# CONFIG_AD7791 is not set +# CONFIG_AD7793 is not set +# CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set +# CONFIG_AD7949 is not set +# CONFIG_AD799X is not set +# CONFIG_AD9467 is not set +# CONFIG_ADI_AXI_ADC 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_IMX7D_ADC=m +# CONFIG_LTC2471 is not set +# CONFIG_LTC2485 is not set +# CONFIG_LTC2496 is not set +# CONFIG_LTC2497 is not set +# CONFIG_MAX1027 is not set +# CONFIG_MAX11100 is not set +# CONFIG_MAX1118 is not set +# CONFIG_MAX1241 is not set +# CONFIG_MAX1363 is not set +# CONFIG_MAX9611 is not set +# CONFIG_MCP320X is not set +# CONFIG_MCP3422 is not set +# CONFIG_MCP3911 is not set +# CONFIG_MEDIATEK_MT6360_ADC is not set +CONFIG_MESON_SARADC=m +# CONFIG_MP2629_ADC is not set +# CONFIG_NAU7802 is not set +CONFIG_QCOM_VADC_COMMON=m +CONFIG_QCOM_SPMI_IADC=m +CONFIG_QCOM_SPMI_VADC=m +# CONFIG_QCOM_SPMI_ADC5 is not set +# 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_ADS8344 is not set +# CONFIG_TI_ADS8688 is not set +# CONFIG_TI_ADS124S08 is not set +# CONFIG_TI_TLC4541 is not set +# CONFIG_VF610_ADC is not set +CONFIG_VIPERBOARD_ADC=m +CONFIG_XILINX_XADC=m +# end of Analog to digital converters + +# +# Analog Front Ends +# +# CONFIG_IIO_RESCALE is not set +# end of Analog Front Ends + +# +# Amplifiers +# +# CONFIG_AD8366 is not set +# CONFIG_HMC425 is not set +# end of Amplifiers + +# +# Chemical Sensors +# +# CONFIG_ATLAS_PH_SENSOR is not set +# CONFIG_ATLAS_EZO_SENSOR is not set +# CONFIG_BME680 is not set +# CONFIG_CCS811 is not set +# CONFIG_IAQCORE is not set +# CONFIG_PMS7003 is not set +CONFIG_SCD30_CORE=m +CONFIG_SCD30_I2C=m +CONFIG_SCD30_SERIAL=m +# CONFIG_SENSIRION_SGP30 is not set +# CONFIG_SPS30 is not set +# CONFIG_VZ89X is not set +# end of Chemical Sensors + +# 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 +# end of Hid Sensor IIO Common + +# +# SSP Sensor Common +# +# CONFIG_IIO_SSP_SENSORHUB is not set +# end of SSP Sensor Common + +# +# 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_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_AD5770R 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_LTC1660 is not set +# CONFIG_LTC2632 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_TI_DAC7311 is not set +# CONFIG_TI_DAC7612 is not set +# CONFIG_VF610_DAC is not set +# end of Digital to analog converters + +# +# IIO dummy driver +# +# end of IIO dummy driver + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +# CONFIG_AD9523 is not set +# end of Clock Generator/Distribution + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +# CONFIG_ADF4350 is not set +CONFIG_ADF4371=m +# end of Phase-Locked Loop (PLL) frequency synthesizers +# end of Frequency Synthesizers DDS/PLL + +# +# Digital gyroscope sensors +# +# CONFIG_ADIS16080 is not set +# CONFIG_ADIS16130 is not set +# CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set +CONFIG_ADXRS290=m +# CONFIG_ADXRS450 is not set +# CONFIG_BMG160 is not set +# CONFIG_FXAS21002C 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 +# end of Digital gyroscope sensors + +# +# 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 +# end of Heart Rate Monitors +# end of Health Sensors + +# +# Humidity sensors +# +# CONFIG_AM2315 is not set +CONFIG_DHT11=m +# CONFIG_HDC100X is not set +CONFIG_HDC2010=m +# 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 +# end of Humidity sensors + +# +# Inertial measurement units +# +# CONFIG_ADIS16400 is not set +# CONFIG_ADIS16460 is not set +# CONFIG_ADIS16475 is not set +# CONFIG_ADIS16480 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set +# CONFIG_FXOS8700_I2C is not set +# CONFIG_FXOS8700_SPI is not set +# CONFIG_KMX61 is not set +CONFIG_INV_ICM42600=m +CONFIG_INV_ICM42600_I2C=m +CONFIG_INV_ICM42600_SPI=m +# CONFIG_INV_MPU6050_I2C is not set +# CONFIG_INV_MPU6050_SPI is not set +# CONFIG_IIO_ST_LSM6DSX is not set +# end of Inertial measurement units + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +# CONFIG_ADJD_S311 is not set +# CONFIG_ADUX1020 is not set +# CONFIG_AL3010 is not set +# CONFIG_AL3320A is not set +# CONFIG_APDS9300 is not set +# CONFIG_APDS9960 is not set +CONFIG_AS73211=m +# 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_GP2AP002 is not set +# CONFIG_GP2AP020A00F is not set +# CONFIG_IQS621_ALS 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_MAX44009 is not set +# CONFIG_NOA1305 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_VCNL4035 is not set +# CONFIG_VEML6030 is not set +# CONFIG_VEML6070 is not set +# CONFIG_VL6180 is not set +# CONFIG_ZOPT2201 is not set +# end of Light sensors + +# +# 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 +# CONFIG_SENSORS_RM3100_I2C is not set +# CONFIG_SENSORS_RM3100_SPI is not set +# end of Magnetometer sensors + +# +# Multiplexers +# +# CONFIG_IIO_MUX is not set +# end of Multiplexers + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m +# end of Inclinometer sensors + +# +# Triggers - standalone +# +# CONFIG_IIO_INTERRUPT_TRIGGER is not set +# CONFIG_IIO_SYSFS_TRIGGER is not set +# end of Triggers - standalone + +# +# Linear and angular position sensors +# +# CONFIG_IQS624_POS is not set +# end of Linear and angular position sensors + +# +# Digital potentiometers +# +# CONFIG_AD5272 is not set +# CONFIG_DS1803 is not set +# CONFIG_MAX5432 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_MCP41010 is not set +# CONFIG_TPL0102 is not set +# end of Digital potentiometers + +# +# Digital potentiostats +# +# CONFIG_LMP91000 is not set +# end of Digital potentiostats + +# +# Pressure sensors +# +# CONFIG_ABP060MG is not set +# CONFIG_BMP280 is not set +# CONFIG_DLHL60D is not set +CONFIG_DPS310=m +CONFIG_HID_SENSOR_PRESS=m +# CONFIG_HP03 is not set +# CONFIG_ICP10100 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 +# end of Pressure sensors + +# +# Lightning sensors +# +# CONFIG_AS3935 is not set +# end of Lightning sensors + +# +# Proximity and distance sensors +# +# CONFIG_ISL29501 is not set +# CONFIG_LIDAR_LITE_V2 is not set +# CONFIG_MB1232 is not set +# CONFIG_PING is not set +# CONFIG_RFD77402 is not set +# CONFIG_SRF04 is not set +# CONFIG_SX9310 is not set +# CONFIG_SX9500 is not set +# CONFIG_SRF08 is not set +# CONFIG_VCNL3020 is not set +# CONFIG_VL53L0X_I2C is not set +# end of Proximity and distance sensors + +# +# Resolver to digital converters +# +# CONFIG_AD2S90 is not set +# CONFIG_AD2S1200 is not set +# end of Resolver to digital converters + +# +# Temperature sensors +# +# CONFIG_IQS620AT_TEMP is not set +# CONFIG_LTC2983 is not set +# 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_MAX31856 is not set +# end of Temperature sensors + +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_PWM_SYSFS=y +# CONFIG_PWM_DEBUG is not set +CONFIG_PWM_ATMEL_TCB=m +CONFIG_PWM_BCM2835=m +# CONFIG_PWM_CROS_EC is not set +CONFIG_PWM_DWC=m +# CONFIG_PWM_FSL_FTM is not set +# CONFIG_PWM_HIBVT is not set +# CONFIG_PWM_IMX1 is not set +# CONFIG_PWM_IMX27 is not set +# CONFIG_PWM_IMX_TPM is not set +# CONFIG_PWM_IQS620A is not set +# CONFIG_PWM_KEEMBAY 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_PM=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_AL_FIC is not set +CONFIG_HISILICON_IRQ_MBIGEN=y +CONFIG_MADERA_IRQ=m +CONFIG_IMX_GPCV2=y +CONFIG_MVEBU_GICP=y +CONFIG_MVEBU_ICU=y +CONFIG_MVEBU_ODMI=y +CONFIG_MVEBU_PIC=y +CONFIG_MVEBU_SEI=y +CONFIG_PARTITION_PERCPU=y +CONFIG_QCOM_IRQ_COMBINER=y +CONFIG_MESON_IRQ_GPIO=y +# CONFIG_QCOM_PDC is not set +CONFIG_IMX_IRQSTEER=y +CONFIG_IMX_INTMUX=y +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +CONFIG_ARCH_HAS_RESET_CONTROLLER=y +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_BRCMSTB_RESCAL=y +CONFIG_RESET_IMX7=y +CONFIG_RESET_INTEL_GW=y +CONFIG_RESET_MESON=y +# CONFIG_RESET_MESON_AUDIO_ARB is not set +# CONFIG_RESET_QCOM_AOSS is not set +# CONFIG_RESET_QCOM_PDC is not set +CONFIG_RESET_RASPBERRYPI=m +CONFIG_RESET_SCMI=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 + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_GENERIC_PHY_MIPI_DPHY=y +CONFIG_PHY_XGENE=m +# CONFIG_USB_LGM_PHY is not set +CONFIG_PHY_SUN4I_USB=m +# CONFIG_PHY_SUN6I_MIPI_DPHY is not set +# CONFIG_PHY_SUN9I_USB is not set +CONFIG_PHY_SUN50I_USB3=m +CONFIG_PHY_MESON8B_USB2=m +CONFIG_PHY_MESON_GXL_USB2=y +CONFIG_PHY_MESON_G12A_USB2=y +CONFIG_PHY_MESON_G12A_USB3_PCIE=y +CONFIG_PHY_MESON_AXG_PCIE=y +CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y +CONFIG_PHY_MESON_AXG_MIPI_DPHY=m +# CONFIG_BCM_KONA_USB2_PHY is not set +CONFIG_PHY_CADENCE_TORRENT=m +# CONFIG_PHY_CADENCE_DPHY is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +CONFIG_PHY_CADENCE_SALVO=m +CONFIG_PHY_FSL_IMX8MQ_USB=m +CONFIG_PHY_MIXEL_MIPI_DPHY=m +CONFIG_PHY_HI6220_USB=m +CONFIG_PHY_HI3660_USB=m +# CONFIG_PHY_HISTB_COMBPHY is not set +# CONFIG_PHY_HISI_INNO_USB2 is not set +CONFIG_PHY_MVEBU_A3700_COMPHY=m +CONFIG_PHY_MVEBU_A3700_UTMI=m +CONFIG_PHY_MVEBU_A38X_COMPHY=m +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_OCELOT_SERDES is not set +CONFIG_PHY_QCOM_APQ8064_SATA=m +CONFIG_PHY_QCOM_IPQ4019_USB=m +CONFIG_PHY_QCOM_IPQ806X_SATA=m +CONFIG_PHY_QCOM_PCIE2=m +CONFIG_PHY_QCOM_QMP=m +CONFIG_PHY_QCOM_QUSB2=m +CONFIG_PHY_QCOM_USB_HS=m +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m +CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_QCOM_USB_HS_28NM=m +CONFIG_PHY_QCOM_USB_SS=m +# CONFIG_PHY_QCOM_IPQ806X_USB is not set +# CONFIG_PHY_ROCKCHIP_DP is not set +CONFIG_PHY_ROCKCHIP_DPHY_RX0=m +CONFIG_PHY_ROCKCHIP_EMMC=m +# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set +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_TEGRA194_P2U=m +CONFIG_PHY_TUSB1210=m +# CONFIG_PHY_INTEL_KEEMBAY_EMMC is not set +# CONFIG_PHY_INTEL_KEEMBAY_USB is not set +# end of PHY Subsystem + +# 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_CMN is not set +CONFIG_ARM_PMU=y +CONFIG_ARM_PMU_ACPI=y +CONFIG_ARM_SMMU_V3_PMU=m +# CONFIG_ARM_DSU_PMU is not set +CONFIG_FSL_IMX8_DDR_PMU=m +# CONFIG_QCOM_L2_PMU is not set +# CONFIG_QCOM_L3_PMU is not set +CONFIG_THUNDERX2_PMU=m +# CONFIG_XGENE_PMU is not set +# CONFIG_ARM_SPE_PMU is not set +CONFIG_ARM_DMC620_PMU=m +# CONFIG_HISI_PMU is not set +# end of Performance monitor support + +CONFIG_RAS=y +CONFIG_USB4=m +# CONFIG_USB4_DEBUGFS_WRITE is not set +# CONFIG_USB4_DMA_TEST is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +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_DEV_DAX_HMEM=m +CONFIG_DEV_DAX_HMEM_DEVICES=y +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_IMX_IIM=m +CONFIG_NVMEM_IMX_OCOTP=m +CONFIG_NVMEM_IMX_OCOTP_SCU=m +CONFIG_QCOM_QFPROM=m +CONFIG_NVMEM_SPMI_SDAM=m +# CONFIG_ROCKCHIP_EFUSE is not set +CONFIG_ROCKCHIP_OTP=m +CONFIG_NVMEM_SUNXI_SID=m +# CONFIG_MESON_EFUSE is not set +# CONFIG_MESON_MX_EFUSE is not set +CONFIG_NVMEM_SNVS_LPGPR=m + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# end of HW tracing support + +# 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 +# end of TEE drivers + +CONFIG_MULTIPLEXER=m + +# +# Multiplexer drivers +# +CONFIG_MUX_ADG792A=m +CONFIG_MUX_ADGS1408=m +CONFIG_MUX_GPIO=m +CONFIG_MUX_MMIO=m +# end of Multiplexer drivers + +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +CONFIG_INTERCONNECT=y +CONFIG_INTERCONNECT_IMX=m +CONFIG_INTERCONNECT_IMX8MM=m +CONFIG_INTERCONNECT_IMX8MN=m +CONFIG_INTERCONNECT_IMX8MQ=m +CONFIG_INTERCONNECT_QCOM=y +CONFIG_INTERCONNECT_QCOM_MSM8916=m +# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set +CONFIG_INTERCONNECT_QCOM_OSM_L3=m +# CONFIG_INTERCONNECT_QCOM_QCS404 is not set +CONFIG_INTERCONNECT_QCOM_SMD_RPM=m +# CONFIG_COUNTER is not set +# CONFIG_MOST is not set +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_VALIDATE_FS_PARSER=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_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_SUPPORT_V4=y +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_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +# CONFIG_F2FS_FS_COMPRESSION 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 is not set +CONFIG_FS_VERITY=y +# CONFIG_FS_VERITY_DEBUG is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +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_VIRTIO_FS=m +CONFIG_FUSE_DAX=y +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 +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/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_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# 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_TMPFS_INODE64 is not set +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 +# end of Pseudo filesystems + +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_FS_ZSTD=y +# CONFIG_UBIFS_ATIME_SUPPORT is not set +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_UBIFS_FS_AUTHENTICATION=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_DEFAULT_KMSG_BYTES=10240 +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_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG 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_ZIP is not set +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_NFS_DISABLE_UDP_SUPPORT is not set +# CONFIG_NFS_V4_2_READ_PLUS is not set +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_2_INTER_SSC is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +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_DISABLE_INSECURE_ENCTYPES=y +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CEPH_FS_SECURITY_LABEL=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_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SWN_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_AFS_DEBUG_CURSOR is not set +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_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_REQUEST_CACHE=y +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +CONFIG_KEY_NOTIFICATIONS=y +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_SELINUX_SIDTAB_HASH_BITS=9 +CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +# 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_TOMOYO_INSECURE_BUILTIN_SETTING is not set +CONFIG_SECURITY_APPARMOR=y +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_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +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_IMA_SECURE_AND_OR_TRUSTED_BOOT 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_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +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_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=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_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_USER=m +# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set +# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set +CONFIG_CRYPTO_GF128MUL=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_PCRYPT=m +CONFIG_CRYPTO_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_ENGINE=m + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=m +CONFIG_CRYPTO_ECC=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECRDSA=m +CONFIG_CRYPTO_SM2=m +CONFIG_CRYPTO_CURVE25519=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128_SIMD=y +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_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +# CONFIG_CRYPTO_KEYWRAP is not set +CONFIG_CRYPTO_NHPOLY1305=m +CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_ESSIV=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_CRC32=m +CONFIG_CRYPTO_XXHASH=m +CONFIG_CRYPTO_BLAKE2B=m +CONFIG_CRYPTO_BLAKE2S=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=m +CONFIG_CRYPTO_STREEBOG=m +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_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_RNG_CAVP is not set +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +# CONFIG_CRYPTO_STATS is not set +CONFIG_CRYPTO_HASH_INFO=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=m +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m +CONFIG_CRYPTO_LIB_BLAKE2S=m +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m +CONFIG_CRYPTO_LIB_CURVE25519=m +CONFIG_CRYPTO_LIB_DES=m +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m +CONFIG_CRYPTO_LIB_SHA256=y +CONFIG_CRYPTO_HW=y +CONFIG_CRYPTO_DEV_ALLWINNER=y +CONFIG_CRYPTO_DEV_SUN4I_SS=m +# CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG is not set +CONFIG_CRYPTO_DEV_SUN8I_CE=m +# CONFIG_CRYPTO_DEV_SUN8I_CE_DEBUG is not set +# CONFIG_CRYPTO_DEV_SUN8I_CE_HASH is not set +# CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG is not set +# CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG is not set +CONFIG_CRYPTO_DEV_SUN8I_SS=m +# CONFIG_CRYPTO_DEV_SUN8I_SS_DEBUG is not set +# CONFIG_CRYPTO_DEV_SUN8I_SS_PRNG is not set +# CONFIG_CRYPTO_DEV_SUN8I_SS_HASH is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_COMMON=m +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API_DESC=m +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API_DESC=m +CONFIG_CRYPTO_DEV_FSL_CAAM=m +# CONFIG_CRYPTO_DEV_FSL_CAAM_DEBUG is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_JR=m +CONFIG_CRYPTO_DEV_FSL_CAAM_RINGSIZE=9 +# CONFIG_CRYPTO_DEV_FSL_CAAM_INTC is not set +CONFIG_CRYPTO_DEV_FSL_CAAM_CRYPTO_API=y +CONFIG_CRYPTO_DEV_FSL_CAAM_AHASH_API=y +CONFIG_CRYPTO_DEV_FSL_CAAM_PKC_API=y +CONFIG_CRYPTO_DEV_FSL_CAAM_RNG_API=y +CONFIG_CRYPTO_DEV_SAHARA=m +CONFIG_CRYPTO_DEV_ATMEL_I2C=m +CONFIG_CRYPTO_DEV_ATMEL_ECC=m +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m +# CONFIG_CRYPTO_DEV_CCP is not set +# CONFIG_CRYPTO_DEV_MXS_DCP 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_MARVELL=m +CONFIG_CRYPTO_DEV_MARVELL_CESA=m +# CONFIG_CRYPTO_DEV_OCTEONTX_CPT is not set +# CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set +CONFIG_CRYPTO_DEV_QCE=m +CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y +CONFIG_CRYPTO_DEV_QCE_SHA=y +CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y +# CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set +# CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set +CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512 +CONFIG_CRYPTO_DEV_QCOM_RNG=m +# CONFIG_CRYPTO_DEV_ROCKCHIP is not set +CONFIG_CRYPTO_DEV_CHELSIO=m +CONFIG_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_SAFEXCEL=m +# CONFIG_CRYPTO_DEV_CCREE is not set +CONFIG_CRYPTO_DEV_HISI_SEC=m +CONFIG_CRYPTO_DEV_HISI_SEC2=m +CONFIG_CRYPTO_DEV_HISI_QM=m +CONFIG_CRYPTO_DEV_HISI_ZIP=m +CONFIG_CRYPTO_DEV_HISI_HPRE=m +CONFIG_CRYPTO_DEV_HISI_TRNG=m +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set +# CONFIG_CRYPTO_DEV_KEEMBAY_OCS_AES_SM4 is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=m +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 +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_RAID6_PQ_BENCHMARK=y +CONFIG_LINEAR_RANGES=y +CONFIG_PACKING=y +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_CORDIC=m +CONFIG_PRIME_NUMBERS=m +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_STMP_DEVICE=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=y +# CONFIG_INDIRECT_PIO is not set +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=y +CONFIG_XXHASH=y +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=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=y +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_DECOMPRESS_ZSTD=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_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m +CONFIG_BTREE=y +CONFIG_INTERVAL_TREE=y +CONFIG_XARRAY_MULTI=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DMA_DECLARE_COHERENT=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y +CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +CONFIG_SWIOTLB=y +CONFIG_DMA_NONCOHERENT_MMAP=y +CONFIG_DMA_COHERENT_POOL=y +CONFIG_DMA_REMAP=y +CONFIG_DMA_DIRECT_REMAP=y +CONFIG_DMA_CMA=y +CONFIG_DMA_PERNUMA_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_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +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_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_DIMLIB=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y +CONFIG_FONT_6x8=y +CONFIG_SG_SPLIT=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_MEMREGION=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_STACKWALK=y +CONFIG_SBITMAP=y +# CONFIG_STRING_SELFTEST is not set +# end of Library routines + +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DYNAMIC_DEBUG_CORE=y +CONFIG_SYMBOLIC_ERRNAME=y +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +# +# Compile-time checks and compiler options +# +CONFIG_DEBUG_INFO=y +# CONFIG_DEBUG_INFO_REDUCED is not set +# CONFIG_DEBUG_INFO_COMPRESSED is not set +# CONFIG_DEBUG_INFO_SPLIT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_BTF is not set +# CONFIG_GDB_SCRIPTS is not set +CONFIG_FRAME_WARN=2048 +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE 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 +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_PAGE_POISONING=y +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS 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_SCHED_STACK_END_CHECK=y +CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +# CONFIG_DEBUG_VM is not set +CONFIG_DEBUG_VM_PGTABLE=y +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_HAVE_ARCH_KASAN_SW_TAGS=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +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_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# 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_SCF_TORTURE_TEST is not set +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +CONFIG_HAVE_DEBUG_BUGVERBOSE=y + +# +# Debug kernel data structures +# +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PLIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +CONFIG_BUG_ON_DATA_CORRUPTION=y +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# 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_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_TRACING=y +CONFIG_GENERIC_TRACER=y +CONFIG_TRACING_SUPPORT=y +CONFIG_FTRACE=y +# CONFIG_BOOTTIME_TRACING is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +# CONFIG_FUNCTION_PROFILER is not set +CONFIG_STACK_TRACER=y +# 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_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENTS=y +# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set +CONFIG_UPROBE_EVENTS=y +CONFIG_BPF_EVENTS=y +CONFIG_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_SYNTH_EVENTS=y +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_SYNTH_EVENT_GEN_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_SAMPLES is not set +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y + +# +# arm64 Debugging +# +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_DEBUG_EFI is not set +# CONFIG_ARM64_RELOC_TEST is not set +# CONFIG_CORESIGHT is not set +# end of arm64 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT is not set +CONFIG_NOTIFIER_ERROR_INJECTION=m +CONFIG_PM_NOTIFIER_ERROR_INJECT=m +# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set +CONFIG_FUNCTION_ERROR_INJECTION=y +# CONFIG_FAULT_INJECTION is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_MIN_HEAP 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_REED_SOLOMON_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_STRSCPY=m +# 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_XARRAY=m +# 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_BITOPS=m +CONFIG_TEST_VMALLOC=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_TEST_BLACKHOLE_DEV=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_TEST_MEMCAT_P is not set +# CONFIG_TEST_STACKINIT is not set +# CONFIG_TEST_MEMINIT is not set +# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_MEMTEST is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/gnu/packages/aux-files/linux-libre/5.11-i686.conf b/gnu/packages/aux-files/linux-libre/5.11-i686.conf new file mode 100644 index 0000000000..ead479a16c --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/5.11-i686.conf @@ -0,0 +1,10792 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/i386 5.11.0 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=231010000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_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_HAVE_KERNEL_ZSTD=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_KERNEL_ZSTD is not set +CONFIG_DEFAULT_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_WATCH_QUEUE=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=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_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_IRQ_MSI_IOMMU=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 +# end of IRQ subsystem + +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_INIT=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 +CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_POSIX_CPU_TIMERS_TASK_WORK=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 +# end of Timers subsystem + +# 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_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TASKS_TRACE_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKHEADERS 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 + +# +# Scheduler features +# +# CONFIG_UCLAMP_TASK is not set +# end of Scheduler features + +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CGROUPS=y +CONFIG_PAGE_COUNTER=y +CONFIG_MEMCG=y +CONFIG_MEMCG_SWAP=y +CONFIG_MEMCG_KMEM=y +CONFIG_BLK_CGROUP=y +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_TIME_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_RD_ZSTD=y +CONFIG_BOOT_CONFIG=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=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_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_IO_URING=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_BPF_PRELOAD 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 +# end of Kernel Performance Events And Counters + +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_SHUFFLE_PAGE_ALLOCATOR=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_X86_32=y +CONFIG_FORCE_DYNAMIC_FTRACE=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +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_ARCH_MAY_HAVE_PC_FDC=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_GENERAL_HUGETLB=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 is not set +CONFIG_SMP=y +CONFIG_X86_FEATURE_NAMES=y +CONFIG_X86_MPPARSE=y +# CONFIG_GOLDFISH is not set +CONFIG_RETPOLINE=y +# CONFIG_X86_CPU_RESCTRL is not set +# CONFIG_X86_BIGSMP is not set +CONFIG_X86_EXTENDED_PLATFORM=y +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_MID is not set +CONFIG_X86_INTEL_QUARK=y +CONFIG_X86_INTEL_LPSS=y +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_IOSF_MBI=y +CONFIG_IOSF_MBI_DEBUG=y +CONFIG_X86_RDC321X=y +CONFIG_X86_32_NON_STANDARD=y +CONFIG_STA2X11=y +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_X86_HV_CALLBACK_VECTOR=y +CONFIG_XEN=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_PVHVM_SMP=y +CONFIG_XEN_PVHVM_GUEST=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +CONFIG_PVH=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_CLOCK=y +# CONFIG_M486SX is not set +# 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_IA32_FEAT_CTL=y +CONFIG_X86_VMX_FEATURE_NAMES=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_CPU_SUP_ZHAOXIN=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=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 +# end of Performance monitoring + +# CONFIG_X86_LEGACY_VM86 is not set +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y +CONFIG_X86_IOPL_IOPERM=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_X86_CPA_STATISTICS is not set +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_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_UMIP=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_EFI=y +CONFIG_EFI_STUB=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 +# end of Processor type and features + +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=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_HIBERNATION_SNAPSHOT_DEV=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_ENERGY_MODEL is not set +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_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +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_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_ACPI_DPTF=y +CONFIG_DPTF_POWER=m +CONFIG_DPTF_PCH_FIVR=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +CONFIG_ACPI_CONFIGFS=m +# CONFIG_PMIC_OPREGION is not set +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_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_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 +# end of CPU Frequency scaling + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_IDLE_GOV_TEO=y +CONFIG_CPU_IDLE_GOV_HALTPOLL=y +CONFIG_HALTPOLL_CPUIDLE=m +# end of CPU Idle + +CONFIG_INTEL_IDLE=y +# end of Power management and ACPI options + +# +# Bus options (PCI etc.) +# +# 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_CNB20LE_QUIRK is not set +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +CONFIG_SCx200=m +CONFIG_SCx200HR_TIMER=m +CONFIG_ALIX=y +CONFIG_NET5501=y +CONFIG_GEOS=y +CONFIG_AMD_NB=y +# CONFIG_X86_SYSFB is not set +# end of Bus options (PCI etc.) + +# +# Binary Emulations +# +CONFIG_COMPAT_32=y +# end of Binary Emulations + +CONFIG_HAVE_ATOMIC_IOMAP=y + +# +# Firmware Drivers +# +CONFIG_EDD=y +CONFIG_EDD_OFF=y +CONFIG_FIRMWARE_MEMMAP=y +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_GENERIC_STUB_INITRD_CMDLINE_LOADER=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_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_UEFI_CPER=y +CONFIG_UEFI_CPER_X86=y +CONFIG_EFI_DEV_PATH_PARSER=y +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + +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_HAVE_KVM_NO_POLL=y +CONFIG_KVM_XFER_TO_GUEST_WORK=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_WERROR=y +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_AS_AVX512=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y +CONFIG_AS_TPAUSE=y + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_GENERIC_ENTRY=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_STATIC_CALL_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_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=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_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_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_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=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_ISA_BUS_API=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=y +CONFIG_COMPAT_32BIT_TIME=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_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_HAVE_STATIC_CALL=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SPLIT_ARG64=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +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_ASM_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_COMPRESS=y +CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_RQ_ALLOC_TIME=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_CGROUP_RWSTAT=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_INTEGRITY_T10=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_CGROUP_IOCOST=y +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_DEBUG_FS_ZONED=y +# CONFIG_BLK_SED_OPAL is not set +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y + +# +# 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 +# end of Partition Types + +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +# CONFIG_BFQ_GROUP_IOSCHED is not set +# end of IO Schedulers + +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_NON_OVERLAPPING_ADDRESS_SPACE=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_ELFCORE=y +CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y +CONFIG_BINFMT_MISC=m +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_SPARSEMEM_STATIC=y +CONFIG_HAVE_FAST_GUP=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MEMORY_BALLOON=y +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_CONTIG_ALLOC=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_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_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_DEFAULT_ON is not set +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=y +# CONFIG_ZSMALLOC_STAT is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_IDLE_PAGE_TRACKING=y +CONFIG_HMM_MIRROR=y +CONFIG_VMAP_PFN=y +CONFIG_FRAME_VECTOR=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +CONFIG_GUP_GET_PTE_LOW_HIGH=y +# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_MAPPING_DIRTY_HELPERS=y +CONFIG_KMAP_LOCAL=y +# end of Memory Management options + +CONFIG_NET=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_NET_REDIRECT=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_SCM=y +CONFIG_UNIX_DIAG=m +CONFIG_TLS=m +# CONFIG_TLS_DEVICE is not set +# CONFIG_TLS_TOE 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_AH=m +CONFIG_XFRM_ESP=m +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_SMC is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m +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_ESPINTCP is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=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_ESPINTCP is not set +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=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_IPV6_RPL_LWTUNNEL is not set +CONFIG_NETLABEL=y +CONFIG_MPTCP=y +CONFIG_INET_MPTCP_DIAG=m +CONFIG_MPTCP_IPV6=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=y +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_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_NF_NAT_MASQUERADE=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y +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_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NFT_XFRM=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=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_MASQUERADE=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 +# end of Core Netfilter Configuration + +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=y +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=y +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_SNMP_BASIC=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 +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +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 +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +# end of DECnet: Netfilter Configuration + +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_NF_CONNTRACK_BRIDGE=m +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 +# end of DCCP CCIDs Configuration + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +# end of DCCP Kernel Hacking + +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_CRYPTO=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_BRIDGE_MRP=y +CONFIG_BRIDGE_CFM=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_8021Q=m +CONFIG_NET_DSA_TAG_AR9331=m +CONFIG_NET_DSA_TAG_BRCM_COMMON=m +CONFIG_NET_DSA_TAG_BRCM=m +CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +CONFIG_NET_DSA_TAG_HELLCREEK=m +CONFIG_NET_DSA_TAG_GSWIP=m +CONFIG_NET_DSA_TAG_DSA_COMMON=m +CONFIG_NET_DSA_TAG_DSA=m +CONFIG_NET_DSA_TAG_EDSA=m +CONFIG_NET_DSA_TAG_MTK=m +CONFIG_NET_DSA_TAG_KSZ=m +CONFIG_NET_DSA_TAG_RTL4_A=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_NET_DSA_TAG_QCA=m +CONFIG_NET_DSA_TAG_LAN9303=m +CONFIG_NET_DSA_TAG_SJA1105=m +CONFIG_NET_DSA_TAG_TRAILER=m +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_TAPRIO=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_FQ_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +CONFIG_NET_SCH_ETS=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_MPLS=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_GATE=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_TC_SKB_EXT 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_DEBUG is not set +# CONFIG_BATMAN_ADV_TRACING 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_VSOCKETS_LOOPBACK=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_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m +CONFIG_QRTR_MHI=m +CONFIG_NET_NCSI=y +# CONFIG_NCSI_OEM_CMD_GET_MAC 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 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 +# end of Network testing +# end of Networking options + +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 +# end of AX.25 network device drivers + +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m +CONFIG_CAN_J1939=m +CONFIG_CAN_ISOTP=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_KVASER_PCIEFD=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_M_CAN_PCI=m +CONFIG_CAN_M_CAN_PLATFORM=m +CONFIG_CAN_M_CAN_TCAN4X5X=m +CONFIG_CAN_PEAK_PCIEFD=m +CONFIG_CAN_SJA1000=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_EMS_PCMCIA=m +CONFIG_CAN_F81601=m +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SJA1000_ISA=m +CONFIG_CAN_SJA1000_PLATFORM=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 +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +# end of CAN SPI interfaces + +# +# 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 +# end of CAN USB interfaces + +# CONFIG_CAN_DEBUG_DEVICES is not set +# end of CAN Device Drivers + +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_MSFTEXT=y +CONFIG_BT_DEBUGFS=y +# CONFIG_BT_SELFTEST is not set + +# +# 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_MTK=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_MTKSDIO=m +CONFIG_BT_MTKUART=m +CONFIG_BT_HCIRSI=m +# end of Bluetooth device drivers + +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=y +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_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_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_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_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_PN532_UART=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=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_S3FWRN82_UART=m +CONFIG_NFC_ST95HF=m +# end of Near Field Communication (NFC) devices + +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_SOCK_MSG=y +CONFIG_NET_DEVLINK=y +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=y +CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_HAVE_EISA=y +# CONFIG_EISA is not set +CONFIG_HAVE_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +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_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_PCIE_BW is not set +# CONFIG_PCIE_EDR is not set +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_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +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 +# + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set +# CONFIG_PCI_MESON is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +CONFIG_PCI_SW_SWITCHTEC=m +# end of PCI switch controller drivers + +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 +# end of RapidIO Switch drivers + +# +# Generic Driver Options +# +CONFIG_AUXILIARY_BUS=y +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_FW_LOADER_PAGED_BUF=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y +# end of Firmware loader + +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_REGMAP_SCCB=m +CONFIG_REGMAP_I3C=m +CONFIG_REGMAP_SPI_AVMM=m +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# end of Generic Driver Options + +# +# Bus devices +# +CONFIG_MHI_BUS=m +# CONFIG_MHI_BUS_DEBUG is not set +CONFIG_MHI_BUS_PCI_GENERIC=m +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_MTK_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set + +# +# Partition parsers +# +CONFIG_MTD_AR7_PARTS=m +CONFIG_MTD_CMDLINE_PARTS=m +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 +# end of 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_PSTORE=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 +# end of RAM/ROM/Flash chip drivers + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_PHYSMAP_GPIO_ADDR=y +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_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +# end of Mapping drivers for chip access + +# +# 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_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 +# end of Self-contained MTD device drivers + +# +# NAND +# +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_RAW_NAND=m + +# +# Raw/parallel NAND flash controllers +# +CONFIG_MTD_NAND_DENALI=m +CONFIG_MTD_NAND_DENALI_PCI=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_CS553X=m +CONFIG_MTD_NAND_MXIC=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_NAND_ARASAN=m + +# +# Misc +# +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_NANDSIM=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_SPI_NAND=m + +# +# ECC engine support +# +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# end of ECC engine support +# end of NAND + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +# end of LPDDR & LPDDR2 PCM memory drivers + +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set +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_MTD_HYPERBUS=m +# 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_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_842 is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +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_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m +CONFIG_BLK_DEV_RNBD=y +CONFIG_BLK_DEV_RNBD_CLIENT=m +CONFIG_BLK_DEV_RNBD_SERVER=m + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_HWMON=y +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TCP=m +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_PASSTHRU is not set +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m +CONFIG_NVME_TARGET_TCP=m +# end of NVME Support + +# +# 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_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_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_XILINX_SDFEC=m +CONFIG_MISC_RTSX=m +CONFIG_PVPANIC=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_EEPROM_EE1004=m +# end of EEPROM support + +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 +# end of Texas Instruments shared transport line discipline + +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set +# CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MEI_HDCP is not set +CONFIG_VMWARE_VMCI=m +CONFIG_ECHO=m +CONFIG_MISC_ALCOR_PCI=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HABANA_AI=m +CONFIG_UACCE=m +# end of Misc devices + +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_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_BLK_DEV_SR=y +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 +# end of SCSI Transports + +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_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_CDNS_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +# CONFIG_SCSI_UFS_BSG is not set +CONFIG_SCSI_UFS_CRYPTO=y +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_SCSI_MYRB=m +CONFIG_SCSI_MYRS=m +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_FDOMAIN=m +CONFIG_SCSI_FDOMAIN_PCI=m +CONFIG_SCSI_FDOMAIN_ISA=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_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_FDOMAIN=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 +# end of SCSI device support + +CONFIG_ATA=y +CONFIG_SATA_HOST=y +CONFIG_PATA_TIMINGS=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_FORCE=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_BCACHE_ASYNC_REGISTRATION is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# 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_EBS is not set +CONFIG_DM_ERA=m +CONFIG_DM_CLONE=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_MULTIPATH_HST=m +CONFIG_DM_MULTIPATH_IOA=m +CONFIG_DM_DELAY=m +CONFIG_DM_DUST=m +# CONFIG_DM_INIT is not set +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y +# 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 +# end of IEEE 1394 (FireWire) support + +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_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set +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_L3S=y +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_BAREUDP=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_MHI_NET=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 +CONFIG_CAIF_DRIVERS=y +CONFIG_CAIF_TTY=m +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_B53_SERDES=m +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m +CONFIG_NET_DSA_LANTIQ_GSWIP=m +CONFIG_NET_DSA_MT7530=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m +CONFIG_NET_DSA_MICROCHIP_KSZ8795=m +CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +CONFIG_NET_DSA_MSCC_SEVILLE=m +CONFIG_NET_DSA_AR9331=m +CONFIG_NET_DSA_SJA1105=m +CONFIG_NET_DSA_SJA1105_PTP=y +# CONFIG_NET_DSA_SJA1105_TAS 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_NET_DSA_VITESSE_VSC73XX=m +CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m +CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m +# end of Distributed Switch Architecture drivers + +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_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_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_CHELSIO_INLINE_CRYPTO=y +# CONFIG_CHELSIO_IPSEC_INLINE is not set +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_GOOGLE=y +CONFIG_GVE=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_IXGBE_IPSEC=y +CONFIG_IXGBEVF=m +CONFIG_IXGBEVF_IPSEC=y +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_IAVF=m +CONFIG_I40EVF=m +CONFIG_ICE=m +CONFIG_FM10K=m +CONFIG_IGC=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_PRESTERA=m +CONFIG_PRESTERA_PCI=m +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_ACCEL=y +# 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_CLS_ACT=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLX5_IPSEC=y +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_SW_STEERING=y +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_LIB=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_NI_XGE_MANAGEMENT_ENET=m +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_PENSANDO=y +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y +CONFIG_QLCNIC_DCB=y +CONFIG_QLCNIC_HWMON=y +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_SELFTESTS is not set +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_INTEL=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_PHY_SEL is not set +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_XILINX=y +CONFIG_XILINX_AXI_EMAC=m +CONFIG_XILINX_LL_TEMAC=m +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_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set +CONFIG_FIXED_PHY=y +CONFIG_SFP=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_ADIN_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AX88796B_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM54140_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM84881_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_CICADA_PHY=m +CONFIG_CORTINA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_LXT_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_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_NXP_TJA11XX_PHY=m +CONFIG_AT803X_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_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_DP83869_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVRES=y +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MVUSB=m +CONFIG_MDIO_MSCC_MIIM=m + +# +# MDIO Multiplexers +# + +# +# PCS device drivers +# +CONFIG_PCS_XPCS=m +CONFIG_PCS_LYNX=m +# end of PCS device drivers + +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_USB_NET_AQC111=m +CONFIG_USB_RTL8153_ECM=m +CONFIG_WLAN=y +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_PCI_NO_EEPROM=m +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_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_DEBUG is not set +# CONFIG_ATH11K_DEBUGFS is not set +# CONFIG_ATH11K_TRACING 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 +# end of iwl3945 / iwl4965 Debugging Options + +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 + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y +# end of Debugging Options + +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_MT76x0U is not set +# CONFIG_MT76x0E is not set +# CONFIG_MT76x2E is not set +# CONFIG_MT76x2U is not set +# CONFIG_MT7603E is not set +# CONFIG_MT7615E is not set +# CONFIG_MT7663U is not set +# CONFIG_MT7663S is not set +# CONFIG_MT7915E is not set +CONFIG_WLAN_VENDOR_MICROCHIP=y +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +CONFIG_WILC1000_SPI=m +# CONFIG_WILC1000_HW_OOB_INTR 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=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_RTW88 is not set +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_PCIE=m +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_VIRT_WIFI=m +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_LAPBETHER=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_USB4_NET=m +CONFIG_HYPERV_NET=m +CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=y +CONFIG_ISDN=y +CONFIG_ISDN_CAPI=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=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_HDLC=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=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_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_APPLESPI=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1050=m +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_IQS62X=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_ADC=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=m +CONFIG_JOYSTICK_IFORCE_232=m +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_JOYSTICK_FSIA6B=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=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_CY8CTMA140=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_TOUCHSCREEN_IQS5XX=m +CONFIG_TOUCHSCREEN_ZINITIX=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_GPIO_BEEPER=m +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_GPIO_VIBRA=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_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_DA7280_HAPTICS=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_IQS269A=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_F3A=y +# 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 +# end of Hardware I/O ports +# end of Input device support + +# +# 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_LDISC_AUTOLOAD=y + +# +# 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_16550A_VARIANTS is not set +# 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_DWLIB=y +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=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_LANTIQ=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_BCM63XX is not set +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_FSL_LINFLEXUART=m +CONFIG_SERIAL_MEN_Z135=m +# CONFIG_SERIAL_SPRD is not set +# end of Serial drivers + +CONFIG_SERIAL_MCTRL_GPIO=y +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_GT=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_NOZOMI=m +CONFIG_NULL_TTY=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y +CONFIG_TTY_PRINTK=y +CONFIG_TTY_PRINTK_LEVEL=6 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +CONFIG_IPMI_PLAT_DATA=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_IPMB_DEVICE_INTERFACE=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_BA431=m +CONFIG_HW_RANDOM_GEODE=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_XIPHERA=m +CONFIG_DTLK=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 +# end of PCMCIA character devices + +CONFIG_MWAVE=m +CONFIG_SCx200_GPIO=m +CONFIG_PC8736x_GPIO=m +CONFIG_NSC_GPIO=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set +CONFIG_NVRAM=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_DEVPORT=y +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_SPI_CR50 is not set +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_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m +# end of Character devices + +# CONFIG_RANDOM_TRUST_CPU is not set +# CONFIG_RANDOM_TRUST_BOOTLOADER 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 +# end of Multiplexer I2C Chip support + +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_AMD_MP2=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_NVIDIA_GPU=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_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_DESIGNWARE_PCI=m +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_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 +# end of I2C Hardware Bus support + +CONFIG_I2C_STUB=m +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_SLAVE_TESTUNIT is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +CONFIG_I3C=m +CONFIG_CDNS_I3C_MASTER=m +CONFIG_DW_I3C_MASTER=m +# CONFIG_MIPI_I3C_HCI 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_DMA is not set +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_NXP_FLEXSPI=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_LANTIQ_SSC=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_SIFIVE=m +CONFIG_SPI_MXIC=m +CONFIG_SPI_TOPCLIFF_PCH=m +CONFIG_SPI_XCOMM=m +# CONFIG_SPI_XILINX is not set +CONFIG_SPI_ZYNQMP_GQSPI=m +CONFIG_SPI_AMD=m + +# +# SPI Multiplexer support +# +CONFIG_SPI_MUX=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_SPI_DYNAMIC=y +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_PTP_1588_CLOCK_IDT82P33=m +CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_VMW is not set +CONFIG_PTP_1588_CLOCK_OCP=m +# end of PTP clock support + +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_DA9062 is not set +CONFIG_PINCTRL_MCP23S08_I2C=m +CONFIG_PINCTRL_MCP23S08_SPI=m +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_LYNXPOINT=m +CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_ALDERLAKE=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_CEDARFORK=m +CONFIG_PINCTRL_DENVERTON=m +CONFIG_PINCTRL_ELKHARTLAKE=m +CONFIG_PINCTRL_EMMITSBURG=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_ICELAKE=m +CONFIG_PINCTRL_JASPERLAKE=m +CONFIG_PINCTRL_LAKEFIELD=m +CONFIG_PINCTRL_LEWISBURG=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_PINCTRL_TIGERLAKE=m + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +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_CDEV=y +CONFIG_GPIO_CDEV_V1=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_MB86S7X=m +CONFIG_GPIO_MENZ127=m +CONFIG_GPIO_STA2X11=y +CONFIG_GPIO_VX855=m +CONFIG_GPIO_XILINX=m +CONFIG_GPIO_AMD_FCH=m +# end of Memory mapped GPIO drivers + +# +# 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 +# end of Port-mapped I/O GPIO drivers + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_PCA9570=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPIC2810=m +# end of I2C GPIO expanders + +# +# 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_TQMX86=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 +# end of MFD GPIO expanders + +# +# PCI GPIO expanders +# +CONFIG_GPIO_AMD8111=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 +# end of PCI GPIO expanders + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX3191X=m +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m +CONFIG_GPIO_XRA1403=m +# end of SPI GPIO expanders + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +# end of USB GPIO expanders + +# +# Virtual GPIO drivers +# +CONFIG_GPIO_AGGREGATOR=m +# CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + +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 +CONFIG_W1_MASTER_SGI=m +# end of 1-wire Bus Masters + +# +# 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_DS2430=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_DS250X=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +# end of 1-wire Slaves + +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_MT6323 is not set +CONFIG_POWER_RESET_RESTART=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y +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_CW2015=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_LT3651=m +CONFIG_CHARGER_MAX14577=m +CONFIG_CHARGER_MAX77693=m +CONFIG_CHARGER_MAX8997=m +CONFIG_CHARGER_MAX8998=m +CONFIG_CHARGER_MP2629=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ2515X=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_BQ25980=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_CHARGER_BD99954=m +CONFIG_CHARGER_WILCO=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_ADM1177=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_AS370=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_AXI_FAN_CONTROL=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_AMD_ENERGY=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ASPEED=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CORSAIR_CPRO=m +CONFIG_SENSORS_CORSAIR_PSU=m +CONFIG_SENSORS_DRIVETEMP=y +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_LTC2947=m +CONFIG_SENSORS_LTC2947_I2C=m +CONFIG_SENSORS_LTC2947_SPI=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2992=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_MAX127=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX31730=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_MR75203=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_ADM1266=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_BEL_PFE=m +CONFIG_SENSORS_IBM_CFFPS=m +CONFIG_SENSORS_INSPUR_IPSPS=m +CONFIG_SENSORS_IR35221=m +CONFIG_SENSORS_IR38064=m +CONFIG_SENSORS_IRPS5401=m +CONFIG_SENSORS_ISL68137=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_LTC2978_REGULATOR=y +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX16601=m +CONFIG_SENSORS_MAX20730=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX31785=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2975=m +CONFIG_SENSORS_PM6764TR=m +CONFIG_SENSORS_PXE1610=m +CONFIG_SENSORS_Q54SJ108A2=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_TPS53679=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_XDPE122=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SBTSI=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_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_TMP513=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 +CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_NETLINK=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_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_DEVFREQ_THERMAL=y +CONFIG_THERMAL_EMULATION=y + +# +# Intel thermal drivers +# +CONFIG_INTEL_POWERCLAMP=m +CONFIG_X86_PKG_TEMP_THERMAL=m +CONFIG_INTEL_SOC_DTS_IOSF_CORE=m +CONFIG_INTEL_SOC_DTS_THERMAL=m +CONFIG_INTEL_QUARK_DTS_THERMAL=m + +# +# ACPI INT340X thermal drivers +# +CONFIG_INT340X_THERMAL=m +CONFIG_ACPI_THERMAL_REL=m +CONFIG_INT3406_THERMAL=m +# end of ACPI INT340X thermal drivers + +CONFIG_INTEL_BXT_PMIC_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +# end of Intel thermal drivers + +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_OPEN_TIMEOUT=0 +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set + +# +# 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_HPWDT_NMI_DECODING=y +CONFIG_KEMPLD_WDT=m +CONFIG_SC1200_WDT=m +CONFIG_SCx200_WDT=m +CONFIG_PC87413_WDT=m +CONFIG_NV_TCO=m +CONFIG_RDC321X_WDT=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_TQMX86_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_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 +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_DEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L15 is not set +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_MFD_CS47L92 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_MFD_MP2629=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_INTEL_SOC_PMIC_MRFLD=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_INTEL_PMC_BXT=m +CONFIG_MFD_INTEL_PMT=m +CONFIG_MFD_IQS62X=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_MT6360=m +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_ABX500_CORE=y +CONFIG_AB3100_CORE=y +CONFIG_AB3100_OTP=m +CONFIG_MFD_STA2X11=y +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_TQMX86=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_MFD_INTEL_M10_BMC=m +# end of Multifunction device drivers + +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_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_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_MAX77826=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MP8859=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6358=m +CONFIG_REGULATOR_MT6360=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_PCA9450=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m +CONFIG_REGULATOR_RC5T583=m +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_RTMV20=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_SLG51000=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_REGULATOR_QCOM_LABIBB=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_IR_RCMM_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_RC_XBOX_DVD=m +CONFIG_IR_TOY=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_CEC_CH7322=m +CONFIG_CEC_CROS_EC=m +CONFIG_CEC_SECO=m +CONFIG_CEC_SECO_RC=y +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_SUPPORT=m +# CONFIG_MEDIA_SUPPORT_FILTER is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y + +# +# Media device types +# +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_PLATFORM_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +# end of Media device types + +# +# Media core support +# +CONFIG_VIDEO_DEV=m +CONFIG_MEDIA_CONTROLLER=y +CONFIG_DVB_CORE=m +# end of Media core support + +# +# Video4Linux options +# +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES 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 +# end of Video4Linux options + +# +# Media controller options +# +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# +# end of Media controller options + +# +# Digital TV options +# +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +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 +# end of Digital TV options + +# +# Media drivers +# +CONFIG_TTPCI_EEPROM=m +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_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_CXUSB_ANALOG=y +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 +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m +CONFIG_VIDEO_SOLO6X10=m +CONFIG_STA2X11_VIP=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_FB_IVTV_FORCE_PAT is not set +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_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 +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 +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 +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_VIDEO_ASPEED=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_DVB_PLATFORM_DRIVERS=y +CONFIG_SDR_PLATFORM_DRIVERS=y + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=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_TEST_DRIVERS is not set + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA1997X=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_TLV320AIC23B=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7604_CEC=y +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_ADV7842_CEC=y +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_ML86V7667=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TC358743=m +CONFIG_VIDEO_TC358743_CEC=y +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_TW9910=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_ADV7511=m +CONFIG_VIDEO_ADV7511_CEC=y +CONFIG_VIDEO_AD9389B=m +CONFIG_VIDEO_AK881X=m +CONFIG_VIDEO_THS8200=m +# end of Video encoders + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +CONFIG_SDR_MAX2175=m +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_I2C=m +CONFIG_VIDEO_ST_MIPID02=m +# end of Miscellaneous helper chips + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_HI556=m +CONFIG_VIDEO_IMX214=m +CONFIG_VIDEO_IMX219=m +CONFIG_VIDEO_IMX258=m +CONFIG_VIDEO_IMX274=m +CONFIG_VIDEO_IMX290=m +CONFIG_VIDEO_IMX319=m +CONFIG_VIDEO_IMX355=m +CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV2659=m +CONFIG_VIDEO_OV2680=m +CONFIG_VIDEO_OV2685=m +CONFIG_VIDEO_OV2740=m +CONFIG_VIDEO_OV5647=m +CONFIG_VIDEO_OV6650=m +CONFIG_VIDEO_OV5670=m +CONFIG_VIDEO_OV5675=m +CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV7251=m +CONFIG_VIDEO_OV772X=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV7740=m +CONFIG_VIDEO_OV8856=m +CONFIG_VIDEO_OV9640=m +CONFIG_VIDEO_OV9650=m +CONFIG_VIDEO_OV9734=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_RDACM20=m +CONFIG_VIDEO_RJ54N1=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K4ECGX=m +CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_CCS=m +CONFIG_VIDEO_ET8EK8=m +CONFIG_VIDEO_S5C73M3=m +# end of Camera sensor devices + +# +# Lens drivers +# +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_AK7375=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9768=m +CONFIG_VIDEO_DW9807_VCM=m +# end of Lens drivers + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_LM3560=m +CONFIG_VIDEO_LM3646=m +# end of Flash devices + +# +# SPI helper chips +# +CONFIG_VIDEO_GS1662=m +# end of SPI helper chips + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +# end of Media SPI Adapters + +CONFIG_MEDIA_TUNER=m + +# +# Customize TV tuners +# +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 +# end of Customize TV tuners + +# +# Customise DVB Frontends +# + +# +# 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_S5H1432=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_DIB9000=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 +CONFIG_DVB_CXD2880=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 +CONFIG_DVB_MN88443X=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_LNBH29=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_LGS8GL5=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 +# end of Customise DVB Frontends + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +# end of Media ancillary drivers + +# +# 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_DBI=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_DEBUG_DP_MST_TOPOLOGY_REFS is not set +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VRAM_HELPER=m +CONFIG_DRM_TTM_HELPER=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_GEM_SHMEM_HELPER=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 +# end of I2C encoder or helper chips + +# +# ARM devices +# +# end of ARM devices + +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 +# end of ACP (Audio CoProcessor) Configuration + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +CONFIG_DRM_AMD_DC_DCN=y +# CONFIG_DRM_AMD_DC_HDCP is not set +CONFIG_DRM_AMD_DC_SI=y +# CONFIG_DEBUG_KERNEL_DC is not set +# end of Display Engine Configuration + +CONFIG_DRM_NOUVEAU=m +# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +# CONFIG_NOUVEAU_DEBUG_PUSH is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +CONFIG_DRM_I915_FORCE_PROBE="" +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_DEBUG_MMIO 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_I915_DEBUG_RUNTIME_PM is not set +# end of drm/i915 Debugging + +# +# drm/i915 Profile Guided Optimisation +# +CONFIG_DRM_I915_FENCE_TIMEOUT=10000 +CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 +CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 +CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 +CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 +CONFIG_DRM_I915_STOP_TIMEOUT=100 +CONFIG_DRM_I915_TIMESLICE_DURATION=1 +# end of drm/i915 Profile Guided Optimisation + +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_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_DRM_ANALOGIX_DP=m +# end of Display Interface Bridges + +# CONFIG_DRM_ETNAVIV is not set +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_GM12U320=m +CONFIG_TINYDRM_HX8357D=m +CONFIG_TINYDRM_ILI9225=m +CONFIG_TINYDRM_ILI9341=m +CONFIG_TINYDRM_ILI9486=m +CONFIG_TINYDRM_MI0283QT=m +CONFIG_TINYDRM_REPAPER=m +CONFIG_TINYDRM_ST7586=m +CONFIG_TINYDRM_ST7735R=m +CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=m +CONFIG_DRM_VBOXVIDEO=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=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=m +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_HYPERV=m +CONFIG_FB_SIMPLE=y +CONFIG_FB_SM712=m +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +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_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_LCD_OTM3225A=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_KTD253=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_QCOM_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 +# end of Backlight & LCD device support + +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +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 +# end of Console display driver support + +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +# end of Graphics support + +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_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_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_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_GENERIC_LEDS=y +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_INTEL_HDMI_SILENT_STREAM=y +# end of HD-Audio + +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_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y +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_ADI=m +CONFIG_SND_SOC_ADI_AXI_I2S=m +CONFIG_SND_SOC_ADI_AXI_SPDIF=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_SOC_AMD_ACP3x=m +CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m +CONFIG_SND_SOC_AMD_RENOIR=m +CONFIG_SND_SOC_AMD_RENOIR_MACH=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_BCM63XX_I2S_WHISTLER=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_MQS=m +CONFIG_SND_SOC_FSL_AUDMIX=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_ESAI=m +CONFIG_SND_SOC_FSL_MICFIL=m +CONFIG_SND_SOC_FSL_EASRC=m +CONFIG_SND_SOC_FSL_XCVR=m +CONFIG_SND_SOC_IMX_AUDMUX=m +# end of SoC Audio for Freescale CPUs + +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_CATPT=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=m +CONFIG_SND_SOC_INTEL_SKL=m +CONFIG_SND_SOC_INTEL_APL=m +CONFIG_SND_SOC_INTEL_KBL=m +CONFIG_SND_SOC_INTEL_GLK=m +CONFIG_SND_SOC_INTEL_CNL=m +CONFIG_SND_SOC_INTEL_CFL=m +CONFIG_SND_SOC_INTEL_CML_H=m +CONFIG_SND_SOC_INTEL_CML_LP=m +CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m +CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y +CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m +CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_MACH=y +# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5650_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_CX2072X_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_DA7219_MAX98357A_GENERIC=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_SOF_WM8804_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_KBL_DA7219_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m +CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m +CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m +CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m +CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m +CONFIG_SND_SOC_MTK_BTCVSD=m +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_PCI=m +CONFIG_SND_SOC_SOF_ACPI=m +# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set +# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set +CONFIG_SND_SOC_SOF=m +CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y +CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y +CONFIG_SND_SOC_SOF_INTEL_ACPI=m +CONFIG_SND_SOC_SOF_INTEL_PCI=m +CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m +CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m +CONFIG_SND_SOC_SOF_INTEL_COMMON=m +CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y +CONFIG_SND_SOC_SOF_BAYTRAIL=m +CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y +CONFIG_SND_SOC_SOF_BROADWELL=m +CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y +CONFIG_SND_SOC_SOF_MERRIFIELD=m +CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_APOLLOLAKE=m +CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_GEMINILAKE=m +CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_CANNONLAKE=m +CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_COFFEELAKE=m +CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ICELAKE=m +CONFIG_SND_SOC_SOF_COMETLAKE=m +CONFIG_SND_SOC_SOF_COMETLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y +CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_TIGERLAKE=m +CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ELKHARTLAKE=m +CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_JASPERLAKE=m +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ALDERLAKE=m +CONFIG_SND_SOC_SOF_HDA_COMMON=m +CONFIG_SND_SOC_SOF_HDA_LINK=y +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y +# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_HDA=m +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_XTENSA=m + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +CONFIG_SND_SOC_XILINX_I2S=m +# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set +# CONFIG_SND_SOC_XILINX_SPDIF is not set +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_ADAU1372=m +CONFIG_SND_SOC_ADAU1372_I2C=m +CONFIG_SND_SOC_ADAU1372_SPI=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_ADAU7118=m +CONFIG_SND_SOC_ADAU7118_HW=m +CONFIG_SND_SOC_ADAU7118_I2C=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4118=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_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS35L35=m +CONFIG_SND_SOC_CS35L36=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_CS4234=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_CS4341=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_CX2072X=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_HDAC_HDA=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98088=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_MAX98373_I2C=m +CONFIG_SND_SOC_MAX98390=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_PCM3060=m +CONFIG_SND_SOC_PCM3060_I2C=m +CONFIG_SND_SOC_PCM3060_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM5102A=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT1011=m +CONFIG_SND_SOC_RT1015=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_RT5660=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_RT5682_I2C=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_SIMPLE_MUX=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_TAS2562=m +CONFIG_SND_SOC_TAS2764=m +CONFIG_SND_SOC_TAS2770=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_TLV320ADCX140=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_TSCS42XX=m +CONFIG_SND_SOC_TSCS454=m +CONFIG_SND_SOC_UDA1334=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_WM8904=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_ZL38060=m +CONFIG_SND_SOC_ZX_AUD96P22=m +CONFIG_SND_SOC_MAX9759=m +CONFIG_SND_SOC_MT6351=m +CONFIG_SND_SOC_MT6358=m +CONFIG_SND_SOC_MT6660=m +CONFIG_SND_SOC_NAU8315=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8822=m +CONFIG_SND_SOC_NAU8824=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_LPASS_WSA_MACRO=m +CONFIG_SND_SOC_LPASS_VA_MACRO=m +# end of CODEC drivers + +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_BIGBEN_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_MACALLY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CREATIVE_SB0540=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_GLORIOUS=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GOOGLE_HAMMER=m +CONFIG_HID_VIVALDI=m +CONFIG_HID_GT683R=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_VIEWSONIC=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_MALTRON=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_U2FZERO=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 +CONFIG_HID_MCP2221=m +# end of Special HID drivers + +# +# 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 +# end of USB HID Boot Protocol drivers +# end of USB HID support + +# +# I2C HID support +# +CONFIG_I2C_HID=m +# end of I2C HID support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_CONN_GPIO=m +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_FEW_INIT_RETRIES is not set +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_MON=m + +# +# 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_PCI_RENESAS is not set +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_FSL is not set +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_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_CDNS3=m +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +CONFIG_USB_CDNS3_PCI_WRAP=m +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_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_GENERIC=m +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_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_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_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_SISUSBVGA=m +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 +# end of USB Physical Layer drivers + +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_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_MAX3420_UDC=m +# CONFIG_USB_DUMMY_HCD is not set +# end of USB Peripheral Controller + +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 + +# +# USB Gadget precomposed configurations +# +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_USB_RAW_GADGET=m +# end of USB Gadget precomposed configurations + +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_RT1711H=m +CONFIG_TYPEC_MT6360=m +CONFIG_TYPEC_TCPCI_MAXIM=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_UCSI=m +CONFIG_UCSI_CCG=m +CONFIG_UCSI_ACPI=m +CONFIG_TYPEC_HD3SS3220=m +CONFIG_TYPEC_TPS6598X=m +CONFIG_TYPEC_STUSB160X=m + +# +# USB Type-C Multiplexer/DeMultiplexer Switch support +# +CONFIG_TYPEC_MUX_PI3USB30532=m +CONFIG_TYPEC_MUX_INTEL_PMC=m +# end of USB Type-C Multiplexer/DeMultiplexer Switch support + +# +# USB Type-C Alternate Mode drivers +# +CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_TYPEC_NVIDIA_ALTMODE=m +# end of USB Type-C Alternate Mode drivers + +CONFIG_USB_ROLE_SWITCH=y +CONFIG_USB_ROLES_INTEL_XHCI=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_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_F_SDH30=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_ALCOR=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_HSQ=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_CLASS_MULTICOLOR=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_LM3532=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_LP50XX=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_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=m +CONFIG_LEDS_MLXREG=m +CONFIG_LEDS_USER=m +CONFIG_LEDS_NIC78BX=m +CONFIG_LEDS_TI_LMU_COMMON=m +CONFIG_LEDS_LM36274=m +CONFIG_LEDS_TPS6105X=m +CONFIG_LEDS_SGM3140=m + +# +# Flash and Torch LED drivers +# +# CONFIG_LEDS_RT8515 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 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_LEDS_TRIGGER_PATTERN=m +CONFIG_LEDS_TRIGGER_AUDIO=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +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_CXGB4=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +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_RTRS=m +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=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_ABEOZ9=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_RV3028=m +CONFIG_RTC_DRV_RV3032=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_SD3078=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_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 +CONFIG_RTC_DRV_RX6110=m + +# +# 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_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_RTC_DRV_WILCO_EC=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_PLX_DMA=m +CONFIG_TIMB_DMA=m +CONFIG_XILINX_ZYNQMP_DPDMA=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_DW_EDMA=m +CONFIG_DW_EDMA_PCIE=m +CONFIG_HSU_DMA=m +CONFIG_SF_PDMA=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_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# end of DMABUF options + +CONFIG_AUXDISPLAY=y +CONFIG_CHARLCD=m +CONFIG_HD44780_COMMON=m +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_LCD2S=m +CONFIG_PARPORT_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y +CONFIG_PANEL=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_NITRO_ENCLAVES=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTIO_DMA_SHARED_BUFFER=m +CONFIG_VDPA=m +# CONFIG_VDPA_SIM is not set +CONFIG_IFCVF=m +CONFIG_MLX5_VDPA=y +CONFIG_MLX5_VDPA_NET=m +CONFIG_VHOST_IOTLB=m +CONFIG_VHOST_RING=m +CONFIG_VHOST=m +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST_VDPA=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_TIMER=y +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m +# end of 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_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_AUTO_XLATE=y +CONFIG_XEN_ACPI=y +CONFIG_XEN_FRONT_PGDIR_SHBUF=m +# end of Xen driver support + +# CONFIG_GREYBUS is not set +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_COMEDI_NI_ROUTING=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_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16203=m +CONFIG_ADIS16240=m +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD7816=m +CONFIG_AD7280=m +# end of Analog to digital converters + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m +# end of Analog digital bi-direction converters + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7746=m +# end of Capacitance to digital converters + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m +# end of Direct Digital Synthesis + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m +# end of Network Analyzer, Impedance Converters + +# +# Active energy metering IC +# +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m +# end of Active energy metering IC + +# +# Resolver to digital converters +# +CONFIG_AD2S1210=m +# end of Resolver to digital converters +# end of IIO staging drivers + +CONFIG_FB_SM750=m +CONFIG_STAGING_MEDIA=y +CONFIG_INTEL_ATOMISP=y +# CONFIG_VIDEO_ZORAN is not set +CONFIG_VIDEO_IPU3_IMGU=m + +# +# Android +# +# end of Android + +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +CONFIG_GS_FPGABOOT=m +CONFIG_UNISYSSPAR=y +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_SEPS525=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_MOST_COMPONENTS=m +CONFIG_MOST_NET=m +CONFIG_MOST_SOUND=m +CONFIG_MOST_VIDEO=m +CONFIG_MOST_I2C=m +CONFIG_KS7010=m +# CONFIG_PI433 is not set + +# +# Gasket devices +# +# end of Gasket devices + +CONFIG_FIELDBUS_DEV=m +# CONFIG_KPC2000 is not set +CONFIG_QLGE=m +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WFX=m +# CONFIG_SPMI_HISI3670 is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACPI_WMI=m +CONFIG_WMI_BMOF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_HUAWEI_WMI=m +CONFIG_INTEL_WMI_SBL_FW_UPDATE=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_MXM_WMI=m +CONFIG_PEAQ_WMI=m +CONFIG_XIAOMI_WMI=m +CONFIG_ACERHDF=m +CONFIG_ACER_WIRELESS=m +CONFIG_ACER_WMI=m +CONFIG_AMD_PMC=m +CONFIG_APPLE_GMUX=m +CONFIG_ASUS_LAPTOP=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_EEEPC_WMI=m +CONFIG_DCDBAS=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_WMI=y +CONFIG_DELL_SMBIOS_SMM=y +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_RBTN=m +CONFIG_DELL_RBU=m +CONFIG_DELL_SMO8800=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_SYSMAN=m +CONFIG_DELL_WMI_DESCRIPTOR=m +CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_WMI_LED=m +CONFIG_AMILO_RFKILL=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_FUJITSU_TABLET=m +CONFIG_GPD_POCKET_FAN=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_TC1100_WMI=m +CONFIG_IBM_RTL=m +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SENSORS_HDAPS=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_INTEL_ATOMISP2_LED=m +CONFIG_INTEL_CHT_INT33FE=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_INT0002_VGPIO=m +CONFIG_INTEL_MENLOW=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_INTEL_VBTN=m +CONFIG_MSI_LAPTOP=m +CONFIG_MSI_WMI=m +CONFIG_PCENGINES_APU2=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_SAMSUNG_Q10=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_LG_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_SYSTEM76_ACPI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_I2C_MULTI_INSTANTIATE=m +# CONFIG_MLX_PLATFORM is not set +# CONFIG_TOUCHSCREEN_DMI is not set +CONFIG_INTEL_IMR=y +CONFIG_INTEL_IPS=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m +CONFIG_INTEL_BXTWC_PMIC_TMU=m +CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_INTEL_MFLD_THERMAL=m +CONFIG_INTEL_MID_POWER_BUTTON=m +CONFIG_INTEL_MRFLD_PWRBTN=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMT_CLASS=m +CONFIG_INTEL_PMT_TELEMETRY=m +CONFIG_INTEL_PMT_CRASHLOG=m +CONFIG_INTEL_PUNIT_IPC=m +CONFIG_INTEL_SCU_IPC=y +CONFIG_INTEL_SCU=y +CONFIG_INTEL_SCU_PCI=y +CONFIG_INTEL_SCU_PLATFORM=m +CONFIG_INTEL_SCU_IPC_UTIL=m +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_LPC=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_LIGHTBAR=m +CONFIG_CROS_EC_DEBUGFS=m +CONFIG_CROS_EC_SENSORHUB=m +CONFIG_CROS_EC_SYSFS=m +CONFIG_CROS_EC_TYPEC=m +CONFIG_CROS_USBPD_LOGGER=m +CONFIG_CROS_USBPD_NOTIFY=m +CONFIG_WILCO_EC=m +# CONFIG_WILCO_EC_DEBUGFS is not set +CONFIG_WILCO_EC_EVENTS=m +CONFIG_WILCO_EC_TELEMETRY=m +# CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set +CONFIG_HAVE_CLK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_SI5341=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 +# end of Clock Source drivers + +CONFIG_MAILBOX=y +CONFIG_PCC=y +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_IOVA=y +CONFIG_IOASID=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# end of Generic IOMMU Pagetable Support + +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DMA=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +# CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +CONFIG_HYPERV_IOMMU=y + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_NS=m +CONFIG_RPMSG_QCOM_GLINK=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +CONFIG_RPMSG_VIRTIO=m +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +CONFIG_QCOM_QMI_HELPERS=m +# end of Qualcomm SoC drivers + +CONFIG_SOC_TI=y + +# +# Xilinx SoC drivers +# +CONFIG_XILINX_VCU=m +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +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_FSA9480=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_INTEL_CHT_WC=m +CONFIG_EXTCON_INTEL_MRFLD=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_PTN5150=m +CONFIG_EXTCON_RT8973A=m +CONFIG_EXTCON_SM5502=m +CONFIG_EXTCON_USB_GPIO=m +CONFIG_EXTCON_USBC_CROS_EC=m +CONFIG_EXTCON_USBC_TUSB320=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_BUFFER_DMA=m +CONFIG_IIO_BUFFER_DMAENGINE=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_ADXL372=m +CONFIG_ADXL372_SPI=m +CONFIG_ADXL372_I2C=m +CONFIG_BMA220=m +CONFIG_BMA400=m +CONFIG_BMA400_I2C=m +CONFIG_BMA400_SPI=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 +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7091R5=m +CONFIG_AD7124=m +CONFIG_AD7192=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7292=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7766=m +CONFIG_AD7768_1=m +CONFIG_AD7780=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD7949=m +CONFIG_AD799X=m +CONFIG_AD9467=m +CONFIG_ADI_AXI_ADC=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_INTEL_MRFLD_ADC=m +CONFIG_LP8788_ADC=m +CONFIG_LTC2471=m +CONFIG_LTC2485=m +CONFIG_LTC2496=m +CONFIG_LTC2497=m +CONFIG_MAX1027=m +CONFIG_MAX11100=m +CONFIG_MAX1118=m +CONFIG_MAX1241=m +CONFIG_MAX1363=m +CONFIG_MAX9611=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MCP3911=m +# CONFIG_MEDIATEK_MT6360_ADC is not set +CONFIG_MEN_Z188_ADC=m +CONFIG_MP2629_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_QCOM_SPMI_ADC5=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 +CONFIG_XILINX_XADC=m +# end of Analog to digital converters + +# +# Analog Front Ends +# +# end of Analog Front Ends + +# +# Amplifiers +# +CONFIG_AD8366=m +CONFIG_HMC425=m +# end of Amplifiers + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_ATLAS_EZO_SENSOR=m +CONFIG_BME680=m +CONFIG_BME680_I2C=m +CONFIG_BME680_SPI=m +CONFIG_CCS811=m +CONFIG_IAQCORE=m +CONFIG_PMS7003=m +CONFIG_SCD30_CORE=m +CONFIG_SCD30_I2C=m +CONFIG_SCD30_SERIAL=m +CONFIG_SENSIRION_SGP30=m +CONFIG_SPS30=m +CONFIG_VZ89X=m +# end of Chemical Sensors + +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m +CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +# end of Hid Sensor IIO Common + +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +# end of SSP Sensor Common + +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# 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_AD5686=m +CONFIG_AD5686_SPI=m +CONFIG_AD5696_I2C=m +CONFIG_AD5755=m +CONFIG_AD5758=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5770R=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_DS4424=m +CONFIG_LTC1660=m +CONFIG_LTC2632=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +CONFIG_MCP4922=m +CONFIG_TI_DAC082S085=m +CONFIG_TI_DAC5571=m +CONFIG_TI_DAC7311=m +CONFIG_TI_DAC7612=m +# end of Digital to analog converters + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set +# end of IIO dummy driver + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m +# end of Clock Generator/Distribution + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m +CONFIG_ADF4371=m +# end of Phase-Locked Loop (PLL) frequency synthesizers +# end of Frequency Synthesizers DDS/PLL + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS290=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_FXAS21002C=m +CONFIG_FXAS21002C_I2C=m +CONFIG_FXAS21002C_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 +# end of Digital gyroscope sensors + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m +CONFIG_MAX30102=m +# end of Heart Rate Monitors +# end of Health Sensors + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HDC2010=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 +# end of Humidity sensors + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16460=m +CONFIG_ADIS16475=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_FXOS8700=m +CONFIG_FXOS8700_I2C=m +CONFIG_FXOS8700_SPI=m +CONFIG_KMX61=m +CONFIG_INV_ICM42600=m +CONFIG_INV_ICM42600_I2C=m +CONFIG_INV_ICM42600_SPI=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_ST_LSM6DSX_I3C=m +# end of Inertial measurement units + +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_ADUX1020=m +CONFIG_AL3010=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_AS73211=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_GP2AP002=m +CONFIG_GP2AP020A00F=m +CONFIG_IQS621_ALS=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_MAX44009=m +CONFIG_NOA1305=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_VCNL4035=m +CONFIG_VEML6030=m +CONFIG_VEML6070=m +CONFIG_VL6180=m +CONFIG_ZOPT2201=m +# end of Light sensors + +# +# 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 +CONFIG_SENSORS_RM3100=m +CONFIG_SENSORS_RM3100_I2C=m +CONFIG_SENSORS_RM3100_SPI=m +# end of Magnetometer sensors + +# +# Multiplexers +# +# end of Multiplexers + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m +# end of Inclinometer sensors + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m +# end of Triggers - standalone + +# +# Linear and angular position sensors +# +CONFIG_IQS624_POS=m +# end of Linear and angular position sensors + +# +# Digital potentiometers +# +CONFIG_AD5272=m +CONFIG_DS1803=m +CONFIG_MAX5432=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4018=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_MCP41010=m +CONFIG_TPL0102=m +# end of Digital potentiometers + +# +# Digital potentiostats +# +CONFIG_LMP91000=m +# end of Digital potentiostats + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_DLHL60D=m +CONFIG_DPS310=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_ICP10100=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 +# end of Pressure sensors + +# +# Lightning sensors +# +CONFIG_AS3935=m +# end of Lightning sensors + +# +# Proximity and distance sensors +# +CONFIG_ISL29501=m +CONFIG_LIDAR_LITE_V2=m +CONFIG_MB1232=m +CONFIG_PING=m +CONFIG_RFD77402=m +CONFIG_SRF04=m +CONFIG_SX9310=m +CONFIG_SX9500=m +CONFIG_SRF08=m +CONFIG_VCNL3020=m +CONFIG_VL53L0X_I2C=m +# end of Proximity and distance sensors + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1200=m +# end of Resolver to digital converters + +# +# Temperature sensors +# +CONFIG_IQS620AT_TEMP=m +CONFIG_LTC2983=m +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_MAX31856=m +# end of Temperature sensors + +CONFIG_NTB=m +CONFIG_NTB_MSI=y +CONFIG_NTB_IDT=m +CONFIG_NTB_SWITCHTEC=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_PERF=m +CONFIG_NTB_MSI_TEST=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_DEBUG is not set +CONFIG_PWM_CRC=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC=m +CONFIG_PWM_IQS620A=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_MADERA_IRQ=m +# end of IRQ chip support + +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_BRCMSTB_RESCAL is not set +CONFIG_RESET_TI_SYSCON=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_USB_LGM_PHY=m +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_PHY_INTEL_LGM_EMMC=m +# end of PHY Subsystem + +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL_CORE=m +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +# end of Performance monitor support + +CONFIG_RAS=y +CONFIG_USB4=m +# CONFIG_USB4_DEBUGFS_WRITE is not set +# CONFIG_USB4_DMA_TEST is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +CONFIG_LIBNVDIMM=y +CONFIG_BLK_DEV_PMEM=m +CONFIG_ND_BLK=m +CONFIG_ND_CLAIM=y +CONFIG_ND_BTT=m +CONFIG_BTT=y +CONFIG_NVDIMM_KEYS=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=m +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_SPMI_SDAM=m +CONFIG_RAVE_SP_EEPROM=m + +# +# HW tracing support +# +CONFIG_STM=m +CONFIG_STM_PROTO_BASIC=m +CONFIG_STM_PROTO_SYS_T=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 +# end of HW tracing support + +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_ALTERA_FREEZE_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_TEE=m + +# +# TEE drivers +# +# end of TEE drivers + +CONFIG_MULTIPLEXER=m + +# +# Multiplexer drivers +# +CONFIG_MUX_ADG792A=m +CONFIG_MUX_ADGS1408=m +CONFIG_MUX_GPIO=m +# end of Multiplexer drivers + +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +# CONFIG_INTERCONNECT is not set +CONFIG_COUNTER=m +CONFIG_MOST=m +CONFIG_MOST_USB_HDM=m +CONFIG_MOST_CDEV=m +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_VALIDATE_FS_PARSER=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_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_SUPPORT_V4=y +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_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +# CONFIG_F2FS_FS_COMPRESSION is not set +CONFIG_ZONEFS_FS=m +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 is not set +CONFIG_FS_VERITY=y +# CONFIG_FS_VERITY_DEBUG is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +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_VIRTIO_FS=m +CONFIG_FUSE_DAX=y +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_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 +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/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_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# 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_PROC_PID_ARCH_STATUS=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 +# end of Pseudo filesystems + +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_FS_ZSTD=y +CONFIG_UBIFS_ATIME_SUPPORT=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_UBIFS_FS_AUTHENTICATION=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_DEFAULT_KMSG_BYTES=10240 +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_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG 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_ZIP is not set +CONFIG_VBOXSF_FS=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_NFS_DISABLE_UDP_SUPPORT is not set +# CONFIG_NFS_V4_2_READ_PLUS is not set +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_2_INTER_SSC is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +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_DISABLE_INSECURE_ENCTYPES=y +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CEPH_FS_SECURITY_LABEL=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_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SWN_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_AFS_DEBUG_CURSOR is not set +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 +# CONFIG_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_REQUEST_CACHE=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y +CONFIG_KEY_NOTIFICATIONS=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_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 +CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +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_TOMOYO_INSECURE_BUILTIN_SETTING is not set +CONFIG_SECURITY_APPARMOR=y +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_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +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_ARCH_POLICY is not set +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +# CONFIG_IMA_APPRAISE_MODSIG is not set +CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_LOAD_X509 is not set +CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT 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_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +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_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=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_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_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m +CONFIG_CRYPTO_ENGINE=m + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_ECC=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECRDSA=m +CONFIG_CRYPTO_SM2=m +CONFIG_CRYPTO_CURVE25519=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=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_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_NHPOLY1305=m +CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_ESSIV=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_XXHASH=m +CONFIG_CRYPTO_BLAKE2B=m +CONFIG_CRYPTO_BLAKE2S=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=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_STREEBOG=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_TI=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_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_RNG_CAVP is not set +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +# CONFIG_CRYPTO_STATS is not set +CONFIG_CRYPTO_HASH_INFO=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=m +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m +CONFIG_CRYPTO_LIB_BLAKE2S=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m +CONFIG_CRYPTO_LIB_CURVE25519=m +CONFIG_CRYPTO_LIB_DES=m +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1 +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m +CONFIG_CRYPTO_LIB_SHA256=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_ATMEL_I2C=m +CONFIG_CRYPTO_DEV_ATMEL_ECC=m +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=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_CCP_DEBUGFS is not set +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_4XXX=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_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_SAFEXCEL=m +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=m +CONFIG_TPM_KEY_PARSER=m +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 +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_RAID6_PQ_BENCHMARK=y +CONFIG_LINEAR_RANGES=y +CONFIG_PACKING=y +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_CORDIC=m +CONFIG_PRIME_NUMBERS=m +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=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=y +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=y +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_DECOMPRESS_ZSTD=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_XARRAY_MULTI=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_SWIOTLB=y +CONFIG_DMA_CMA=y +CONFIG_DMA_PERNUMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=0 +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_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +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_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_DIMLIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_32=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y +CONFIG_FONT_6x8=y +CONFIG_SG_POOL=y +CONFIG_MEMREGION=y +CONFIG_ARCH_STACKWALK=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +CONFIG_OBJAGG=m +# CONFIG_STRING_SELFTEST is not set +# end of Library routines + +CONFIG_PLDMFW=y + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DYNAMIC_DEBUG_CORE=y +CONFIG_SYMBOLIC_ERRNAME=y +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set +CONFIG_FRAME_POINTER=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_KGDB=y +CONFIG_KGDB_HONOUR_BLOCKLIST=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_EARLY_DEBUG=y +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_OWNER is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS 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_SCHED_STACK_END_CHECK=y +# 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_DEBUG_PER_CPU_MAPS is not set +# CONFIG_DEBUG_KMAP_LOCAL is not set +CONFIG_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y +# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set +# CONFIG_DEBUG_HIGHMEM is not set +CONFIG_HAVE_DEBUG_STACKOVERFLOW=y +# CONFIG_DEBUG_STACKOVERFLOW is not set +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +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_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# 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_SCF_TORTURE_TEST is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set + +# +# Debug kernel data structures +# +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PLIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +CONFIG_TORTURE_TEST=m +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# 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_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_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=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_BOOTTIME_TRACING is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_STACK_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +# CONFIG_HWLAT_TRACER is not set +CONFIG_MMIOTRACE=y +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_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_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_SYNTH_EVENTS=y +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_MMIOTRACE_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_SYNTH_EVENT_GEN_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_SAMPLES is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y + +# +# x86 Debugging +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_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_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set +# CONFIG_DEBUG_TLBFLUSH is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +# 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_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# CONFIG_DEBUG_ENTRY is not set +# CONFIG_DEBUG_NMI_SELFTEST is not set +# CONFIG_DEBUG_IMR_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 +# end of x86 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT 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_CC_HAS_SANCOV_TRACE_PC=y +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_MIN_HEAP 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_REED_SOLOMON_TEST is not set +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_STRSCPY=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_UUID=m +CONFIG_TEST_XARRAY=m +CONFIG_TEST_OVERFLOW=m +CONFIG_TEST_RHASHTABLE=m +CONFIG_TEST_HASH=m +CONFIG_TEST_IDA=m +CONFIG_TEST_PARMAN=m +CONFIG_TEST_LKM=m +CONFIG_TEST_BITOPS=m +CONFIG_TEST_VMALLOC=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_TEST_BLACKHOLE_DEV=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_TEST_MEMCAT_P is not set +CONFIG_TEST_OBJAGG=m +# CONFIG_TEST_STACKINIT is not set +# CONFIG_TEST_MEMINIT is not set +# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_TEST_FPU is not set +CONFIG_MEMTEST=y +# CONFIG_HYPERV_TESTING is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf new file mode 100644 index 0000000000..178bb220d7 --- /dev/null +++ b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf @@ -0,0 +1,10828 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 5.11.0-rc7 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="gcc (Debian 8.3.0-6) 8.3.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=80300 +CONFIG_LD_VERSION=231010000 +CONFIG_CLANG_VERSION=0 +CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_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_HAVE_KERNEL_ZSTD=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_KERNEL_ZSTD is not set +CONFIG_DEFAULT_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SWAP=y +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +CONFIG_POSIX_MQUEUE=y +CONFIG_POSIX_MQUEUE_SYSCTL=y +CONFIG_WATCH_QUEUE=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_USELIB=y +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=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_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_IRQ_MSI_IOMMU=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 +# end of IRQ subsystem + +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_INIT=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 +CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_POSIX_CPU_TIMERS_TASK_WORK=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 +# end of Timers subsystem + +# 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_PSI=y +# CONFIG_PSI_DEFAULT_DISABLED is not set +# end of CPU/Task time and stats accounting + +CONFIG_CPU_ISOLATION=y + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_SRCU=y +CONFIG_TREE_SRCU=y +CONFIG_TASKS_RCU_GENERIC=y +CONFIG_TASKS_RUDE_RCU=y +CONFIG_TASKS_TRACE_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_BUILD_BIN2C=y +# CONFIG_IKCONFIG is not set +# CONFIG_IKHEADERS 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 + +# +# Scheduler features +# +# CONFIG_UCLAMP_TASK is not set +# end of Scheduler features + +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CC_HAS_INT128=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_KMEM=y +CONFIG_BLK_CGROUP=y +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_TIME_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_RD_ZSTD=y +CONFIG_BOOT_CONFIG=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_SYSCTL=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_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_IO_URING=y +CONFIG_ADVISE_SYSCALLS=y +CONFIG_HAVE_ARCH_USERFAULTFD_WP=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_ARCH_WANT_DEFAULT_BPF_JIT=y +# CONFIG_BPF_PRELOAD 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 +# end of Kernel Performance Events And Counters + +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_SHUFFLE_PAGE_ALLOCATOR=y +CONFIG_SLUB_CPU_PARTIAL=y +CONFIG_SYSTEM_DATA_VERIFICATION=y +CONFIG_PROFILING=y +CONFIG_TRACEPOINTS=y +# end of General setup + +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +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_ARCH_MAY_HAVE_PC_FDC=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_GENERAL_HUGETLB=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=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_X86_CPU_RESCTRL 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_XXL=y +# CONFIG_PARAVIRT_DEBUG is not set +CONFIG_PARAVIRT_SPINLOCKS=y +CONFIG_X86_HV_CALLBACK_VECTOR=y +CONFIG_XEN=y +CONFIG_XEN_PV=y +CONFIG_XEN_512GB=y +CONFIG_XEN_PV_SMP=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_PVHVM_SMP=y +CONFIG_XEN_PVHVM_GUEST=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_KVM_GUEST=y +CONFIG_ARCH_CPUIDLE_HALTPOLL=y +CONFIG_PVH=y +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_PARAVIRT_CLOCK=y +CONFIG_JAILHOUSE_GUEST=y +# CONFIG_ACRN_GUEST is not set +# 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_IA32_FEAT_CTL=y +CONFIG_X86_VMX_FEATURE_NAMES=y +CONFIG_PROCESSOR_SELECT=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_HYGON=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_ZHAOXIN=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=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 +# end of Performance monitoring + +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y +CONFIG_X86_VSYSCALL_EMULATION=y +CONFIG_X86_IOPL_IOPERM=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_X86_CPA_STATISTICS is not set +# CONFIG_AMD_MEM_ENCRYPT is not set +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=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_UMIP=y +CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y +CONFIG_X86_INTEL_TSX_MODE_OFF=y +# CONFIG_X86_INTEL_TSX_MODE_ON is not set +# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set +CONFIG_X86_SGX=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_EFI_MIXED=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_SIG is not set +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 is not set +# CONFIG_LEGACY_VSYSCALL_XONLY is not set +CONFIG_LEGACY_VSYSCALL_NONE=y +# CONFIG_CMDLINE_BOOL is not set +CONFIG_MODIFY_LDT_SYSCALL=y +CONFIG_HAVE_LIVEPATCH=y +CONFIG_LIVEPATCH=y +# end of Processor type and features + +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_HIBERNATION_SNAPSHOT_DEV=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_ENERGY_MODEL is not set +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_REV_OVERRIDE_POSSIBLE=y +CONFIG_ACPI_EC_DEBUGFS=m +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +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_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_NFIT_SECURITY_DEBUG is not set +CONFIG_ACPI_NUMA=y +CONFIG_ACPI_HMAT=y +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_ACPI_DPTF=y +CONFIG_DPTF_POWER=m +CONFIG_DPTF_PCH_FIVR=m +CONFIG_ACPI_WATCHDOG=y +CONFIG_ACPI_EXTLOG=m +CONFIG_ACPI_ADXL=y +CONFIG_ACPI_CONFIGFS=m +# CONFIG_PMIC_OPREGION is not set +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_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 +# end of CPU Frequency scaling + +# +# CPU Idle +# +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_IDLE_GOV_TEO=y +CONFIG_CPU_IDLE_GOV_HALTPOLL=y +CONFIG_HALTPOLL_CPUIDLE=m +# end of CPU Idle + +CONFIG_INTEL_IDLE=y +# end of Power management and ACPI options + +# +# Bus options (PCI etc.) +# +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_MMCONF_FAM10H=y +# CONFIG_PCI_CNB20LE_QUIRK is not set +# CONFIG_ISA_BUS is not set +CONFIG_ISA_DMA_API=y +CONFIG_AMD_NB=y +# CONFIG_X86_SYSFB is not set +# end of Bus options (PCI etc.) + +# +# Binary Emulations +# +CONFIG_IA32_EMULATION=y +CONFIG_X86_X32=y +CONFIG_COMPAT_32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +# end of Binary Emulations + +# +# Firmware Drivers +# +CONFIG_EDD=y +CONFIG_EDD_OFF=y +CONFIG_FIRMWARE_MEMMAP=y +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_SOFT_RESERVE=y +CONFIG_EFI_RUNTIME_WRAPPERS=y +CONFIG_EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER=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_EFI_RCI2_TABLE is not set +# CONFIG_EFI_DISABLE_PCI_DMA is not set +# end of EFI (Extensible Firmware Interface) Support + +CONFIG_UEFI_CPER=y +CONFIG_UEFI_CPER_X86=y +CONFIG_EFI_DEV_PATH_PARSER=y +CONFIG_EFI_EARLYCON=y +CONFIG_EFI_CUSTOM_SSDT_OVERLAYS=y + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + +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_HAVE_KVM_NO_POLL=y +CONFIG_KVM_XFER_TO_GUEST_WORK=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=m +CONFIG_KVM_WERROR=y +CONFIG_KVM_INTEL=m +CONFIG_KVM_AMD=m +CONFIG_KVM_AMD_SEV=y +# CONFIG_KVM_MMU_AUDIT is not set +CONFIG_AS_AVX512=y +CONFIG_AS_SHA1_NI=y +CONFIG_AS_SHA256_NI=y +CONFIG_AS_TPAUSE=y + +# +# General architecture-dependent options +# +CONFIG_CRASH_CORE=y +CONFIG_KEXEC_CORE=y +CONFIG_HOTPLUG_SMT=y +CONFIG_GENERIC_ENTRY=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_STATIC_CALL_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_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=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_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_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_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR=y +CONFIG_STACKPROTECTOR_STRONG=y +CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_CONTEXT_TRACKING_OFFSTACK=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_HAVE_ARCH_SOFT_DIRTY=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_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_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_HAVE_ARCH_PREL32_RELOCATIONS=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_HAVE_STATIC_CALL=y +CONFIG_HAVE_STATIC_CALL_INLINE=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# end of General architecture-dependent options + +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_ASM_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_COMPRESS=y +CONFIG_MODULE_COMPRESS_GZIP=y +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +CONFIG_UNUSED_SYMBOLS=y +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLK_RQ_ALLOC_TIME=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_BLK_CGROUP_RWSTAT=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +CONFIG_BLK_DEV_INTEGRITY=y +CONFIG_BLK_DEV_INTEGRITY_T10=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_CGROUP_IOCOST=y +CONFIG_BLK_WBT_MQ=y +CONFIG_BLK_DEBUG_FS=y +CONFIG_BLK_DEBUG_FS_ZONED=y +# CONFIG_BLK_SED_OPAL is not set +CONFIG_BLK_INLINE_ENCRYPTION=y +CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y + +# +# 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 +# end of Partition Types + +CONFIG_BLOCK_COMPAT=y +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_MQ_VIRTIO=y +CONFIG_BLK_MQ_RDMA=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_IOSCHED_BFQ=m +# CONFIG_BFQ_GROUP_IOSCHED is not set +# end of IO Schedulers + +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_NON_OVERLAPPING_ADDRESS_SPACE=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 +# end of Executable file formats + +# +# Memory Management options +# +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y +CONFIG_NUMA_KEEP_MEMINFO=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_PAGE_REPORTING=y +CONFIG_MIGRATION=y +CONFIG_CONTIG_ALLOC=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_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_ZSWAP_COMPRESSOR_DEFAULT_DEFLATE is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZO=y +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_842 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4 is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_LZ4HC is not set +# CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD is not set +CONFIG_ZSWAP_COMPRESSOR_DEFAULT="lzo" +CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y +# CONFIG_ZSWAP_ZPOOL_DEFAULT_Z3FOLD is not set +# CONFIG_ZSWAP_ZPOOL_DEFAULT_ZSMALLOC is not set +CONFIG_ZSWAP_ZPOOL_DEFAULT="zbud" +# CONFIG_ZSWAP_DEFAULT_ON is not set +CONFIG_ZPOOL=y +CONFIG_ZBUD=y +CONFIG_Z3FOLD=m +CONFIG_ZSMALLOC=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_PTE_DEVMAP=y +CONFIG_ZONE_DEVICE=y +CONFIG_DEV_PAGEMAP_OPS=y +CONFIG_HMM_MIRROR=y +# CONFIG_DEVICE_PRIVATE is not set +CONFIG_VMAP_PFN=y +CONFIG_FRAME_VECTOR=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y +CONFIG_ARCH_HAS_PKEYS=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_MAPPING_DIRTY_HELPERS=y +# end of Memory Management options + +CONFIG_NET=y +CONFIG_WANT_COMPAT_NETLINK_MESSAGES=y +CONFIG_COMPAT_NETLINK_MESSAGES=y +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_NET_REDIRECT=y +CONFIG_SKB_EXTENSIONS=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_SCM=y +CONFIG_UNIX_DIAG=m +CONFIG_TLS=m +# CONFIG_TLS_DEVICE is not set +# CONFIG_TLS_TOE is not set +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=m +CONFIG_XFRM_USER=m +CONFIG_XFRM_USER_COMPAT=m +CONFIG_XFRM_INTERFACE=m +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +CONFIG_XFRM_STATISTICS=y +CONFIG_XFRM_AH=m +CONFIG_XFRM_ESP=m +CONFIG_XFRM_IPCOMP=m +CONFIG_NET_KEY=m +# CONFIG_NET_KEY_MIGRATE is not set +# CONFIG_SMC is not set +CONFIG_XDP_SOCKETS=y +CONFIG_XDP_SOCKETS_DIAG=m +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_ESPINTCP is not set +CONFIG_INET_IPCOMP=m +CONFIG_INET_XFRM_TUNNEL=m +CONFIG_INET_TUNNEL=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_ESPINTCP is not set +CONFIG_INET6_IPCOMP=m +CONFIG_IPV6_MIP6=m +CONFIG_IPV6_ILA=m +CONFIG_INET6_XFRM_TUNNEL=m +CONFIG_INET6_TUNNEL=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_IPV6_RPL_LWTUNNEL is not set +CONFIG_NETLABEL=y +CONFIG_MPTCP=y +CONFIG_INET_MPTCP_DIAG=m +CONFIG_MPTCP_IPV6=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=y +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_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_NF_NAT_MASQUERADE=y +CONFIG_NETFILTER_SYNPROXY=m +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y +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_REJECT_INET=m +CONFIG_NFT_COMPAT=m +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NFT_XFRM=m +CONFIG_NFT_SOCKET=m +CONFIG_NFT_OSF=m +CONFIG_NFT_TPROXY=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m +CONFIG_NFT_FIB_NETDEV=m +CONFIG_NFT_REJECT_NETDEV=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_MASQUERADE=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 +# end of Core Netfilter Configuration + +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=y +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=y +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_SNMP_BASIC=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 +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TPROXY_IPV6=m +CONFIG_NF_TABLES_IPV6=y +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m +CONFIG_NF_FLOW_TABLE_IPV6=m +CONFIG_NF_DUP_IPV6=m +CONFIG_NF_REJECT_IPV6=m +CONFIG_NF_LOG_IPV6=m +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 +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=m + +# +# DECnet: Netfilter Configuration +# +CONFIG_DECNET_NF_GRABULATOR=m +# end of DECnet: Netfilter Configuration + +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m +CONFIG_NF_CONNTRACK_BRIDGE=m +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 +# end of DCCP CCIDs Configuration + +# +# DCCP Kernel Hacking +# +# CONFIG_IP_DCCP_DEBUG is not set +# end of DCCP Kernel Hacking + +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_CRYPTO=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_BRIDGE_MRP=y +CONFIG_BRIDGE_CFM=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_8021Q=m +CONFIG_NET_DSA_TAG_AR9331=m +CONFIG_NET_DSA_TAG_BRCM_COMMON=m +CONFIG_NET_DSA_TAG_BRCM=m +CONFIG_NET_DSA_TAG_BRCM_PREPEND=m +CONFIG_NET_DSA_TAG_HELLCREEK=m +CONFIG_NET_DSA_TAG_GSWIP=m +CONFIG_NET_DSA_TAG_DSA_COMMON=m +CONFIG_NET_DSA_TAG_DSA=m +CONFIG_NET_DSA_TAG_EDSA=m +CONFIG_NET_DSA_TAG_MTK=m +CONFIG_NET_DSA_TAG_KSZ=m +CONFIG_NET_DSA_TAG_RTL4_A=m +CONFIG_NET_DSA_TAG_OCELOT=m +CONFIG_NET_DSA_TAG_QCA=m +CONFIG_NET_DSA_TAG_LAN9303=m +CONFIG_NET_DSA_TAG_SJA1105=m +CONFIG_NET_DSA_TAG_TRAILER=m +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_TAPRIO=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_FQ_PIE=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=m +CONFIG_NET_SCH_ETS=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_MPLS=m +CONFIG_NET_ACT_VLAN=m +CONFIG_NET_ACT_BPF=m +CONFIG_NET_ACT_CONNMARK=m +CONFIG_NET_ACT_CTINFO=m +CONFIG_NET_ACT_SKBMOD=m +CONFIG_NET_ACT_IFE=m +CONFIG_NET_ACT_TUNNEL_KEY=m +CONFIG_NET_ACT_CT=m +CONFIG_NET_ACT_GATE=m +CONFIG_NET_IFE_SKBMARK=m +CONFIG_NET_IFE_SKBPRIO=m +CONFIG_NET_IFE_SKBTCINDEX=m +# CONFIG_NET_TC_SKB_EXT 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_DEBUG is not set +# CONFIG_BATMAN_ADV_TRACING 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_VSOCKETS_LOOPBACK=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_QRTR=m +CONFIG_QRTR_SMD=m +CONFIG_QRTR_TUN=m +CONFIG_QRTR_MHI=m +CONFIG_NET_NCSI=y +# CONFIG_NCSI_OEM_CMD_GET_MAC 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 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 +# end of Network testing +# end of Networking options + +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 +# end of AX.25 network device drivers + +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m +CONFIG_CAN_J1939=m +CONFIG_CAN_ISOTP=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_KVASER_PCIEFD=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_M_CAN_PCI=m +CONFIG_CAN_M_CAN_PLATFORM=m +CONFIG_CAN_M_CAN_TCAN4X5X=m +CONFIG_CAN_PEAK_PCIEFD=m +CONFIG_CAN_SJA1000=m +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_EMS_PCMCIA=m +CONFIG_CAN_F81601=m +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_SJA1000_ISA=m +CONFIG_CAN_SJA1000_PLATFORM=m +CONFIG_CAN_SOFTING=m +CONFIG_CAN_SOFTING_CS=m + +# +# CAN SPI interfaces +# +CONFIG_CAN_HI311X=m +CONFIG_CAN_MCP251X=m +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set +# end of CAN SPI interfaces + +# +# 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 +# end of CAN USB interfaces + +# CONFIG_CAN_DEBUG_DEVICES is not set +# end of CAN Device Drivers + +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_MSFTEXT=y +CONFIG_BT_DEBUGFS=y +# CONFIG_BT_SELFTEST is not set + +# +# 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_MTK=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_MTKSDIO=m +CONFIG_BT_MTKUART=m +CONFIG_BT_HCIRSI=m +# end of Bluetooth device drivers + +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=y +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_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_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_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_PN533=m +CONFIG_NFC_PN533_USB=m +CONFIG_NFC_PN533_I2C=m +CONFIG_NFC_PN532_UART=m +CONFIG_NFC_MICROREAD=m +CONFIG_NFC_MICROREAD_I2C=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_S3FWRN82_UART=m +CONFIG_NFC_ST95HF=m +# end of Near Field Communication (NFC) devices + +CONFIG_PSAMPLE=m +CONFIG_NET_IFE=m +CONFIG_LWTUNNEL=y +CONFIG_LWTUNNEL_BPF=y +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_SOCK_MSG=y +CONFIG_NET_DEVLINK=y +CONFIG_PAGE_POOL=y +CONFIG_FAILOVER=y +CONFIG_ETHTOOL_NETLINK=y +CONFIG_HAVE_EBPF_JIT=y + +# +# Device Drivers +# +CONFIG_HAVE_EISA=y +# CONFIG_EISA is not set +CONFIG_HAVE_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +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_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_PCIE_BW is not set +# CONFIG_PCIE_EDR is not set +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_P2PDMA is not set +CONFIG_PCI_LABEL=y +CONFIG_PCI_HYPERV=m +# CONFIG_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +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 +# +# CONFIG_VMD is not set +CONFIG_PCI_HYPERV_INTERFACE=m + +# +# DesignWare PCI Core Support +# +# CONFIG_PCIE_DW_PLAT_HOST is not set +# CONFIG_PCI_MESON is not set +# end of DesignWare PCI Core Support + +# +# Mobiveil PCIe Core Support +# +# end of Mobiveil PCIe Core Support + +# +# Cadence PCIe controllers support +# +# end of Cadence PCIe controllers support +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +CONFIG_PCI_SW_SWITCHTEC=m +# end of PCI switch controller drivers + +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 +# end of RapidIO Switch drivers + +# +# Generic Driver Options +# +CONFIG_AUXILIARY_BUS=y +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_FW_LOADER_PAGED_BUF=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_FW_LOADER_COMPRESS=y +CONFIG_FW_CACHE=y +# end of Firmware loader + +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_HMEM_REPORTING=y +# 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_REGMAP_SOUNDWIRE=m +CONFIG_REGMAP_SCCB=m +CONFIG_REGMAP_I3C=m +CONFIG_REGMAP_SPI_AVMM=m +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +# end of Generic Driver Options + +# +# Bus devices +# +CONFIG_MHI_BUS=m +# CONFIG_MHI_BUS_DEBUG is not set +CONFIG_MHI_BUS_PCI_GENERIC=m +# end of Bus devices + +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_GNSS=m +CONFIG_GNSS_SERIAL=m +CONFIG_GNSS_MTK_SERIAL=m +CONFIG_GNSS_SIRF_SERIAL=m +CONFIG_GNSS_UBX_SERIAL=m +CONFIG_MTD=m +# CONFIG_MTD_TESTS is not set + +# +# Partition parsers +# +CONFIG_MTD_AR7_PARTS=m +CONFIG_MTD_CMDLINE_PARTS=m +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 +# end of 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_PSTORE=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 +# end of RAM/ROM/Flash chip drivers + +# +# Mapping drivers for chip access +# +CONFIG_MTD_COMPLEX_MAPPINGS=y +CONFIG_MTD_PHYSMAP=m +# CONFIG_MTD_PHYSMAP_COMPAT is not set +CONFIG_MTD_PHYSMAP_GPIO_ADDR=y +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_INTEL_VR_NOR=m +CONFIG_MTD_PLATRAM=m +# end of Mapping drivers for chip access + +# +# 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_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 +# end of Self-contained MTD device drivers + +# +# NAND +# +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_RAW_NAND=m + +# +# Raw/parallel NAND flash controllers +# +CONFIG_MTD_NAND_DENALI=m +CONFIG_MTD_NAND_DENALI_PCI=m +CONFIG_MTD_NAND_CAFE=m +CONFIG_MTD_NAND_MXIC=m +CONFIG_MTD_NAND_GPIO=m +CONFIG_MTD_NAND_PLATFORM=m +CONFIG_MTD_NAND_ARASAN=m + +# +# Misc +# +CONFIG_MTD_SM_COMMON=m +CONFIG_MTD_NAND_NANDSIM=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_SPI_NAND=m + +# +# ECC engine support +# +CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y +# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# end of ECC engine support +# end of NAND + +# +# LPDDR & LPDDR2 PCM memory drivers +# +CONFIG_MTD_LPDDR=m +CONFIG_MTD_QINFO_PROBE=m +# end of LPDDR & LPDDR2 PCM memory drivers + +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set +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_MTD_HYPERBUS=m +# 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_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set +# CONFIG_ZRAM_DEF_COMP_LZO is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_842 is not set +CONFIG_ZRAM_DEF_COMP="lzo-rle" +# CONFIG_ZRAM_WRITEBACK is not set +# CONFIG_ZRAM_MEMORY_TRACKING is not set +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_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m +CONFIG_BLK_DEV_RNBD=y +CONFIG_BLK_DEV_RNBD_CLIENT=m +CONFIG_BLK_DEV_RNBD_SERVER=m + +# +# NVME Support +# +CONFIG_NVME_CORE=y +CONFIG_BLK_DEV_NVME=y +# CONFIG_NVME_MULTIPATH is not set +CONFIG_NVME_HWMON=y +CONFIG_NVME_FABRICS=m +CONFIG_NVME_RDMA=m +CONFIG_NVME_FC=m +CONFIG_NVME_TCP=m +CONFIG_NVME_TARGET=m +# CONFIG_NVME_TARGET_PASSTHRU is not set +CONFIG_NVME_TARGET_LOOP=m +CONFIG_NVME_TARGET_RDMA=m +CONFIG_NVME_TARGET_FC=m +CONFIG_NVME_TARGET_FCLOOP=m +CONFIG_NVME_TARGET_TCP=m +# end of NVME Support + +# +# 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_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_LATTICE_ECP3_CONFIG=m +CONFIG_SRAM=y +# CONFIG_PCI_ENDPOINT_TEST is not set +CONFIG_XILINX_SDFEC=m +CONFIG_MISC_RTSX=m +CONFIG_PVPANIC=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_EEPROM_EE1004=m +# end of EEPROM support + +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 +# end of Texas Instruments shared transport line discipline + +CONFIG_SENSORS_LIS3_I2C=m +CONFIG_ALTERA_STAPL=m +# CONFIG_INTEL_MEI is not set +# CONFIG_INTEL_MEI_ME is not set +# CONFIG_INTEL_MEI_TXE is not set +# CONFIG_INTEL_MEI_HDCP is not set +CONFIG_VMWARE_VMCI=m +CONFIG_GENWQE=m +CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0 +CONFIG_ECHO=m +CONFIG_MISC_ALCOR_PCI=m +CONFIG_MISC_RTSX_PCI=m +CONFIG_MISC_RTSX_USB=m +CONFIG_HABANA_AI=m +CONFIG_UACCE=m +# end of Misc devices + +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_PROC_FS=y + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +CONFIG_CHR_DEV_ST=m +CONFIG_BLK_DEV_SR=y +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 +# end of SCSI Transports + +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_CDNS_PLATFORM=m +# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set +# CONFIG_SCSI_UFS_BSG is not set +CONFIG_SCSI_UFS_CRYPTO=y +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_SCSI_FLASHPOINT=y +CONFIG_SCSI_MYRB=m +CONFIG_SCSI_MYRS=m +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_FDOMAIN=m +CONFIG_SCSI_FDOMAIN_PCI=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_FDOMAIN=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 +# end of SCSI device support + +CONFIG_ATA=y +CONFIG_SATA_HOST=y +CONFIG_PATA_TIMINGS=y +CONFIG_ATA_VERBOSE_ERROR=y +CONFIG_ATA_FORCE=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_BCACHE_ASYNC_REGISTRATION is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# 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_EBS is not set +CONFIG_DM_ERA=m +CONFIG_DM_CLONE=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_MULTIPATH_HST=m +CONFIG_DM_MULTIPATH_IOA=m +CONFIG_DM_DELAY=m +CONFIG_DM_DUST=m +# CONFIG_DM_INIT is not set +CONFIG_DM_UEVENT=y +CONFIG_DM_FLAKEY=m +CONFIG_DM_VERITY=m +CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y +# 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 +# end of IEEE 1394 (FireWire) support + +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_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set +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_L3S=y +CONFIG_IPVLAN=m +CONFIG_IPVTAP=m +CONFIG_VXLAN=m +CONFIG_GENEVE=m +CONFIG_BAREUDP=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_MHI_NET=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 +CONFIG_CAIF_DRIVERS=y +CONFIG_CAIF_TTY=m +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_B53_SERDES=m +CONFIG_NET_DSA_BCM_SF2=m +# CONFIG_NET_DSA_LOOP is not set +CONFIG_NET_DSA_HIRSCHMANN_HELLCREEK=m +CONFIG_NET_DSA_LANTIQ_GSWIP=m +CONFIG_NET_DSA_MT7530=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m +CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m +CONFIG_NET_DSA_MICROCHIP_KSZ8795=m +CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y +# CONFIG_NET_DSA_MV88E6XXX_PTP is not set +CONFIG_NET_DSA_MSCC_SEVILLE=m +CONFIG_NET_DSA_AR9331=m +CONFIG_NET_DSA_SJA1105=m +CONFIG_NET_DSA_SJA1105_PTP=y +# CONFIG_NET_DSA_SJA1105_TAS 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_NET_DSA_VITESSE_VSC73XX=m +CONFIG_NET_DSA_VITESSE_VSC73XX_SPI=m +CONFIG_NET_DSA_VITESSE_VSC73XX_PLATFORM=m +# end of Distributed Switch Architecture drivers + +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_CHELSIO_INLINE_CRYPTO=y +# CONFIG_CHELSIO_IPSEC_INLINE is not set +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_GOOGLE=y +CONFIG_GVE=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_IXGBE_IPSEC=y +CONFIG_IXGBEVF=m +CONFIG_IXGBEVF_IPSEC=y +CONFIG_I40E=m +CONFIG_I40E_DCB=y +CONFIG_IAVF=m +CONFIG_I40EVF=m +CONFIG_ICE=m +CONFIG_FM10K=m +CONFIG_IGC=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_PRESTERA=m +CONFIG_PRESTERA_PCI=m +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_ACCEL=y +# 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_CLS_ACT=y +CONFIG_MLX5_CORE_EN_DCB=y +# CONFIG_MLX5_CORE_IPOIB is not set +CONFIG_MLX5_IPSEC=y +CONFIG_MLX5_EN_IPSEC=y +CONFIG_MLX5_SW_STEERING=y +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_LIB=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_NI_XGE_MANAGEMENT_ENET=m +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_PENSANDO=y +CONFIG_IONIC=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_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_SELFTESTS is not set +CONFIG_STMMAC_PLATFORM=m +CONFIG_DWMAC_GENERIC=m +CONFIG_DWMAC_INTEL=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_PHY_SEL is not set +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_XILINX=y +CONFIG_XILINX_AXI_EMAC=m +CONFIG_XILINX_LL_TEMAC=m +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_PHYLINK=m +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set +CONFIG_FIXED_PHY=y +CONFIG_SFP=m + +# +# MII PHY device drivers +# +CONFIG_AMD_PHY=m +CONFIG_ADIN_PHY=m +CONFIG_AQUANTIA_PHY=m +CONFIG_AX88796B_PHY=m +CONFIG_BROADCOM_PHY=m +CONFIG_BCM54140_PHY=m +CONFIG_BCM7XXX_PHY=m +CONFIG_BCM84881_PHY=m +CONFIG_BCM87XX_PHY=m +CONFIG_BCM_NET_PHYLIB=m +CONFIG_CICADA_PHY=m +CONFIG_CORTINA_PHY=m +CONFIG_DAVICOM_PHY=m +CONFIG_ICPLUS_PHY=m +CONFIG_LXT_PHY=m +CONFIG_INTEL_XWAY_PHY=m +CONFIG_LSI_ET1011C_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_NXP_TJA11XX_PHY=m +CONFIG_AT803X_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_DP83822_PHY=m +CONFIG_DP83TC811_PHY=m +CONFIG_DP83848_PHY=m +CONFIG_DP83867_PHY=m +CONFIG_DP83869_PHY=m +CONFIG_VITESSE_PHY=m +CONFIG_XILINX_GMII2RGMII=m +CONFIG_MICREL_KS8995MA=m +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVRES=y +CONFIG_MDIO_BITBANG=m +CONFIG_MDIO_BCM_UNIMAC=m +CONFIG_MDIO_CAVIUM=m +CONFIG_MDIO_GPIO=m +CONFIG_MDIO_I2C=m +CONFIG_MDIO_MVUSB=m +CONFIG_MDIO_MSCC_MIIM=m +CONFIG_MDIO_THUNDER=m + +# +# MDIO Multiplexers +# + +# +# PCS device drivers +# +CONFIG_PCS_XPCS=m +CONFIG_PCS_LYNX=m +# end of PCS device drivers + +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_USB_NET_AQC111=m +CONFIG_USB_RTL8153_ECM=m +CONFIG_WLAN=y +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_PCI_NO_EEPROM=m +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_ATH11K=m +CONFIG_ATH11K_PCI=m +# CONFIG_ATH11K_DEBUG is not set +# CONFIG_ATH11K_DEBUGFS is not set +# CONFIG_ATH11K_TRACING 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 +# end of iwl3945 / iwl4965 Debugging Options + +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 + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUGFS=y +CONFIG_IWLWIFI_DEVICE_TRACING=y +# end of Debugging Options + +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_MT76x0U is not set +# CONFIG_MT76x0E is not set +# CONFIG_MT76x2E is not set +# CONFIG_MT76x2U is not set +# CONFIG_MT7603E is not set +# CONFIG_MT7615E is not set +# CONFIG_MT7663U is not set +# CONFIG_MT7663S is not set +# CONFIG_MT7915E is not set +CONFIG_WLAN_VENDOR_MICROCHIP=y +CONFIG_WILC1000=m +CONFIG_WILC1000_SDIO=m +CONFIG_WILC1000_SPI=m +# CONFIG_WILC1000_HW_OOB_INTR 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=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_RTW88=m +CONFIG_RTW88_CORE=m +CONFIG_RTW88_PCI=m +CONFIG_RTW88_8822B=m +CONFIG_RTW88_8822C=m +CONFIG_RTW88_8723D=m +CONFIG_RTW88_8821C=m +CONFIG_RTW88_8822BE=m +CONFIG_RTW88_8822CE=m +CONFIG_RTW88_8723DE=m +CONFIG_RTW88_8821CE=m +# CONFIG_RTW88_DEBUG is not set +# CONFIG_RTW88_DEBUGFS is not set +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_PCIE=m +CONFIG_PCMCIA_RAYCS=m +CONFIG_PCMCIA_WL3501=m +CONFIG_MAC80211_HWSIM=m +CONFIG_USB_NET_RNDIS_WLAN=m +CONFIG_VIRT_WIFI=m +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_LAPBETHER=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_USB4_NET=m +CONFIG_HYPERV_NET=m +CONFIG_NETDEVSIM=m +CONFIG_NET_FAILOVER=y +CONFIG_ISDN=y +CONFIG_ISDN_CAPI=y +CONFIG_CAPI_TRACE=y +CONFIG_ISDN_CAPI_MIDDLEWARE=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_HDLC=m +CONFIG_MISDN_IPAC=m +CONFIG_MISDN_ISAR=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_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_APPLESPI=m +CONFIG_KEYBOARD_ATKBD=y +CONFIG_KEYBOARD_QT1050=m +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_IQS62X=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_ADC=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=m +CONFIG_JOYSTICK_IFORCE_232=m +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_JOYSTICK_FSIA6B=m +CONFIG_INPUT_TABLET=y +CONFIG_TABLET_USB_ACECAD=m +CONFIG_TABLET_USB_AIPTEK=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_CY8CTMA140=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_TOUCHSCREEN_IQS5XX=m +CONFIG_TOUCHSCREEN_ZINITIX=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_GPIO_BEEPER=m +CONFIG_INPUT_GPIO_DECODER=m +CONFIG_INPUT_GPIO_VIBRA=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +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_DA7280_HAPTICS=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_IQS269A=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_F3A=y +# 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 +# end of Hardware I/O ports +# end of Input device support + +# +# 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_LDISC_AUTOLOAD=y + +# +# 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_16550A_VARIANTS is not set +# 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_DWLIB=y +CONFIG_SERIAL_8250_DW=m +CONFIG_SERIAL_8250_RT288X=y +CONFIG_SERIAL_8250_LPSS=m +CONFIG_SERIAL_8250_MID=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_LANTIQ=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_BCM63XX is not set +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_FSL_LINFLEXUART=m +CONFIG_SERIAL_MEN_Z135=m +# CONFIG_SERIAL_SPRD is not set +# end of Serial drivers + +CONFIG_SERIAL_MCTRL_GPIO=y +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_GT=m +CONFIG_ISI=m +CONFIG_N_HDLC=m +CONFIG_N_GSM=m +CONFIG_NOZOMI=m +CONFIG_NULL_TTY=m +CONFIG_TRACE_ROUTER=m +CONFIG_TRACE_SINK=m +CONFIG_HVC_DRIVER=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y +CONFIG_TTY_PRINTK=y +CONFIG_TTY_PRINTK_LEVEL=6 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_VIRTIO_CONSOLE=m +CONFIG_IPMI_HANDLER=m +CONFIG_IPMI_DMI_DECODE=y +CONFIG_IPMI_PLAT_DATA=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_IPMB_DEVICE_INTERFACE=m +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TIMERIOMEM=m +CONFIG_HW_RANDOM_INTEL=m +CONFIG_HW_RANDOM_AMD=m +CONFIG_HW_RANDOM_BA431=m +CONFIG_HW_RANDOM_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_XIPHERA=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 +# end of PCMCIA character devices + +CONFIG_MWAVE=m +CONFIG_DEVMEM=y +# CONFIG_DEVKMEM is not set +CONFIG_NVRAM=m +CONFIG_RAW_DRIVER=m +CONFIG_MAX_RAW_DEVS=256 +CONFIG_DEVPORT=y +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_SPI_CR50 is not set +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_XILLYBUS=m +CONFIG_XILLYBUS_PCIE=m +# end of Character devices + +# CONFIG_RANDOM_TRUST_CPU is not set +# CONFIG_RANDOM_TRUST_BOOTLOADER 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 +# end of Multiplexer I2C Chip support + +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_AMD_MP2=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_NVIDIA_GPU=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_SLAVE is not set +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_I2C_DESIGNWARE_BAYTRAIL=y +CONFIG_I2C_DESIGNWARE_PCI=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_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 +# end of I2C Hardware Bus support + +CONFIG_I2C_STUB=m +CONFIG_I2C_SLAVE=y +CONFIG_I2C_SLAVE_EEPROM=m +# CONFIG_I2C_SLAVE_TESTUNIT is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +CONFIG_I3C=m +CONFIG_CDNS_I3C_MASTER=m +CONFIG_DW_I3C_MASTER=m +# CONFIG_MIPI_I3C_HCI 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_DMA is not set +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MMIO=m +CONFIG_SPI_DLN2=m +CONFIG_SPI_NXP_FLEXSPI=m +CONFIG_SPI_GPIO=m +CONFIG_SPI_LM70_LLP=m +CONFIG_SPI_LANTIQ_SSC=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_SIFIVE=m +CONFIG_SPI_MXIC=m +CONFIG_SPI_XCOMM=m +# CONFIG_SPI_XILINX is not set +CONFIG_SPI_ZYNQMP_GQSPI=m +CONFIG_SPI_AMD=m + +# +# SPI Multiplexer support +# +CONFIG_SPI_MUX=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_SPI_DYNAMIC=y +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_PTP_1588_CLOCK_IDT82P33=m +CONFIG_PTP_1588_CLOCK_IDTCM=m +# CONFIG_PTP_1588_CLOCK_VMW is not set +CONFIG_PTP_1588_CLOCK_OCP=m +# end of PTP clock support + +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_DA9062 is not set +CONFIG_PINCTRL_MCP23S08_I2C=m +CONFIG_PINCTRL_MCP23S08_SPI=m +CONFIG_PINCTRL_MCP23S08=m +CONFIG_PINCTRL_SX150X=y +CONFIG_PINCTRL_BAYTRAIL=y +CONFIG_PINCTRL_CHERRYVIEW=m +CONFIG_PINCTRL_LYNXPOINT=m +CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_ALDERLAKE=m +CONFIG_PINCTRL_BROXTON=m +CONFIG_PINCTRL_CANNONLAKE=m +CONFIG_PINCTRL_CEDARFORK=m +CONFIG_PINCTRL_DENVERTON=m +CONFIG_PINCTRL_ELKHARTLAKE=m +CONFIG_PINCTRL_EMMITSBURG=m +CONFIG_PINCTRL_GEMINILAKE=m +CONFIG_PINCTRL_ICELAKE=m +CONFIG_PINCTRL_JASPERLAKE=m +CONFIG_PINCTRL_LAKEFIELD=m +CONFIG_PINCTRL_LEWISBURG=m +CONFIG_PINCTRL_SUNRISEPOINT=m +CONFIG_PINCTRL_TIGERLAKE=m + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +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_CDEV=y +CONFIG_GPIO_CDEV_V1=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_MB86S7X=m +CONFIG_GPIO_MENZ127=m +CONFIG_GPIO_VX855=m +CONFIG_GPIO_XILINX=m +CONFIG_GPIO_AMD_FCH=m +# end of Memory mapped GPIO drivers + +# +# 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 +# end of Port-mapped I/O GPIO drivers + +# +# I2C GPIO expanders +# +CONFIG_GPIO_ADP5588=m +CONFIG_GPIO_MAX7300=m +CONFIG_GPIO_MAX732X=m +CONFIG_GPIO_PCA953X=m +CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_PCA9570=m +CONFIG_GPIO_PCF857X=m +CONFIG_GPIO_TPIC2810=m +# end of I2C GPIO expanders + +# +# 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_MSIC=y +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_TQMX86=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 +# end of MFD GPIO expanders + +# +# 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 +# end of PCI GPIO expanders + +# +# SPI GPIO expanders +# +CONFIG_GPIO_MAX3191X=m +CONFIG_GPIO_MAX7301=m +CONFIG_GPIO_MC33880=m +CONFIG_GPIO_PISOSR=m +CONFIG_GPIO_XRA1403=m +# end of SPI GPIO expanders + +# +# USB GPIO expanders +# +CONFIG_GPIO_VIPERBOARD=m +# end of USB GPIO expanders + +# +# Virtual GPIO drivers +# +CONFIG_GPIO_AGGREGATOR=m +# CONFIG_GPIO_MOCKUP is not set +# end of Virtual GPIO drivers + +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 +CONFIG_W1_MASTER_SGI=m +# end of 1-wire Bus Masters + +# +# 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_DS2430=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_DS250X=m +CONFIG_W1_SLAVE_DS2780=m +CONFIG_W1_SLAVE_DS2781=m +CONFIG_W1_SLAVE_DS28E04=m +CONFIG_W1_SLAVE_DS28E17=m +# end of 1-wire Slaves + +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_MT6323 is not set +CONFIG_POWER_RESET_RESTART=y +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_POWER_SUPPLY_HWMON=y +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_CW2015=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_LT3651=m +CONFIG_CHARGER_MAX14577=m +CONFIG_CHARGER_MAX77693=m +CONFIG_CHARGER_MAX8997=m +CONFIG_CHARGER_MAX8998=m +CONFIG_CHARGER_MP2629=m +CONFIG_CHARGER_BQ2415X=m +CONFIG_CHARGER_BQ24190=m +CONFIG_CHARGER_BQ24257=m +CONFIG_CHARGER_BQ24735=m +CONFIG_CHARGER_BQ2515X=m +CONFIG_CHARGER_BQ25890=m +CONFIG_CHARGER_BQ25980=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_CHARGER_BD99954=m +CONFIG_CHARGER_WILCO=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_ADM1177=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_AS370=m +CONFIG_SENSORS_ASC7621=m +CONFIG_SENSORS_AXI_FAN_CONTROL=m +CONFIG_SENSORS_K8TEMP=m +CONFIG_SENSORS_K10TEMP=m +CONFIG_SENSORS_FAM15H_POWER=m +CONFIG_SENSORS_AMD_ENERGY=m +CONFIG_SENSORS_APPLESMC=m +CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ASPEED=m +CONFIG_SENSORS_ATXP1=m +CONFIG_SENSORS_CORSAIR_CPRO=m +CONFIG_SENSORS_CORSAIR_PSU=m +CONFIG_SENSORS_DRIVETEMP=y +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_LTC2947=m +CONFIG_SENSORS_LTC2947_I2C=m +CONFIG_SENSORS_LTC2947_SPI=m +CONFIG_SENSORS_LTC2990=m +CONFIG_SENSORS_LTC2992=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_MAX127=m +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX31722=m +CONFIG_SENSORS_MAX31730=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_MR75203=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_ADM1266=m +CONFIG_SENSORS_ADM1275=m +CONFIG_SENSORS_BEL_PFE=m +CONFIG_SENSORS_IBM_CFFPS=m +CONFIG_SENSORS_INSPUR_IPSPS=m +CONFIG_SENSORS_IR35221=m +CONFIG_SENSORS_IR38064=m +CONFIG_SENSORS_IRPS5401=m +CONFIG_SENSORS_ISL68137=m +CONFIG_SENSORS_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_LTC2978_REGULATOR=y +CONFIG_SENSORS_LTC3815=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX16601=m +CONFIG_SENSORS_MAX20730=m +CONFIG_SENSORS_MAX20751=m +CONFIG_SENSORS_MAX31785=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_MP2975=m +CONFIG_SENSORS_PM6764TR=m +CONFIG_SENSORS_PXE1610=m +CONFIG_SENSORS_Q54SJ108A2=m +CONFIG_SENSORS_TPS40422=m +CONFIG_SENSORS_TPS53679=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_XDPE122=m +CONFIG_SENSORS_ZL6100=m +CONFIG_SENSORS_SBTSI=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_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_TMP513=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 +CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m + +# +# ACPI drivers +# +CONFIG_SENSORS_ACPI_POWER=m +CONFIG_SENSORS_ATK0110=m +CONFIG_THERMAL=y +CONFIG_THERMAL_NETLINK=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_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +CONFIG_THERMAL_GOV_BANG_BANG=y +CONFIG_THERMAL_GOV_USER_SPACE=y +CONFIG_DEVFREQ_THERMAL=y +CONFIG_THERMAL_EMULATION=y + +# +# Intel thermal drivers +# +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_PROC_THERMAL_MMIO_RAPL=m +# end of ACPI INT340X thermal drivers + +CONFIG_INTEL_BXT_PMIC_THERMAL=m +CONFIG_INTEL_PCH_THERMAL=m +# end of Intel thermal drivers + +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_OPEN_TIMEOUT=0 +CONFIG_WATCHDOG_SYSFS=y + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set + +# +# 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_HPWDT_NMI_DECODING=y +CONFIG_KEMPLD_WDT=m +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_TQMX86_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_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 +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_DEV=m +CONFIG_MFD_MADERA=m +CONFIG_MFD_MADERA_I2C=m +CONFIG_MFD_MADERA_SPI=m +# CONFIG_MFD_CS47L15 is not set +# CONFIG_MFD_CS47L35 is not set +# CONFIG_MFD_CS47L85 is not set +# CONFIG_MFD_CS47L90 is not set +# CONFIG_MFD_CS47L92 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_MFD_MP2629=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_INTEL_SOC_PMIC_MRFLD=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_INTEL_PMC_BXT=m +CONFIG_MFD_INTEL_PMT=m +CONFIG_MFD_IQS62X=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_MT6360=m +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_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_TQMX86=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_MFD_INTEL_M10_BMC=m +# end of Multifunction device drivers + +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_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_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_MAX77826=m +CONFIG_REGULATOR_MC13XXX_CORE=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_REGULATOR_MP8859=m +CONFIG_REGULATOR_MT6311=m +CONFIG_REGULATOR_MT6323=m +CONFIG_REGULATOR_MT6358=m +CONFIG_REGULATOR_MT6360=m +CONFIG_REGULATOR_MT6397=m +CONFIG_REGULATOR_PALMAS=m +CONFIG_REGULATOR_PCA9450=m +CONFIG_REGULATOR_PCAP=m +CONFIG_REGULATOR_PCF50633=m +CONFIG_REGULATOR_PV88060=m +CONFIG_REGULATOR_PV88080=m +CONFIG_REGULATOR_PV88090=m +CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_QCOM_SPMI=m +CONFIG_REGULATOR_QCOM_USB_VBUS=m +CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m +CONFIG_REGULATOR_RC5T583=m +CONFIG_REGULATOR_RT4801=m +CONFIG_REGULATOR_RT5033=m +CONFIG_REGULATOR_RTMV20=m +CONFIG_REGULATOR_S2MPA01=m +CONFIG_REGULATOR_S2MPS11=m +CONFIG_REGULATOR_S5M8767=m +CONFIG_REGULATOR_SKY81452=m +CONFIG_REGULATOR_SLG51000=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_REGULATOR_QCOM_LABIBB=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_IR_RCMM_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_RC_XBOX_DVD=m +CONFIG_IR_TOY=m +CONFIG_CEC_CORE=m +CONFIG_CEC_NOTIFIER=y +# CONFIG_MEDIA_CEC_RC is not set +CONFIG_MEDIA_CEC_SUPPORT=y +CONFIG_CEC_CH7322=m +CONFIG_CEC_CROS_EC=m +CONFIG_CEC_SECO=m +CONFIG_CEC_SECO_RC=y +CONFIG_USB_PULSE8_CEC=m +CONFIG_USB_RAINSHADOW_CEC=m +CONFIG_MEDIA_SUPPORT=m +# CONFIG_MEDIA_SUPPORT_FILTER is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y + +# +# Media device types +# +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_PLATFORM_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +# end of Media device types + +# +# Media core support +# +CONFIG_VIDEO_DEV=m +CONFIG_MEDIA_CONTROLLER=y +CONFIG_DVB_CORE=m +# end of Media core support + +# +# Video4Linux options +# +CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_V4L2_I2C=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES 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 +# end of Video4Linux options + +# +# Media controller options +# +CONFIG_MEDIA_CONTROLLER_DVB=y +CONFIG_MEDIA_CONTROLLER_REQUEST_API=y + +# +# Please notice that the enabled Media controller Request API is EXPERIMENTAL +# +# end of Media controller options + +# +# Digital TV options +# +# CONFIG_DVB_MMAP is not set +CONFIG_DVB_NET=y +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 +# end of Digital TV options + +# +# Media drivers +# +CONFIG_TTPCI_EEPROM=m +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_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_CXUSB_ANALOG=y +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 +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_FB_IVTV_FORCE_PAT is not set +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_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 +CONFIG_RADIO_WL128X=m +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 +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_VIDEO_ASPEED=m +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_DVB_PLATFORM_DRIVERS=y +CONFIG_SDR_PLATFORM_DRIVERS=y + +# +# MMC/SDIO DVB adapters +# +CONFIG_SMS_SDIO_DRV=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_TEST_DRIVERS is not set + +# +# FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y + +# +# IR I2C driver auto-selected by 'Autoselect ancillary drivers' +# +CONFIG_VIDEO_IR_I2C=m + +# +# Audio decoders, processors and mixers +# +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA1997X=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_TLV320AIC23B=m +CONFIG_VIDEO_UDA1342=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_SONY_BTF_MPX=m +# end of Audio decoders, processors and mixers + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m +# end of RDS decoders + +# +# Video decoders +# +CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_ADV7183=m +CONFIG_VIDEO_ADV7604=m +CONFIG_VIDEO_ADV7604_CEC=y +CONFIG_VIDEO_ADV7842=m +CONFIG_VIDEO_ADV7842_CEC=y +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_BT866=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_ML86V7667=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TC358743=m +CONFIG_VIDEO_TC358743_CEC=y +CONFIG_VIDEO_TVP514X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_TVP7002=m +CONFIG_VIDEO_TW2804=m +CONFIG_VIDEO_TW9903=m +CONFIG_VIDEO_TW9906=m +CONFIG_VIDEO_TW9910=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m +# end of Video decoders + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_ADV7343=m +CONFIG_VIDEO_ADV7393=m +CONFIG_VIDEO_ADV7511=m +CONFIG_VIDEO_ADV7511_CEC=y +CONFIG_VIDEO_AD9389B=m +CONFIG_VIDEO_AK881X=m +CONFIG_VIDEO_THS8200=m +# end of Video encoders + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +# end of Video improvement chips + +# +# Audio/Video compression chips +# +CONFIG_VIDEO_SAA6752HS=m +# end of Audio/Video compression chips + +# +# SDR tuner chips +# +CONFIG_SDR_MAX2175=m +# end of SDR tuner chips + +# +# Miscellaneous helper chips +# +CONFIG_VIDEO_THS7303=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_I2C=m +CONFIG_VIDEO_ST_MIPID02=m +# end of Miscellaneous helper chips + +# +# Camera sensor devices +# +CONFIG_VIDEO_APTINA_PLL=m +CONFIG_VIDEO_CCS_PLL=m +CONFIG_VIDEO_HI556=m +CONFIG_VIDEO_IMX214=m +CONFIG_VIDEO_IMX219=m +CONFIG_VIDEO_IMX258=m +CONFIG_VIDEO_IMX274=m +CONFIG_VIDEO_IMX290=m +CONFIG_VIDEO_IMX319=m +CONFIG_VIDEO_IMX355=m +CONFIG_VIDEO_OV02A10=m +CONFIG_VIDEO_OV2640=m +CONFIG_VIDEO_OV2659=m +CONFIG_VIDEO_OV2680=m +CONFIG_VIDEO_OV2685=m +CONFIG_VIDEO_OV2740=m +CONFIG_VIDEO_OV5647=m +CONFIG_VIDEO_OV6650=m +CONFIG_VIDEO_OV5670=m +CONFIG_VIDEO_OV5675=m +CONFIG_VIDEO_OV5695=m +CONFIG_VIDEO_OV7251=m +CONFIG_VIDEO_OV772X=m +CONFIG_VIDEO_OV7640=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_OV7740=m +CONFIG_VIDEO_OV8856=m +CONFIG_VIDEO_OV9640=m +CONFIG_VIDEO_OV9650=m +CONFIG_VIDEO_OV9734=m +CONFIG_VIDEO_OV13858=m +CONFIG_VIDEO_VS6624=m +CONFIG_VIDEO_MT9M001=m +CONFIG_VIDEO_MT9M032=m +CONFIG_VIDEO_MT9M111=m +CONFIG_VIDEO_MT9P031=m +CONFIG_VIDEO_MT9T001=m +CONFIG_VIDEO_MT9T112=m +CONFIG_VIDEO_MT9V011=m +CONFIG_VIDEO_MT9V032=m +CONFIG_VIDEO_MT9V111=m +CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_NOON010PC30=m +CONFIG_VIDEO_M5MOLS=m +CONFIG_VIDEO_RDACM20=m +CONFIG_VIDEO_RJ54N1=m +CONFIG_VIDEO_S5K6AA=m +CONFIG_VIDEO_S5K6A3=m +CONFIG_VIDEO_S5K4ECGX=m +CONFIG_VIDEO_S5K5BAF=m +CONFIG_VIDEO_CCS=m +CONFIG_VIDEO_ET8EK8=m +CONFIG_VIDEO_S5C73M3=m +# end of Camera sensor devices + +# +# Lens drivers +# +CONFIG_VIDEO_AD5820=m +CONFIG_VIDEO_AK7375=m +CONFIG_VIDEO_DW9714=m +CONFIG_VIDEO_DW9768=m +CONFIG_VIDEO_DW9807_VCM=m +# end of Lens drivers + +# +# Flash devices +# +CONFIG_VIDEO_ADP1653=m +CONFIG_VIDEO_LM3560=m +CONFIG_VIDEO_LM3646=m +# end of Flash devices + +# +# SPI helper chips +# +CONFIG_VIDEO_GS1662=m +# end of SPI helper chips + +# +# Media SPI Adapters +# +CONFIG_CXD2880_SPI_DRV=m +# end of Media SPI Adapters + +CONFIG_MEDIA_TUNER=m + +# +# Customize TV tuners +# +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 +# end of Customize TV tuners + +# +# Customise DVB Frontends +# + +# +# 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_S5H1432=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_DIB9000=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 +CONFIG_DVB_CXD2880=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 +CONFIG_DVB_MN88443X=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_LNBH29=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_LGS8GL5=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 +# end of Customise DVB Frontends + +# +# Tools to develop new frontends +# +CONFIG_DVB_DUMMY_FE=m +# end of Media ancillary drivers + +# +# 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_DBI=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_DEBUG_DP_MST_TOPOLOGY_REFS is not set +CONFIG_DRM_FBDEV_EMULATION=y +CONFIG_DRM_FBDEV_OVERALLOC=100 +# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +# CONFIG_DRM_DP_CEC is not set +CONFIG_DRM_TTM=m +CONFIG_DRM_VRAM_HELPER=m +CONFIG_DRM_TTM_HELPER=m +CONFIG_DRM_GEM_CMA_HELPER=y +CONFIG_DRM_KMS_CMA_HELPER=y +CONFIG_DRM_GEM_SHMEM_HELPER=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 +# end of I2C encoder or helper chips + +# +# ARM devices +# +# end of ARM devices + +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 +# end of ACP (Audio CoProcessor) Configuration + +# +# Display Engine Configuration +# +CONFIG_DRM_AMD_DC=y +CONFIG_DRM_AMD_DC_DCN=y +# CONFIG_DRM_AMD_DC_HDCP is not set +CONFIG_DRM_AMD_DC_SI=y +# CONFIG_DEBUG_KERNEL_DC is not set +# end of Display Engine Configuration + +# CONFIG_HSA_AMD is not set +CONFIG_DRM_NOUVEAU=m +# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +# CONFIG_NOUVEAU_DEBUG_MMU is not set +# CONFIG_NOUVEAU_DEBUG_PUSH is not set +CONFIG_DRM_NOUVEAU_BACKLIGHT=y +CONFIG_DRM_I915=m +CONFIG_DRM_I915_FORCE_PROBE="" +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_DEBUG_MMIO 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_I915_DEBUG_RUNTIME_PM is not set +# end of drm/i915 Debugging + +# +# drm/i915 Profile Guided Optimisation +# +CONFIG_DRM_I915_FENCE_TIMEOUT=10000 +CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250 +CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500 +CONFIG_DRM_I915_PREEMPT_TIMEOUT=640 +CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000 +CONFIG_DRM_I915_STOP_TIMEOUT=100 +CONFIG_DRM_I915_TIMESLICE_DURATION=1 +# end of drm/i915 Profile Guided Optimisation + +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_QXL=m +CONFIG_DRM_BOCHS=m +CONFIG_DRM_VIRTIO_GPU=m +CONFIG_DRM_PANEL=y + +# +# Display Panels +# +# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set +# end of Display Panels + +CONFIG_DRM_BRIDGE=y +CONFIG_DRM_PANEL_BRIDGE=y + +# +# Display Interface Bridges +# +CONFIG_DRM_ANALOGIX_ANX78XX=m +CONFIG_DRM_ANALOGIX_DP=m +# end of Display Interface Bridges + +# CONFIG_DRM_ETNAVIV is not set +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_DRM_GM12U320=m +CONFIG_TINYDRM_HX8357D=m +CONFIG_TINYDRM_ILI9225=m +CONFIG_TINYDRM_ILI9341=m +CONFIG_TINYDRM_ILI9486=m +CONFIG_TINYDRM_MI0283QT=m +CONFIG_TINYDRM_REPAPER=m +CONFIG_TINYDRM_ST7586=m +CONFIG_TINYDRM_ST7735R=m +CONFIG_DRM_XEN=y +CONFIG_DRM_XEN_FRONTEND=m +CONFIG_DRM_VBOXVIDEO=m +# CONFIG_DRM_LEGACY is not set +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y + +# +# Frame buffer Devices +# +CONFIG_FB_CMDLINE=y +CONFIG_FB_NOTIFY=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=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=m +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_HYPERV=m +CONFIG_FB_SIMPLE=y +CONFIG_FB_SM712=m +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +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_AMS369FG06=m +CONFIG_LCD_LMS501KF03=m +CONFIG_LCD_HX8357=m +CONFIG_LCD_OTM3225A=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_KTD253=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_QCOM_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 +# end of Backlight & LCD device support + +CONFIG_VGASTATE=m +CONFIG_VIDEOMODE_HELPERS=y +CONFIG_HDMI=y + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +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 +# end of Console display driver support + +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +# end of Graphics support + +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_GENERIC_LEDS=y +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_INTEL_HDMI_SILENT_STREAM=y +# end of HD-Audio + +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_INTEL_NHLT=y +CONFIG_SND_INTEL_DSP_CONFIG=m +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y +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_ADI=m +CONFIG_SND_SOC_ADI_AXI_I2S=m +CONFIG_SND_SOC_ADI_AXI_SPDIF=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_SOC_AMD_ACP3x=m +CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m +CONFIG_SND_SOC_AMD_RENOIR=m +CONFIG_SND_SOC_AMD_RENOIR_MACH=m +CONFIG_SND_ATMEL_SOC=m +CONFIG_SND_BCM63XX_I2S_WHISTLER=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_MQS=m +CONFIG_SND_SOC_FSL_AUDMIX=m +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_SPDIF=m +CONFIG_SND_SOC_FSL_ESAI=m +CONFIG_SND_SOC_FSL_MICFIL=m +CONFIG_SND_SOC_FSL_EASRC=m +CONFIG_SND_SOC_FSL_XCVR=m +CONFIG_SND_SOC_IMX_AUDMUX=m +# end of SoC Audio for Freescale CPUs + +CONFIG_SND_I2S_HI6210_I2S=m +# CONFIG_SND_SOC_IMG is not set +CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y +CONFIG_SND_SOC_INTEL_SST=m +CONFIG_SND_SOC_INTEL_CATPT=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=m +CONFIG_SND_SOC_INTEL_SKL=m +CONFIG_SND_SOC_INTEL_APL=m +CONFIG_SND_SOC_INTEL_KBL=m +CONFIG_SND_SOC_INTEL_GLK=m +CONFIG_SND_SOC_INTEL_CNL=m +CONFIG_SND_SOC_INTEL_CFL=m +CONFIG_SND_SOC_INTEL_CML_H=m +CONFIG_SND_SOC_INTEL_CML_LP=m +CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m +CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y +CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m +CONFIG_SND_SOC_ACPI_INTEL_MATCH=m +CONFIG_SND_SOC_INTEL_MACH=y +# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set +CONFIG_SND_SOC_INTEL_HASWELL_MACH=m +CONFIG_SND_SOC_INTEL_BDW_RT5650_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_CX2072X_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_DA7219_MAX98357A_GENERIC=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m +CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m +CONFIG_SND_SOC_INTEL_SOF_WM8804_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_KBL_DA7219_MAX98927_MACH=m +CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m +CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m +CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m +CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m +CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m +CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m +CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m +CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m +CONFIG_SND_SOC_MTK_BTCVSD=m +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_PCI=m +CONFIG_SND_SOC_SOF_ACPI=m +# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set +# CONFIG_SND_SOC_SOF_DEVELOPER_SUPPORT is not set +CONFIG_SND_SOC_SOF=m +CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y +CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y +CONFIG_SND_SOC_SOF_INTEL_ACPI=m +CONFIG_SND_SOC_SOF_INTEL_PCI=m +CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m +CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m +CONFIG_SND_SOC_SOF_INTEL_COMMON=m +CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y +CONFIG_SND_SOC_SOF_BAYTRAIL=m +CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y +CONFIG_SND_SOC_SOF_BROADWELL=m +CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y +CONFIG_SND_SOC_SOF_MERRIFIELD=m +CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_APOLLOLAKE=m +CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_GEMINILAKE=m +CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_CANNONLAKE=m +CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_COFFEELAKE=m +CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ICELAKE=m +CONFIG_SND_SOC_SOF_COMETLAKE=m +CONFIG_SND_SOC_SOF_COMETLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y +CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_TIGERLAKE=m +CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ELKHARTLAKE=m +CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_JASPERLAKE=m +CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_ALDERLAKE=m +CONFIG_SND_SOC_SOF_HDA_COMMON=m +CONFIG_SND_SOC_SOF_HDA_LINK=y +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y +# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_HDA=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK=y +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m +CONFIG_SND_SOC_SOF_XTENSA=m + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +CONFIG_SND_SOC_XILINX_I2S=m +# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set +# CONFIG_SND_SOC_XILINX_SPDIF is not set +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_ADAU1372=m +CONFIG_SND_SOC_ADAU1372_I2C=m +CONFIG_SND_SOC_ADAU1372_SPI=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_ADAU7118=m +CONFIG_SND_SOC_ADAU7118_HW=m +CONFIG_SND_SOC_ADAU7118_I2C=m +CONFIG_SND_SOC_AK4104=m +CONFIG_SND_SOC_AK4118=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_CROS_EC_CODEC=m +CONFIG_SND_SOC_CS35L32=m +CONFIG_SND_SOC_CS35L33=m +CONFIG_SND_SOC_CS35L34=m +CONFIG_SND_SOC_CS35L35=m +CONFIG_SND_SOC_CS35L36=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_CS4234=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_CS4341=m +CONFIG_SND_SOC_CS4349=m +CONFIG_SND_SOC_CS53L30=m +CONFIG_SND_SOC_CX2072X=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_HDAC_HDA=m +CONFIG_SND_SOC_INNO_RK3036=m +CONFIG_SND_SOC_MAX98088=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_MAX98373_I2C=m +CONFIG_SND_SOC_MAX98373_SDW=m +CONFIG_SND_SOC_MAX98390=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_PCM3060=m +CONFIG_SND_SOC_PCM3060_I2C=m +CONFIG_SND_SOC_PCM3060_SPI=m +CONFIG_SND_SOC_PCM3168A=m +CONFIG_SND_SOC_PCM3168A_I2C=m +CONFIG_SND_SOC_PCM3168A_SPI=m +CONFIG_SND_SOC_PCM5102A=m +CONFIG_SND_SOC_PCM512x=m +CONFIG_SND_SOC_PCM512x_I2C=m +CONFIG_SND_SOC_PCM512x_SPI=m +# CONFIG_SND_SOC_RK3328 is not set +CONFIG_SND_SOC_RL6231=m +CONFIG_SND_SOC_RL6347A=m +CONFIG_SND_SOC_RT286=m +CONFIG_SND_SOC_RT298=m +CONFIG_SND_SOC_RT1011=m +CONFIG_SND_SOC_RT1015=m +CONFIG_SND_SOC_RT1308_SDW=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_RT5660=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_RT5682_I2C=m +CONFIG_SND_SOC_RT5682_SDW=m +CONFIG_SND_SOC_RT700=m +CONFIG_SND_SOC_RT700_SDW=m +CONFIG_SND_SOC_RT711=m +CONFIG_SND_SOC_RT711_SDW=m +CONFIG_SND_SOC_RT715=m +CONFIG_SND_SOC_RT715_SDW=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_SIMPLE_MUX=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_TAS2562=m +CONFIG_SND_SOC_TAS2764=m +CONFIG_SND_SOC_TAS2770=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_TLV320ADCX140=m +CONFIG_SND_SOC_TS3A227E=m +CONFIG_SND_SOC_TSCS42XX=m +CONFIG_SND_SOC_TSCS454=m +CONFIG_SND_SOC_UDA1334=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_WM8904=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_WSA881X=m +CONFIG_SND_SOC_ZL38060=m +CONFIG_SND_SOC_ZX_AUD96P22=m +CONFIG_SND_SOC_MAX9759=m +CONFIG_SND_SOC_MT6351=m +CONFIG_SND_SOC_MT6358=m +CONFIG_SND_SOC_MT6660=m +CONFIG_SND_SOC_NAU8315=m +CONFIG_SND_SOC_NAU8540=m +CONFIG_SND_SOC_NAU8810=m +CONFIG_SND_SOC_NAU8822=m +CONFIG_SND_SOC_NAU8824=m +CONFIG_SND_SOC_NAU8825=m +CONFIG_SND_SOC_TPA6130A2=m +CONFIG_SND_SOC_LPASS_WSA_MACRO=m +CONFIG_SND_SOC_LPASS_VA_MACRO=m +# end of CODEC drivers + +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_BIGBEN_FF=m +CONFIG_HID_CHERRY=m +CONFIG_HID_CHICONY=m +CONFIG_HID_CORSAIR=m +CONFIG_HID_COUGAR=m +CONFIG_HID_MACALLY=m +CONFIG_HID_PRODIKEYS=m +CONFIG_HID_CMEDIA=m +CONFIG_HID_CP2112=m +CONFIG_HID_CREATIVE_SB0540=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_GLORIOUS=m +CONFIG_HID_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_GOOGLE_HAMMER=m +CONFIG_HID_VIVALDI=m +CONFIG_HID_GT683R=m +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_VIEWSONIC=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_MALTRON=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_U2FZERO=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 +CONFIG_HID_MCP2221=m +# end of Special HID drivers + +# +# 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 +# end of USB HID Boot Protocol drivers +# end of USB HID support + +# +# I2C HID support +# +CONFIG_I2C_HID=m +# end of I2C HID support + +# +# Intel ISH HID support +# +CONFIG_INTEL_ISH_HID=m +# CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER is not set +# end of Intel ISH HID support + +# +# AMD SFH HID Support +# +CONFIG_AMD_SFH_HID=m +# end of AMD SFH HID Support +# end of HID support + +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +CONFIG_USB_LED_TRIG=y +CONFIG_USB_ULPI_BUS=m +CONFIG_USB_CONN_GPIO=m +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_FEW_INIT_RETRIES is not set +CONFIG_USB_DYNAMIC_MINORS=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +CONFIG_USB_LEDS_TRIGGER_USBPORT=m +CONFIG_USB_AUTOSUSPEND_DELAY=2 +CONFIG_USB_MON=m + +# +# 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_PCI_RENESAS is not set +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_FSL is not set +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_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_CDNS3=m +# CONFIG_USB_CDNS3_GADGET is not set +# CONFIG_USB_CDNS3_HOST is not set +CONFIG_USB_CDNS3_PCI_WRAP=m +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_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_GENERIC=m +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_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_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_APPLE_MFI_FASTCHARGE=m +CONFIG_USB_SISUSBVGA=m +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 +# end of USB Physical Layer drivers + +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_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_MAX3420_UDC=m +# CONFIG_USB_DUMMY_HCD is not set +# end of USB Peripheral Controller + +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 + +# +# USB Gadget precomposed configurations +# +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_USB_RAW_GADGET=m +# end of USB Gadget precomposed configurations + +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_TCPCI=m +CONFIG_TYPEC_RT1711H=m +CONFIG_TYPEC_MT6360=m +CONFIG_TYPEC_TCPCI_MAXIM=m +CONFIG_TYPEC_FUSB302=m +CONFIG_TYPEC_UCSI=m +CONFIG_UCSI_CCG=m +CONFIG_UCSI_ACPI=m +CONFIG_TYPEC_HD3SS3220=m +CONFIG_TYPEC_TPS6598X=m +CONFIG_TYPEC_STUSB160X=m + +# +# USB Type-C Multiplexer/DeMultiplexer Switch support +# +CONFIG_TYPEC_MUX_PI3USB30532=m +CONFIG_TYPEC_MUX_INTEL_PMC=m +# end of USB Type-C Multiplexer/DeMultiplexer Switch support + +# +# USB Type-C Alternate Mode drivers +# +CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_TYPEC_NVIDIA_ALTMODE=m +# end of USB Type-C Alternate Mode drivers + +CONFIG_USB_ROLE_SWITCH=y +CONFIG_USB_ROLES_INTEL_XHCI=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_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_F_SDH30=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_ALCOR=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_HSQ=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_CLASS_MULTICOLOR=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_LM3532=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_LP50XX=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_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 +CONFIG_LEDS_TI_LMU_COMMON=m +CONFIG_LEDS_LM36274=m +CONFIG_LEDS_TPS6105X=m +CONFIG_LEDS_SGM3140=m + +# +# Flash and Torch LED drivers +# +# CONFIG_LEDS_RT8515 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 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_LEDS_TRIGGER_PATTERN=m +CONFIG_LEDS_TRIGGER_AUDIO=m +# CONFIG_ACCESSIBILITY is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_USER_MAD=m +CONFIG_INFINIBAND_USER_ACCESS=m +CONFIG_INFINIBAND_USER_MEM=y +CONFIG_INFINIBAND_ON_DEMAND_PAGING=y +CONFIG_INFINIBAND_ADDR_TRANS=y +CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y +CONFIG_INFINIBAND_VIRT_DMA=y +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_QIB=m +CONFIG_INFINIBAND_QIB_DCA=y +CONFIG_INFINIBAND_CXGB4=m +CONFIG_INFINIBAND_EFA=m +CONFIG_INFINIBAND_I40IW=m +CONFIG_MLX4_INFINIBAND=m +CONFIG_MLX5_INFINIBAND=m +CONFIG_INFINIBAND_OCRDMA=m +CONFIG_INFINIBAND_VMWARE_PVRDMA=m +CONFIG_INFINIBAND_USNIC=m +CONFIG_INFINIBAND_BNXT_RE=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_RDMAVT=m +CONFIG_RDMA_RXE=m +CONFIG_RDMA_SIW=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_RTRS=m +CONFIG_INFINIBAND_RTRS_CLIENT=m +CONFIG_INFINIBAND_RTRS_SERVER=m +CONFIG_INFINIBAND_OPA_VNIC=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_I10NM=m +CONFIG_EDAC_PND2=m +CONFIG_EDAC_IGEN6=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_ABEOZ9=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_RV3028=m +CONFIG_RTC_DRV_RV3032=m +CONFIG_RTC_DRV_RV8803=m +CONFIG_RTC_DRV_S5M=m +CONFIG_RTC_DRV_SD3078=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_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 +CONFIG_RTC_DRV_RX6110=m + +# +# 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_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_RTC_DRV_WILCO_EC=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_IDXD=m +CONFIG_INTEL_IDXD_SVM=y +CONFIG_INTEL_IOATDMA=m +CONFIG_PLX_DMA=m +CONFIG_XILINX_ZYNQMP_DPDMA=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_DW_EDMA=m +CONFIG_DW_EDMA_PCIE=m +CONFIG_HSU_DMA=m +CONFIG_SF_PDMA=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_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# end of DMABUF options + +CONFIG_DCA=m +CONFIG_AUXDISPLAY=y +CONFIG_CHARLCD=m +CONFIG_HD44780_COMMON=m +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_LCD2S=m +CONFIG_PARPORT_PANEL=m +CONFIG_PANEL_PARPORT=0 +CONFIG_PANEL_PROFILE=5 +# CONFIG_PANEL_CHANGE_MESSAGE is not set +# CONFIG_CHARLCD_BL_OFF is not set +# CONFIG_CHARLCD_BL_ON is not set +CONFIG_CHARLCD_BL_FLASH=y +CONFIG_PANEL=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_NITRO_ENCLAVES=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y +CONFIG_VIRTIO_PCI=y +CONFIG_VIRTIO_PCI_LEGACY=y +CONFIG_VIRTIO_VDPA=m +CONFIG_VIRTIO_PMEM=m +CONFIG_VIRTIO_BALLOON=y +CONFIG_VIRTIO_MEM=m +CONFIG_VIRTIO_INPUT=m +CONFIG_VIRTIO_MMIO=y +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTIO_DMA_SHARED_BUFFER=m +CONFIG_VDPA=m +# CONFIG_VDPA_SIM is not set +CONFIG_IFCVF=m +CONFIG_MLX5_VDPA=y +CONFIG_MLX5_VDPA_NET=m +CONFIG_VHOST_IOTLB=m +CONFIG_VHOST_RING=m +CONFIG_VHOST=m +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=m +CONFIG_VHOST_SCSI=m +CONFIG_VHOST_VSOCK=m +CONFIG_VHOST_VDPA=m +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_TIMER=y +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m +# end of Microsoft Hyper-V guest support + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=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_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_XEN_FRONT_PGDIR_SHBUF=m +CONFIG_XEN_UNPOPULATED_ALLOC=y +# end of Xen driver support + +# CONFIG_GREYBUS is not set +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_COMEDI_NI_ROUTING=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_RTS5208=m +CONFIG_VT6655=m +CONFIG_VT6656=m + +# +# IIO staging drivers +# + +# +# Accelerometers +# +CONFIG_ADIS16203=m +CONFIG_ADIS16240=m +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD7816=m +CONFIG_AD7280=m +# end of Analog to digital converters + +# +# Analog digital bi-direction converters +# +CONFIG_ADT7316=m +CONFIG_ADT7316_SPI=m +CONFIG_ADT7316_I2C=m +# end of Analog digital bi-direction converters + +# +# Capacitance to digital converters +# +CONFIG_AD7150=m +CONFIG_AD7746=m +# end of Capacitance to digital converters + +# +# Direct Digital Synthesis +# +CONFIG_AD9832=m +CONFIG_AD9834=m +# end of Direct Digital Synthesis + +# +# Network Analyzer, Impedance Converters +# +CONFIG_AD5933=m +# end of Network Analyzer, Impedance Converters + +# +# Active energy metering IC +# +CONFIG_ADE7854=m +CONFIG_ADE7854_I2C=m +CONFIG_ADE7854_SPI=m +# end of Active energy metering IC + +# +# Resolver to digital converters +# +CONFIG_AD2S1210=m +# end of Resolver to digital converters +# end of IIO staging drivers + +CONFIG_FB_SM750=m +CONFIG_STAGING_MEDIA=y +CONFIG_INTEL_ATOMISP=y +# CONFIG_VIDEO_ZORAN is not set +CONFIG_VIDEO_IPU3_IMGU=m + +# +# Android +# +# end of Android + +CONFIG_LTE_GDM724X=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_FWTTY_MAX_TOTAL_PORTS=64 +CONFIG_FWTTY_MAX_CARD_PORTS=32 +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_SEPS525=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_MOST_COMPONENTS=m +CONFIG_MOST_NET=m +CONFIG_MOST_SOUND=m +CONFIG_MOST_VIDEO=m +CONFIG_MOST_I2C=m +CONFIG_KS7010=m +# CONFIG_PI433 is not set + +# +# Gasket devices +# +CONFIG_STAGING_GASKET_FRAMEWORK=m +CONFIG_STAGING_APEX_DRIVER=m +# end of Gasket devices + +CONFIG_FIELDBUS_DEV=m +# CONFIG_KPC2000 is not set +CONFIG_QLGE=m +CONFIG_WIMAX=m +CONFIG_WIMAX_DEBUG_LEVEL=8 +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +CONFIG_WFX=m +# CONFIG_SPMI_HISI3670 is not set +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACPI_WMI=m +CONFIG_WMI_BMOF=m +CONFIG_ALIENWARE_WMI=m +CONFIG_HUAWEI_WMI=m +CONFIG_INTEL_WMI_SBL_FW_UPDATE=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_MXM_WMI=m +CONFIG_PEAQ_WMI=m +CONFIG_XIAOMI_WMI=m +CONFIG_ACERHDF=m +CONFIG_ACER_WIRELESS=m +CONFIG_ACER_WMI=m +CONFIG_AMD_PMC=m +CONFIG_APPLE_GMUX=m +CONFIG_ASUS_LAPTOP=m +CONFIG_ASUS_WIRELESS=m +CONFIG_ASUS_WMI=m +CONFIG_ASUS_NB_WMI=m +CONFIG_EEEPC_LAPTOP=m +CONFIG_EEEPC_WMI=m +CONFIG_DCDBAS=m +CONFIG_DELL_SMBIOS=m +CONFIG_DELL_SMBIOS_WMI=y +CONFIG_DELL_SMBIOS_SMM=y +CONFIG_DELL_LAPTOP=m +CONFIG_DELL_RBTN=m +CONFIG_DELL_RBU=m +CONFIG_DELL_SMO8800=m +CONFIG_DELL_WMI=m +CONFIG_DELL_WMI_SYSMAN=m +CONFIG_DELL_WMI_DESCRIPTOR=m +CONFIG_DELL_WMI_AIO=m +CONFIG_DELL_WMI_LED=m +CONFIG_AMILO_RFKILL=m +CONFIG_FUJITSU_LAPTOP=m +CONFIG_FUJITSU_TABLET=m +CONFIG_GPD_POCKET_FAN=m +CONFIG_HP_ACCEL=m +CONFIG_HP_WIRELESS=m +CONFIG_HP_WMI=m +CONFIG_IBM_RTL=m +CONFIG_IDEAPAD_LAPTOP=m +CONFIG_SENSORS_HDAPS=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_INTEL_ATOMISP2_LED=m +CONFIG_INTEL_CHT_INT33FE=m +CONFIG_INTEL_HID_EVENT=m +CONFIG_INTEL_INT0002_VGPIO=m +CONFIG_INTEL_MENLOW=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_INTEL_VBTN=m +CONFIG_MSI_LAPTOP=m +CONFIG_MSI_WMI=m +CONFIG_PCENGINES_APU2=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_SAMSUNG_Q10=m +CONFIG_ACPI_TOSHIBA=m +CONFIG_TOSHIBA_BT_RFKILL=m +CONFIG_TOSHIBA_HAPS=m +CONFIG_TOSHIBA_WMI=m +CONFIG_ACPI_CMPC=m +CONFIG_COMPAL_LAPTOP=m +CONFIG_LG_LAPTOP=m +CONFIG_PANASONIC_LAPTOP=m +CONFIG_SONY_LAPTOP=m +CONFIG_SONYPI_COMPAT=y +CONFIG_SYSTEM76_ACPI=m +CONFIG_TOPSTAR_LAPTOP=m +CONFIG_I2C_MULTI_INSTANTIATE=m +# CONFIG_MLX_PLATFORM is not set +# CONFIG_TOUCHSCREEN_DMI is not set +CONFIG_INTEL_IPS=m +CONFIG_INTEL_RST=m +CONFIG_INTEL_SMARTCONNECT=m + +# +# Intel Speed Select Technology interface support +# +CONFIG_INTEL_SPEED_SELECT_INTERFACE=m +# end of Intel Speed Select Technology interface support + +# CONFIG_INTEL_TURBO_MAX_3 is not set +CONFIG_INTEL_UNCORE_FREQ_CONTROL=m +CONFIG_INTEL_BXTWC_PMIC_TMU=m +CONFIG_INTEL_CHTDC_TI_PWRBTN=m +CONFIG_INTEL_MFLD_THERMAL=m +CONFIG_INTEL_MID_POWER_BUTTON=m +CONFIG_INTEL_MRFLD_PWRBTN=m +CONFIG_INTEL_PMC_CORE=y +CONFIG_INTEL_PMT_CLASS=m +CONFIG_INTEL_PMT_TELEMETRY=m +CONFIG_INTEL_PMT_CRASHLOG=m +CONFIG_INTEL_PUNIT_IPC=m +CONFIG_INTEL_SCU_IPC=y +CONFIG_INTEL_SCU=y +CONFIG_INTEL_SCU_PCI=y +CONFIG_INTEL_SCU_PLATFORM=m +CONFIG_INTEL_SCU_IPC_UTIL=m +CONFIG_INTEL_TELEMETRY=m +CONFIG_PMC_ATOM=y +CONFIG_CHROME_PLATFORMS=y +CONFIG_CHROMEOS_LAPTOP=m +CONFIG_CHROMEOS_PSTORE=m +CONFIG_CHROMEOS_TBMC=m +CONFIG_CROS_EC=m +CONFIG_CROS_EC_I2C=m +CONFIG_CROS_EC_ISHTP=m +CONFIG_CROS_EC_SPI=m +CONFIG_CROS_EC_LPC=m +CONFIG_CROS_EC_PROTO=y +CONFIG_CROS_KBD_LED_BACKLIGHT=m +CONFIG_CROS_EC_CHARDEV=m +CONFIG_CROS_EC_LIGHTBAR=m +CONFIG_CROS_EC_DEBUGFS=m +CONFIG_CROS_EC_SENSORHUB=m +CONFIG_CROS_EC_SYSFS=m +CONFIG_CROS_EC_TYPEC=m +CONFIG_CROS_USBPD_LOGGER=m +CONFIG_CROS_USBPD_NOTIFY=m +CONFIG_WILCO_EC=m +# CONFIG_WILCO_EC_DEBUGFS is not set +CONFIG_WILCO_EC_EVENTS=m +CONFIG_WILCO_EC_TELEMETRY=m +# CONFIG_MELLANOX_PLATFORM is not set +CONFIG_SURFACE_PLATFORMS=y +CONFIG_SURFACE3_WMI=m +CONFIG_SURFACE_3_BUTTON=m +CONFIG_SURFACE_3_POWER_OPREGION=m +CONFIG_SURFACE_GPE=m +CONFIG_SURFACE_PRO3_BUTTON=m +CONFIG_HAVE_CLK=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_WM831X=m +CONFIG_COMMON_CLK_MAX9485=m +CONFIG_COMMON_CLK_SI5341=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 +# end of Clock Source drivers + +CONFIG_MAILBOX=y +CONFIG_PCC=y +CONFIG_ALTERA_MBOX=m +CONFIG_IOMMU_IOVA=y +CONFIG_IOASID=y +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y + +# +# Generic IOMMU Pagetable Support +# +# end of Generic IOMMU Pagetable Support + +# CONFIG_IOMMU_DEBUGFS is not set +# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set +CONFIG_IOMMU_DMA=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_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set +CONFIG_IRQ_REMAP=y +CONFIG_HYPERV_IOMMU=y + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +CONFIG_RPMSG=m +# CONFIG_RPMSG_CHAR is not set +CONFIG_RPMSG_NS=m +CONFIG_RPMSG_QCOM_GLINK=m +CONFIG_RPMSG_QCOM_GLINK_RPM=m +CONFIG_RPMSG_VIRTIO=m +# end of Rpmsg drivers + +CONFIG_SOUNDWIRE=m + +# +# SoundWire Devices +# +CONFIG_SOUNDWIRE_CADENCE=m +CONFIG_SOUNDWIRE_INTEL=m +CONFIG_SOUNDWIRE_QCOM=m +CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# end of NXP/Freescale QorIQ SoC drivers + +# +# i.MX SoC drivers +# +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# end of Enable LiteX SoC Builder specific drivers + +# +# Qualcomm SoC drivers +# +CONFIG_QCOM_QMI_HELPERS=m +# end of Qualcomm SoC drivers + +CONFIG_SOC_TI=y + +# +# Xilinx SoC drivers +# +CONFIG_XILINX_VCU=m +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +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_FSA9480=m +CONFIG_EXTCON_GPIO=m +CONFIG_EXTCON_INTEL_INT3496=m +CONFIG_EXTCON_INTEL_CHT_WC=m +CONFIG_EXTCON_INTEL_MRFLD=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_PTN5150=m +CONFIG_EXTCON_RT8973A=m +CONFIG_EXTCON_SM5502=m +CONFIG_EXTCON_USB_GPIO=m +CONFIG_EXTCON_USBC_CROS_EC=m +CONFIG_EXTCON_USBC_TUSB320=m +CONFIG_MEMORY=y +CONFIG_IIO=m +CONFIG_IIO_BUFFER=y +CONFIG_IIO_BUFFER_CB=m +CONFIG_IIO_BUFFER_DMA=m +CONFIG_IIO_BUFFER_DMAENGINE=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_ADXL372=m +CONFIG_ADXL372_SPI=m +CONFIG_ADXL372_I2C=m +CONFIG_BMA220=m +CONFIG_BMA400=m +CONFIG_BMA400_I2C=m +CONFIG_BMA400_SPI=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 +# end of Accelerometers + +# +# Analog to digital converters +# +CONFIG_AD_SIGMA_DELTA=m +CONFIG_AD7091R5=m +CONFIG_AD7124=m +CONFIG_AD7192=m +CONFIG_AD7266=m +CONFIG_AD7291=m +CONFIG_AD7292=m +CONFIG_AD7298=m +CONFIG_AD7476=m +CONFIG_AD7606=m +CONFIG_AD7606_IFACE_PARALLEL=m +CONFIG_AD7606_IFACE_SPI=m +CONFIG_AD7766=m +CONFIG_AD7768_1=m +CONFIG_AD7780=m +CONFIG_AD7791=m +CONFIG_AD7793=m +CONFIG_AD7887=m +CONFIG_AD7923=m +CONFIG_AD7949=m +CONFIG_AD799X=m +CONFIG_AD9467=m +CONFIG_ADI_AXI_ADC=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_INTEL_MRFLD_ADC=m +CONFIG_LP8788_ADC=m +CONFIG_LTC2471=m +CONFIG_LTC2485=m +CONFIG_LTC2496=m +CONFIG_LTC2497=m +CONFIG_MAX1027=m +CONFIG_MAX11100=m +CONFIG_MAX1118=m +CONFIG_MAX1241=m +CONFIG_MAX1363=m +CONFIG_MAX9611=m +CONFIG_MCP320X=m +CONFIG_MCP3422=m +CONFIG_MCP3911=m +# CONFIG_MEDIATEK_MT6360_ADC is not set +CONFIG_MEN_Z188_ADC=m +CONFIG_MP2629_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_QCOM_SPMI_ADC5=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 +CONFIG_XILINX_XADC=m +# end of Analog to digital converters + +# +# Analog Front Ends +# +# end of Analog Front Ends + +# +# Amplifiers +# +CONFIG_AD8366=m +CONFIG_HMC425=m +# end of Amplifiers + +# +# Chemical Sensors +# +CONFIG_ATLAS_PH_SENSOR=m +CONFIG_ATLAS_EZO_SENSOR=m +CONFIG_BME680=m +CONFIG_BME680_I2C=m +CONFIG_BME680_SPI=m +CONFIG_CCS811=m +CONFIG_IAQCORE=m +CONFIG_PMS7003=m +CONFIG_SCD30_CORE=m +CONFIG_SCD30_I2C=m +CONFIG_SCD30_SERIAL=m +CONFIG_SENSIRION_SGP30=m +CONFIG_SPS30=m +CONFIG_VZ89X=m +# end of Chemical Sensors + +CONFIG_IIO_CROS_EC_SENSORS_CORE=m +CONFIG_IIO_CROS_EC_SENSORS=m +CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m + +# +# Hid Sensor IIO Common +# +CONFIG_HID_SENSOR_IIO_COMMON=m +CONFIG_HID_SENSOR_IIO_TRIGGER=m +# end of Hid Sensor IIO Common + +CONFIG_IIO_MS_SENSORS_I2C=m + +# +# SSP Sensor Common +# +CONFIG_IIO_SSP_SENSORS_COMMONS=m +CONFIG_IIO_SSP_SENSORHUB=m +# end of SSP Sensor Common + +CONFIG_IIO_ST_SENSORS_I2C=m +CONFIG_IIO_ST_SENSORS_SPI=m +CONFIG_IIO_ST_SENSORS_CORE=m + +# +# 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_AD5686=m +CONFIG_AD5686_SPI=m +CONFIG_AD5696_I2C=m +CONFIG_AD5755=m +CONFIG_AD5758=m +CONFIG_AD5761=m +CONFIG_AD5764=m +CONFIG_AD5770R=m +CONFIG_AD5791=m +CONFIG_AD7303=m +CONFIG_AD8801=m +CONFIG_DS4424=m +CONFIG_LTC1660=m +CONFIG_LTC2632=m +CONFIG_M62332=m +CONFIG_MAX517=m +CONFIG_MCP4725=m +CONFIG_MCP4922=m +CONFIG_TI_DAC082S085=m +CONFIG_TI_DAC5571=m +CONFIG_TI_DAC7311=m +CONFIG_TI_DAC7612=m +# end of Digital to analog converters + +# +# IIO dummy driver +# +CONFIG_IIO_SIMPLE_DUMMY=m +# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set +# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set +# end of IIO dummy driver + +# +# Frequency Synthesizers DDS/PLL +# + +# +# Clock Generator/Distribution +# +CONFIG_AD9523=m +# end of Clock Generator/Distribution + +# +# Phase-Locked Loop (PLL) frequency synthesizers +# +CONFIG_ADF4350=m +CONFIG_ADF4371=m +# end of Phase-Locked Loop (PLL) frequency synthesizers +# end of Frequency Synthesizers DDS/PLL + +# +# Digital gyroscope sensors +# +CONFIG_ADIS16080=m +CONFIG_ADIS16130=m +CONFIG_ADIS16136=m +CONFIG_ADIS16260=m +CONFIG_ADXRS290=m +CONFIG_ADXRS450=m +CONFIG_BMG160=m +CONFIG_BMG160_I2C=m +CONFIG_BMG160_SPI=m +CONFIG_FXAS21002C=m +CONFIG_FXAS21002C_I2C=m +CONFIG_FXAS21002C_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 +# end of Digital gyroscope sensors + +# +# Health Sensors +# + +# +# Heart Rate Monitors +# +CONFIG_AFE4403=m +CONFIG_AFE4404=m +CONFIG_MAX30100=m +CONFIG_MAX30102=m +# end of Heart Rate Monitors +# end of Health Sensors + +# +# Humidity sensors +# +CONFIG_AM2315=m +CONFIG_DHT11=m +CONFIG_HDC100X=m +CONFIG_HDC2010=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 +# end of Humidity sensors + +# +# Inertial measurement units +# +CONFIG_ADIS16400=m +CONFIG_ADIS16460=m +CONFIG_ADIS16475=m +CONFIG_ADIS16480=m +CONFIG_BMI160=m +CONFIG_BMI160_I2C=m +CONFIG_BMI160_SPI=m +CONFIG_FXOS8700=m +CONFIG_FXOS8700_I2C=m +CONFIG_FXOS8700_SPI=m +CONFIG_KMX61=m +CONFIG_INV_ICM42600=m +CONFIG_INV_ICM42600_I2C=m +CONFIG_INV_ICM42600_SPI=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_ST_LSM6DSX_I3C=m +# end of Inertial measurement units + +CONFIG_IIO_ADIS_LIB=m +CONFIG_IIO_ADIS_LIB_BUFFER=y + +# +# Light sensors +# +CONFIG_ACPI_ALS=m +CONFIG_ADJD_S311=m +CONFIG_ADUX1020=m +CONFIG_AL3010=m +CONFIG_AL3320A=m +CONFIG_APDS9300=m +CONFIG_APDS9960=m +CONFIG_AS73211=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_GP2AP002=m +CONFIG_GP2AP020A00F=m +CONFIG_IQS621_ALS=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_MAX44009=m +CONFIG_NOA1305=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_VCNL4035=m +CONFIG_VEML6030=m +CONFIG_VEML6070=m +CONFIG_VL6180=m +CONFIG_ZOPT2201=m +# end of Light sensors + +# +# 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 +CONFIG_SENSORS_RM3100=m +CONFIG_SENSORS_RM3100_I2C=m +CONFIG_SENSORS_RM3100_SPI=m +# end of Magnetometer sensors + +# +# Multiplexers +# +# end of Multiplexers + +# +# Inclinometer sensors +# +CONFIG_HID_SENSOR_INCLINOMETER_3D=m +CONFIG_HID_SENSOR_DEVICE_ROTATION=m +# end of Inclinometer sensors + +# +# Triggers - standalone +# +CONFIG_IIO_HRTIMER_TRIGGER=m +CONFIG_IIO_INTERRUPT_TRIGGER=m +CONFIG_IIO_TIGHTLOOP_TRIGGER=m +CONFIG_IIO_SYSFS_TRIGGER=m +# end of Triggers - standalone + +# +# Linear and angular position sensors +# +CONFIG_IQS624_POS=m +# end of Linear and angular position sensors + +# +# Digital potentiometers +# +CONFIG_AD5272=m +CONFIG_DS1803=m +CONFIG_MAX5432=m +CONFIG_MAX5481=m +CONFIG_MAX5487=m +CONFIG_MCP4018=m +CONFIG_MCP4131=m +CONFIG_MCP4531=m +CONFIG_MCP41010=m +CONFIG_TPL0102=m +# end of Digital potentiometers + +# +# Digital potentiostats +# +CONFIG_LMP91000=m +# end of Digital potentiostats + +# +# Pressure sensors +# +CONFIG_ABP060MG=m +CONFIG_BMP280=m +CONFIG_BMP280_I2C=m +CONFIG_BMP280_SPI=m +CONFIG_IIO_CROS_EC_BARO=m +CONFIG_DLHL60D=m +CONFIG_DPS310=m +CONFIG_HID_SENSOR_PRESS=m +CONFIG_HP03=m +CONFIG_ICP10100=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 +# end of Pressure sensors + +# +# Lightning sensors +# +CONFIG_AS3935=m +# end of Lightning sensors + +# +# Proximity and distance sensors +# +CONFIG_ISL29501=m +CONFIG_LIDAR_LITE_V2=m +CONFIG_MB1232=m +CONFIG_PING=m +CONFIG_RFD77402=m +CONFIG_SRF04=m +CONFIG_SX9310=m +CONFIG_SX9500=m +CONFIG_SRF08=m +CONFIG_VCNL3020=m +CONFIG_VL53L0X_I2C=m +# end of Proximity and distance sensors + +# +# Resolver to digital converters +# +CONFIG_AD2S90=m +CONFIG_AD2S1200=m +# end of Resolver to digital converters + +# +# Temperature sensors +# +CONFIG_IQS620AT_TEMP=m +CONFIG_LTC2983=m +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_MAX31856=m +# end of Temperature sensors + +CONFIG_NTB=m +CONFIG_NTB_MSI=y +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_MSI_TEST=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_DEBUG is not set +CONFIG_PWM_CRC=y +CONFIG_PWM_CROS_EC=m +CONFIG_PWM_DWC=m +CONFIG_PWM_IQS620A=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_MADERA_IRQ=m +# end of IRQ chip support + +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_BRCMSTB_RESCAL is not set +CONFIG_RESET_TI_SYSCON=m + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_USB_LGM_PHY=m +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_PHY_INTEL_LGM_EMMC=m +# end of PHY Subsystem + +CONFIG_POWERCAP=y +CONFIG_INTEL_RAPL_CORE=m +CONFIG_INTEL_RAPL=m +# CONFIG_IDLE_INJECT is not set +CONFIG_MCB=m +CONFIG_MCB_PCI=m +CONFIG_MCB_LPC=m + +# +# Performance monitor support +# +# end of Performance monitor support + +CONFIG_RAS=y +# CONFIG_RAS_CEC is not set +CONFIG_USB4=m +# CONFIG_USB4_DEBUGFS_WRITE is not set +# CONFIG_USB4_DMA_TEST is not set + +# +# Android +# +# CONFIG_ANDROID is not set +# end of Android + +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_NVDIMM_KEYS=y +CONFIG_DAX_DRIVER=y +CONFIG_DAX=y +CONFIG_DEV_DAX=m +CONFIG_DEV_DAX_PMEM=m +CONFIG_DEV_DAX_HMEM=m +CONFIG_DEV_DAX_HMEM_DEVICES=y +CONFIG_DEV_DAX_KMEM=m +CONFIG_DEV_DAX_PMEM_COMPAT=m +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_SPMI_SDAM=m +CONFIG_RAVE_SP_EEPROM=m + +# +# HW tracing support +# +CONFIG_STM=m +CONFIG_STM_PROTO_BASIC=m +CONFIG_STM_PROTO_SYS_T=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 +# end of HW tracing support + +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_ALTERA_FREEZE_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_TEE=m + +# +# TEE drivers +# +CONFIG_AMDTEE=m +# end of TEE drivers + +CONFIG_MULTIPLEXER=m + +# +# Multiplexer drivers +# +CONFIG_MUX_ADG792A=m +CONFIG_MUX_ADGS1408=m +CONFIG_MUX_GPIO=m +# end of Multiplexer drivers + +CONFIG_PM_OPP=y +CONFIG_UNISYS_VISORBUS=m +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +# CONFIG_INTERCONNECT is not set +CONFIG_COUNTER=m +CONFIG_MOST=m +CONFIG_MOST_USB_HDM=m +CONFIG_MOST_CDEV=m +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_VALIDATE_FS_PARSER=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_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_SUPPORT_V4=y +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_IO_TRACE is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +# CONFIG_F2FS_FS_COMPRESSION is not set +CONFIG_ZONEFS_FS=m +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 is not set +CONFIG_FS_VERITY=y +# CONFIG_FS_VERITY_DEBUG is not set +# CONFIG_FS_VERITY_BUILTIN_SIGNATURES is not set +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_VIRTIO_FS=m +CONFIG_FUSE_DAX=y +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 +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/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_EXFAT_FS=m +CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# 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_PROC_PID_ARCH_STATUS=y +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_TMPFS_XATTR=y +# CONFIG_TMPFS_INODE64 is not set +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 +# end of Pseudo filesystems + +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_FS_ZSTD=y +CONFIG_UBIFS_ATIME_SUPPORT=y +CONFIG_UBIFS_FS_XATTR=y +CONFIG_UBIFS_FS_SECURITY=y +CONFIG_UBIFS_FS_AUTHENTICATION=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_DEFAULT_KMSG_BYTES=10240 +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_PSTORE_ZONE=m +CONFIG_PSTORE_BLK=m +CONFIG_PSTORE_BLK_BLKDEV="" +CONFIG_PSTORE_BLK_KMSG_SIZE=64 +CONFIG_PSTORE_BLK_MAX_REASON=2 +CONFIG_SYSV_FS=m +CONFIG_UFS_FS=m +# CONFIG_UFS_FS_WRITE is not set +# CONFIG_UFS_DEBUG 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_ZIP is not set +CONFIG_VBOXSF_FS=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_NFS_DISABLE_UDP_SUPPORT is not set +# CONFIG_NFS_V4_2_READ_PLUS is not set +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_2_INTER_SSC is not set +CONFIG_NFSD_V4_SECURITY_LABEL=y +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_DISABLE_INSECURE_ENCTYPES=y +CONFIG_SUNRPC_DEBUG=y +CONFIG_SUNRPC_XPRT_RDMA=m +CONFIG_CEPH_FS=m +CONFIG_CEPH_FSCACHE=y +CONFIG_CEPH_FS_POSIX_ACL=y +CONFIG_CEPH_FS_SECURITY_LABEL=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_DEBUG=y +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SWN_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_AFS_DEBUG_CURSOR is not set +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 +# CONFIG_UNICODE is not set +CONFIG_IO_WQ=y +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +CONFIG_KEYS_REQUEST_CACHE=y +CONFIG_PERSISTENT_KEYRINGS=y +CONFIG_TRUSTED_KEYS=y +CONFIG_ENCRYPTED_KEYS=y +CONFIG_KEY_DH_OPERATIONS=y +CONFIG_KEY_NOTIFICATIONS=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_DISABLE=y +CONFIG_SECURITY_SELINUX_DEVELOP=y +CONFIG_SECURITY_SELINUX_AVC_STATS=y +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 +CONFIG_SECURITY_SELINUX_SIDTAB_HASH_BITS=9 +CONFIG_SECURITY_SELINUX_SID2STR_CACHE_SIZE=256 +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_TOMOYO_INSECURE_BUILTIN_SETTING is not set +CONFIG_SECURITY_APPARMOR=y +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_SECURITY_SAFESETID is not set +# CONFIG_SECURITY_LOCKDOWN_LSM is not set +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_ARCH_POLICY is not set +# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set +CONFIG_IMA_APPRAISE_BOOTPARAM=y +# CONFIG_IMA_APPRAISE_MODSIG is not set +CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_BLACKLIST_KEYRING=y +# CONFIG_IMA_LOAD_X509 is not set +CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y +# CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT 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_LSM="yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization +# end of Kernel hardening options +# end of Security options + +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_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=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_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_CRYPTD=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_SIMD=m +CONFIG_CRYPTO_GLUE_HELPER_X86=m +CONFIG_CRYPTO_ENGINE=m + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_ECC=m +CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECRDSA=m +CONFIG_CRYPTO_SM2=m +CONFIG_CRYPTO_CURVE25519=m +CONFIG_CRYPTO_CURVE25519_X86=m + +# +# Authenticated Encryption with Associated Data +# +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_CHACHA20POLY1305=m +CONFIG_CRYPTO_AEGIS128=m +CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=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_OFB=m +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_KEYWRAP=m +CONFIG_CRYPTO_NHPOLY1305=m +CONFIG_CRYPTO_NHPOLY1305_SSE2=m +CONFIG_CRYPTO_NHPOLY1305_AVX2=m +CONFIG_CRYPTO_ADIANTUM=m +CONFIG_CRYPTO_ESSIV=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_XXHASH=m +CONFIG_CRYPTO_BLAKE2B=m +CONFIG_CRYPTO_BLAKE2S=m +CONFIG_CRYPTO_BLAKE2S_X86=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_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA3=m +CONFIG_CRYPTO_SM3=m +CONFIG_CRYPTO_STREEBOG=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_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_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_RNG_CAVP is not set +CONFIG_CRYPTO_USER_API_AEAD=m +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y +# CONFIG_CRYPTO_STATS is not set +CONFIG_CRYPTO_HASH_INFO=y + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=m +CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m +CONFIG_CRYPTO_LIB_BLAKE2S=m +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m +CONFIG_CRYPTO_LIB_CHACHA=m +CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m +CONFIG_CRYPTO_LIB_CURVE25519=m +CONFIG_CRYPTO_LIB_DES=m +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m +CONFIG_CRYPTO_LIB_POLY1305=m +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m +CONFIG_CRYPTO_LIB_SHA256=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_ATMEL_I2C=m +CONFIG_CRYPTO_DEV_ATMEL_ECC=m +CONFIG_CRYPTO_DEV_ATMEL_SHA204A=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_CCP_DEBUGFS is not set +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_4XXX=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_CRYPTO_DEV_VIRTIO=m +CONFIG_CRYPTO_DEV_SAFEXCEL=m +CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m +# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=m +CONFIG_TPM_KEY_PARSER=m +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 +# end of Certificates for signature checking + +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_RAID6_PQ_BENCHMARK=y +CONFIG_LINEAR_RANGES=y +CONFIG_PACKING=y +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_CORDIC=m +CONFIG_PRIME_NUMBERS=m +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=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=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=y +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_DECOMPRESS_ZSTD=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_XARRAY_MULTI=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_DMA_OPS=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_SWIOTLB=y +CONFIG_DMA_CMA=y +CONFIG_DMA_PERNUMA_CMA=y + +# +# Default contiguous memory area size: +# +CONFIG_CMA_SIZE_MBYTES=0 +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_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +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_IRQ_POLL=y +CONFIG_MPILIB=y +CONFIG_SIGNATURE=y +CONFIG_DIMLIB=y +CONFIG_OID_REGISTRY=y +CONFIG_UCS2_STRING=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_FONT_SUPPORT=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +CONFIG_FONT_6x10=y +# CONFIG_FONT_10x18 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +CONFIG_FONT_TER16x32=y +CONFIG_FONT_6x8=y +CONFIG_SG_POOL=y +CONFIG_ARCH_HAS_PMEM_API=y +CONFIG_MEMREGION=y +CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y +CONFIG_ARCH_HAS_COPY_MC=y +CONFIG_ARCH_STACKWALK=y +CONFIG_SBITMAP=y +CONFIG_PARMAN=m +CONFIG_OBJAGG=m +# CONFIG_STRING_SELFTEST is not set +# end of Library routines + +CONFIG_PLDMFW=y + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +CONFIG_BOOT_PRINTK_DELAY=y +CONFIG_DYNAMIC_DEBUG=y +CONFIG_DYNAMIC_DEBUG_CORE=y +CONFIG_SYMBOLIC_ERRNAME=y +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +# +# Compile-time checks and compiler options +# +# CONFIG_DEBUG_INFO is not set +CONFIG_FRAME_WARN=1024 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_32B is not set +CONFIG_FRAME_POINTER=y +CONFIG_STACK_VALIDATION=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_KGDB=y +CONFIG_KGDB_HONOUR_BLOCKLIST=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_EARLY_DEBUG=y +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +# CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y +# end of Generic Kernel Debugging Instruments + +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_MISC=y + +# +# Memory Debugging +# +# CONFIG_PAGE_EXTENSION is not set +# CONFIG_DEBUG_PAGEALLOC is not set +# CONFIG_PAGE_OWNER is not set +# CONFIG_PAGE_POISONING is not set +# CONFIG_DEBUG_PAGE_REF is not set +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS 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_SCHED_STACK_END_CHECK=y +CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_VM_PGTABLE 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_ARCH_SUPPORTS_KMAP_LOCAL_FORCE_MAP=y +# CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=0 +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_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +CONFIG_SCHED_DEBUG=y +CONFIG_SCHED_INFO=y +CONFIG_SCHEDSTATS=y +# end of Scheduler Debugging + +# 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_SCF_TORTURE_TEST is not set +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set + +# +# Debug kernel data structures +# +# CONFIG_DEBUG_LIST is not set +# CONFIG_DEBUG_PLIST is not set +# CONFIG_DEBUG_SG is not set +# CONFIG_DEBUG_NOTIFIERS is not set +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +CONFIG_TORTURE_TEST=m +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=60 +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# 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_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_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=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_BOOTTIME_TRACING is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_STACK_TRACER=y +# CONFIG_IRQSOFF_TRACER is not set +CONFIG_SCHED_TRACER=y +# CONFIG_HWLAT_TRACER is not set +CONFIG_MMIOTRACE=y +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_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_DYNAMIC_EVENTS=y +CONFIG_PROBE_EVENTS=y +# CONFIG_BPF_KPROBE_OVERRIDE is not set +CONFIG_FTRACE_MCOUNT_RECORD=y +CONFIG_SYNTH_EVENTS=y +# CONFIG_HIST_TRIGGERS is not set +# CONFIG_TRACE_EVENT_INJECT is not set +# CONFIG_TRACEPOINT_BENCHMARK is not set +# CONFIG_RING_BUFFER_BENCHMARK is not set +# CONFIG_TRACE_EVAL_MAP_FILE is not set +# CONFIG_FTRACE_RECORD_RECURSION is not set +# CONFIG_FTRACE_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_STARTUP_TEST is not set +# CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set +# CONFIG_MMIOTRACE_TEST is not set +# CONFIG_PREEMPTIRQ_DELAY_TEST is not set +# CONFIG_SYNTH_EVENT_GEN_TEST is not set +# CONFIG_KPROBE_EVENT_GEN_TEST is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_SAMPLES is not set +CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y +CONFIG_STRICT_DEVMEM=y +CONFIG_IO_STRICT_DEVMEM=y + +# +# x86 Debugging +# +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_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_USB_XDBC is not set +# CONFIG_EFI_PGT_DUMP is not set +# 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_0X80 is not set +CONFIG_IO_DELAY_0XED=y +# CONFIG_IO_DELAY_UDELAY is not set +# CONFIG_IO_DELAY_NONE is not set +# CONFIG_DEBUG_BOOT_PARAMS is not set +# CONFIG_CPA_DEBUG is not set +# 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 +# end of x86 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT 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_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_KCOV is not set +CONFIG_RUNTIME_TESTING_MENU=y +# CONFIG_LKDTM is not set +# CONFIG_TEST_LIST_SORT is not set +# CONFIG_TEST_MIN_HEAP 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_REED_SOLOMON_TEST is not set +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_STRSCPY=m +CONFIG_TEST_KSTRTOX=m +CONFIG_TEST_PRINTF=m +CONFIG_TEST_BITMAP=m +CONFIG_TEST_UUID=m +CONFIG_TEST_XARRAY=m +CONFIG_TEST_OVERFLOW=m +CONFIG_TEST_RHASHTABLE=m +CONFIG_TEST_HASH=m +CONFIG_TEST_IDA=m +CONFIG_TEST_PARMAN=m +CONFIG_TEST_LKM=m +CONFIG_TEST_BITOPS=m +CONFIG_TEST_VMALLOC=m +CONFIG_TEST_USER_COPY=m +CONFIG_TEST_BPF=m +CONFIG_TEST_BLACKHOLE_DEV=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_TEST_MEMCAT_P is not set +# CONFIG_TEST_LIVEPATCH is not set +CONFIG_TEST_OBJAGG=m +# CONFIG_TEST_STACKINIT is not set +# CONFIG_TEST_MEMINIT is not set +# CONFIG_TEST_FREE_PAGES is not set +# CONFIG_TEST_FPU is not set +CONFIG_MEMTEST=y +# CONFIG_HYPERV_TESTING is not set +# end of Kernel Testing and Coverage +# end of Kernel hacking diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 51a8e24040..f4ba4ffffb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,6 +353,19 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. +(define-public linux-libre-5.11-version "5.11") +(define deblob-scripts-5.11 + (linux-libre-deblob-scripts + linux-libre-5.11-version + (base32 "1kcvwbbzlii4smx6m4hj97va5bf3drbglb24jkky93a1g37a9ksj") + (base32 "0y76962qnnjxc5jgaw9vwrydzwjvj3q4xf7skp3ks2dab7vkhj33"))) +(define-public linux-libre-5.11-pristine-source + (let ((version linux-libre-5.11-version) + (hash (base32 "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"))) + (make-linux-libre-source version + (%upstream-linux-source version hash) + deblob-scripts-5.11))) + (define-public linux-libre-5.10-version "5.10.16") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -468,6 +481,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (patches (append (origin-patches source) patches)))) +(define-public linux-libre-5.11-source + (source-with-patches linux-libre-5.11-pristine-source + (list %boot-logo-patch + %linux-libre-arm-export-__sync_icache_dcache-patch))) + (define-public linux-libre-5.10-source (source-with-patches linux-libre-5.10-pristine-source (list %boot-logo-patch @@ -572,6 +590,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (description "Headers of the Linux-Libre kernel.") (license license:gpl2))) +(define-public linux-libre-headers-5.11 + (make-linux-libre-headers* linux-libre-5.10-version + linux-libre-5.10-source)) + (define-public linux-libre-headers-5.10 (make-linux-libre-headers* linux-libre-5.10-version linux-libre-5.10-source)) @@ -866,6 +888,12 @@ It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; +(define-public linux-libre-5.11 + (make-linux-libre* linux-libre-5.11-version + linux-libre-5.11-source + '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") + #:configuration-file kernel-config)) + (define-public linux-libre-5.10 (make-linux-libre* linux-libre-5.10-version linux-libre-5.10-source -- cgit 1.4.1 From 61a73c533cf7c5f729da118a6a201107f34fa220 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Feb 2021 22:48:17 +0100 Subject: gnu: alacritty: Add comment. * gnu/packages/terminals.scm (alacritty)[arguments]: Try to explain why this field is so ugly, and what might be done to avoid it. --- gnu/packages/terminals.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 831e10a8e3..291a241473 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1276,6 +1276,12 @@ made by suckless.") (libxkbcommon (assoc-ref inputs "libxkbcommon")) (libwayland (assoc-ref inputs "wayland")) (mesa (assoc-ref inputs "mesa"))) + ;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY): + ;; Failed to initialize any backend! Wayland status: NoWaylandLib + ;; XXX We patch transitive dependencies that aren't even direct + ;; inputs to this package, because of the way Guix's Rust build + ;; system currently works. + ;; might fix this and allow patching them directly. (substitute* (string-append vendor-dir "/" smithay-client-toolkit-src "/seat/keyboard/ffi.rs") @@ -1297,6 +1303,8 @@ made by suckless.") "/client.rs") (("libwayland-client\\.so") (string-append libwayland "/lib/libwayland-client.so"))) + + ;; Mesa is needed everywhere. (substitute* (string-append vendor-dir "/" glutin-api "glx/mod.rs") (("libGL.so") (string-append mesa "/lib/libGL.so"))) -- cgit 1.4.1 From 888a4ab39ca6455ab9734b48665e95da86afadf4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 21:59:01 +0100 Subject: gnu: Add rust-s3handler-0.6. * gnu/packages/crates-io.scm (rust-s3handler-0.6): New variable. (rust-s3handler-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 53 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5c0a2b5923..3fa11c564b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34313,29 +34313,33 @@ sub-processes using a fork-like interface.") quickly convert floating point numbers to decimal strings.") (license (list license:asl2.0 license:boost1.0)))) -(define-public rust-s3handler-0.5 +(define-public rust-s3handler-0.6 (package (name "rust-s3handler") - (version "0.5.3") + (version "0.6.6") (source (origin (method url-fetch) (uri (crate-uri "s3handler" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18nc7ya6rn9g0gz8j24rpal08x6a9b07bv80767sqg4hmw42zl4d")))) + (base32 "0zridmnz9l3mr0crma95a3jqi961g034agx43a5yh4pgvv2q6mzq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-base64" ,rust-base64-0.6) + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.6) + ("rust-bytes" ,rust-bytes-0.5) ("rust-chrono" ,rust-chrono-0.4) ("rust-colored" ,rust-colored-1) + ("rust-dyn-clone" ,rust-dyn-clone-1) ("rust-failure" ,rust-failure-0.1) ("rust-failure-derive" ,rust-failure-derive-0.1) + ("rust-futures" ,rust-futures-0.3) ("rust-hmac" ,rust-hmac-0.4) ("rust-hmac-sha1" ,rust-hmac-sha1-0.1) - ("rust-http" ,rust-http-0.1) + ("rust-http" ,rust-http-0.2) ("rust-hyper" ,rust-hyper-0.11) ("rust-log" ,rust-log-0.4) ("rust-md5" ,rust-md5-0.3) @@ -34349,6 +34353,7 @@ quickly convert floating point numbers to decimal strings.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-sha2" ,rust-sha2-0.6) + ("rust-tokio" ,rust-tokio-0.2) ("rust-url" ,rust-url-2)))) (home-page "https://crates.io/crates/s3handler") (synopsis "Library for S3 Rich Support client (S3RS)") @@ -34356,6 +34361,44 @@ quickly convert floating point numbers to decimal strings.") client (S3RS).") (license license:expat))) +(define-public rust-s3handler-0.5 + (package + (inherit rust-s3handler-0.6) + (name "rust-s3handler") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "s3handler" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18nc7ya6rn9g0gz8j24rpal08x6a9b07bv80767sqg4hmw42zl4d")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-base64" ,rust-base64-0.6) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-colored" ,rust-colored-1) + ("rust-failure" ,rust-failure-0.1) + ("rust-failure-derive" ,rust-failure-derive-0.1) + ("rust-hmac" ,rust-hmac-0.4) + ("rust-hmac-sha1" ,rust-hmac-sha1-0.1) + ("rust-http" ,rust-http-0.1) + ("rust-hyper" ,rust-hyper-0.11) + ("rust-log" ,rust-log-0.4) + ("rust-md5" ,rust-md5-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-quick-xml" ,rust-quick-xml-0.12) + ("rust-regex" ,rust-regex-0.2) + ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-rust-crypto" ,rust-rust-crypto-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha2" ,rust-sha2-0.6) + ("rust-url" ,rust-url-2)))))) + (define-public rust-safemem-0.3 (package (name "rust-safemem") -- cgit 1.4.1 From 84cc2bdc3a38da0e512ab29df06eb9fba74f3e0a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:00:45 +0100 Subject: gnu: rust-rand-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-rand-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3fa11c564b..4be37d7879 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30275,14 +30275,14 @@ radix.") (define-public rust-rand-0.8 (package (name "rust-rand") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (crate-uri "rand" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07lb17qj02bi17mhqxlmsiyf4g8cmplm6hbiw5hxc900li19nl8q")))) + (base32 "0zldxfx4gi551n2fna4zz9ab22zsnzw1mj5hzi5nfs24dgkfgy8f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 0d653629163bbba89cc4162789afb26fd136eff6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:04:59 +0100 Subject: gnu: rust-md5-0.7: Update to 0.7.0. * gnu/packages/crates-io.scm (rust-md5-0.7): Update to 0.7.0. (rust-md5-0.6): Inherit from above. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4be37d7879..f5538d3a6c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22262,8 +22262,28 @@ parallelize and optimize.") (("rust-digest" ,rust-digest-0.8) ("rust-hex-literal" ,rust-hex-literal-0.1)))))) +(define-public rust-md5-0.7 + (package + (name "rust-md5") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "md5" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 "0wcps37hrhz59fkhf8di1ppdnqld6l1w5sdy7jp7p51z0i4c8329")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/stainless-steel/md5") + (synopsis "MD5 hash function in Rust") + (description "The package provides the MD5 hash function.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-md5-0.6 (package + (inherit rust-md5-0.7) (name "rust-md5") (version "0.6.1") (source @@ -22273,13 +22293,7 @@ parallelize and optimize.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))) - (build-system cargo-build-system) - (home-page "https://github.com/stainless-steel/md5") - (synopsis "MD5 hash function in Rust") - (description "The package provides the MD5 hash function.") - (license (list license:asl2.0 - license:expat)))) + "17b2xm4h4cvxsdjsf3kdrzqv2za60kak961xzi5kmw6g6djcssvy")))))) (define-public rust-md5-0.3 (package -- cgit 1.4.1 From 6f8755f2eb14288709f16f0e619fe18f0b24e20a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:05:28 +0100 Subject: gnu: rust-uuid-0.8: Update to 0.8.2. * gnu/packages/crates-io.scm (rust-uuid-0.8): Update to 0.8.2. --- gnu/packages/crates-io.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f5538d3a6c..d63b2ba5da 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45708,7 +45708,7 @@ first byte.") (define-public rust-uuid-0.8 (package (name "rust-uuid") - (version "0.8.1") + (version "0.8.2") (source (origin (method url-fetch) @@ -45717,17 +45717,17 @@ first byte.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "049w16qwk3d3b9cmpgvd7fvcnwgs75l8rlsagh06w7ga9dm2zplz")))) + "1dy4ldcp7rnzjy56dxh7d2sgrcvn4q77y0a8r0a48946h66zjp5w")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-winapi" ,rust-winapi-0.3) - ("rust-sha1" ,rust-sha1-0.6) - ("rust-md5" ,rust-md5-0.6) - ("rust-rand" ,rust-rand-0.7) + (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-md5" ,rust-md5-0.7) ("rust-serde" ,rust-serde-1) - ("rust-slog" ,rust-slog-2)))) + ("rust-sha1" ,rust-sha1-0.6) + ("rust-slog" ,rust-slog-2) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/uuid-rs/uuid") (synopsis "Library to generate and parse UUIDs") (description -- cgit 1.4.1 From 1d84cd8a8c0069478f7bb1eac2678d4e3b945f89 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:07:31 +0100 Subject: gnu: Add rust-term-0.7. * gnu/packages/crates-io.scm (rust-term-0.7): New variable. (rust-term-0.6): Inherit from above. --- gnu/packages/crates-io.scm | 63 ++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d63b2ba5da..cd469be8cf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40562,29 +40562,48 @@ directories.") template language.") (license license:expat))) +(define-public rust-term-0.7 + (package + (name "rust-term") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07xzxmg7dbhlirpyfq09v7cfb9gxn0077sqqvszgjvyrjnngi7f5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-dirs-next" ,rust-dirs-next-2) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Stebalien/term") + (synopsis "Terminal formatting library") + (description + "This package provides a terminal formatting library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-term-0.6 - (package - (name "rust-term") - (version "0.6.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "term" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1ddqxq9hrk8zqq1f8pqhz72vrlfc8vh2xcza2gb623z78lrkm1n0")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-dirs" ,rust-dirs-2) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/Stebalien/term") - (synopsis "Terminal formatting library") - (description - "This package provides a terminal formatting library.") - (license (list license:expat license:asl2.0)))) + (package + (inherit rust-term-0.7) + (name "rust-term") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "term" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ddqxq9hrk8zqq1f8pqhz72vrlfc8vh2xcza2gb623z78lrkm1n0")))) + (arguments + `(#:cargo-inputs + (("rust-dirs" ,rust-dirs-2) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-term-0.5 (package -- cgit 1.4.1 From 66c6d6a5a55167e3855bedb1bce93733cfc44ca2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:09:25 +0100 Subject: gnu: rust-libc-0.2: Update to 0.2.86. * gnu/packages/crates-io.scm (rust-libc-0.2): Update to 0.2.86. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd469be8cf..0b2e52c608 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20476,15 +20476,15 @@ requires non-const function calls to be computed.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.81") + (version "0.2.86") (source (origin (method url-fetch) (uri (crate-uri "libc" version)) - (file-name (string-append name "-" version ".crate")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jsk82v5snd286ba92lir5snrxl18qm3kjkagz8c97hn0q9q50hl")))) + "074b38mq1rx3dgg7sf952d4ccywq450zymk7gzn5q9z39f92sa5p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 6c6e8eea17618d39f263f4a59fb9ae88107f8eec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:11:44 +0100 Subject: gnu: rust-sha2-0.9: Update to 0.9.3. * gnu/packages/crates-io.scm (rust-sha2-0.9): Update to 0.9.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0b2e52c608..8626a8c807 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36795,7 +36795,7 @@ code is translated from C to Rust using c2rust.") (define-public rust-sha2-0.9 (package (name "rust-sha2") - (version "0.9.2") + (version "0.9.3") (source (origin (method url-fetch) @@ -36804,7 +36804,7 @@ code is translated from C to Rust using c2rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1a225akwq8k1ym827f8f72rfgxaf7zdnnq07qpcblj91zs3anykf")))) + "1phjvjcvc33xa3xdpxw3a324ksbnrg9qhjnig13z9dwsn8a7m0ps")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 75a1ceaf4b47fb2a01c6cdbc9b113bf222f644c6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:14:33 +0100 Subject: gnu: Add rust-rustyline-7. * gnu/packages/crates-io.scm (rust-rustyline-7): New variable. (rust-rustyline-6): Inherit from above. --- gnu/packages/crates-io.scm | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8626a8c807..37f418f409 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34237,8 +34237,44 @@ sub-processes using a fork-like interface.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2)))))) +(define-public rust-rustyline-7 + (package + (name "rust-rustyline") + (version "7.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v1czmy3ir7d06xldp8bg94l97hrm15hcgdxxkq3cwbizhdk09w2")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.19) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("skim" ,skim-0.7)))) + (home-page "https://github.com/kkawakam/rustyline") + (synopsis "Readline implementation in Rust") + (description + "Rustyline, a readline implementation based on the linenoise package.") + (license license:expat))) + (define-public rust-rustyline-6 (package + (inherit rust-rustyline-7) (name "rust-rustyline") (version "6.3.0") (source @@ -34250,7 +34286,6 @@ sub-processes using a fork-like interface.") (sha256 (base32 "04w4k0nwsra84h90rvwkr6vmjp3nshjqaj9rakfym8qr09xmw3bg")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) @@ -34270,12 +34305,7 @@ sub-processes using a fork-like interface.") ("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-env-logger" ,rust-env-logger-0.7) ("rust-rustyline-derive" ,rust-rustyline-derive-0.3) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/kkawakam/rustyline") - (synopsis "Readline implementation in Rust") - (description - "Rustyline, a readline implementation based on the linenoise package.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-rustyline-derive-0.3 (package -- cgit 1.4.1 From aeeb6bf0fd253327ff1e14a99023fd44d1edd2f8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:15:55 +0100 Subject: gnu: rust-memchr-2: Update to 2.3.4. * gnu/packages/crates-io.scm (rust-memchr-2): Update to 2.3.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37f418f409..59214f07c8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22365,7 +22365,7 @@ unstable -Z self-profile flag.") (define-public rust-memchr-2 (package (name "rust-memchr") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) @@ -22374,7 +22374,7 @@ unstable -Z self-profile flag.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0074pvsfl938ndl5js14ibc7i9q0k3zp390z843w8nlyv4bxha1p")))) + "098m9clfs495illlw00hv2gg67mhm7jflld3msyclvi5m9xc9q8f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From cc8489ba494861c9a3b38743882dab6f083b6179 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:16:57 +0100 Subject: gnu: Add rust-quick-xml-0.21. * gnu/packages/crates-io.scm (rust-quick-xml-0.21): New variable. (rust-quick-xml-0.20): Inherit from above. --- gnu/packages/crates-io.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 59214f07c8..1a60a668e3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29838,17 +29838,17 @@ to write.") (license (list license:asl2.0 license:expat)))) -(define-public rust-quick-xml-0.20 +(define-public rust-quick-xml-0.21 (package (name "rust-quick-xml") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (crate-uri "quick-xml" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pd6fiq79sxsf75027a65f45fqm0kds0in0y9nkf9415issbdai6")))) + (base32 "0xgcmf5qlpjsl239igbkf4j6mlmsm5xp14a3rv45h2j185cnjlh4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -29862,6 +29862,25 @@ to write.") "This package provides a high performance XML reader and writer.") (license license:expat))) +(define-public rust-quick-xml-0.20 + (package + (inherit rust-quick-xml-0.21) + (name "rust-quick-xml") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quick-xml" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pd6fiq79sxsf75027a65f45fqm0kds0in0y9nkf9415issbdai6")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-memchr" ,rust-memchr-2) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-quick-xml-0.19 (package (inherit rust-quick-xml-0.20) -- cgit 1.4.1 From b4b4a96fe6fad9e9016277a94f4ffe56f23a2326 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:18:44 +0100 Subject: gnu: Add rust-users-0.11. * gnu/packages/crates-io.scm (rust-users-0.11): New variable. (rust-users-0.10): Inherit from above. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a60a668e3..fba00154a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45611,8 +45611,32 @@ encoding.") See winapi for types and constants.") (license license:expat))) +(define-public rust-users-0.11 + (package + (name "rust-users") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "users" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cmhafhhka2yya66yrprlv33kg7rm1xh1pyalbjp6yr6dxnhzk14")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4)))) + (home-page "https://github.com/ogham/rust-users") + (synopsis "Library for getting information on Unix users and groups") + (description "This package provides a library for getting information on +Unix users and groups.") + (license license:expat))) + (define-public rust-users-0.10 (package + (inherit rust-users-0.11) (name "rust-users") (version "0.10.0") (source @@ -45624,18 +45648,12 @@ See winapi for types and constants.") (sha256 (base32 "11plda5r3dl8hs0sl0jskazam4ayv3a06vmhzk4l7914agljfhma")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4)) #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.7)))) - (home-page "https://github.com/ogham/rust-users") - (synopsis "Library for getting information on Unix users and groups") - (description "This package provides a library for getting information on -Unix users and groups.") - (license license:expat))) + (("rust-env-logger" ,rust-env-logger-0.7)))))) (define-public rust-users-0.9 (package -- cgit 1.4.1 From fb627203e966ad3ae6fb27ffdafbd56123369043 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:20:19 +0100 Subject: gnu: Add rust-redox-syscall-0.2. * gnu/packages/crates-io.scm (rust-redox-syscall-0.2): New variable. [rust-redox-syscall-0.1]: Inherit from above. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fba00154a4..d5b4370c90 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31378,10 +31378,34 @@ currently pressed on macOS.") owned memory.") (license license:expat))) + +(define-public rust-redox-syscall-0.2 + (package + (name "rust-redox-syscall") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "redox_syscall" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n878lpw577avdr5dzbkil02xwbx0a57mr2r3dcnnkz28i71wd4l")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1)))) + (home-page "https://gitlab.redox-os.org/redox-os/syscall") + (synopsis "Rust library to access raw Redox system calls") + (description + "This package provides a Rust library to access raw Redox system calls.") + (license license:expat))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-redox-syscall-0.1 (package + (inherit rust-redox-syscall-0.2) (name "rust-redox-syscall") (version "0.1.57") (source @@ -31392,13 +31416,7 @@ owned memory.") (sha256 (base32 "1kh59fpwy33w9nwd5iyc283yglq8pf2s41hnhvl48iax9mz0zk21")))) - (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) - (home-page "https://gitlab.redox-os.org/redox-os/syscall") - (synopsis "Rust library to access raw Redox system calls") - (description "This package provides a Rust library to access raw Redox -system calls.") - (license license:expat))) + (arguments '(#:skip-build? #t)))) (define-public rust-redox-termios-0.1 (package -- cgit 1.4.1 From 6513650d40f744aa46b12b91bff218204b17b2fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:21:43 +0100 Subject: gnu: rust-tempfile-3: Update to 3.2.0. * gnu/packages/crates-io.scm (rust-tempfile-3): Update to 3.2.0. --- gnu/packages/crates-io.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d5b4370c90..c0b05d97f6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40514,23 +40514,22 @@ deleting all contents when it's dropped.") (define-public rust-tempfile-3 (package (name "rust-tempfile") - (version "3.1.0") + (version "3.2.0") (source - (origin - (method url-fetch) - (uri (crate-uri "tempfile" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "1a9cfdqw70n7bcnkx05aih9xdba8lqazmqlkjpkmn2la6gcj8vks")))) + (origin + (method url-fetch) + (uri (crate-uri "tempfile" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 "08pbf3c1i42382dc44dil5bgiawcsi0qk6zdibw10f69rxiwdhfs")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + (("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-rand" ,rust-rand-0.7) - ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-rand" ,rust-rand-0.8) + ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-remove-dir-all" ,rust-remove-dir-all-0.5) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://stebalien.com/projects/tempfile-rs") -- cgit 1.4.1 From f2afc2615cb0af433beab5df605dd8ed1a074b6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:23:00 +0100 Subject: gnu: rust-num-integer-0.1: Update to 0.1.44. * gnu/packages/crates-io.scm (rust-num-integer-0.1): Update to 0.1.44. --- gnu/packages/crates-io.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c0b05d97f6..112cea1d60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25290,7 +25290,7 @@ directly.") (define-public rust-num-integer-0.1 (package (name "rust-num-integer") - (version "0.1.43") + (version "0.1.44") (source (origin (method url-fetch) @@ -25299,15 +25299,15 @@ directly.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0nw79ynfvw8br6yncv27pw65y2vw2z7m3kv9g2hinm1dcrz4ancd")))) + "1nq152y3304as1iai95hqz8prqnc94lks1s7q05sfjdmcf56kk6j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-num-traits" ,rust-num-traits-0.2) - ("rust-autocfg" ,rust-autocfg-1)))) + (("rust-autocfg" ,rust-autocfg-1) + ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://github.com/rust-num/num-integer") (synopsis "Integer traits and functions") - (description "Integer traits and functions.") + (description "This package provides Integer traits and functions.") ;; Dual licensed. (license (list license:asl2.0 license:expat)))) -- cgit 1.4.1 From 27881228d55ab4e7b6a3b6d98322e7826fe5050c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:24:08 +0100 Subject: gnu: rust-serde-yaml-0.8: Update to 0.8.17. * gnu/packages/crates-io.scm (rust-serde-yaml-0.8): Update to 0.8.17. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 112cea1d60..483c21ed7e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36377,14 +36377,14 @@ for later processing.") (define-public rust-serde-yaml-0.8 (package (name "rust-serde-yaml") - (version "0.8.15") + (version "0.8.17") (source (origin (method url-fetch) (uri (crate-uri "serde_yaml" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17q8rshlq56z6zna7wxhk9pihna3s5qdz8q5niip396lwkvfh6wp")))) + (base32 "08xvb5zxz3x5dgx0fy1q0aq9aa9fibcvi75333wnnwk1mga4wr8m")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From a22c9cbc7271bda5d12fd2fee332c3a2c56488b4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:25:29 +0100 Subject: gnu: rust-syn-1: Update to 1.0.60. * gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.60. [arguments]: Re-order Cargo inputs. Remove Cargo development inputs since --- gnu/packages/crates-io.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 483c21ed7e..845c5606d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39632,33 +39632,21 @@ browsers.") (define-public rust-syn-1 (package (name "rust-syn") - (version "1.0.53") + (version "1.0.60") (source (origin (method url-fetch) (uri (crate-uri "syn" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0s3y325n7s6gsg4wg0dq0pxymhv1x8qd4nmsp8my2kf24h3y4cw8")))) + (base32 "1080gw6mlja7yl26crya3k403wjdp7v3wx9mxcmpcnlar9z5j067")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-unicode-xid" ,rust-unicode-xid-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1)) - #:cargo-development-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-flate2" ,rust-flate2-1) - ("rust-insta" ,rust-insta-0.16) - ("rust-rayon" ,rust-rayon-1) - ("rust-ref-cast" ,rust-ref-cast-1) - ("rust-regex" ,rust-regex-1) - ("rust-reqwest" ,rust-reqwest-0.10) - ("rust-syn-test-suite" ,rust-syn-test-suite-0) - ("rust-tar" ,rust-tar-0.4) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-walkdir" ,rust-walkdir-2)))) + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2)))) (home-page "https://github.com/dtolnay/syn") (synopsis "Parser for Rust source code") (description -- cgit 1.4.1 From b4f755decd4dbbeb202ea2881a7d74c5e31546c1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:26:39 +0100 Subject: gnu: rust-serde-derive-1: Update to 1.0.123. * gnu/packages/crates-io.scm (rust-serde-derive-1): Update to 1.0.123. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 845c5606d9..860ef0a14d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35976,7 +35976,7 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.118") + (version "1.0.123") (source (origin (method url-fetch) @@ -35984,7 +35984,7 @@ TOML/JSON/MessagePack strings and serializable values.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "1pvj4v8k107ichsnm7jgm9kxyi2lf971x52bmxhm5mcwd4k3akf8")))) + "0ccg4m7ww6mfs5vjdbdifri2kf1wyd4difjnqnraph2gssaw54ck")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 9866b1da45c2109964bc6df813fe8c21fff631af Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:27:49 +0100 Subject: gnu: rust-serde-1: Update to 1.0.123. * gnu/packages/crates-io.scm (rust-serde-1): Update to 1.0.123. [arguments]: Skip build. Remove Cargo development inputs. --- gnu/packages/crates-io.scm | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 860ef0a14d..57b19a4421 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35619,23 +35619,19 @@ rules are rather complex. This crate implements the whole grammar." ) (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.118") + (version "1.0.123") (source - (origin - (method url-fetch) - (uri (crate-uri "serde" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "0028kv3dh3ix5g7jfws22zb9hcqq4cnpwn2lnlpam1wxhmil5ih6")))) + (origin + (method url-fetch) + (uri (crate-uri "serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1bk9733mgiv5sg8yb19y8mc85fb2aaqp1k02v10alavj688idmcj")))) (build-system cargo-build-system) (arguments - ;; Tests fail with "error: cannot find derive macro `Deserialize` in this - ;; scope". - `(#:tests? #false + `(#:skip-build? #t #:cargo-inputs - (("rust-serde-derive" ,rust-serde-derive-1)) - #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://serde.rs") (synopsis "Generic serialization/deserialization framework") -- cgit 1.4.1 From 675ce003010b6326d6214b6f56bb6985ff436031 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:28:55 +0100 Subject: gnu: rust-encoding-rs-0.8: Update to 0.8.28. * gnu/packages/crates-io.scm (rust-encoding-rs-0.8): Update to 0.8.28. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57b19a4421..76e2aeacaa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12548,7 +12548,7 @@ encodings.") (define-public rust-encoding-rs-0.8 (package (name "rust-encoding-rs") - (version "0.8.26") + (version "0.8.28") (source (origin (method url-fetch) @@ -12557,7 +12557,7 @@ encodings.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10xjcafwbxvm2kfsyymxlz8wc9s4bmdj1xzlc809rxyp2yrbl6w0")))) + "0rf0r99q4kgjrx22kx7pjyjg4lm21599y3ggvy3hzj2spi7h5pw0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 15b84d0bb0a0acbe1f6c2cc754f972d25442b108 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:30:21 +0100 Subject: gnu: Add rust-calamine-0.17. * gnu/packages/crates-io.scm (rust-calamine-0.17): New variable. (rust-calamine-0.16): Inherit from above. --- gnu/packages/crates-io.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 76e2aeacaa..d173354246 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6034,17 +6034,17 @@ cached data.") directories and @code{CACHEDIR.TAG} files.") (license (list license:expat license:asl2.0)))) -(define-public rust-calamine-0.16 +(define-public rust-calamine-0.17 (package (name "rust-calamine") - (version "0.16.2") + (version "0.17.0") (source (origin (method url-fetch) (uri (crate-uri "calamine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03nl0n79rbq5x0crgg59brxr86hc9k5kjbf3h7d5c8g5mzlkxf9n")))) + (base32 "095sx7dma2p1pn464l51ac6drih3c1bhwfw8g0y00vdwqwmrrvn8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -6064,6 +6064,30 @@ directories and @code{CACHEDIR.TAG} files.") spreadsheet file.") (license license:expat))) +(define-public rust-calamine-0.16 + (package + (inherit rust-calamine-0.17) + (name "rust-calamine") + (version "0.16.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "calamine" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03nl0n79rbq5x0crgg59brxr86hc9k5kjbf3h7d5c8g5mzlkxf9n")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-codepage" ,rust-codepage-0.1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-quick-xml" ,rust-quick-xml-0.19) + ("rust-serde" ,rust-serde-1) + ("rust-zip" ,rust-zip-0.5)))))) + (define-public rust-calloop-0.6 (package (name "rust-calloop") -- cgit 1.4.1 From c0df77f1e6b6b946cd70ad81517545f41dc1e443 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:31:14 +0100 Subject: gnu: rust-bytes-1: Update to 1.0.1. * gnu/packages/crates-io.scm (rust-bytes-1): Update to 1.0.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d173354246..5d06523105 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5736,14 +5736,14 @@ little-endian.") (define-public rust-bytes-1 (package (name "rust-bytes") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (crate-uri "bytes" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wpsy2jwmbrsn7x6vcd00hw9vvz071lv8nrb25wrspvmkna8w7xd")))) + (base32 "0h6h1c8g3yj2b4k8g25gr3246mq985y0kl3z685cs784fr1ww05p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 0ad85c6cc1a8fb70435a9bdb219b99b29618b5a7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:33:04 +0100 Subject: gnu: Add rust-serde-fmt-1. * gnu/packages/crates-io.scm (rust-serde-fmt-1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d06523105..047eaac03c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35909,6 +35909,29 @@ for the serde framework.") "Unstable AST representation used by Serde codegen.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-fmt-1 + (package + (name "rust-serde-fmt") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_fmt" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "195sp3zxbdgrnaqxwn9z3pij04fd7yyihnm4fpfc261r5fdacqr9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/KodrAus/serde_fmt.git") + (synopsis "Write any @code{serde::Serialize} using standard formatting APIs") + (description + "This package allows one to Write any @code{serde::Serialize} using the +standard formatting APIs.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-serde-ini-0.2 (package (name "rust-serde-ini") -- cgit 1.4.1 From 8983e6d789a8d13f9551935aa6b276917995e329 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:34:16 +0100 Subject: gnu: Add rust-value-bag-1. * gnu/packages/crates-io.scm (rust-value-bag-1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 047eaac03c..9656d7a851 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45953,6 +45953,31 @@ first byte.") rav1e.") (license license:bsd-2))) +(define-public rust-value-bag-1 + (package + (name "rust-value-bag") + (version "1.0.0-alpha.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "value-bag" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cas61n2vkf9b82ljv6dzs8hp8s07arl68vw24rr1jamw0860rvb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ctor" ,rust-ctor-0.1) + ("rust-erased-serde" ,rust-erased-serde-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-fmt" ,rust-serde-fmt-1) + ("rust-sval" ,rust-sval-1)))) + (home-page "https://github.com/sval-rs/value-bag") + (synopsis "Anonymous structured values") + (description "This package provides anonymous structured values.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") -- cgit 1.4.1 From b06aa1ac8e8f596920bba73224f7313fdcb38ec1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:35:14 +0100 Subject: gnu: Add rust-sval-derive-1. * gnu/packages/crates-io.scm (rust-sval-derive-1): New variable. (rust-sval-derive-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9656d7a851..baaf206e11 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39516,20 +39516,21 @@ alike. It's completely modular, and built directly for @code{async/await}.") ("rust-smallvec" ,rust-smallvec-0.6) ("rust-serde" ,rust-serde-1)))))) -(define-public rust-sval-derive-0.5 +(define-public rust-sval-derive-1 (package (name "rust-sval-derive") - (version "0.5.2") + (version "1.0.0-alpha.5") (source (origin (method url-fetch) (uri (crate-uri "sval_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1spip2cjhmjazq2dns69909p9hyx4cmbx6ma4g2skwvcwv4h3gnq")))) + (base32 "1clarb8fqxlffa2i6p70l5nr6l3pcp90p98xkvdn8f65xkc0hhkp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) @@ -39538,6 +39539,24 @@ alike. It's completely modular, and built directly for @code{async/await}.") (description "This package provides custom derive for @code{sval}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-sval-derive-0.5 + (package + (inherit rust-sval-derive-1) + (name "rust-sval-derive") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sval_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1spip2cjhmjazq2dns69909p9hyx4cmbx6ma4g2skwvcwv4h3gnq")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-sval-derive-0.4 (package (inherit rust-sval-derive-0.5) -- cgit 1.4.1 From 49b196865f5dca17ae72db368768cd00ee858a0d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:36:10 +0100 Subject: gnu: Add rust-sval-1. * gnu/packages/crates-io.scm (rust-sval-1): New variable. (rust-sval-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index baaf206e11..63def8cdb2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39470,31 +39470,50 @@ alike. It's completely modular, and built directly for @code{async/await}.") ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.3) ("rust-web-sys" ,rust-web-sys-0.3)))))) -(define-public rust-sval-0.5 +(define-public rust-sval-1 (package (name "rust-sval") - (version "0.5.2") + (version "1.0.0-alpha.5") (source (origin (method url-fetch) (uri (crate-uri "sval" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "052j9ipwpb1zh02gw2ys8c4wpjqdf35991k0zkwljnalx37i79qj")))) + (base32 "025sy290xnn56nl15qkrkq0whxcwlvb4bzp996azbjl7gdyfxxj5")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) - ("rust-sval-derive" ,rust-sval-derive-0.5)) - #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.9)))) + ("rust-sval-derive" ,rust-sval-derive-1)))) (home-page "https://github.com/sval-rs/sval") (synopsis "No-std, object-safe serialization framework") (description "This package provides a no-std, object-safe serialization framework.") (license (list license:asl2.0 license:expat)))) +(define-public rust-sval-0.5 + (package + (inherit rust-sval-1) + (name "rust-sval") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sval" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "052j9ipwpb1zh02gw2ys8c4wpjqdf35991k0zkwljnalx37i79qj")))) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-sval-derive" ,rust-sval-derive-0.5)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.9)))))) + (define-public rust-sval-0.4 (package (inherit rust-sval-0.5) -- cgit 1.4.1 From 8c03a432d9dda21fc65cbeaf09795e4a5bd23739 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 22:37:28 +0100 Subject: gnu: rust-log-0.4: Update to 0.4.14. * gnu/packages/crates-io.scm (rust-log-0.4): Update to 0.4.14. [arguments]: Skip build. Add rust-sval-1 and rust-value-bag as Cargo inputs. Remove Cargo development inputs. --- gnu/packages/crates-io.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 63def8cdb2..dd73ed1a19 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21541,23 +21541,22 @@ by inspecting the system for user preference.") (define-public rust-log-0.4 (package (name "rust-log") - (version "0.4.11") + (version "0.4.14") (source - (origin - (method url-fetch) - (uri (crate-uri "log" version)) - (file-name (string-append name "-" version ".crate")) - (sha256 - (base32 - "12xzqaflpiljn5cmxsbnbv9sjaj13ykhwsvll0gysbx4blbyvasg")))) + (origin + (method url-fetch) + (uri (crate-uri "log" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 "04175hv0v62shd82qydq58a48k3bjijmk54v38zgqlbxqkkbpfai")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-serde" ,rust-serde-1) - ("rust-sval" ,rust-sval-0.5)) - #:cargo-development-inputs - (("rust-serde-test" ,rust-serde-test-1)))) + ("rust-sval" ,rust-sval-1) + ("rust-value-bag" ,rust-value-bag-1)))) (home-page "https://github.com/rust-lang/log") (synopsis "Lightweight logging facade for Rust") (description -- cgit 1.4.1 From d776b2efb7f65f881036ecdeec0ca5e3b0c9690c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 23:05:28 +0100 Subject: gnu: Add rust-quickcheck-1. * gnu/packages/crates-io.scm (rust-quickcheck-1): New variable. (rust-quickcheck-0.9): Inherit from above. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dd73ed1a19..12796823f0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29943,8 +29943,35 @@ to write.") ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2)))))) +(define-public rust-quickcheck-1 + (package + (name "rust-quickcheck") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mjhkfqwrb8mdyxdqr4zzbj1rm5dfx25n9zcc25lb6fxwiw673sq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-env-logger" ,rust-env-logger-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/BurntSushi/quickcheck") + (synopsis "Automatic property based testing with shrinking") + (description + "QuickCheck is a way to do property based testing using randomly generated +input. This crate comes with the ability to randomly generate and shrink +integers, floats, tuples, booleans, lists, strings, options and results.") + (license (list license:unlicense license:expat)))) + (define-public rust-quickcheck-0.9 (package + (inherit rust-quickcheck-1) (name "rust-quickcheck") (version "0.9.2") (source @@ -29956,20 +29983,12 @@ to write.") (sha256 (base32 "0pwl7j21wmf843kpa9gr0byb40hg975ghjrwp0yxcym99bkq6j54")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.7) ("rust-log" ,rust-log-0.4) ("rust-rand" ,rust-rand-0.7) - ("rust-rand-core" ,rust-rand-core-0.5)))) - (home-page "https://github.com/BurntSushi/quickcheck") - (synopsis "Automatic property based testing with shrinking") - (description - "QuickCheck is a way to do property based testing using randomly generated -input. This crate comes with the ability to randomly generate and shrink -integers, floats, tuples, booleans, lists, strings, options and results.") - (license (list license:unlicense license:expat)))) + ("rust-rand-core" ,rust-rand-core-0.5)))))) (define-public rust-quickcheck-0.8 (package -- cgit 1.4.1 From 9e3f561cd4118a90dc9e57fe707ef4100af7b2a7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 23:10:17 +0100 Subject: gnu: Add rust-quickcheck-macros-1. * gnu/packages/crates-io.scm (rust-quickcheck-macros-1): New variable. (quickcheck-macros-0.9): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 12796823f0..ac38d1180d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30105,8 +30105,33 @@ integers, floats, tuples, booleans, lists, strings, options and results.") (base32 "1vb4acppaavlnchzc1jmn5wlkgir9x9gmhgp97bavyxxqxgsg1nh")))))) +(define-public rust-quickcheck-macros-1 + (package + (name "rust-quickcheck-macros") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quickcheck-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1s8nh0fmmzq3fd7928qcp2syvymlyv1pmww6fxcaj5np48r6jamj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/BurntSushi/quickcheck") + (synopsis "Macro attribute for quickcheck") + (description + "This package provides a macro attribute for quickcheck.") + (license (list license:unlicense license:expat)))) + (define-public rust-quickcheck-macros-0.9 (package + (inherit rust-quickcheck-macros-1) (name "rust-quickcheck-macros") (version "0.9.1") (source @@ -30118,19 +30143,13 @@ integers, floats, tuples, booleans, lists, strings, options and results.") (sha256 (base32 "0zsb9b4jpg7qvbiym4v8y9pgqk7p1g4f5hn9gp0fnzz9v1pib330")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/BurntSushi/quickcheck") - (synopsis "Macro attribute for quickcheck") - (description - "This package provides a macro attribute for quickcheck.") - (license (list license:unlicense license:expat)))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))))) (define-public rust-quickcheck-macros-0.8 (package -- cgit 1.4.1 From b95a9ff8fd2a2b87d41cdbe7532188b6bd27fd81 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Feb 2021 23:32:58 +0100 Subject: gnu: nushell: Update to 0.27.0. * gnu/packages/shells.scm (nushell): Update to 0.27.0. (rust-nu-cli-0.27): (rust-nu-command-0.27): (rust-nu-data-0.27): (rust-nu-engine-0.27): (rust-nu-errors-0.27): (rust-nu-json-0.27): (rust-nu-parser-0.27): (rust-nu-plugin-0.27): (rust-nu-plugin-binaryview-0.27): (rust-nu-plugin-chart-0.27): (rust-nu-plugin-fetch-0.27): (rust-nu-plugin-from-bson-0.27): (rust-nu-plugin-from-sqlite-0.27): (rust-nu-plugin-inc-0.27): (rust-nu-plugin-match-0.27): (rust-nu-plugin-post-0.27): (rust-nu-plugin-s3-0.27): (rust-nu-plugin-sys-0.27): (rust-nu-plugin-textview-0.27): (rust-nu-plugin-to-bson-0.27): (rust-nu-plugin-to-sqlite-0.27): (rust-nu-plugin-tree-0.27): (rust-nu-plugin-xpath-0.27): (rust-nu-protocol-0.27): (rust-nu-source-0.27): (rust-nu-stream-0.27): (rust-nu-test-support-0.27): (rust-nu-value-ext-0.27): New variables. (rust-nu-cli-0.26): (rust-nu-command-0.26): (rust-nu-data-0.26): (rust-nu-engine-0.26): (rust-nu-errors-0.26): (rust-nu-json-0.26): (rust-nu-parser-0.26): (rust-nu-plugin-0.26): (rust-nu-plugin-binaryview-0.26): (rust-nu-plugin-chart-0.26): (rust-nu-plugin-fetch-0.26): (rust-nu-plugin-from-bson-0.26): (rust-nu-plugin-from-sqlite-0.26): (rust-nu-plugin-inc-0.26): (rust-nu-plugin-match-0.26): (rust-nu-plugin-post-0.26): (rust-nu-plugin-s3-0.26): (rust-nu-plugin-sys-0.26): (rust-nu-plugin-textview-0.26): (rust-nu-plugin-to-bson-0.26): (rust-nu-plugin-to-sqlite-0.26): (rust-nu-plugin-tree-0.26): (rust-nu-plugin-xpath-0.26): (rust-nu-protocol-0.26): (rust-nu-source-0.26): (rust-nu-stream-0.26): (rust-nu-test-support-0.26): (rust-nu-value-ext-0.26): Remove variables. --- gnu/packages/shells.scm | 669 ++++++++++++++++++++++++------------------------ 1 file changed, 335 insertions(+), 334 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 03a094945c..8a62105e22 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -938,98 +938,94 @@ files and text.") (license license:gpl3+))) (define-public nushell - ;; Regular 0.26.0 release has an issue with rust-sysinfo. Use a later - ;; commit including the patches fixing it. - (let ((commit "30833468844eca336e24e02c3304a0245b5760b5") - (revision "0")) - (package - (name "nushell") - (version (git-version "0.26.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nushell/nushell.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "19miwximiqh9j7cjh2f72c38a06d0zvd9fxa7m8aaz8cbcmnsrjp")))) - (build-system cargo-build-system) - (arguments - `(#:rust ,rust-1.47 - #:tests? #false ;missing files - #:features '("extra") - #:cargo-inputs - (("rust-clap" ,rust-clap-2) - ("rust-ctrlc" ,rust-ctrlc-3) - ("rust-futures" ,rust-futures-0.3) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-log" ,rust-log-0.4) - ("rust-nu-cli" ,rust-nu-cli-0.26) - ("rust-nu-command" ,rust-nu-command-0.26) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-engine" ,rust-nu-engine-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-parser" ,rust-nu-parser-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.26) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.26) - ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.26) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.26) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.26) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.26) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.26) - ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.26) - ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.26) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.26) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.26) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.26) - ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.26) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.26) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.26) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.26) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.26) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.26) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) - #:cargo-development-inputs - (("rust-dunce" ,rust-dunce-1) - ("rust-nu-test-support" ,rust-nu-test-support-0.26)))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python))) - (inputs - `(("curl" ,curl) - ("libgit2" ,libgit2) - ("libx11" ,libx11) - ("libxcb" ,libxcb) - ("openssl" ,openssl) - ("zlib" ,zlib))) - (home-page "https://www.nushell.sh") - (synopsis "Shell that understands the structure of the data") - (description - "Nu draws inspiration from projects like PowerShell, functional + (package + (name "nushell") + (version "0.27.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nushell/nushell.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gi477kfin9vpi7cmijqgbshm54r2winp4pkravrd7v3pqw0isrr")))) + (build-system cargo-build-system) + (arguments + `(#:rust ,rust-1.47 + #:tests? #false ;missing files + #:features '("extra") + #:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-futures" ,rust-futures-0.3) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-nu-cli" ,rust-nu-cli-0.27) + ("rust-nu-command" ,rust-nu-command-0.27) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-engine" ,rust-nu-engine-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-parser" ,rust-nu-parser-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.27) + ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.27) + ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.27) + ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.27) + ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.27) + ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.27) + ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.27) + ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.27) + ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.27) + ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.27) + ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.27) + ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.27) + ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.27) + ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.27) + ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.27) + ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.27) + ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.27) + ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.27) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) + #:cargo-development-inputs + (("rust-dunce" ,rust-dunce-1) + ("rust-nu-test-support" ,rust-nu-test-support-0.27)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python))) + (inputs + `(("curl" ,curl) + ("libgit2" ,libgit2) + ("libx11" ,libx11) + ("libxcb" ,libxcb) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (home-page "https://www.nushell.sh") + (synopsis "Shell that understands the structure of the data") + (description + "Nu draws inspiration from projects like PowerShell, functional programming languages, and modern CLI tools. Rather than thinking of files and services as raw streams of text, Nu looks at each input as something with structure. For example, when you list the contents of a directory, what you get back is a table of rows, where each row represents an item in that directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") - (license license:expat)))) + (license license:expat))) -(define-public rust-nu-cli-0.26 +(define-public rust-nu-cli-0.27 (package (name "rust-nu-cli") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cm560qksr7j55kwfxldfp9ry25dbwnw6l3lmm3pbc0hfwdp1w0r")))) + (base32 "0kj0n4lkzmscvya1m5psf1n3ijpzxn4avw2a71rqgcdjyk3phahb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1041,8 +1037,8 @@ of commands called a ``pipeline''.") ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-byte-unit" ,rust-byte-unit-4) - ("rust-bytes" ,rust-bytes-0.5) - ("rust-calamine" ,rust-calamine-0.16) + ("rust-bytes" ,rust-bytes-1) + ("rust-calamine" ,rust-calamine-0.17) ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) @@ -1072,19 +1068,19 @@ of commands called a ``pipeline''.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-command" ,rust-nu-command-0.26) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-engine" ,rust-nu-engine-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-json" ,rust-nu-json-0.26) - ("rust-nu-parser" ,rust-nu-parser-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-stream" ,rust-nu-stream-0.26) - ("rust-nu-table" ,rust-nu-table-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-command" ,rust-nu-command-0.27) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-engine" ,rust-nu-engine-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-json" ,rust-nu-json-0.27) + ("rust-nu-parser" ,rust-nu-parser-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-stream" ,rust-nu-stream-0.27) + ("rust-nu-table" ,rust-nu-table-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1093,9 +1089,10 @@ of commands called a ``pipeline''.") ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) ("rust-query-interface" ,rust-query-interface-0.3) - ("rust-quick-xml" ,rust-quick-xml-0.20) - ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9) - ("rust-rand" ,rust-rand-0.7) + ("rust-quick-xml" ,rust-quick-xml-0.21) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rand" ,rust-rand-0.8) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-roxmltree" ,rust-roxmltree-0.14) @@ -1116,7 +1113,7 @@ of commands called a ``pipeline''.") ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) - ("rust-term" ,rust-term-0.6) + ("rust-term" ,rust-term-0.7) ("rust-term-size" ,rust-term-size-0.3) ("rust-termcolor" ,rust-termcolor-1) ("rust-titlecase" ,rust-titlecase-1) @@ -1125,7 +1122,7 @@ of commands called a ``pipeline''.") ("rust-umask" ,rust-umask-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) - ("rust-users" ,rust-users-0.10) + ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) ("rust-which" ,rust-which-4) ("rust-zip" ,rust-zip-0.5)))) @@ -1134,17 +1131,17 @@ of commands called a ``pipeline''.") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-command-0.26 +(define-public rust-nu-command-0.27 (package (name "rust-nu-command") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kqip12aw38c6wa9blzmk4xyndjgm4k23iiaw2187vsanh0h53q7")))) + (base32 "16syx1sb3bj4hdh1l294byqqzbrgm24jp6h339rf9sn4k1m9fwd3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1156,8 +1153,8 @@ of commands called a ``pipeline''.") ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-byte-unit" ,rust-byte-unit-4) - ("rust-bytes" ,rust-bytes-0.5) - ("rust-calamine" ,rust-calamine-0.16) + ("rust-bytes" ,rust-bytes-1) + ("rust-calamine" ,rust-calamine-0.17) ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) @@ -1187,18 +1184,19 @@ of commands called a ``pipeline''.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-engine" ,rust-nu-engine-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-json" ,rust-nu-json-0.26) - ("rust-nu-parser" ,rust-nu-parser-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-stream" ,rust-nu-stream-0.26) - ("rust-nu-table" ,rust-nu-table-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-engine" ,rust-nu-engine-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-json" ,rust-nu-json-0.27) + ("rust-nu-parser" ,rust-nu-parser-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-stream" ,rust-nu-stream-0.27) + ("rust-nu-table" ,rust-nu-table-0.27) + ("rust-nu-test-support" + ,rust-nu-test-support-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1207,14 +1205,14 @@ of commands called a ``pipeline''.") ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) ("rust-query-interface" ,rust-query-interface-0.3) - ("rust-quick-xml" ,rust-quick-xml-0.20) + ("rust-quick-xml" ,rust-quick-xml-0.21) ("rust-rand" ,rust-rand-0.7) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-6) + ("rust-rustyline" ,rust-rustyline-7) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) @@ -1228,7 +1226,7 @@ of commands called a ``pipeline''.") ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) - ("rust-term" ,rust-term-0.6) + ("rust-term" ,rust-term-0.7) ("rust-term-size" ,rust-term-size-0.3) ("rust-termcolor" ,rust-termcolor-1) ("rust-titlecase" ,rust-titlecase-1) @@ -1237,7 +1235,7 @@ of commands called a ``pipeline''.") ("rust-umask" ,rust-umask-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) - ("rust-users" ,rust-users-0.10) + ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) ("rust-which" ,rust-which-4) ("rust-zip" ,rust-zip-0.5)))) @@ -1246,17 +1244,17 @@ of commands called a ``pipeline''.") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-data-0.26 +(define-public rust-nu-data-0.27 (package (name "rust-nu-data") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jmicfs49laczgvif5axv2gb0c52hrfxvf3ywi7iinr7n8h1sfpx")))) + (base32 "0k024pgzq3r6rh3j3d3pnsnsg5vnz6w21g7xabsfm1ylv074d8i9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1271,12 +1269,12 @@ of commands called a ``pipeline''.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-table" ,rust-nu-table-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-table" ,rust-nu-table-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1284,23 +1282,23 @@ of commands called a ``pipeline''.") ("rust-query-interface" ,rust-query-interface-0.3) ("rust-serde" ,rust-serde-1) ("rust-toml" ,rust-toml-0.5) - ("rust-users" ,rust-users-0.10)))) + ("rust-users" ,rust-users-0.11)))) (home-page "https://www.nushell.sh") (synopsis "CLI for nushell") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-engine-0.26 +(define-public rust-nu-engine-0.27 (package (name "rust-nu-engine") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fbvv8dvxzfbkyvy8iyis9xvijv794lpjfp0hrl25s0lrjykbji0")))) + (base32 "14463wafn4am6c7sc942zqjs4ckd3yxm8l786qhhkxw7gwq7m76s")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1323,14 +1321,14 @@ of commands called a ``pipeline''.") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-parser" ,rust-nu-parser-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-stream" ,rust-nu-stream-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-parser" ,rust-nu-parser-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-stream" ,rust-nu-stream-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) @@ -1339,23 +1337,23 @@ of commands called a ``pipeline''.") ("rust-term-size" ,rust-term-size-0.3) ("rust-termcolor" ,rust-termcolor-1) ("rust-umask" ,rust-umask-1) - ("rust-users" ,rust-users-0.10)))) + ("rust-users" ,rust-users-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Core commands for nushell") (description "Core commands for nushell") (license license:expat))) -(define-public rust-nu-errors-0.26 +(define-public rust-nu-errors-0.27 (package (name "rust-nu-errors") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0q6cbb02m9cfvjc7fcfzj814iz9ab2j2m3c3qwqskkrig4cwz3sl")))) + (base32 "0j9w8fyjgrb602v35871vychh2b9m3bzjmmk8jgcbm41458ji5sl")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1366,7 +1364,7 @@ of commands called a ``pipeline''.") ("rust-derive-new" ,rust-derive-new-0.5) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1378,17 +1376,17 @@ of commands called a ``pipeline''.") (description "Core error subsystem for Nushell") (license license:expat))) -(define-public rust-nu-json-0.26 +(define-public rust-nu-json-0.27 (package (name "rust-nu-json") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "085k9p41pqzivw6z6rxxzr8haagwqi795a2dh084qs99cyi5hj2n")))) + (base32 "0s3bv8hcqfric8ib9da71cjfa298pn3154lyziv55yg2wrmqn9kr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1402,17 +1400,17 @@ of commands called a ``pipeline''.") (description "This package is a fork of @code{serde-hjson}.") (license license:expat))) -(define-public rust-nu-parser-0.26 +(define-public rust-nu-parser-0.27 (package (name "rust-nu-parser") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05wns7z1xifdlypklar2hb2q9515lrlwx5jl69aw3k877nmwg07p")))) + (base32 "0jyl29c16hmyfbmp4w0yay441dc3c54hwknqsaq7bppg5kyxhvx9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1423,11 +1421,12 @@ of commands called a ``pipeline''.") ("rust-derive-is-enum-variant" ,rust-derive-is-enum-variant-0.1) ("rust-dunce" ,rust-dunce-1) ("rust-indexmap" ,rust-indexmap-1) + ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1438,10 +1437,10 @@ of commands called a ``pipeline''.") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-plugin-0.26 +(define-public rust-nu-plugin-0.27 (package (name "rust-nu-plugin") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) @@ -1449,18 +1448,18 @@ of commands called a ``pipeline''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1n7lf9d0dkjdnmwv60szrz22z47aq3yl946f9y20dnk7xy798bv6")))) + (base32 "1k5hjaisig9syx442qslnipq6anphi67wvqhig1l6alwf95d7mps")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) @@ -1469,29 +1468,29 @@ of commands called a ``pipeline''.") (description "Nushell Plugin") (license license:expat))) -(define-public rust-nu-plugin-binaryview-0.26 +(define-public rust-nu-plugin-binaryview-0.27 (package (name "rust-nu-plugin-binaryview") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ngnkpcl6gqi3rp2k666rfq35hlqhii3jlg0yfi42inxsh5mxgpf")))) + (base32 "0dqh50v3whd9vdcjyyymwh9jcxjrx73ixzdwp3ga8vgcg4fsy2xp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-crossterm" ,rust-crossterm-0.18) + ("rust-crossterm" ,rust-crossterm-0.19) ("rust-image" ,rust-image-0.22) ("rust-neso" ,rust-neso-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-rawkey" ,rust-rawkey-0.1)))) (home-page "https://www.nushell.sh") @@ -1500,29 +1499,29 @@ of commands called a ``pipeline''.") "This package provides a binary viewer plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.26 +(define-public rust-nu-plugin-chart-0.27 (package (name "rust-nu-plugin-chart") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pyccvidzqgz7yp16jdjgyb708cimx0j334wzi8ij8l7x395qwn3")))) + (base32 "14bh7qa2a6hwrggcb9qi92d9dqdrsr6hz5bhplbb8ym9yhr1b43k")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-cli" ,rust-nu-cli-0.26) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-cli" ,rust-nu-cli-0.27) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-tui" ,rust-tui-0.14)))) (home-page "https://www.nushell.sh") (synopsis "Plugin to display charts") @@ -1530,27 +1529,27 @@ of commands called a ``pipeline''.") "This package provides a plugin to display charts in Nushell.") (license license:expat))) -(define-public rust-nu-plugin-fetch-0.26 +(define-public rust-nu-plugin-fetch-0.27 (package (name "rust-nu-plugin-fetch") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0f61f3n5wdzqwfi94ym8j60sd1wah1z1gdyhyg60fbyygd9scm4r")))) + (base32 "0cyn462vpb1njhcdmad63c672xc3si2l4kvgbjf7z57zsg4ldf1i")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-surf" ,rust-surf-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1558,28 +1557,28 @@ of commands called a ``pipeline''.") (description "This package provides a URL fetch plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.26 +(define-public rust-nu-plugin-from-bson-0.27 (package (name "rust-nu-plugin-from-bson") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ywvxlx1i44yz7md5wbd4sadbh2j6nah6ccfpkrls0gjmagqsbvj")))) + (base32 "02r66fm1ih690d5z9il4lawnk53vv51d6cxga7s4bj68yn7b5sig")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1588,27 +1587,27 @@ of commands called a ``pipeline''.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.26 +(define-public rust-nu-plugin-from-sqlite-0.27 (package (name "rust-nu-plugin-from-sqlite") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0898ar0q2r0p5f8vr6w290b3wfyq2wrlygz7rhf8qfcxc3mdxxi2")))) + (base32 "1l5li343ba8g6cvckjby78vl9d8nj5n679asdh103gr2y8pbrk4b")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1619,28 +1618,28 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.26 +(define-public rust-nu-plugin-inc-0.27 (package (name "rust-nu-plugin-inc") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v72zaqhzf37x3sba43c6pry75v4aacqsk4mw7fnmx6mfzbpjdn6")))) + (base32 "0rpgbxk79wgg3wks9w1nz0pala2arq9kxrqm971ph10gl398dah0")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-test-support" ,rust-nu-test-support-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) - ("rust-semver" ,rust-semver-0.10)))) + (("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-semver" ,rust-semver-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Version incrementer plugin for Nushell") (description @@ -1648,25 +1647,25 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-match-0.26 +(define-public rust-nu-plugin-match-0.27 (package (name "rust-nu-plugin-match") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0iifbi739x077wwvjgdjw2h7cr149sznvjl6c5m06llmvniga4sa")))) + (base32 "0v8rdpxqf414mbz2yqgh6cqfi3cszir4mh6qdgijll1ywjib1xag")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + (("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-regex" ,rust-regex-1)))) (home-page "https://www.nushell.sh") (synopsis "Regex match plugin for Nushell") @@ -1674,57 +1673,57 @@ Nushell.") "This package provides a regex match plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-post-0.26 +(define-public rust-nu-plugin-post-0.27 (package (name "rust-nu-plugin-post") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05frjzgrci7f9fvfqls3067ipnn2ihqxydimi7kbwajs0kzj7b45")))) + (base32 "0i2jd19rw4dpi44qfw1yavzyhljqxcr4angyk4q3rn49isdz2njg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-base64" ,rust-base64-0.12) + (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde-json" ,rust-serde-json-1) ("rust-surf" ,rust-surf-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") - (synopsis "HTTP post plugin for Nushell") - (description "This package is an HTTP post plugin for Nushell.") + (synopsis "HTTP POST plugin for Nushell") + (description "This package is an HTTP POST plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-ps-0.26 +(define-public rust-nu-plugin-ps-0.27 (package (name "rust-nu-plugin-ps") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1znj1hjy2c2bj14hjx6yh4r3dknb7qflza1vmq5x98vnvf04i8c4")))) + (base32 "1xh55xi1w8393dyk9vp8l74r73pva4rbl5rrz4flx692vw5i40f5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-timer" ,rust-futures-timer-3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1733,78 +1732,80 @@ Nushell.") "This package provides a process list plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-s3-0.26 +(define-public rust-nu-plugin-s3-0.27 (package (name "rust-nu-plugin-s3") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0978rsy95qdvwnh5m2bl8ypl7rb7c0dv3zcnd986jyq3n1ykqykj")))) + (base32 "0g8dx1llizvg98g9jw80iz2jpcnjq4zvw70drsllzlxygpap0rl5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-s3handler" ,rust-s3handler-0.5)))) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-s3handler" ,rust-s3handler-0.6)))) (home-page "https://www.nushell.sh") (synopsis "S3 plugin for Nushell") (description "This package is an S3 plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.26 +(define-public rust-nu-plugin-selector-0.27 (package (name "rust-nu-plugin-selector") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vcwa4g6j8w27g2m4wkk04gja2bw8s9m72v7hbcdmfncgq4cnjrw")))) + (base32 "1v674fkmdb2y28blhvlg0ryp6ric621sfl8law1msvqxq4c7jn84")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-nipper" ,rust-nipper-0.1) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26)))) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27)))) (home-page "https://www.nushell.sh") (synopsis "Web scraping using CSS selector") (description "This package provides web scraping using CSS selector.") (license license:expat))) -(define-public rust-nu-plugin-start-0.26 +(define-public rust-nu-plugin-start-0.27 (package (name "rust-nu-plugin-start") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0k7yqjrj7ydihcpjm8wgf3v4n8w16rawvxk9hdfysgmmvzw29kk8")))) + (base32 "0i98qchvslw0chbzzscfnib1yf1w6wfi1bbp9766hjldnvac0rik")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-open" ,rust-open-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1814,10 +1815,10 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-sys-0.26 +(define-public rust-nu-plugin-sys-0.27 (package (name "rust-nu-plugin-sys") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) @@ -1825,17 +1826,17 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02jddzflzb173g8s6026vi0vk887h4p1q1a2cmc5g31r20z6h61p")))) + (base32 "1zfyjdkga65ns8qdhxzjaj4b5q76pvqkv98sa3cj4sx4wl8q9zrg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1843,28 +1844,28 @@ Nushell.") (description "This package provides a system info plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-textview-0.26 +(define-public rust-nu-plugin-textview-0.27 (package (name "rust-nu-plugin-textview") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12zxphslc56n7s60i8603pq4g9iji58fg5zjvx2g6b06h83070qv")))) + (base32 "1izjv2jwbpaw9y01wdhsv3fnyhrhn0rdx3nr86i9rab1xcgnxrny")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("bat" ,bat) ("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-nu-data" ,rust-nu-data-0.26) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-data" ,rust-nu-data-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-term-size" ,rust-term-size-0.3) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1873,27 +1874,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.26 +(define-public rust-nu-plugin-to-bson-0.27 (package (name "rust-nu-plugin-to-bson") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vpd5j2z2jjqbf8ks6df76xr86rim1wr7x3y1m77c4v1icsnxgzs")))) + (base32 "1k5r4gwn5h48ix4wqyfj4lcymg61ssc5mw8zy7x6s0w2daj58f85")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1902,27 +1903,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.26 +(define-public rust-nu-plugin-to-sqlite-0.27 (package (name "rust-nu-plugin-to-sqlite") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05z4cwaq55rfwdvr3vr8kqdyqbzpkbrdpz1mp4d9fa9b273xs393")))) + (base32 "1n5xy6yfd5vgqz1vj4p7nrb200m8akcfhpqp5hjbn79c7w4nn5d1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1933,26 +1934,26 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-tree-0.26 +(define-public rust-nu-plugin-tree-0.27 (package (name "rust-nu-plugin-tree") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q80fr430igfw9a4qa5l3ydw6xhppzhqf2i6pvfjmdgf2vhflpdr")))) + (base32 "102zhj8sv0mybv0wnljsw48n0p6y5wx7lzv7w96kflxna40q1dm4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-ptree" ,rust-ptree-0.3)))) (home-page "https://www.nushell.sh") (synopsis "Tree viewer plugin for Nushell") @@ -1960,27 +1961,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.26 +(define-public rust-nu-plugin-xpath-0.27 (package (name "rust-nu-plugin-xpath") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sp3q5wlmwpzsx9751wqis2xxshck0fl6gpl1jckwivg8s9glbbg")))) + (base32 "1x9zn2xyqkyg0pjl8kzd9da3gmhknlrdga02rzyssnc0kjagkm7v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-plugin" ,rust-nu-plugin-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-plugin" ,rust-nu-plugin-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) (home-page "https://www.nushell.sh") @@ -1988,17 +1989,17 @@ Nushell.") (description "Traverses XML") (license license:expat))) -(define-public rust-nu-protocol-0.26 +(define-public rust-nu-protocol-0.27 (package (name "rust-nu-protocol") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1s2lm9aydgcwi0h9jhpi9ba5i55k7iv70fpgl85cm7dlw4kyzjv0")))) + (base32 "1z6q6zdkhwx3axv5m788l4k8yds3zd161mwvmvaz0vzj6g10np51")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2010,8 +2011,8 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) @@ -2025,17 +2026,17 @@ Nushell.") (description "Core values and protocols for Nushell") (license license:expat))) -(define-public rust-nu-source-0.26 +(define-public rust-nu-source-0.27 (package (name "rust-nu-source") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sdmasal3qqcp8fjpqncppc81m0984bp528lb9zggipbxzjpvb3i")))) + (base32 "0dr8lssx8cf22cwrrjcpx4xlqxk8qv6nyar3i9jk218q34m6bgn2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2052,41 +2053,41 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-stream-0.26 +(define-public rust-nu-stream-0.27 (package (name "rust-nu-stream") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1y7f28zxfrlhi9qrpbk6dpzb3wr6f59yhx3yim001796c1x6xlcs")))) + (base32 "1hz9n380rnvvg86qi9bfika6c702kn4b9ljsgcwrr984mm3vbb2n")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26)))) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27)))) (home-page "https://www.nushell.sh") (synopsis "Nushell stream") (description "This package provides Nushell stream.") (license license:expat))) -(define-public rust-nu-table-0.26 +(define-public rust-nu-table-0.27 (package (name "rust-nu-table") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kxgmngfzi13xr2r65f5mxy24a8d1d0xrhi9bfjp5955r8r09km4")))) + (base32 "1rmxic6vif8vb5klsvlida7p24nqbnmj1xclmg0p9a10bykzp4gp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2099,17 +2100,17 @@ Nushell.") (description "Nushell table printing") (license license:expat))) -(define-public rust-nu-test-support-0.26 +(define-public rust-nu-test-support-0.27 (package (name "rust-nu-test-support") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nlr9sqjiwviw15x76cc87n6366fxkxz1lsfh6m2ncca1zwgpa69")))) + (base32 "0hwiymqhh6x37bn0vnyi8rxzn6rpq561hxs80fw5qs4q3dkx74nv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2120,10 +2121,10 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://www.nushell.sh") @@ -2132,10 +2133,10 @@ Nushell.") tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.26 +(define-public rust-nu-value-ext-0.27 (package (name "rust-nu-value-ext") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) @@ -2143,16 +2144,16 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12qwxhkxdxsg7q6kbsqg46127lsy150b53kpbly0s8cgwra3bhv5")))) + (base32 "11jj6v6i6hn66q9hbkj3vw5ccz3lkiypxcd1qg5qnlzxq8ba8mj1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.26) - ("rust-nu-protocol" ,rust-nu-protocol-0.26) - ("rust-nu-source" ,rust-nu-source-0.26) + ("rust-nu-errors" ,rust-nu-errors-0.27) + ("rust-nu-protocol" ,rust-nu-protocol-0.27) + ("rust-nu-source" ,rust-nu-source-0.27) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "@code{Extension} traits for values in Nushell") -- cgit 1.4.1 From 8fc36d82271946bf5e327b0f2feef9f65ce91701 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Feb 2021 17:53:36 -0500 Subject: gnu: WebKitGTK: Update to 2.30.5 [fixes CVE-2020-13558]. * gnu/packages/webkit.scm (webkitgtk): Update to 2.30.5. --- 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 1f49c7de91..9ad6682880 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -224,14 +224,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.30.4") + (version "2.30.5") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "093v5wwi237kq8a2fvs6dn5b9rgjll1y6mdicrr7izq1a1ya75fm")) + "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) -- cgit 1.4.1 From 861ba5258399360a8f4c4e7cd08958f46d2c2b1e Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Wed, 17 Feb 2021 09:54:11 +0800 Subject: gnu: Add ttyload. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (ttyload): New variable. Signed-off-by: 宋文武 --- gnu/packages/admin.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 77386d6033..282a513320 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -527,6 +528,42 @@ or via the @code{facter} Ruby library.") (home-page "https://github.com/puppetlabs/facter-ng") (license license:expat))) +(define-public ttyload + (let ((revision "1") + (commit "f9495372801ce4b4dad98ad854203e694c31c1eb")) + (package + (name "ttyload") + (version (git-version "0.5.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lindes/ttyload") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ldb7a13b9v876c6cbrs78pkizj64drnqx95z5shfbwgpwfhr4im")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list (string-append "CC=" ,(cc-for-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"))) + (install-file "ttyload" bin))))))) + (home-page "https://www.daveltd.com/src/util/ttyload/") + (synopsis "Console based color-coded graphs of CPU load average") + (description + "Show graphs for 1 minute, 5 minute, 15 minute load averages on the +console.") + ;; This package uses a modified version of the "ISC License". + (license (license:non-copyleft "file://LICENSE"))))) + (define-public htop (package (name "htop") -- cgit 1.4.1 From d3adae38ca5df5644466f2ffd5cd23f4a514b06c Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Wed, 17 Feb 2021 00:51:14 +0100 Subject: gnu: Add strawberry. * gnu/packages/music.scm (strawberry): New variable. --- gnu/packages/music.scm | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 8b09a1588a..8ffc136b51 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Ryan Prior +;;; Copyright © 2021 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -443,6 +444,98 @@ playing your music.") ;; qocoa is under MIT and CC by-sa for the icons. license:cc-by-sa3.0)))) +(define-public strawberry + (package + (name "strawberry") + (version "0.8.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/strawberrymusicplayer/strawberry") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lfbbmhfzwlhnjhzfk5zn8h71cabx47pzfkcw2nylkbqkz83r57r")) + (modules '((guix build utils) + (ice-9 regex))) + (snippet + '(begin + (use-modules ((ice-9 regex))) + (for-each + (lambda (dir) + ;; TODO: The following dependencies are still bundled: + ;; - "singleapplication" + (let ((bundled '("singleapplication"))) + (if (not + (string-match + (string-append ".?*(" (string-join bundled "|") ")") + dir)) + (delete-file-recursively dir)))) + (find-files "3rdparty" + (lambda (file stat) + (string-match "^3rdparty/[^/]*$" file)) + #:directories? #t)) + #t)))) + (build-system cmake-build-system) + (arguments + `(#:test-target "run_strawberry_tests" + #:configure-flags + (list "-DUSE_SYSTEM_TAGLIB=TRUE" + "-DBUILD_TESTS=TRUE") + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/strawberry") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))) + #t))) + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + (setenv "HOME" (getcwd)) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("boost" ,boost) + ("chromaprint" ,chromaprint) + ("dbus" ,dbus) + ("fftw" ,fftw) + ("glib" ,glib) + ("gnutls" ,gnutls) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("libcdio" ,libcdio) + ("libmtp" ,libmtp) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("sqlite" ,sqlite) + ("taglib" ,taglib))) + (home-page "https://www.strawberrymusicplayer.org/") + (synopsis "Music player and library organizer") + (description "Strawberry is a music player and music collection organizer. +It is a fork of Clementine aimed at music collectors and audiophiles.") + (license (list + ;; strawberry. + license:gpl3+ + ;; singleapplication + license:expat + ;; icons. + license:cc-by-sa3.0)))) + (define-public cmus (package (name "cmus") -- cgit 1.4.1 From 81c1d127aeb16d6ee0eece6d6ed6b194019b2ea6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Feb 2021 23:12:16 +0000 Subject: gnu: cl-mgl-pax: Update to 0.0.3-2.4ada6eb. * gnu/packages/lisp-xyz.scm (sbcl-mgl-pax): Update to 0.0.3-2.4ada6eb. (ecl-mgl-pax): Enable tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5f1db87794..6a070b5b51 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2092,10 +2092,11 @@ processes that doesn't run under Emacs. Lisp processes created by (sbcl-package->ecl-package sbcl-slime-swank)) (define-public sbcl-mgl-pax - (let ((commit "61ce8741f8920bd2faa425c5de4a99afdbc506c2")) + (let ((commit "4ada6eb26364e71addb169ce58e4ba83bc7a8eaa") + (revision "2")) (package (name "sbcl-mgl-pax") - (version (git-version "0.0.3" "1" commit)) + (version (git-version "0.0.3" revision commit)) (source (origin (method git-fetch) @@ -2103,7 +2104,7 @@ processes that doesn't run under Emacs. Lisp processes created by (url "https://github.com/melisgl/mgl-pax") (commit commit))) (sha256 - (base32 "1zm3j9vzd38b9pq7wmamj0pm1v5i13339mkbywyv0jzb5n1hz9s1")) + (base32 "1s38crgvmd9hgqwsscqpj6m6c10a074zjgg8k5sl15yih1wkpssm")) (file-name (git-file-name "mgl-pax" version)))) (build-system asdf-build-system/sbcl) (inputs @@ -2137,13 +2138,7 @@ pretty, documentation is code.") (sbcl-package->cl-source-package sbcl-mgl-pax)) (define-public ecl-mgl-pax - (let ((pkg (sbcl-package->ecl-package sbcl-mgl-pax))) - (package - (inherit pkg) - (arguments - (substitute-keyword-arguments (package-arguments pkg) - ;; TODO: Find why the tests fail on ECL. - ((#:tests? _ #f) #f)))))) + (sbcl-package->ecl-package sbcl-mgl-pax)) (define-public sbcl-mssql (let ((commit "045602a19a32254108f2b75871049293f49731eb") -- cgit 1.4.1 From fc284b733e3aa9f387219890c90c737e652f3843 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Feb 2021 23:23:17 +0000 Subject: gnu: cl-change-case: Update to 0.2.0-1.45c70b6. * gnu/packages/lisp-xyz.scm (sbcl-cl-change-case): Update to 0.2.0-1.45c70b6. [arguments] Enable tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6a070b5b51..390db119a5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10195,10 +10195,11 @@ multiple checkers, including Aspell and Hunspell.") (sbcl-package->ecl-package sbcl-enchant)) (define-public sbcl-cl-change-case - (let ((commit "5ceff2a5f8bd845b6cb510c6364176b27a238fd3")) + (let ((commit "45c70b601125889689e0c1c37d7e727a3a0af022") + (revision "1")) (package (name "sbcl-cl-change-case") - (version (git-version "0.1.0" "1" commit)) + (version (git-version "0.2.0" revision commit)) (home-page "https://github.com/rudolfochrist/cl-change-case") (source (origin @@ -10208,18 +10209,13 @@ multiple checkers, including Aspell and Hunspell.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1afyglglk9z3yg8gylcl301bl2r8vq3sllyznzj9s5xi5gs6qyf2")))) + (base32 "0qmk341zzcsbf8sq0w9ix3r080zg4ri6vzxym63lhdjfzwz3y8if")))) (build-system asdf-build-system/sbcl) (inputs `(("cl-ppcre" ,sbcl-cl-ppcre) ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) (native-inputs `(("fiveam" ,sbcl-fiveam))) - (arguments - '(;; FIXME: Test pass but phase fails with 'Component - ;; "cl-change-case-test" not found, required by'. - #:tests? #f - #:test-asd-file "cl-change-case-test.asd")) (synopsis "Convert Common Lisp strings between camelCase, PascalCase and more") (description "@code{cl-change-case} is library to convert strings between camelCase, -- cgit 1.4.1 From 6cf3b1c265e6d89e3cbfbae22d937fdf65c4a302 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 17 Feb 2021 10:00:28 +0100 Subject: gnu: cl-change-case: Fix description. * gnu/packages/lisp-xyz.scm (sbcl-cl-change-case)[description]: Add missing word. --- gnu/packages/lisp-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 390db119a5..e8a65f36bd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10207,7 +10207,7 @@ multiple checkers, including Aspell and Hunspell.") (uri (git-reference (url home-page) (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-change-case" version)) (sha256 (base32 "0qmk341zzcsbf8sq0w9ix3r080zg4ri6vzxym63lhdjfzwz3y8if")))) (build-system asdf-build-system/sbcl) @@ -10216,10 +10216,11 @@ multiple checkers, including Aspell and Hunspell.") ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) (native-inputs `(("fiveam" ,sbcl-fiveam))) - (synopsis "Convert Common Lisp strings between camelCase, PascalCase and more") + (synopsis + "Convert Common Lisp strings between camelCase, PascalCase and more") (description - "@code{cl-change-case} is library to convert strings between camelCase, -PascalCase, snake_case, param-case, CONSTANT_CASE and more.") + "@code{cl-change-case} is a library to convert strings between +camelCase, PascalCase, snake_case, param-case, CONSTANT_CASE and more.") (license license:llgpl)))) (define-public cl-change-case -- cgit 1.4.1 From 6591e184f0dc7a5159247c9deb12b976f6a8208b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Feb 2021 00:52:29 +0000 Subject: gnu: cl-pngload: Update to 2.0.0-2.91f1d70. * gnu/packages/lisp-xyz.scm (sbcl-pngload): Update to 2.0.0-2.91f1d70. [source]: Update URI as upstream repository migrated. [home-page]: Likewise. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 64 ++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e8a65f36bd..22b51ef40a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11532,38 +11532,40 @@ files.") (sbcl-package->ecl-package sbcl-zpb-exif)) (define-public sbcl-pngload - (package - (name "sbcl-pngload") - (version "2.0.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/bufferswap/pngload") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ix8dd0fxlf8xm0bszh1s7sx83hn0vqq8b8c9gkrd5m310w8mpvh")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("3bz" ,sbcl-3bz) - ("alexandria" ,sbcl-alexandria) - ("cffi" ,sbcl-cffi) - ("mmap" ,sbcl-mmap) - ("parse-float" ,sbcl-parse-float) - ("static-vectors" ,sbcl-static-vectors) - ("swap-bytes" ,sbcl-swap-bytes) - ("zpb-exif" ,sbcl-zpb-exif))) - (arguments - ;; Test suite disabled because of a dependency cycle. - ;; pngload tests depend on opticl which depends on pngload. - '(#:tests? #f)) - (home-page "https://github.com/bufferswap/pngload") - (synopsis "PNG image decoder for Common Lisp") - (description - "This is a Common Lisp library to load images in the PNG image format, + (let ((commit "91f1d703c65bb6a94d6fee06ddbbbbbc5778b71f") + (revision "2")) + (package + (name "sbcl-pngload") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/pngload.git") + (commit commit))) + (file-name (git-file-name "pngload" version)) + (sha256 + (base32 "0s94fdbrbqj12qvgyn2g4lfwvz7qhhzbclrpz5ni7adwxgrmvxl1")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("3bz" ,sbcl-3bz) + ("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("mmap" ,sbcl-mmap) + ("parse-float" ,sbcl-parse-float) + ("static-vectors" ,sbcl-static-vectors) + ("swap-bytes" ,sbcl-swap-bytes) + ("zpb-exif" ,sbcl-zpb-exif))) + (arguments + ;; Test suite disabled because of a dependency cycle. + ;; pngload tests depend on opticl which depends on pngload. + '(#:tests? #f)) + (home-page "https://git.mfiano.net/mfiano/pngload.git") + (synopsis "PNG image decoder for Common Lisp") + (description + "This is a Common Lisp library to load images in the PNG image format, both from files on disk, or streams in memory.") - (license license:expat))) + (license license:expat)))) (define-public cl-pngload (sbcl-package->cl-source-package sbcl-pngload)) -- cgit 1.4.1 From 43b2e440c38a39eb64088bd6c08771c060aa10fc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 13 Feb 2021 10:07:47 +0100 Subject: services: wireguard: New service. * gnu/services/vpn.scm (wireguard-peer, wireguard-configuration): New records. (wireguard-service-type): New variable. * doc/guix.texi (VPN Services): Document it. --- doc/guix.texi | 73 +++++++++++++++++++++++++-- gnu/services/vpn.scm | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 207 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 535c98a453..942d5f93df 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26336,9 +26336,12 @@ Defaults to @samp{()}. @cindex virtual private network (VPN) The @code{(gnu services vpn)} module provides services related to -@dfn{virtual private networks} (VPNs). It provides a @emph{client} service for -your machine to connect to a VPN, and a @emph{server} service for your machine -to host a VPN@. Both services use @uref{https://openvpn.net/, OpenVPN}. +@dfn{virtual private networks} (VPNs). + +@subsubheading OpenVPN + +It provides a @emph{client} service for your machine to connect to a +VPN, and a @emph{server} service for your machine to host a VPN@. @deffn {Scheme Procedure} openvpn-client-service @ [#:config (openvpn-client-configuration)] @@ -26717,6 +26720,70 @@ Defaults to @samp{#f}. @c %end of automatic openvpn-server documentation +@subsubheading Wireguard + +@defvr {Scheme Variable} wireguard-service-type +A service type for a Wireguard tunnel interface. Its value must be a +@code{wireguard-configuration} record as in this example: + +@lisp +(service wireguard-service-type + (wireguard-configuration + (peers + (list + (wireguard-peer + (name "my-peer") + (endpoint "my.wireguard.com:51820") + (public-key "hzpKg9X1yqu1axN6iJp0mWf6BZGo8m1wteKwtTmDGF4=") + (allowed-ips '("10.0.0.2/32"))))))) +@end lisp + +@end defvr + +@deftp {Data Type} wireguard-configuration +Data type representing the configuration of the Wireguard service. + +@table @asis +@item @code{wireguard} +The wireguard package to use for this service. + +@item @code{interface} (default: @code{"wg0"}) +The interface name for the VPN. + +@item @code{addresses} (default: @code{'("10.0.0.1/32")}) +The IP addresses to be assigned to the above interface. + +@item @code{private-key} (default: @code{"/etc/wireguard/private.key"}) +The private key file for the interface. It is automatically generated if +the file does not exist. + +@item @code{peers} (default: @code{'()}) +The authorized peers on this interface. This is a list of +@var{wireguard-peer} records. + +@end table +@end deftp + +@deftp {Data Type} wireguard-peer +Data type representing a Wireguard peer attached to a given interface. + +@table @asis +@item @code{name} +The peer name. + +@item @code{endpoint} (default: @code{#f}) +The optional endpoint for the peer, such as +@code{"demo.wireguard.com:51820"}. + +@item @code{public-key} +The peer public-key represented as a base64 string. + +@item @code{allowed-ips} +A list of IP addresses from which incoming traffic for this peer is +allowed and to which incoming traffic for this peer is directed. + +@end table +@end deftp @node Network File System @subsection Network File System diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 70f2617c7e..3e315a6df2 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -40,7 +40,24 @@ openvpn-remote-configuration openvpn-ccd-configuration generate-openvpn-client-documentation - generate-openvpn-server-documentation)) + generate-openvpn-server-documentation + + wireguard-peer + wireguard-peer? + wireguard-peer-name + wireguard-peer-endpoint + wireguard-peer-allowed-ips + + wireguard-configuration + wireguard-configuration? + wireguard-configuration-wireguard + wireguard-configuration-interface + wireguard-configuration-addresses + wireguard-configuration-port + wireguard-configuration-private-key + wireguard-configuration-peers + + wireguard-service-type)) ;;; ;;; OpenVPN. @@ -507,3 +524,122 @@ is truncated and rewritten every minute.") (remote openvpn-remote-configuration)) (openvpn-remote-configuration ,openvpn-remote-configuration-fields)) 'openvpn-client-configuration)) + + +;;; +;;; Wireguard. +;;; + +(define-record-type* + wireguard-peer make-wireguard-peer + wireguard-peer? + (name wireguard-peer-name) + (endpoint wireguard-peer-endpoint + (default #f)) ;string + (public-key wireguard-peer-public-key) ;string + (allowed-ips wireguard-peer-allowed-ips)) ;list of strings + +(define-record-type* + wireguard-configuration make-wireguard-configuration + wireguard-configuration? + (wireguard wireguard-configuration-wireguard ; + (default wireguard-tools)) + (interface wireguard-configuration-interface ;string + (default "wg0")) + (addresses wireguard-configuration-addresses ;string + (default '("10.0.0.1/32"))) + (port wireguard-configuration-port ;integer + (default 51820)) + (private-key wireguard-configuration-private-key ;string + (default "/etc/wireguard/private.key")) + (peers wireguard-configuration-peers ;list of + (default '()))) + +(define (wireguard-configuration-file config) + (define (peer->config peer) + (let ((name (wireguard-peer-name peer)) + (public-key (wireguard-peer-public-key peer)) + (endpoint (wireguard-peer-endpoint peer)) + (allowed-ips (wireguard-peer-allowed-ips peer))) + (format #f "[Peer] #~a +PublicKey = ~a +AllowedIPs = ~a +~a" + name + public-key + (string-join allowed-ips ",") + (if endpoint + (format #f "Endpoint = ~a\n" endpoint) + "\n")))) + + (match-record config + (wireguard interface addresses port private-key peers) + (let* ((config-file (string-append interface ".conf")) + (peers (map peer->config peers)) + (config + (computed-file + "wireguard-config" + #~(begin + (mkdir #$output) + (chdir #$output) + (call-with-output-file #$config-file + (lambda (port) + (let ((format (@ (ice-9 format) format))) + (format port "[Interface] +Address = ~a +PostUp = ~a set %i private-key ~a +~a +~{~a~^~%~}" + #$(string-join addresses ",") + #$(file-append wireguard "/bin/wg") + #$private-key + #$(if port + (format #f "ListenPort = ~a" port) + "") + (list #$@peers))))))))) + (file-append config "/" config-file)))) + +(define (wireguard-activation config) + (match-record config + (private-key) + #~(begin + (use-modules (guix build utils) + (ice-9 popen) + (ice-9 rdelim)) + (mkdir-p (dirname #$private-key)) + (unless (file-exists? #$private-key) + (let* ((pipe + (open-input-pipe (string-append + #$(file-append wireguard-tools "/bin/wg") + " genkey"))) + (key (read-line pipe))) + (call-with-output-file #$private-key + (lambda (port) + (display key port))) + (chmod #$private-key #o400) + (close-pipe pipe)))))) + +(define (wireguard-shepherd-service config) + (match-record config + (wireguard interface) + (let ((wg-quick (file-append wireguard "/bin/wg-quick")) + (config (wireguard-configuration-file config))) + (list (shepherd-service + (requirement '(networking)) + (provision (list + (symbol-append 'wireguard- + (string->symbol interface)))) + (start #~(lambda _ + (invoke #$wg-quick "up" #$config))) + (stop #~(lambda _ + (invoke #$wg-quick "down" #$config))) + (documentation "Run the Wireguard VPN tunnel")))))) + +(define wireguard-service-type + (service-type + (name 'wireguard) + (extensions + (list (service-extension shepherd-root-service-type + wireguard-shepherd-service) + (service-extension activation-service-type + wireguard-activation))))) -- cgit 1.4.1 From ee2a5da80a9bda25542c00a7a35a9ddddcbd58af Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 19 Jan 2021 18:09:28 +0100 Subject: scripts: system: Remove 'vm-image' command. Remove the 'vm-image' command that has been superseded by the 'image' command. * gnu/system/vm.scm (system-qemu-image): Remove it. * guix/scripts/system.scm (system-derivation-for-action): Mark 'vm-image' command as deprecated and use the image API to produce the VM image. (perform-action, show-help): Adapt accordingly. * tests/guix-system.sh: Ditto. * doc/guix.texi (Invoking guix system, Running Guix in a VM): Ditto. * etc/completion/fish/guix.fish: Ditto. * etc/completion/zsh/_guix: Ditto. --- doc/guix.texi | 33 +++++++++++------------ etc/completion/fish/guix.fish | 7 +++-- etc/completion/zsh/_guix | 2 +- gnu/system/vm.scm | 63 ------------------------------------------- guix/scripts/system.scm | 24 ++++++++--------- tests/guix-system.sh | 2 +- 6 files changed, 33 insertions(+), 98 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 942d5f93df..69897169bd 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -32575,8 +32575,7 @@ size of the image. @cindex System images, creation in various formats @cindex Creating system images in various formats -@item vm-image -@itemx image +@item image @itemx docker-image Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone. By default, @@ -32620,15 +32619,15 @@ the image to it using the following command: The @code{--list-image-types} command lists all the available image types. -@cindex vm-image, creating virtual machine images -When using @code{vm-image}, the returned image is in qcow2 format, which -the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for -more information on how to run the image in a virtual machine. The -@code{grub-bootloader} bootloader is always used independently of what -is declared in the @code{operating-system} file passed as argument. -This is to make it easier to work with QEMU, which uses the SeaBIOS BIOS -by default, expecting a bootloader to be installed in the Master Boot -Record (MBR). +@cindex creating virtual machine images +When using the @code{qcow2} image type, the returned image is in qcow2 +format, which the QEMU emulator can efficiently use. @xref{Running Guix +in a VM}, for more information on how to run the image in a virtual +machine. The @code{grub-bootloader} bootloader is always used +independently of what is declared in the @code{operating-system} file +passed as argument. This is to make it easier to work with QEMU, which +uses the SeaBIOS BIOS by default, expecting a bootloader to be installed +in the Master Boot Record (MBR). @cindex docker-image, creating docker images When using @code{docker-image}, a Docker image is produced. Guix builds @@ -32723,7 +32722,7 @@ create a virtual machine image that contains provenance information, you can run: @example -guix system vm-image --save-provenance config.scm +guix system image -t qcow2 --save-provenance config.scm @end example That way, the resulting image will effectively ``embed its own source'' @@ -32746,10 +32745,10 @@ When this option is omitted, @command{guix system} uses the for burning on CDs and DVDs. @item --image-size=@var{size} -For the @code{vm-image} and @code{image} actions, create an image -of the given @var{size}. @var{size} may be a number of bytes, or it may -include a unit as a suffix (@pxref{Block size, size specifications,, -coreutils, GNU Coreutils}). +For the @code{image} action, create an image of the given @var{size}. +@var{size} may be a number of bytes, or it may include a unit as a +suffix (@pxref{Block size, size specifications,, coreutils, GNU +Coreutils}). When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system declared in @@ -33112,7 +33111,7 @@ If you built your own image, you must copy it out of the store before you can use it. When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform. Here is a minimal QEMU invocation that will boot the result of @command{guix system -vm-image} on x86_64 hardware: +image -t qcow2} on x86_64 hardware: @example $ qemu-system-x86_64 \ diff --git a/etc/completion/fish/guix.fish b/etc/completion/fish/guix.fish index 73bd176112..422baab4bb 100644 --- a/etc/completion/fish/guix.fish +++ b/etc/completion/fish/guix.fish @@ -133,7 +133,7 @@ complete -f -c guix -n '__fish_guix_using_command pull' -l url -d 'download the complete -f -c guix -n '__fish_guix_using_command pull' -l bootstrap -d 'use the bootstrap Guile to build the new Guix' #### system -set -l remotecommands reconfigure roll-back switch-generation list-generations build container vm vm-image disk-image init extension-graph shepherd-graph load-path keep-failed keep-going dry-run fallback no-substitutes substitutes-urls no-grafts no-offload max-silent-time timeout verbosity rounds cores max-jobs derivation on-error image-size no-grub share expose full-boot +set -l remotecommands reconfigure roll-back switch-generation list-generations build container vm image init extension-graph shepherd-graph load-path keep-failed keep-going dry-run fallback no-substitutes substitutes-urls no-grafts no-offload max-silent-time timeout verbosity rounds cores max-jobs derivation on-error image-size no-grub share expose full-boot complete -f -c guix -n '__fish_guix_needs_command' -a system -d 'Build the operating system declared in FILE according to ACTION.' complete -f -c guix -n '__fish_guix_using_command system' -l reconfigure -d 'switch to a new operating system configuration' complete -f -c guix -n '__fish_guix_using_command system' -l roll-back -d 'switch to the previous operating system configuration' @@ -142,8 +142,7 @@ complete -f -c guix -n '__fish_guix_using_command system' -l list-generations -d complete -f -c guix -n '__fish_guix_using_command system' -l build -d 'build the operating system without installing anything' complete -f -c guix -n '__fish_guix_using_command system' -l container -d 'build a container that shares the host\'s store' complete -f -c guix -n '__fish_guix_using_command system' -l vm -d 'build a virtual machine image that shares the host\'s store' -complete -f -c guix -n '__fish_guix_using_command system' -l vm-image -d 'build a freestanding virtual machine image' -complete -f -c guix -n '__fish_guix_using_command system' -l disk-image -d 'build a disk image, suitable for a USB stick' +complete -f -c guix -n '__fish_guix_using_command system' -l image -d 'build a disk image, suitable for a USB stick' complete -f -c guix -n '__fish_guix_using_command system' -l init -d 'initialize a root file system to run GNU' complete -f -c guix -n '__fish_guix_using_command system' -l extension-graph -d 'emit the service extension graph in Dot format' complete -f -c guix -n '__fish_guix_using_command system' -l shepherd-graph -d 'emit the graph of shepherd services in Dot format' @@ -167,7 +166,7 @@ complete -f -c guix -n '__fish_guix_using_command system' -s M -d 'allow at most complete -f -c guix -n '__fish_guix_using_command system' -a "--max-jobs=" -d 'allow at most N build jobs' complete -f -c guix -n '__fish_guix_using_command system' -s d -l derivation -d 'return the derivation of the given system' complete -f -c guix -n '__fish_guix_using_command system' -a "--on-error=" -d 'apply STRATEGY when an error occurs while reading FILE' -complete -f -c guix -n '__fish_guix_using_command system' -a "--image-size=" -d 'for \'vm-image\', produce an image of SIZE' +complete -f -c guix -n '__fish_guix_using_command system' -a "--image-size=" -d 'for \'image\', produce an image of SIZE' complete -f -c guix -n '__fish_guix_using_command system' -l no-grub -d 'for \'init\', do not install GRUB' complete -f -c guix -n '__fish_guix_using_command system' -a "--share=" -d 'for \'vm\', share host file system according to SPEC' complete -f -c guix -n '__fish_guix_using_command system' -a "--expose=" -d 'for \'vm\', expose host file system according to SPEC' diff --git a/etc/completion/zsh/_guix b/etc/completion/zsh/_guix index ae93b62b1d..aa1a859e0d 100644 --- a/etc/completion/zsh/_guix +++ b/etc/completion/zsh/_guix @@ -383,7 +383,7 @@ _guix_list_installed_packages() '--max-jobs=[allow at most N build jobs]:N' \ '--derivation[return the derivation of the given system]' \ '--on-error=[apply STRATEGY when an error occurs while reading FILE]:STRATEGY' \ - '--image-size=[for "vm-image", produce an image of SIZE]:SIZE' \ + '--image-size=[for "image", produce an image of SIZE]:SIZE' \ '--no-grub[for "init", do not install GRUB]' \ '--share=[for "vm", share host file system according to SPEC]:SPEC' \ '--expose=[for "vm", expose host file system according to SPEC]:SPEC' \ diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 1afae6b4ed..d7ae048b81 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -73,7 +73,6 @@ #:export (expression->derivation-in-linux-vm qemu-image virtualized-operating-system - system-qemu-image system-qemu-image/shared-store system-qemu-image/shared-store-script @@ -557,68 +556,6 @@ the operating system." #:single-file-output? #t #:references-graphs `((,graph ,os))))) - -;;; -;;; VM and disk images. -;;; - -(define* (system-qemu-image os - #:key - (file-system-type "ext4") - (disk-image-size (* 900 (expt 2 20)))) - "Return the derivation of a freestanding QEMU image of DISK-IMAGE-SIZE bytes -of the GNU system as described by OS." - (define file-systems-to-keep - ;; Keep only file systems other than root and not normally bound to real - ;; devices. - (remove (lambda (fs) - (let ((target (file-system-mount-point fs)) - (source (file-system-device fs))) - (or (string=? target "/") - (and (string? source) - (string-prefix? "/dev/" source)) - (uuid? source) - (file-system-label? source)))) - (operating-system-file-systems os))) - - (define root-uuid - ;; UUID of the root file system. - (operating-system-uuid os - (if (string=? file-system-type "iso9660") - 'iso9660 - 'dce))) - - - (let* ((os (operating-system - (inherit os) - - ;; As in 'virtualized-operating-system', use BIOS-style GRUB. - (bootloader (bootloader-configuration - (bootloader grub-bootloader) - (target "/dev/vda"))) - - ;; 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))) - ;;; ;;; VMs that share file systems with the host. diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 19b8c5163c..ead20a071e 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -695,8 +695,6 @@ checking this by themselves in their 'check' procedure." os #:mappings mappings #:shared-network? container-shared-network?)) - ((vm-image) - (system-qemu-image os #:disk-image-size image-size)) ((vm) (system-qemu-image/shared-store-script os #:full-boot? full-boot? @@ -705,11 +703,16 @@ checking this by themselves in their 'check' procedure." image-size (* 70 (expt 2 20))) #:mappings mappings)) - ((image disk-image) - (let* ((base-image (os->image os #:type image-type)) + ((image disk-image vm-image) + (let* ((image-type (if (eq? action 'vm-image) + qcow2-image-type + image-type)) + (base-image (os->image os #:type image-type)) (base-target (image-target base-image))) (when (eq? action 'disk-image) (warning (G_ "'disk-image' is deprecated: use 'image' instead~%"))) + (when (eq? action 'vm-image) + (warning (G_ "'vm-image' is deprecated: use 'image' instead~%"))) (lower-object (system-image (image @@ -781,9 +784,8 @@ and TARGET arguments." "Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install bootloader; BOOTLOADER-TAGET is the target for the bootloader; TARGET is the target root directory; IMAGE-SIZE is the size of the image to be built, for -the 'vm-image' and 'image' actions. IMAGE-TYPE is the type of image to -be built. When VOLATILE-ROOT? is #t, the root file system is mounted -volatile. +the 'image' action. IMAGE-TYPE is the type of image to be built. When +VOLATILE-ROOT? is #t, the root file system is mounted volatile. FULL-BOOT? is used for the 'vm' action; it determines whether to boot directly to the kernel or to the bootloader. CONTAINER-SHARED-NETWORK? @@ -968,8 +970,6 @@ Some ACTIONS support additional ARGS.\n")) container build a container that shares the host's store\n")) (display (G_ "\ vm build a virtual machine image that shares the host's store\n")) - (display (G_ "\ - vm-image build a freestanding virtual machine image\n")) (display (G_ "\ image build a Guix System image\n")) (display (G_ "\ @@ -999,7 +999,7 @@ Some ACTIONS support additional ARGS.\n")) (display (G_ " -t, --image-type=TYPE for 'image', produce an image of TYPE")) (display (G_ " - --image-size=SIZE for 'vm-image', produce an image of SIZE")) + --image-size=SIZE for 'image', produce an image of SIZE")) (display (G_ " --no-bootloader for 'init', do not install a bootloader")) (display (G_ " @@ -1017,8 +1017,8 @@ Some ACTIONS support additional ARGS.\n")) (display (G_ " -N, --network for 'container', allow containers to access the network")) (display (G_ " - -r, --root=FILE for 'vm', 'vm-image', 'image', 'container', - and 'build', make FILE a symlink to the result, and + -r, --root=FILE for 'vm', 'image', 'container' and 'build', + make FILE a symlink to the result, and register it as a garbage collector root")) (display (G_ " --full-boot for 'vm', make a full boot sequence")) diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 24cc2591d5..8bc0dcf2fc 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -339,7 +339,7 @@ done # Verify that the disk image types can be built. guix system -n vm gnu/system/examples/vm-image.tmpl -guix system -n vm-image gnu/system/examples/vm-image.tmpl +guix system -n image -t qcow2 gnu/system/examples/vm-image.tmpl # This invocation was taken care of in the loop above: # guix system -n disk-image gnu/system/examples/bare-bones.tmpl guix system -n disk-image -t iso9660 gnu/system/examples/bare-bones.tmpl -- cgit 1.4.1 From 4cce7610eb992fcf168be7cb05ec2b1b2020171e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 Jan 2021 12:06:56 +0100 Subject: image: Export image? procedure. * gnu/image.scm (image?): Export it. --- gnu/image.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/image.scm b/gnu/image.scm index a60d83b175..75d489490d 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -31,6 +31,7 @@ partition-initializer image + image? image-name image-format image-target -- cgit 1.4.1 From 6e8cdf1d26092cb9654e179b04730fff7c15c94f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 20 Jan 2021 10:56:08 +0100 Subject: scripts: system: Accept records as input. * guix/scripts/system.scm (system-derivation-for-action): Replace "os" argument by "image". Remove "image-size", "image-type", "label" and "volatile-root?" arguments. (perform-action): Ditto. (process-action): Construct the record and pass it to "perform-action" procedure. * tests/guix-system.sh: Adapt accordingly. * gnu/system/images/hurd.scm: Return the default image. * gnu/system/images/novena.scm: Ditto. * gnu/system/images/pine64.scm: Ditto. * gnu/system/images/pinebook-pro.scm Ditto. --- gnu/system/images/hurd.scm | 3 + gnu/system/images/novena.scm | 3 + gnu/system/images/pine64.scm | 3 + gnu/system/images/pinebook-pro.scm | 3 + guix/scripts/system.scm | 132 ++++++++++++++++++------------------- tests/guix-system.sh | 7 +- 6 files changed, 80 insertions(+), 71 deletions(-) (limited to 'gnu') diff --git a/gnu/system/images/hurd.scm b/gnu/system/images/hurd.scm index 4417952c5d..eac5b7f7e6 100644 --- a/gnu/system/images/hurd.scm +++ b/gnu/system/images/hurd.scm @@ -111,3 +111,6 @@ (inherit (os->image hurd-barebones-os #:type hurd-qcow2-image-type)) (name 'hurd-barebones.qcow2))) + +;; Return the default image. +hurd-barebones-qcow2-image diff --git a/gnu/system/images/novena.scm b/gnu/system/images/novena.scm index dfaf2c60ee..1cd724ff88 100644 --- a/gnu/system/images/novena.scm +++ b/gnu/system/images/novena.scm @@ -59,3 +59,6 @@ (inherit (os->image novena-barebones-os #:type novena-image-type)) (name 'novena-barebones-raw-image))) + +;; Return the default image. +novena-barebones-raw-image diff --git a/gnu/system/images/pine64.scm b/gnu/system/images/pine64.scm index 63b31399a5..613acd5cfd 100644 --- a/gnu/system/images/pine64.scm +++ b/gnu/system/images/pine64.scm @@ -64,3 +64,6 @@ (inherit (os->image pine64-barebones-os #:type pine64-image-type)) (name 'pine64-barebones-raw-image))) + +;; Return the default image. +pine64-barebones-raw-image diff --git a/gnu/system/images/pinebook-pro.scm b/gnu/system/images/pinebook-pro.scm index 22997fd742..b56a7ea409 100644 --- a/gnu/system/images/pinebook-pro.scm +++ b/gnu/system/images/pinebook-pro.scm @@ -66,3 +66,6 @@ (inherit (os->image pinebook-pro-barebones-os #:type pinebook-pro-image-type)) (name 'pinebook-pro-barebones-raw-image))) + +;; Return the default image. +pinebook-pro-barebones-raw-image diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index ead20a071e..e3cf99acc6 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -680,13 +680,15 @@ checking this by themselves in their 'check' procedure." ;;; Action. ;;; -(define* (system-derivation-for-action os action - #:key image-size image-type - full-boot? container-shared-network? - mappings label - volatile-root?) - "Return as a monadic value the derivation for OS according to ACTION." - (mlet %store-monad ((target (current-target-system))) +(define* (system-derivation-for-action image action + #:key + full-boot? + container-shared-network? + mappings) + "Return as a monadic value the derivation for IMAGE according to ACTION." + (mlet %store-monad ((target (current-target-system)) + (os -> (image-operating-system image)) + (image-size -> (image-size image))) (case action ((build init reconfigure) (operating-system-derivation os)) @@ -704,25 +706,11 @@ checking this by themselves in their 'check' procedure." (* 70 (expt 2 20))) #:mappings mappings)) ((image disk-image vm-image) - (let* ((image-type (if (eq? action 'vm-image) - qcow2-image-type - image-type)) - (base-image (os->image os #:type image-type)) - (base-target (image-target base-image))) - (when (eq? action 'disk-image) - (warning (G_ "'disk-image' is deprecated: use 'image' instead~%"))) - (when (eq? action 'vm-image) - (warning (G_ "'vm-image' is deprecated: use 'image' instead~%"))) - (lower-object - (system-image - (image - (inherit (if label - (image-with-label base-image label) - base-image)) - (target (or base-target target)) - (size image-size) - (operating-system os) - (volatile-root? volatile-root?)))))) + (when (eq? action 'disk-image) + (warning (G_ "'disk-image' is deprecated: use 'image' instead~%"))) + (when (eq? action 'vm-image) + (warning (G_ "'vm-image' is deprecated: use 'image' instead~%"))) + (lower-object (system-image image))) ((docker-image) (system-docker-image os #:shared-network? container-shared-network?))))) @@ -768,7 +756,7 @@ and TARGET arguments." (set! %load-compiled-path (lowered-gexp-load-compiled-path lowered)) (return (primitive-eval (lowered-gexp-sexp lowered)))))) -(define* (perform-action action os +(define* (perform-action action image #:key (validate-reconfigure ensure-forward-reconfigure) save-provenance? @@ -776,16 +764,13 @@ and TARGET arguments." install-bootloader? dry-run? derivations-only? use-substitutes? bootloader-target target - image-size image-type - volatile-root? - full-boot? label container-shared-network? + full-boot? + container-shared-network? (mappings '()) (gc-root #f)) - "Perform ACTION for OS. INSTALL-BOOTLOADER? specifies whether to install + "Perform ACTION for IMAGE. INSTALL-BOOTLOADER? specifies whether to install bootloader; BOOTLOADER-TAGET is the target for the bootloader; TARGET is the -target root directory; IMAGE-SIZE is the size of the image to be built, for -the 'image' action. IMAGE-TYPE is the type of image to be built. When -VOLATILE-ROOT? is #t, the root file system is mounted volatile. +target root directory. FULL-BOOT? is used for the 'vm' action; it determines whether to boot directly to the kernel or to the bootloader. CONTAINER-SHARED-NETWORK? @@ -807,6 +792,9 @@ static checks." '() (map boot-parameters->menu-entry (profile-boot-parameters)))) + (define os + (image-operating-system image)) + (define bootloader (operating-system-bootloader os)) @@ -829,11 +817,7 @@ static checks." (check-initrd-modules os))) (mlet* %store-monad - ((sys (system-derivation-for-action os action - #:label label - #:image-type image-type - #:image-size image-size - #:volatile-root? volatile-root? + ((sys (system-derivation-for-action image action #:full-boot? full-boot? #:container-shared-network? container-shared-network? #:mappings mappings)) @@ -1169,9 +1153,9 @@ Some ACTIONS support additional ARGS.\n")) ACTION must be one of the sub-commands that takes an operating system declaration as an argument (a file name.) OPTS is the raw alist of options resulting from command-line parsing." - (define (ensure-operating-system file-or-exp obj) - (unless (operating-system? obj) - (leave (G_ "'~a' does not return an operating system~%") + (define (ensure-operating-system-or-image file-or-exp obj) + (unless (or (operating-system? obj) (image? obj)) + (leave (G_ "'~a' does not return an operating system or an image~%") file-or-exp)) obj) @@ -1185,27 +1169,47 @@ resulting from command-line parsing." (expr (assoc-ref opts 'expression)) (system (assoc-ref opts 'system)) (target (assoc-ref opts 'target)) - (transform (if save-provenance? - (cut operating-system-with-provenance <> file) - identity)) - (os (transform - (ensure-operating-system - (or file expr) - (cond - ((and expr file) - (leave - (G_ "both file and expression cannot be specified~%"))) - (expr - (read/eval expr)) - (file - (load* file %user-module - #:on-error (assoc-ref opts 'on-error))) - (else - (leave (G_ "no configuration specified~%"))))))) - + (transform (lambda (obj) + (if (and save-provenance? (operating-system? obj)) + (operating-system-with-provenance obj file) + obj))) + (obj (transform + (ensure-operating-system-or-image + (or file expr) + (cond + ((and expr file) + (leave + (G_ "both file and expression cannot be specified~%"))) + (expr + (read/eval expr)) + (file + (load* file %user-module + #:on-error (assoc-ref opts 'on-error))) + (else + (leave (G_ "no configuration specified~%"))))))) (dry? (assoc-ref opts 'dry-run?)) (bootloader? (assoc-ref opts 'install-bootloader?)) (label (assoc-ref opts 'label)) + (image-type (lookup-image-type-by-name + (assoc-ref opts 'image-type))) + (image (let* ((image-type (if (eq? action 'vm-image) + qcow2-image-type + image-type)) + (image-size (assoc-ref opts 'image-size)) + (volatile? (assoc-ref opts 'volatile-root?)) + (base-image (if (operating-system? obj) + (os->image obj + #:type image-type) + obj)) + (base-target (image-target base-image))) + (image + (inherit (if label + (image-with-label base-image label) + base-image)) + (target (or base-target target)) + (size image-size) + (volatile-root? volatile?)))) + (os (image-operating-system image)) (target-file (match args ((first second) second) (_ #f))) @@ -1241,7 +1245,7 @@ resulting from command-line parsing." (warn-about-old-distro #:suggested-command "guix system reconfigure")) - (perform-action action os + (perform-action action image #:dry-run? dry? #:derivations-only? (assoc-ref opts 'derivations-only?) @@ -1250,11 +1254,6 @@ resulting from command-line parsing." (assoc-ref opts 'skip-safety-checks?) #:validate-reconfigure (assoc-ref opts 'validate-reconfigure) - #:image-type (lookup-image-type-by-name - (assoc-ref opts 'image-type)) - #:image-size (assoc-ref opts 'image-size) - #:volatile-root? - (assoc-ref opts 'volatile-root?) #:full-boot? (assoc-ref opts 'full-boot?) #:container-shared-network? (assoc-ref opts 'container-shared-network?) @@ -1264,7 +1263,6 @@ resulting from command-line parsing." (_ #f)) opts) #:install-bootloader? bootloader? - #:label label #:target target-file #:bootloader-target bootloader-target #:gc-root (assoc-ref opts 'gc-root))))) diff --git a/tests/guix-system.sh b/tests/guix-system.sh index 8bc0dcf2fc..238c8929a8 100644 --- a/tests/guix-system.sh +++ b/tests/guix-system.sh @@ -337,12 +337,11 @@ for example in gnu/system/examples/*.tmpl; do guix system -n disk-image $target "$example" done -# Verify that the disk image types can be built. +# Verify that the images can be built. guix system -n vm gnu/system/examples/vm-image.tmpl +guix system -n image gnu/system/images/pinebook-pro.scm guix system -n image -t qcow2 gnu/system/examples/vm-image.tmpl -# This invocation was taken care of in the loop above: -# guix system -n disk-image gnu/system/examples/bare-bones.tmpl -guix system -n disk-image -t iso9660 gnu/system/examples/bare-bones.tmpl +guix system -n image -t iso9660 gnu/system/examples/bare-bones.tmpl guix system -n docker-image gnu/system/examples/docker-image.tmpl # Verify that at least the raw image type is available. -- cgit 1.4.1 From bad548161eb2f3e2d869812ed307e20f7583933e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 12:32:31 +0100 Subject: gnu: emacs-scratch-el: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-scratch-el): Update to 1.3. --- gnu/packages/emacs-xyz.scm | 62 ++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d302a3f96..4aed2643fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14425,42 +14425,40 @@ from @code{groovy-mode} for editing Jenkins declarative pipeline files.") (license license:gpl3+)))) (define-public emacs-scratch-el - (let ((commit "2cdf2b841ce7a0987093f65b0cc431947549f897") - (revision "1")) - (package - (name "emacs-scratch-el") - (version (git-version "1.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ieure/scratch-el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wscsndynjmnliajqaz28r1ww81j8wh84zwaaswx51abhwgl0idf")))) - (build-system emacs-build-system) - (native-inputs - `(("texinfo" ,texinfo))) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (unless (invoke "makeinfo" "scratch.texi") - (error "makeinfo failed")) - (install-file "scratch.info" - (string-append (assoc-ref outputs "out") - "/share/info")) - #t))))) - (home-page "https://github.com/ieure/scratch-el/") - (synopsis "Create scratch buffers with the same mode as current buffer") - (description "Scratch is an extension to Emacs that enables one to create + (package + (name "emacs-scratch-el") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ieure/scratch-el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yiwq2gc4gdgfhaagpawhb7yrzc4fsnyb10w5d0q4whv64cj8555")))) + (build-system emacs-build-system) + (native-inputs + `(("texinfo" ,texinfo))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (unless (invoke "makeinfo" "scratch.texi") + (error "makeinfo failed")) + (install-file "scratch.info" + (string-append (assoc-ref outputs "out") + "/share/info")) + #t))))) + (home-page "https://github.com/ieure/scratch-el/") + (synopsis "Create scratch buffers with the same mode as current buffer") + (description "Scratch is an extension to Emacs that enables one to create scratch buffers that are in the same mode as the current buffer. This is notably useful when working on code in some language; you may grab code into a scratch buffer, and, by virtue of this extension, do so using the Emacs formatting rules for that language.") - (license license:bsd-2)))) + (license license:bsd-2))) (define-public emacs-kv (package -- cgit 1.4.1 From 6e39a8094f37690350438703033de384a197fed6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 12:39:22 +0100 Subject: gnu: emacs-elisp-slime-nav: Update to 0.10. * gnu/packages/emacs-xyz.scm (emacs-elisp-slime-nav): Update to 0.10. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4aed2643fe..df370b38b7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15246,7 +15246,7 @@ Emacs.") (define-public emacs-elisp-slime-nav (package (name "emacs-elisp-slime-nav") - (version "0.9") + (version "0.10") (source (origin (method git-fetch) @@ -15255,7 +15255,7 @@ Emacs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih")))) + (base32 "08k4zlawjkb0ldn4lgrhih8nzln398x7dwzpipqfyrmp0xziywma")))) (build-system emacs-build-system) (home-page "https://github.com/purcell/elisp-slime-nav") (synopsis "Make @code{M-.} and @code{M-,} work for elisp like they do in SLIME") -- cgit 1.4.1 From 0208f313a29b17a384728e22b8e633c78215a701 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 12:45:25 +0100 Subject: gnu: emacs-parsebib: Update to 2.4.1. * gnu/packages/emacs-xyz.scm (emacs-parsebib): Update to 2.4.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index df370b38b7..c14d658fc5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15773,7 +15773,7 @@ files to be expanded upon opening them.") (define-public emacs-parsebib (package (name "emacs-parsebib") - (version "2.3.3") + (version "2.4.1") (source (origin (method git-fetch) @@ -15782,7 +15782,7 @@ files to be expanded upon opening them.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0mpgyy9qfb5x4fvlmb274hgayjbwf0bgk65dxyx31zikjwpcd56p")))) + (base32 "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni")))) (build-system emacs-build-system) (home-page "https://github.com/joostkremers/parsebib") (synopsis "Library for parsing @file{.bib} files") -- cgit 1.4.1 From 260b6d5554f24657058fbae0955897c674402c2c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:01:05 +0100 Subject: gnu: emacs-edit-server: Update to 1.16. * gnu/packages/emacs-xyz.scm (emacs-edit-server): Update to 1.16. [propagated-inputs]: Add emacs-ert-async. --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c14d658fc5..a40dac7ba0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16430,7 +16430,7 @@ mode.") (define-public emacs-edit-server (package (name "emacs-edit-server") - (version "1.15") + (version "1.16") (source (origin (method git-fetch) @@ -16439,7 +16439,7 @@ mode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xxby3ghs38i1l7kag12rnzlzcg9297pm8k6kqq3aqzsg9d2950y")))) + (base32 "0m7gj224sqxjjw5sxky92fnrxg9jy4nf33kwf0aqxnfhqlgh545k")))) (build-system emacs-build-system) (arguments `(#:phases @@ -16448,6 +16448,7 @@ mode.") ;; Elisp directory is not in root of the source. (lambda _ (chdir "servers")))))) + (propagated-inputs `(("emacs-ert-async" ,emacs-ert-async))) (home-page "https://github.com/stsquad/emacs_chrome") (synopsis "Server that responds to edit requests from Chromium") (description -- cgit 1.4.1 From 398c95f98683f7c7d81b51ae1cbcf631fefc9fca Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:06:34 +0100 Subject: gnu: emacs-ibuffer-projectile: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-ibuffer-projectile): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a40dac7ba0..ec67e69259 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16812,29 +16812,27 @@ within Emacs.") (license license:gpl3+)))) (define-public emacs-ibuffer-projectile - (let ((commit "76496214144687cee0b5139be2e61b1e400cac87") - (revision "2")) - (package - (name "emacs-ibuffer-projectile") - (version (git-version "0.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/purcell/ibuffer-projectile") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0vv9xwb1qd5x8zhqmmsn1nrpd11cql9hxb7483nsdhcfwl4apqav")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-projectile" ,emacs-projectile))) - (home-page "https://github.com/purcell/ibuffer-projectile") - (synopsis "Group ibuffer's list by projectile root") - (description "Adds functionality to Emacs @code{ibuffer} for + (package + (name "emacs-ibuffer-projectile") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/ibuffer-projectile") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "18cqxnwzzbkcj9jcaw89b210432yzhrl1dwsv48p0jbhfnr17k41")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-projectile" ,emacs-projectile))) + (home-page "https://github.com/purcell/ibuffer-projectile") + (synopsis "Group ibuffer's list by projectile root") + (description "Adds functionality to Emacs @code{ibuffer} for grouping buffers by their projectile root directory.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-elm-mode (package -- cgit 1.4.1 From bad1e5697c9d4a101ad8e83e8300e5b093cc15ee Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:08:53 +0100 Subject: gnu: emacs-org-re-reveal: Update to 3.7.0. * gnu/packages/emacs-xyz.scm (emacs-org-re-reveal): Update to 3.7.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec67e69259..301ba6bcae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17081,7 +17081,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.1.1") + (version "3.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -17090,7 +17090,7 @@ powerful Org contents.") (file-name (git-file-name name version)) (sha256 (base32 - "0an799lxy1j48zlg00982d1rhg46ls4fz4v7r7qdh6228icq5hij")))) + "1vzn0l8ig4rzh5h8j7kxn8kslqrij97qqv98fbnlwmrw4z87v8dr")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-htmlize" ,emacs-htmlize) -- cgit 1.4.1 From 1767b27dd6933ecc7260d724a4d1f80481a495a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:11:28 +0100 Subject: gnu: emacs-magit-org-todos-el: Update to 0.1.2. * gnu/packages/emacs-xyz.scm (emacs-magit-org-todos-el): Update to 0.1.2. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 301ba6bcae..2d668d1ade 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17405,32 +17405,31 @@ Emacs.") (license license:gpl3+)))) (define-public emacs-magit-org-todos-el - (let ((commit "df206287737b9671f2e36ae7b1474ebbe9940d2a")) - (package - (name "emacs-magit-org-todos-el") - (version (git-version "0.1.1" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/danielma/magit-org-todos.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0kdp7k7jnnrkhsg0xh1c3h7iz0vgi120gf5xwl1hxy61avivnxrn")))) - (propagated-inputs - `(("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") - (description "This package allows you to get @file{todo.org} into your + (package + (name "emacs-magit-org-todos-el") + (version "0.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danielma/magit-org-todos.el") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07r5x256k1fjjxs1yfg41kc94nwvnjlk2vvknkra3j8v9p0j88m7")))) + (propagated-inputs + `(("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") + (description "This package allows you to get @file{todo.org} into your magit status. If you have a @file{todo.org} file with @code{TODO} items in the root of your repository, @code{magit-org-todos} will create a section in your Magit status buffer with each of your todos.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-vcsh (package -- cgit 1.4.1 From d77dfee1f327139e3a349c6e3e62c0d230d20609 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:13:22 +0100 Subject: gnu: emacs-default-text-scale: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-default-text-scale): Update to 0.2. --- gnu/packages/emacs-xyz.scm | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2d668d1ade..a383f5f12b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17658,27 +17658,24 @@ interactive behavior should be different.") (license license:gpl3+))) (define-public emacs-default-text-scale - (let ((commit "968e985e219235f3e744d6d967e592acbaf6e0a8") - (revision "1")) - (package - (name "emacs-default-text-scale") - (version (string-append "0.1" "-" revision "." - (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/purcell/default-text-scale") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zds01c3q5yny6ab1fxfkzzgn1kgl3q23lxxap905f4qd70v922h")))) - (build-system emacs-build-system) - (home-page "https://github.com/purcell/default-text-scale") - (synopsis "Adjust the font size in all Emacs frames") - (description "This package provides commands for increasing or + (package + (name "emacs-default-text-scale") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/default-text-scale") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0h42jiwxrxjmk7ccwh3h25n7dy2rq61ncm5wx27jhkncc5jdm4h6")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/default-text-scale") + (synopsis "Adjust the font size in all Emacs frames") + (description "This package provides commands for increasing or decreasing the default font size in all GUI Emacs frames.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-mixed-pitch ;; This commit contains fixes for visual alignment of line numbers and -- cgit 1.4.1 From 53c98cb97d18520bc12f5d3e169e561661f86afe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:14:51 +0100 Subject: gnu: emacs-mixed-pitch: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-mixed-pitch): Update to 1.1.1. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a383f5f12b..11de05c8de 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17678,32 +17678,27 @@ decreasing the default font size in all GUI Emacs frames.") (license license:gpl3+))) (define-public emacs-mixed-pitch - ;; This commit contains fixes for visual alignment of line numbers and - ;; org-indent-mode. - (let ((commit "d305108f9520e196b533f05d1dcc284cf535faaf") - (tag "1.1.0") - (revision "0")) - (package - (name "emacs-mixed-pitch") - (version (git-version tag revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/jabranham/mixed-pitch.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0yx89is3g2m8af8vfsz5rgjmfmx7mfrxlffb1x6y4b8lh9l0k6dj")))) - (build-system emacs-build-system) - (home-page "https://gitlab.com/jabranham/mixed-pitch") - (synopsis "Mix variable- and fixed-pitch fonts in the same Emacs buffer") - (description - "@code{mixed-pitch-mode} is a minor mode that enables mixing + (package + (name "emacs-mixed-pitch") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jabranham/mixed-pitch.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/jabranham/mixed-pitch") + (synopsis "Mix variable- and fixed-pitch fonts in the same Emacs buffer") + (description + "@code{mixed-pitch-mode} is a minor mode that enables mixing variable-pitch and fixed-pitch fonts in the same buffer. The list @code{mixed-pitch-fixed-pitch-faces} defines the faces that are kept fixed-pitch,everything else becomes variable-pitch.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-visual-regexp (package -- cgit 1.4.1 From c7ea1c51213a1f779c820bdc3bf91619ff92191d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:29:51 +0100 Subject: gnu: emacs-slime-company: Update to 1.6. * gnu/packages/emacs-xyz.scm (emacs-slime-company): Update to 1.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 11de05c8de..f163533fce 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18108,7 +18108,7 @@ sections for bookmarks, projectil projects, org-agenda and more. ") (define-public emacs-slime-company (package (name "emacs-slime-company") - (version "1.1") + (version "1.6") (source (origin (method git-fetch) @@ -18117,7 +18117,7 @@ sections for bookmarks, projectil projects, org-agenda and more. ") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g")))) + (base32 "05dnnc4ms5c9yp9h65k2gbkg3pw9k38nx5wzlwdlfr4shqmw54w0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-slime" ,emacs-slime) -- cgit 1.4.1 From 6a184342f92554ce0690bbd872eaaf5483ba578d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 17 Feb 2021 14:30:15 +0100 Subject: gnu: cuirass: Update to 0.0.1-68.ea01201. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-68.ea01201. --- 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 ad2e979fbc..31a32736be 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "23688a0e451e0265ad29e150d6eba497d4291fb6") - (revision "67")) + (let ((commit "ea01201ccd267506451e0301fbc5d8f12ef9ba5c") + (revision "68")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1r90wnj9w3vh3rr48mddp0xi874ffawc9nsb8cdnpw034px62k1k")))) + "1c7h725y3d6msbrk49j57qfpxjlspb9gc5cq77hi3qmrb48vrlhb")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 01c1b8e0dc6583ad707da25c75f7139f852137a4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:34:20 +0100 Subject: gnu: emacs-helm-firefox: Fix version string. * gnu/packages/emacs-xyz.scm (emacs-helm-firefox)[origin]: Tagged commit is really version 1.3. --- gnu/packages/emacs-xyz.scm | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f163533fce..255e0a4e78 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17807,29 +17807,26 @@ compilation/grep buffers. Works with @code{wgrep}, @code{ack}, @code{ag}, (license license:gpl3+)))) (define-public emacs-helm-firefox - (let ((commit "0ad34b7b5abc485a86cae6920c14de861cbeb085") - (revision "1")) - (package - (name "emacs-helm-firefox") - (version (string-append "0.0.1" "-" revision "." - (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-firefox") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs")))) - (propagated-inputs - `(("emacs-helm" ,emacs-helm))) - (build-system emacs-build-system) - (home-page "https://github.com/emacs-helm/helm-firefox") - (synopsis "Display firefox bookmarks with Emacs Helm interface") - (description "Display firefox bookmarks with Emacs Helm interface") - (license license:gpl3+)))) + (package + (name "emacs-helm-firefox") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-firefox") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs")))) + (propagated-inputs + `(("emacs-helm" ,emacs-helm))) + (build-system emacs-build-system) + (home-page "https://github.com/emacs-helm/helm-firefox") + (synopsis "Display firefox bookmarks with Emacs Helm interface") + (description "Display firefox bookmarks with Emacs Helm interface") + (license license:gpl3+))) (define-public emacs-interactive-align (package -- cgit 1.4.1 From d41e9fe69dee3ef72bbdf9ebf40cff3bbfdcf0c9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:38:37 +0100 Subject: gnu: emacs-esh-autosuggest: Update to 2.0.1. * gnu/packages/emacs-xyz.scm (emacs-esh-autosuggest): Update to 2.0.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 255e0a4e78..e9a7837b4e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18496,7 +18496,7 @@ matching regexps.") (define-public emacs-esh-autosuggest (package (name "emacs-esh-autosuggest") - (version "2.0.0") + (version "2.0.1") (source (origin (method git-fetch) @@ -18506,7 +18506,7 @@ matching regexps.") (file-name (git-file-name name version)) (sha256 (base32 - "116pdjgpjy9b0psm5kzwkwy7dq8vn0p6dy75dl1zsy2xrjf1iqdw")))) + "0l2nnlr3b6df1xn0qjf5d5ryy1wcs1jczyfy795vsasd5gm3g0xh")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-company" ,emacs-company))) (home-page "https://github.com/dieggsy/esh-autosuggest") -- cgit 1.4.1 From 8df4a4beafe821b0e5e271241e0ec12d12cfd422 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:40:24 +0100 Subject: gnu: emacs-desktop-environment: Update to 0.4.0. * gnu/packages/emacs-xyz.scm (emacs-desktop-environment): Update to 0.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e9a7837b4e..215331fa05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18525,7 +18525,7 @@ autosuggestions with: (define-public emacs-desktop-environment (package (name "emacs-desktop-environment") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) @@ -18535,7 +18535,7 @@ autosuggestions with: (file-name (git-file-name name version)) (sha256 (base32 - "195n99xvxyh4cfxjpfa1h1maalqrxf7nyi0bh3lqa1z6z5bdb6x2")))) + "0s33jncjg8c2xlr90qjk1ishwmwxm9yg0z6n3kzilawcilpxidsh")))) (build-system emacs-build-system) (home-page "https://gitlab.petton.fr/DamienCassou/desktop-environment") (synopsis "Control your GNU/Linux desktop environment from Emacs") -- cgit 1.4.1 From fd654c47e8a9f4c4287b54062eaf8b7b10200f76 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:42:33 +0100 Subject: gnu: emacs-zotxt: Update to 5.0.5. * gnu/packages/emacs-xyz.scm (emacs-zotxt): Update to 5.0.5. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 215331fa05..4318ff002c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18578,16 +18578,16 @@ calendar.") (define-public emacs-zotxt (package (name "emacs-zotxt") - (version "20180518") + (version "5.0.5") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/egh/zotxt-emacs") - (commit "23a4a9f74a658222027d53a9a83cd4bcc583ca8b"))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09fq3w9yk9kn6bz7y9kgpiw612dvj3yzsdk734js6zgb0p8lfd2c")))) + (base32 "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-deferred" ,emacs-deferred) -- cgit 1.4.1 From 158f98e3eedee063234974b30fe30a3dc3327f2a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:49:33 +0100 Subject: gnu: emacs-package-lint: Update to 0.13-0.14c216f. * gnu/packages/emacs-xyz.scm (emacs-package-lint): Update to 0.13-0.14c216f. --- gnu/packages/emacs-xyz.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4318ff002c..503edddf7d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19199,10 +19199,14 @@ image, rotate it, save modified images, and more.") (license license:gpl3+)))) (define-public emacs-package-lint - (let ((commit "69bb89d00ba212b734c676ad056aa793c450b288")) + ;; The commit below includes a fix for a missing file, "stdlib-changes", + ;; preventing build. + (let ((commit "14c216f4889e71eec2a9da64e36ab8990337e82d") + (version "0.13") + (revision "0")) (package (name "emacs-package-lint") - (version (git-version "0.5" "1" commit)) + (version (git-version version revision commit)) (source (origin (method git-fetch) @@ -19212,7 +19216,7 @@ image, rotate it, save modified images, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "1hfricsgmy3x9snnd2p4xq6vnnv94qdsxxnxp07b3hqc9bhw31rq")))) + "1zifiqmpj9j14fnrm3jxapady25m1nlm514nfry0jfrhhikvj6i8")))) (build-system emacs-build-system) (home-page "https://github.com/purcell/package-lint") (synopsis "Linting library for elisp package authors") -- cgit 1.4.1 From 208272def9f9097889ec37429346e18c190f34b0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:52:16 +0100 Subject: gnu: emacs-pandoc-mode: Update to 2.30.1. * gnu/packages/emacs-xyz.scm (emacs-pandoc-mode): Update to 2.30.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 503edddf7d..cf37f2fe7f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19437,7 +19437,7 @@ text in neighboring sections.") (define-public emacs-pandoc-mode (package (name "emacs-pandoc-mode") - (version "2.27.2") + (version "2.30.1") (source (origin (method git-fetch) @@ -19447,7 +19447,7 @@ text in neighboring sections.") (file-name (git-file-name name version)) (sha256 (base32 - "04bqc7mhgkfks3nsvimd3rrriv4nqbksmv5ahlbbd03aqa2b0vrv")))) + "1k31pkvd9m798i6phcr0y3wd34fgq6ii41hx3lszmikvxb1yvm2y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit 1.4.1 From 07aea714f8a814178255c92c54c39def28283fb3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:54:46 +0100 Subject: gnu: emacs-dired-rsync: Update to 0.6. * gnu/packages/emacs-xyz.scm (emacs-dired-rsync): Update to 0.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cf37f2fe7f..bd57201420 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19817,7 +19817,7 @@ buffer displays recursive dir sizes.") (define-public emacs-dired-rsync (package (name "emacs-dired-rsync") - (version "0.5") + (version "0.6") (source (origin (method git-fetch) (uri (git-reference @@ -19826,7 +19826,7 @@ buffer displays recursive dir sizes.") (file-name (git-file-name name version)) (sha256 (base32 - "1nq3d8py2zsji835wilg514z5j180k371pwqsqrmnnhq1cj4fkia")))) + "19za6i96xrmczdh928n5ixd7j7pvy175sz1msaiwvdjwysjr8k51")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-s" ,emacs-s) -- cgit 1.4.1 From 0ca8092399f5b7238dd5d191af02682ad85e4187 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:55:48 +0100 Subject: gnu: emacs-magit-todos: Update to 1.5.3. * gnu/packages/emacs-xyz.scm (emacs-magit-todos): Update to 1.5.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bd57201420..003a82d416 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19879,7 +19879,7 @@ buffers – other modes on the TODO list). (define-public emacs-magit-todos (package (name "emacs-magit-todos") - (version "1.4.1") + (version "1.5.3") (source (origin (method git-fetch) @@ -19889,7 +19889,7 @@ buffers – other modes on the TODO list). (file-name (git-file-name name version)) (sha256 (base32 - "1rcl6j53yabxqk3jzgaxvm3wqq7rayf1hdib2v2fapw5b0layym6")))) + "12ay02vk6bk77k33mhlqi41m03a77y80b15rj1dbh1n6jfrjwkfy")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit 1.4.1 From a7da8a5ebc65a173fef7dcedec08889c84e69fdb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:57:08 +0100 Subject: gnu: emacs-hackernews: Update to 0.6.1. * gnu/packages/emacs-xyz.scm (emacs-hackernews): Update to 0.6.1. --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 003a82d416..e55d48dee1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19935,29 +19935,27 @@ files) are provided.") (license license:gpl2+)))) (define-public emacs-hackernews - (let ((commit "2362d7b00e59da7caddc8c0adc24dccb42fddef9") - (revision "2")) - (package - (name "emacs-hackernews") - (version (git-version "0.5.0" revision 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 - "1hcc5b173yzcvvd2ls3jxrmsw2w9bi21m9hcpcirkn0nh93ywadv")))) - (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 + (package + (name "emacs-hackernews") + (version "0.6.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clarete/hackernews.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "17lkjcka6ydd6khhz5jbjlybfpx05153z0d8s1rxaxcwl7z2y6cf")))) + (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)))) + (license license:gpl3))) (define-public emacs-youtube-dl (let ((commit "af877b5bc4f01c04fccfa7d47a2c328926f20ef4") -- cgit 1.4.1 From c3b5ac2fa091d2dd5fdec339b8932ed64ad53fd6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 14:58:47 +0100 Subject: gnu: emacs-org-web-tools: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-org-web-tools): Update to 1.1.1. [propagated-inputs]: Add emacs-request. --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e55d48dee1..63b6ef0eeb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20042,7 +20042,7 @@ depending on the downloaded URL.") (define-public emacs-org-web-tools (package (name "emacs-org-web-tools") - (version "1.0") + (version "1.1.1") (source (origin (method git-fetch) @@ -20052,11 +20052,12 @@ depending on the downloaded URL.") (file-name (git-file-name name version)) (sha256 (base32 - "0kak9h5ny00d39gnwspv53nadnag01brw2fq9zk5wpfc91h9bjng")))) + "0v4qad54r0z7dr7kg5lpfdsazi44qvrbybx9aciyl4w9grfajphb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) ("emacs-esxml" ,emacs-esxml) + ("emacs-request" ,emacs-request) ("emacs-s" ,emacs-s))) (inputs `(("pandoc" ,pandoc))) -- cgit 1.4.1 From e4730f2d19d5d1a5f23fc6356e6930bad8ca5675 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:01:29 +0100 Subject: gnu: emacs-synosaurus: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-synosaurus): Update to 0.2.0. [arguments]: Fix configure phase. Tiny refactoring. --- gnu/packages/emacs-xyz.scm | 68 ++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 63b6ef0eeb..499269072d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20109,42 +20109,40 @@ 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 + (package + (name "emacs-synosaurus") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hpdeifel/synosaurus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14dd6p89pmpf1w3nx4f9mzm4sn2b64nicws436ck7pmp223pwciv")))) + (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. + (make-file-writable "synosaurus-wordnet.el") + ;; Specify the absolute file names of the various + ;; programs so that everything works out-of-the-box. + (emacs-substitute-variables "synosaurus-wordnet.el" + ("synosaurus-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+)))) + (license license:gpl3+))) (define-public emacs-editorconfig (package -- cgit 1.4.1 From 5b5b7336f4817d9c7944649de14b6fa5b1e4806e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:04:51 +0100 Subject: gnu: emacs-buttercup: Update to 1.24. * gnu/packages/emacs-xyz.scm (emacs-buttercup): Update to 1.24. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 499269072d..3b462e790e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20559,7 +20559,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (define-public emacs-buttercup (package (name "emacs-buttercup") - (version "1.23") + (version "1.24") (source (origin (method git-fetch) @@ -20569,7 +20569,7 @@ targets the Emacs based IDEs (CIDER, ESS, Geiser, Robe, SLIME etc.)") (file-name (git-file-name name version)) (sha256 (base32 - "0ym1hajy47n5f1rxic8qfxrwd8zc1r7csz1v4hrwhwm4qld4krfr")))) + "1w02p4bfkyga6sign4flq2kw0hawyvnv63410pyh8nm7acp311gg")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit 1.4.1 From fe0ab6027427bcba927378027aef9d1e1cc3d8df Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:06:15 +0100 Subject: gnu: emacs-cort: Update to 7.1.0. * gnu/packages/emacs-xyz.scm (emacs-cort): Update to 7.1.0. --- gnu/packages/emacs-xyz.scm | 52 +++++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3b462e790e..6474223afd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20590,34 +20590,30 @@ functions to ensure they are called with the right arguments during testing.") (license license:gpl3+))) (define-public emacs-cort - ;; Choosing a recent commit to fix some bugs. - ;; https://github.com/conao3/cort.el/issues/106 - (let ((commit "495c3972b92b57a0cb5dd65ce5de9d3c6b8b6509") - (revision "1")) - (package - (name "emacs-cort") - (version (git-version "3.0.5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/conao3/cort.el") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0f4irq1arh9c7lf9a5bla25am0jy5r6lj8ayb8k9k7lrirzhyk99")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-ansi" ,emacs-ansi))) - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" "--quick" - "--directory=." "--load=cort-tests.el" - "--funcall=cort-test-run"))) - (home-page "https://github.com/conao3/cort.el") - (synopsis "Unit test framework for the Emacs Lisp") - (description "@code{cort} is a lightweight Emacs Lisp unit test library.") - (license license:gpl3+)))) + (package + (name "emacs-cort") + (version "7.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/conao3/cort.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03c223nczpbdkjmq69panhbsq2a0zj20w329jgj4c0zsj8m1a32a")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ansi" ,emacs-ansi))) + (arguments + `(#:tests? #t + #:test-command '("emacs" "--batch" "--quick" + "--directory=." "--load=cort-tests.el" + "--funcall=cort-test-run"))) + (home-page "https://github.com/conao3/cort.el") + (synopsis "Unit test framework for the Emacs Lisp") + (description "@code{cort} is a lightweight Emacs Lisp unit test library.") + (license license:gpl3+))) (define-public emacs-wordnut (let ((commit "feac531404041855312c1a046bde7ea18c674915") -- cgit 1.4.1 From 4f6934a22e689861c70f7a521a070505da1fdb48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:08:07 +0100 Subject: gnu: emacs-annalist: Update to 1.0.1. * gnu/packages/emacs-xyz.scm (emacs-annalist): Update to 1.0.1. --- gnu/packages/emacs-xyz.scm | 64 ++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6474223afd..9f3416bd4f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20730,40 +20730,38 @@ other frame parameters.") (license license:gpl3+)))) (define-public emacs-annalist - (let ((commit "e0601539c9ac0171a684ea3ff6266d215d1d08e6") - (revision "1")) - (package - (name "emacs-annalist") - (version (git-version "1.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/noctuid/annalist.el") - (commit commit))) - (sha256 - (base32 - "10bmimdzpi6cql4sb2hbgdvrza83xbac50bi9qng4z662pfnlaam")) - (file-name (git-file-name name version)))) - (build-system emacs-build-system) - (native-inputs - `(("emacs-buttercup" ,emacs-buttercup) - ("emacs-lispy" ,emacs-lispy) - ("emacs-evil" ,emacs-evil))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'fix-makefile - (lambda _ - (substitute* "Makefile" - (("cask exec ") "")) - #t))) - #:tests? #t - #:test-command '("make" "test"))) - (home-page "https://github.com/noctuid/annalist.el") - (synopsis "Record and display information with Org headings and tables") - (description "This package allows for keybindings, settings, hooks, and + (package + (name "emacs-annalist") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/noctuid/annalist.el") + (commit version))) + (sha256 + (base32 + "1jlb5w4972l8m2aa18q2l6arfpm65g4nk21dn1yi8c9dbpk2g67c")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (native-inputs + `(("emacs-buttercup" ,emacs-buttercup) + ("emacs-lispy" ,emacs-lispy) + ("emacs-evil" ,emacs-evil))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'fix-makefile + (lambda _ + (substitute* "Makefile" + (("cask exec ") "")) + #t))) + #:tests? #t + #:test-command '("make" "test"))) + (home-page "https://github.com/noctuid/annalist.el") + (synopsis "Record and display information with Org headings and tables") + (description "This package allows for keybindings, settings, hooks, and advice to be recorded and displayed.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-general (let ((commit "a0b17d207badf462311b2eef7c065b884462cb7c") -- cgit 1.4.1 From 093beb65a584d6bb9826badbff672429d891da58 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:15:59 +0100 Subject: gnu: emacs-libmpdel: Update to 1.2.0. * gnu/packages/emacs-xyz.scm (emacs-libmpdel): Update to 1.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9f3416bd4f..48cbd6125f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21040,7 +21040,7 @@ comments.") (define-public emacs-libmpdel (package (name "emacs-libmpdel") - (version "1.1.2") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -21049,7 +21049,7 @@ comments.") (file-name (git-file-name name version)) (sha256 (base32 - "0dnjndpv6bmz5blfs75ynmbm32g23l4slg5p3941b1i94a08qzpy")))) + "1nzs6g2mg3jhfhhfcxjhd9sbvwzhmr6j6mc80ln2nr4gzjqgaa4k")))) (build-system emacs-build-system) (home-page "https://gitea.petton.fr/mpdel/libmpdel") (synopsis "Emacs library to communicate with Music Player Daemon (MPD)") -- cgit 1.4.1 From f30382b42245a974c8e563b90da069c716f6b12d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 11:26:51 +0200 Subject: gnu: Add ruby-oedipus-lex. * gnu/packages/ruby.scm (ruby-oedipus-lex): 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 90f885a379..e6992f3e21 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5519,6 +5519,29 @@ projects. It has very little overhead and can be easily integrated with development tools to catch coverage problems early.") (license license:expat))) +(define-public ruby-oedipus-lex + (package + (name "ruby-oedipus-lex") + (version "2.5.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "oedipus_lex" version)) + (sha256 + (base32 + "1v1rk78khwq87ar300lwll570zxpkq9rjnpgc9mgsyd6mm9qjz4w")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-hoe" ,ruby-hoe))) + (synopsis "Ruby lexer") + (description + "Oedipus Lex is a lexer generator in the same family as Rexical and Rex. +It is based primarily on generating code much like you would a hand-written +lexer. It uses StrScanner within a multi-level case statement. As such, +Oedipus matches on the first match, not the longest.") + (home-page "https://github.com/seattlerb/oedipus_lex") + (license license:expat))) + (define-public ruby-guard (package (name "ruby-guard") -- cgit 1.4.1 From 8c7f4e180a9a2e4cd54e4cc639615a4231122e43 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 11:27:58 +0200 Subject: gnu: ruby-parser: Update to 3.0.0.0. * gnu/packages/ruby.scm (ruby-parser): Update to 3.0.0.0. --- 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 e6992f3e21..8a001806c0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5264,14 +5264,14 @@ across multiple CPU cores.") (define-public ruby-parser (package (name "ruby-parser") - (version "2.7.2.0") + (version "3.0.0.0") (source (origin (method url-fetch) (uri (rubygems-uri "parser" version)) (sha256 (base32 - "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z")))) + "1jixakyzmy0j5c1rb0fjrrdhgnyryvrr6vgcybs14jfw09akv5ml")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; tests not included in gem -- cgit 1.4.1 From 6e3a85192ca48a749858c8c7f128c5ec59c2ff89 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 11:29:27 +0200 Subject: gnu: ruby-rubocop-ast: Update to 1.4.1. * gnu/packages/ruby.scm (ruby-rubocop-ast): Update to 1.4.1. [arguments]: Remove 'disable-bundler phase. Add 'generate-lexer phase. [native-inputs]: Add ruby-oedipus-lex, ruby-pry, ruby-racc, ruby-rake, ruby-simplecov. --- gnu/packages/ruby.scm | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8a001806c0..5c7f1f9aea 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6978,7 +6978,7 @@ inspired by the Sinatra microframework style of specifying actions: (define-public ruby-rubocop-ast (package (name "ruby-rubocop-ast") - (version "0.3.0") + (version "1.4.1") (source (origin (method git-fetch) ;no test suite in distributed gem @@ -6988,16 +6988,15 @@ inspired by the Sinatra microframework style of specifying actions: (file-name (git-file-name name version)) (sha256 (base32 - "1ycf6qcj8nbzk2js72priim4642lkn56w5kbny1nlryjkckxgm04")))) + "1x2m7k4bn4zvvwmj7imzmv0dav6xnrbcvssad1m5lkprx7h5lzkq")))) (build-system ruby-build-system) (arguments `(#:test-target "spec" #:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-bundler + (add-before 'build 'generate-lexer (lambda _ - (substitute* "Rakefile" - (("Bundler\\.setup.*") "nil\n")) - #t)) + (setenv "RUBOCOP_VERSION" "none") + (invoke "rake" "generate"))) (replace 'replace-git-ls-files (lambda _ (substitute* "rubocop-ast.gemspec" @@ -7006,7 +7005,12 @@ inspired by the Sinatra microframework style of specifying actions: #t))))) (native-inputs `(("ruby-bump" ,ruby-bump) - ("ruby-rspec" ,ruby-rspec))) + ("ruby-oedipus-lex" ,ruby-oedipus-lex) + ("ruby-pry" ,ruby-pry) + ("ruby-racc" ,ruby-racc) + ("ruby-rake" ,ruby-rake) + ("ruby-rspec" ,ruby-rspec) + ("ruby-simplecov" ,ruby-simplecov))) (propagated-inputs `(("ruby-parser" ,ruby-parser))) (synopsis "RuboCop's AST extensions and NodePattern functionality") -- cgit 1.4.1 From f7bd9d235eb7d6841ced42e406b896a7384ba7fe Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 12:06:08 +0200 Subject: gnu: ruby-hashdiff: Update to 1.0.1. * gnu/packages/ruby.scm (ruby-hashdiff): Update to 1.0.1. --- gnu/packages/ruby.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 5c7f1f9aea..28ba7b403e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3092,20 +3092,19 @@ immutable queue or stack).") (define-public ruby-hashdiff (package (name "ruby-hashdiff") - (version "0.3.8") + (version "1.0.1") (source (origin (method url-fetch) (uri (rubygems-uri "hashdiff" version)) (sha256 (base32 - "19ykg5pax8798nh1yv71adkx0zzs7gn2rxjj86v7nsw0jba5lask")))) + "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c")))) (build-system ruby-build-system) (arguments '(#:phases (modify-phases %standard-phases - ;; Run tests directly via rspec to avoid Rake issue: - ;; NoMethodError: undefined method `last_comment' + ;; Run tests directly via rspec to avoid depending on rubocop. (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- cgit 1.4.1 From 4f8c551cf367c9b1f83e8b438df4764abaab2d41 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 12:07:06 +0200 Subject: gnu: Add ruby-stackprof. * gnu/packages/ruby.scm (ruby-stackprof): 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 28ba7b403e..8dab0b6e1d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7556,6 +7556,28 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (home-page "https://github.com/deivid-rodriguez/pry-byebug") (license license:expat))) +(define-public ruby-stackprof + (package + (name "ruby-stackprof") + (version "0.2.16") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "stackprof" version)) + (sha256 + (base32 + "147rb66p3n062vc433afqhkd99iazvkrqnghxgh871r62yhha93f")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-mocha" ,ruby-mocha) + ("ruby-rake-compiler" ,ruby-rake-compiler))) + (synopsis "Sampling profiler for Ruby code") + (description + "@code{stackprof} is a fast sampling profiler for Ruby code, with cpu, +wallclock and object allocation samplers.") + (home-page "http://github.com/tmm1/stackprof") + (license license:expat))) + (define-public ruby-binding-of-caller (package (name "ruby-binding-of-caller") -- cgit 1.4.1 From f499e12486cf69643ec8baa23530d9caad13502b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 12:07:32 +0200 Subject: gnu: Add ruby-memory-profiler. * gnu/packages/ruby.scm (ruby-memory-profiler): 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 8dab0b6e1d..3294b4e134 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7700,6 +7700,29 @@ Profiling multiple threads simultaneously is supported. (home-page "https://github.com/ruby-prof/ruby-prof") (license license:bsd-2))) +(define-public ruby-memory-profiler + (package + (name "ruby-memory-profiler") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SamSaffron/memory_profiler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07yqv11q68xg2fqkrhs6ysngryk8b9zq6qzh24rgx9xqv6qfnj0w")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-rake" ,ruby-rake))) + (synopsis "Memory profiling routines for Ruby") + (description + "This package provides memory profiling routines for Ruby.") + (home-page "https://github.com/SamSaffron/memory_profiler") + (license license:expat))) + (define-public ruby-cucumber-messages (package (name "ruby-cucumber-messages") -- cgit 1.4.1 From 16c0cc5cfe7283a0170662b1880dd640d99f8a4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 12:35:03 +0200 Subject: gnu: ruby-crack: Update to 0.4.5. * gnu/packages/ruby.scm (ruby-crack): Update to 0.4.5. [propagated-inputs]: Remove ruby-safe-yaml. Add ruby-rexml. --- 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 3294b4e134..d1fe82b2ee 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2047,14 +2047,14 @@ value is found.") (define-public ruby-crack (package (name "ruby-crack") - (version "0.4.3") + (version "0.4.5") (source (origin (method url-fetch) (uri (rubygems-uri "crack" version)) (sha256 (base32 - "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k")))) + "1cr1kfpw3vkhysvkk3wg7c54m75kd68mbm9rs5azdjdq57xid13r")))) (build-system ruby-build-system) (arguments `(#:phases @@ -2068,7 +2068,7 @@ value is found.") (find-files "test" ".*rb$"))) #t))))) (propagated-inputs - `(("ruby-safe-yaml" ,ruby-safe-yaml))) + `(("ruby-rexml" ,ruby-rexml))) (synopsis "Simple JSON and XML parsing for Ruby") (description "@code{crack} provides really simple JSON and XML parsing, extracted from -- cgit 1.4.1 From cc128eefd7ec77c84c5d8a5cab4db03823d13112 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 15:29:26 +0200 Subject: gnu: ruby-rubocop-performance: Update to 1.9.2. * gnu/packages/ruby.scm (ruby-rubocop-performance): Update to 1.9.2. [source]: Download from git uri. [arguments]: Replace 'replace-git-ls-files phase. Add 'set-home phase. [propagated-inputs]: Add ruby-rubocop-ast. [native-inputs]: Add ruby-bump, ruby-yard. --- gnu/packages/ruby.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d1fe82b2ee..1934a68c01 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1549,19 +1549,38 @@ logic.") (define-public ruby-rubocop-performance (package (name "ruby-rubocop-performance") - (version "1.7.1") + (version "1.9.2") (source (origin - (method url-fetch) - (uri (rubygems-uri "rubocop-performance" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubocop-hq/rubocop-performance") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "04r8d4x62ygv17spvz9yyfxbmbf8qxwhijs0xycfvzr0q4pyg9sw")))) + "04lmkmz6c0ccs5miikrww7lakp7y6xz00g7b47ay7rn7sx5j6qyf")))) (build-system ruby-build-system) (arguments - `(#:tests? #f)) ;no test suite in the distributed gem + `(#:tests? #f ; tests require a git checkout of rubocop's source code. + #:phases + (modify-phases %standard-phases + (replace 'replace-git-ls-files + (lambda _ + (substitute* "rubocop-performance.gemspec" + (("`git ls-files -z config lib LICENSE.txt README.md`") + "`find config lib LICENSE.txt README.md -type f -print0 |sort -z`")) + #t)) + (add-before 'check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp") + #t))))) (propagated-inputs - `(("ruby-rubocop" ,ruby-rubocop))) + `(("ruby-rubocop" ,ruby-rubocop) + ("ruby-rubocop-ast" ,ruby-rubocop-ast))) + (native-inputs + `(("ruby-bump" ,ruby-bump) + ("ruby-yard" ,ruby-yard))) (synopsis "Performance optimizations checkers for Ruby code") (description "This package provides a collection of RuboCop cops to check for performance optimizations in Ruby code.") -- cgit 1.4.1 From 8588e6683c72d7c9c5e5a3a0573f4494ba22211c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 15:30:36 +0200 Subject: gnu: Add ruby-rubocop-rspec. * gnu/packages/ruby.scm (ruby-rubocop-rspec): New variable. --- gnu/packages/ruby.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1934a68c01..bad97e8918 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1546,6 +1546,44 @@ logic.") (home-page "https://github.com/typhoeus/typhoeus") (license license:expat))) +(define-public ruby-rubocop-rspec + (package + (name "ruby-rubocop-rspec") + (version "2.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubocop-hq/rubocop-rspec") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gdpjpympb6qc77bang759z7z6lckf14ghkx8v6614agxg8l3g5y")))) + (build-system ruby-build-system) + (arguments + '(#:test-target "internal_investigation" + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-HOME + (lambda _ + (setenv "HOME" "/tmp") + #t))))) + (propagated-inputs + `(("ruby-rubocop" ,ruby-rubocop) + ("ruby-rubocop-ast" ,ruby-rubocop-ast))) + (native-inputs + `(("ruby-rack" ,ruby-rack) + ("ruby-rspec" ,ruby-rspec) + ("ruby-rubocop-performance" ,ruby-rubocop-performance) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-yard" ,ruby-yard))) + (synopsis "Code style checking for RSpec files") + (description "This package provides a plugin for the RuboCop code style +enforcing & linting tool.") + (home-page "https://github.com/rubocop-hq/rubocop-rspec") + (license license:expat))) + (define-public ruby-rubocop-performance (package (name "ruby-rubocop-performance") -- cgit 1.4.1 From a4d61297e2e3e573ff53164c37c792d5c846cd46 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 15:38:33 +0200 Subject: gnu: ruby-webmock: Update to 3.11.2. * gnu/packages/ruby.scm (ruby-webmock): Update to 3.11.2. (ruby-webmock-2): Inherit from ruby-webmock. (ruby-omniauth-oauth2, ruby-solargraph)[native-inputs]: Switch from ruby-webmock-2 to ruby-webmock. --- gnu/packages/ruby.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bad97e8918..58614a61ac 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2353,7 +2353,7 @@ authentication.") ("ruby-rspec" ,ruby-rspec) ("ruby-simplecov" ,ruby-simplecov) ("ruby-rack-test" ,ruby-rack-test) - ("ruby-webmock" ,ruby-webmock-2))) + ("ruby-webmock" ,ruby-webmock))) (synopsis "Abstract OAuth2 strategy for OmniAuth") (description "This library provides a generic OAuth2 strategy for OmniAuth. It @@ -9063,17 +9063,17 @@ requests.") (home-page "https://github.com/opperator/warden-oauth2") (license license:expat))) -(define-public ruby-webmock-2 +(define-public ruby-webmock (package (name "ruby-webmock") - (version "2.3.2") + (version "3.11.2") (source (origin (method url-fetch) (uri (rubygems-uri "webmock" version)) (sha256 (base32 - "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5")))) + "1hdlbvfw316lkz251qnfk79drmaay7l51kidvicz41nhvw12xz8v")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler) @@ -9089,6 +9089,19 @@ requests. This is useful when testing software.") (home-page "https://github.com/bblimke/webmock") (license license:expat))) +(define-public ruby-webmock-2 + (package + (inherit ruby-webmock) + (name "ruby-webmock") + (version "2.3.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "webmock" version)) + (sha256 + (base32 + "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5")))))) + (define-public ruby-unicode-display-width (package (name "ruby-unicode-display-width") @@ -11950,7 +11963,7 @@ application.") `(("ruby-rspec" ,ruby-rspec) ("ruby-pry" ,ruby-pry) ("ruby-simplecov" ,ruby-simplecov) - ("ruby-webmock" ,ruby-webmock-2))) + ("ruby-webmock" ,ruby-webmock))) ;; FIXME: can't figure out how to run the tests properly: ;; An error occurred while loading spec_helper. -- cgit 1.4.1 From 301d1bacc1f33ed5f2f546488c3a1dbc66cc3f4f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Feb 2021 16:06:12 +0200 Subject: gnu: ruby-rubocop: Update to 1.10.0. * gnu/packages/ruby.scm (ruby-rubocop): Update to 1.10.0. [source]: Remove patch. [arguments]: Remove custom 'remove-problematic-tests, 'disable-bundler, 'replace-git-ls-files phases. Add custom 'check phase. [native-inputs]: Add ruby-memory-profiler, ruby-rake, ruby-rubocop-minimal, ruby-rubocop-performance-minimal, ruby-rubocop-rspec-minimal, ruby-simplecov, ruby-stackprof. Replace ruby-webmock-2 with ruby-webmock. (ruby-rubocop-minimal, ruby-rubocop-performance-minimal, ruby-rubocop-rspec-minimal): New variables. * gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../ruby-rubocop-break-dependency-cycle.patch | 101 --------------------- gnu/packages/ruby.scm | 78 ++++++++++------ 3 files changed, 49 insertions(+), 131 deletions(-) delete mode 100644 gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 250901f6d9..c3398c62fd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1597,7 +1597,6 @@ dist_patch_DATA = \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ - %D%/packages/patches/ruby-rubocop-break-dependency-cycle.patch\ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ diff --git a/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch b/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch deleted file mode 100644 index 035a98fa33..0000000000 --- a/gnu/packages/patches/ruby-rubocop-break-dependency-cycle.patch +++ /dev/null @@ -1,101 +0,0 @@ -From ff3f00b7f33332ebf1c3c05abc4a781684775b3c Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Tue, 14 Jul 2020 11:50:12 -0400 -Subject: [PATCH] config: Drop rubocop-performance, rubocop-rspec requirements. - -This patch removes Rubocop extensions from Rubocop's closure to break -a dependency cycle with itself. - -* .rubocop.yml: Remove rubocop-performance and rubocop-rspec and their -corresponding directives. -* .rubocop_todo.yml: Likewise. ---- - .rubocop.yml | 15 --------------- - .rubocop_todo.yml | 44 -------------------------------------------- - 2 files changed, 59 deletions(-) - -diff --git a/.rubocop.yml b/.rubocop.yml -index 4f05d5be2..f12ef7c06 100644 ---- a/.rubocop.yml -+++ b/.rubocop.yml -@@ -3,8 +3,6 @@ - inherit_from: .rubocop_todo.yml - require: - - rubocop/cop/internal_affairs -- - rubocop-performance -- - rubocop-rspec - - AllCops: - NewCops: enable -@@ -106,16 +104,3 @@ Metrics/ClassLength: - Metrics/ModuleLength: - Exclude: - - 'spec/**/*.rb' -- --RSpec/FilePath: -- Exclude: -- - spec/rubocop/formatter/junit_formatter_spec.rb -- --RSpec/PredicateMatcher: -- EnforcedStyle: explicit -- --RSpec/MessageSpies: -- EnforcedStyle: receive -- --RSpec/NestedGroups: -- Max: 7 -diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml -index 3f72042d1..fa637cd42 100644 ---- a/.rubocop_todo.yml -+++ b/.rubocop_todo.yml -@@ -24,47 +24,3 @@ Metrics/MethodLength: - # Configuration parameters: CountComments. - Metrics/ModuleLength: - Max: 132 -- --# Offense count: 10 --RSpec/AnyInstance: -- Exclude: -- - 'spec/rubocop/cli_spec.rb' -- - 'spec/rubocop/cop/lint/duplicate_methods_spec.rb' -- - 'spec/rubocop/cop/team_spec.rb' -- - 'spec/rubocop/target_finder_spec.rb' -- --# Offense count: 981 --# Configuration parameters: Prefixes. --# Prefixes: when, with, without --RSpec/ContextWording: -- Enabled: false -- --# Offense count: 3810 --# Configuration parameters: Max. --RSpec/ExampleLength: -- Enabled: false -- --# Offense count: 38 --RSpec/ExpectOutput: -- Exclude: -- - 'spec/rubocop/cli/cli_auto_gen_config_spec.rb' -- - 'spec/rubocop/cli/cli_options_spec.rb' -- - 'spec/rubocop/config_spec.rb' -- - 'spec/rubocop/cop/cop_spec.rb' -- - 'spec/rubocop/formatter/disabled_config_formatter_spec.rb' -- - 'spec/rubocop/formatter/formatter_set_spec.rb' -- - 'spec/rubocop/options_spec.rb' -- - 'spec/rubocop/rake_task_spec.rb' -- - 'spec/rubocop/result_cache_spec.rb' -- - 'spec/rubocop/target_finder_spec.rb' -- --# Offense count: 434 --RSpec/MultipleExpectations: -- Max: 25 -- --# Offense count: 5 --RSpec/SubjectStub: -- Exclude: -- - 'spec/rubocop/config_spec.rb' -- - 'spec/rubocop/formatter/json_formatter_spec.rb' -- - 'spec/rubocop/formatter/progress_formatter_spec.rb' --- -2.27.0 - diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 58614a61ac..6c9583b3cf 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1584,6 +1584,16 @@ enforcing & linting tool.") (home-page "https://github.com/rubocop-hq/rubocop-rspec") (license license:expat))) +(define-public ruby-rubocop-rspec-minimal + (hidden-package + (package + (inherit ruby-rubocop-rspec) + (arguments + (substitute-keyword-arguments (package-arguments ruby-rubocop-rspec) + ((#:tests? _ #f) #f))) + (propagated-inputs '()) + (native-inputs '())))) + (define-public ruby-rubocop-performance (package (name "ruby-rubocop-performance") @@ -1625,6 +1635,16 @@ for performance optimizations in Ruby code.") (home-page "https://docs.rubocop.org/rubocop-performance/") (license license:expat))) +(define-public ruby-rubocop-performance-minimal + (hidden-package + (package + (inherit ruby-rubocop-performance) + (arguments + (substitute-keyword-arguments (package-arguments ruby-rubocop-performance) + ((#:tests? _ #f) #f))) + (propagated-inputs '()) + (native-inputs '())))) + (define-public ruby-gimme (let ((revision "1") (commit "4e71f0236f1271871916dd403261d26533db34c0")) @@ -7270,7 +7290,7 @@ run.") (define-public ruby-rubocop (package (name "ruby-rubocop") - (version "0.88.0") + (version "1.10.0") (source (origin (method git-fetch) ;no tests in distributed gem @@ -7280,42 +7300,25 @@ run.") (file-name (git-file-name name version)) (sha256 (base32 - "1d06893jp8pd85fvgp5d16vqcf31bafi430v4f4y746ihyvhzz5r")) - (patches (search-patches "ruby-rubocop-break-dependency-cycle.patch")))) + "0wjw9vpzr4f3nf1zf010bag71w4hdi0haybdn7r5rlmw45pmim29")))) (build-system ruby-build-system) (arguments '(#:test-target "default" #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-problematic-tests - ;; These tests depend on Rubocop extensions, which cannot be - ;; included as they cause a dependency cycle with Rubocop itself. - (lambda _ - (delete-file "spec/rubocop/config_loader_spec.rb") - (substitute* "Gemfile" - ((".*'rubocop-performance'.*") "") - ((".*'rubocop-rspec'.*") "")) - ;; Prevent "Unnecessary disabling of RSpec/* (unknown cop)" - ;; errors. - (substitute* (find-files "spec/rubocop/cop/" "_spec\\.rb$") - (("# (rubocop:(enable|disable) RSpec.*)" _ what) - (string-append "# Disabled: " what))) - #t)) - (add-after 'unpack 'disable-bundler - (lambda _ - (substitute* "Rakefile" - (("Bundler\\.setup.*") "nil\n")) - #t)) - (replace 'replace-git-ls-files - (lambda _ - (substitute* "rubocop.gemspec" - (("`git ls-files(.*)`" _ files) - (format #f "`find ~a -type f| sort`" files))) - #t)) (add-before 'check 'set-home (lambda _ (setenv "HOME" (getcwd)) #t)) + ;; Rubocop depends on itself for tests, directly and indirectly. By + ;; regenerating the TODO list we test rubocop against itself and + ;; forgo adjusting the test suite to our environment each release. + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (make-file-writable ".rubocop_todo.yml") + (invoke "./exe/rubocop" "--auto-gen-config")) + #t)) (add-before 'check 'make-adoc-files-writable (lambda _ (let ((adoc-files (find-files "docs/modules/ROOT/pages" @@ -7324,10 +7327,17 @@ run.") #t))))) (native-inputs `(("ruby-bump" ,ruby-bump) + ("ruby-memory-profiler" ,ruby-memory-profiler) ("ruby-pry" ,ruby-pry) + ("ruby-rake" ,ruby-rake) ("ruby-rspec" ,ruby-rspec) + ("ruby-rubocop-minimal" ,ruby-rubocop-minimal) + ("ruby-rubocop-performance-minimal" ,ruby-rubocop-performance-minimal) + ("ruby-rubocop-rspec-minimal" ,ruby-rubocop-rspec-minimal) + ("ruby-simplecov" ,ruby-simplecov) + ("ruby-stackprof" ,ruby-stackprof) ("ruby-test-queue" ,ruby-test-queue) - ("ruby-webmock" ,ruby-webmock-2) + ("ruby-webmock" ,ruby-webmock) ("ruby-yard" ,ruby-yard))) (propagated-inputs `(("ruby-parallel" ,ruby-parallel) @@ -7345,6 +7355,16 @@ the community-driven Ruby Style Guide.") (home-page "https://github.com/rubocop-hq/rubocop") (license license:expat))) +(define-public ruby-rubocop-minimal + (hidden-package + (package + (inherit ruby-rubocop) + (arguments + (substitute-keyword-arguments (package-arguments ruby-rubocop) + ((#:tests? _ #f) #f))) + (propagated-inputs '()) + (native-inputs '())))) + (define-public ruby-contest (package (name "ruby-contest") -- cgit 1.4.1 From 755fb2bce32245bda468b366b587f881a012e007 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:18:52 +0100 Subject: gnu: emacs-dtrt-indent: Update to 1.4. * gnu/packages/emacs-xyz.scm (emacs-dtrt-indent): Update to 1.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48cbd6125f..c8e6fd81d8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21223,7 +21223,7 @@ according to their use.") (define-public emacs-dtrt-indent (package (name "emacs-dtrt-indent") - (version "1.2") + (version "1.4") (source (origin (method git-fetch) (uri (git-reference @@ -21232,7 +21232,7 @@ according to their use.") (file-name (git-file-name name version)) (sha256 (base32 - "0p5v5xwr0s59hv3s0f85byafphc85qv76g41crad9fhnxzab9rly")))) + "11r68sh3yrrfib7pixnazispwsffrygmgplffrv8qq57xrqzyxih")))) (build-system emacs-build-system) (home-page "https://github.com/jscheid/dtrt-indent") (synopsis "Minor mode that guesses the indentation offset") -- cgit 1.4.1 From d59734d2c1b2375039ce5fb85dfb527ad059590f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:19:05 +0100 Subject: gnu: emacs-repo: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-repo): Update to 0.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c8e6fd81d8..b112dfc919 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21245,7 +21245,7 @@ convenient to edit foreign files.") (define-public emacs-repo (package (name "emacs-repo") - (version "0.1.3") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -21254,7 +21254,7 @@ convenient to edit foreign files.") (file-name (git-file-name name version)) (sha256 (base32 - "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz")))) + "0jgiawdnzjlrpx2j1y6djwbqncdpmyfd31q1qf1890049y8ppxnb")))) (build-system emacs-build-system) (native-inputs `(("emacs-el-mock" ,emacs-el-mock) -- cgit 1.4.1 From 81fe955acc5e7cc7a6a3fb96f0181fe187c7a189 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:39:16 +0100 Subject: gnu: emacs-disk-usage: Remove ".git" suffix from source URI. * gnu/packages/emacs-xyz.scm (emacs-disk-usage)[source]: Remove ".git" suffix from URL. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b112dfc919..90f403df27 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21365,7 +21365,7 @@ opposed to character-based).") (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/Ambrevar/emacs-disk-usage.git") + (url "https://gitlab.com/Ambrevar/emacs-disk-usage") (commit version))) (file-name (git-file-name name version)) (sha256 -- cgit 1.4.1 From 447757f83bc27926340be84b24186dcef8bd1845 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 15:41:00 +0100 Subject: gnu: emacs-orgit: Update to 1.6.3. * gnu/packages/emacs-xyz.scm (emacs-orgit): Update to 1.6.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90f403df27..0a786b3085 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21382,7 +21382,7 @@ recursively. The results are cached for speed.") (define-public emacs-orgit (package (name "emacs-orgit") - (version "1.5.3") + (version "1.6.3") (home-page "https://github.com/magit/orgit") (source (origin (method git-fetch) @@ -21392,7 +21392,7 @@ recursively. The results are cached for speed.") (file-name (git-file-name name version)) (sha256 (base32 - "1ywavzki510rslsgfm0cnn3mlh644p61ha2nfb715xhkg7cd3j9g")))) + "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit 1.4.1 From 8aedb2f028169646d1493d00078b9ca0897f5a18 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Feb 2021 12:03:18 +0100 Subject: gnu: sbcl-repl-utilities: Update to 20210215. * gnu/packages/lisp-xyz.scm (sbcl-repl-utilities): Update to 20210215. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 22b51ef40a..79fcbd5395 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13520,7 +13520,7 @@ for drawning progress bars") (sbcl-package->ecl-package sbcl-cl-progress-bar)) (define-public sbcl-repl-utilities - (let ((commit "e0de9c92e774f77cab1a4cd92e2ac922ac3a807e")) + (let ((commit "7e300df663177ea4581f4e7e9c601377881dd986")) (package (name "sbcl-repl-utilities") (version (git-version "0.0.0" "1" commit)) @@ -13532,7 +13532,7 @@ for drawning progress bars") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1r5icmw3ha5y77kvzqni3a9bcd66d9pz5mjsbw04xg3jk0d15cgz")))) + (base32 "1hh56pq5nw3l4b83dzlyss69f06r038byj2cnjwvci4hfjhdfcc3")))) (build-system asdf-build-system/sbcl) (home-page "https://github.com/m-n/repl-utilities") (synopsis "Ease common tasks at the Common Lisp REPL") -- cgit 1.4.1 From adfbba466916b6335b8871b83bb7b1abebd2798e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 17 Feb 2021 17:22:09 +0100 Subject: gnu: cuirass: Update to 0.0.1-69.860fffa. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-69.860fffa. --- 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 31a32736be..f7480acc78 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "ea01201ccd267506451e0301fbc5d8f12ef9ba5c") - (revision "68")) + (let ((commit "860fffa2608dcdfd7fae474115bafa1b20f69b72") + (revision "69")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1c7h725y3d6msbrk49j57qfpxjlspb9gc5cq77hi3qmrb48vrlhb")))) + "0dscfjpv3rkf1wy3z1yxc3fp27q1x8nrmdhfxr5dvhayb5b3ibml")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From d9dd91034716ed5656628085cc1e6dea98b783cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 19:15:42 +0100 Subject: gnu: Add emacs-lsp-treemacs. * gnu/packages/emacs-xyz.scm (emacs-lsp-treemacs): New variable. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0a786b3085..0fa1d6e520 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21581,6 +21581,30 @@ integration with other popular Emacs packages like Company, Flycheck, and Projectile.") (license license:gpl3+))) +(define-public emacs-lsp-treemacs + (package + (name "emacs-lsp-treemacs") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-lsp/lsp-treemacs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z9cb7i546pbzvxii6lsj31jq8m70xrzscphl5z71vh93sydyhkb")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-treemacs" ,emacs-treemacs))) + (home-page "https://github.com/emacs-lsp/lsp-treemacs") + (synopsis "Integration between LSP mode and treemacs") + (description + "This package provides integration between LSP mode and treemacs, +and implementation of treeview controls using treemacs as a tree renderer.") + (license license:gpl3+))) + (define-public emacs-pfuture (package (name "emacs-pfuture") -- cgit 1.4.1 From c651aa533c6bd9bf2a30f294e53cbb9eb4aafa5e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 19:16:13 +0100 Subject: gnu: Add emacs-dap-mode. * gnu/packages/emacs-xyz.scm (emacs-dap-mode): New variable. --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0fa1d6e520..0364231e1f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21605,6 +21605,34 @@ Projectile.") and implementation of treeview controls using treemacs as a tree renderer.") (license license:gpl3+))) +(define-public emacs-dap-mode + (package + (name "emacs-dap-mode") + (version "0.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-lsp/dap-mode") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1d4hdydfk86d4slibigyhwng8wx3vzyap8hp5iv0h7wr6868m4iv")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-bui" ,emacs-bui) + ("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-posframe" ,emacs-posframe) + ("emacs-lsp-treemacs" ,emacs-lsp-treemacs))) + (home-page "https://emacs-lsp.github.io/dap-mode") + (synopsis "Emacs client/library for Debug Adapter Protocol ") + (description + "Dap mode is an Emacs client/library for Debug Adapter +Protocol (DAP), a wire protocol for communication between client and +debug server. It is similar to the LSP but provides integration with +Debug server.") + (license license:gpl3+))) + (define-public emacs-pfuture (package (name "emacs-pfuture") -- cgit 1.4.1 From 406d3a8efe059dc4f4b8a8d8171f766e0564daaf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 19:17:10 +0100 Subject: gnu: emacs-lsp-java: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-lsp-java): Update to 3.1. --- gnu/packages/emacs-xyz.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0364231e1f..f572b819e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21818,7 +21818,7 @@ files in Elisp.") (define-public emacs-lsp-java (package (name "emacs-lsp-java") - (version "2.2") + (version "3.1") (source (origin (method git-fetch) (uri (git-reference @@ -21827,16 +21827,17 @@ files in Elisp.") (file-name (git-file-name name version)) (sha256 (base32 - "0hcnvbyaqyypgby1bfj4zbrbq97amk8hfx0sj4w73rl46yf4jk3j")))) + "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-lsp-mode" ,emacs-lsp-mode) - ("emacs-markdown-mode" ,emacs-markdown-mode) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-ht" ,emacs-ht) - ("emacs-request" ,emacs-request) - ("emacs-treemacs" ,emacs-treemacs))) + `(("emacs-dap-mode" ,emacs-dap-mode) + ("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-markdown-mode" ,emacs-markdown-mode) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-ht" ,emacs-ht) + ("emacs-request" ,emacs-request) + ("emacs-treemacs" ,emacs-treemacs))) (home-page "https://github.com/emacs-lsp/lsp-java/") (synopsis "Java support for lsp-mode") (description "Emacs Java IDE using Eclipse JDT Language Server.") -- cgit 1.4.1 From 453118150957e3e2919a07d82e9908bdd99d25f4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 19:20:28 +0100 Subject: gnu: emacs-helm-lsp: Update to 0.2. * gnu/packages/emacs-xyz.scm (emacs-helm-lsp): Update to 0.2. --- gnu/packages/emacs-xyz.scm | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f572b819e5..b22a3226f7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21919,31 +21919,29 @@ workspaces with a LSP-compliant server running.") (license license:gpl3+))) (define-public emacs-helm-lsp - (let ((commit "3a58ca4cfd94b9ab1e15e819d3b16ef568e8889b") - (revision "1")) - (package - (name "emacs-helm-lsp") - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-lsp/helm-lsp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wh5zai3s17ss2q8wcdd6d87hv1h3nbyrxxs4js9cas8m6y2ssjv")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("emacs-lsp-mode" ,emacs-lsp-mode) - ("emacs-dash" ,emacs-dash))) - (home-page "https://github.com/emacs-lsp/helm-lsp") - (synopsis "Provide LSP-enhanced completion for symbols") - (description - "This package enhances @code{helm} with completion for symbols from + (package + (name "emacs-helm-lsp") + (version "0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-lsp/helm-lsp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vq3qpqm3ndqyvf5bk8qhqcr60x9ykc0ipk2a43rr3yjm4z1b6s9")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-lsp-mode" ,emacs-lsp-mode) + ("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/emacs-lsp/helm-lsp") + (synopsis "Provide LSP-enhanced completion for symbols") + (description + "This package enhances @code{helm} with completion for symbols from workspaces with a LSP-compliant server running.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-helm-notmuch (package -- cgit 1.4.1 From ebc968d56a73376bc160812ff8185793cbe4e6d3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Feb 2021 19:21:36 +0100 Subject: gnu: emacs-elmacro: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-elmacro): Update to 1.1.1. --- gnu/packages/emacs-xyz.scm | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b22a3226f7..0d7e5df5cb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21969,29 +21969,28 @@ real search.") (license license:gpl3+))) (define-public emacs-elmacro - (let ((commit "89b9b0feabafd01fee48111d67131c4c9b5fed9a")) - (package - (name "emacs-elmacro") - (version (git-version "1.1.0" "1" commit)) - (home-page "https://github.com/Silex/elmacro") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06wkzafh6vbcjf0m3sl253mgcq32p8cdv7vsfmyx51baa36938ha")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-s" ,emacs-s) - ("emacs-dash" ,emacs-dash))) - (synopsis "Convert keyboard macros to Emacs Lisp") - (description - "This package displays keyboard macros or latest interactive commands + (package + (name "emacs-elmacro") + (version "1.1.1") + (home-page "https://github.com/Silex/elmacro") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x4wnsshf9h10mp51x92vs5rxw5had4gmw6zz4f53czx1ymcv16a")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s) + ("emacs-dash" ,emacs-dash))) + (synopsis "Convert keyboard macros to Emacs Lisp") + (description + "This package displays keyboard macros or latest interactive commands as Emacs Lisp.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-transient (let ((revision "1") -- cgit 1.4.1 From 94b876969b4b13747bacbbc66a118dd0d44cef86 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Feb 2021 21:38:23 +0100 Subject: gnu: bind: Update to 9.16.12 [fixes CVE-2020-8625]. * gnu/packages/dns.scm (bind): Update to 9.16.12. --- 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 bbf43542b7..1b98efcb19 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -317,7 +317,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (package (name "bind") ;; When updating, check whether isc-dhcp's bundled copy should be as well. - (version "9.16.11") + (version "9.16.12") (source (origin (method url-fetch) (uri (string-append @@ -325,7 +325,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "1hcr0q6i2mk83yi12zxjs5q21y3gx7683q99l77ibxfqsx6zc481")))) + "0zys8hk08zzrw57x0vmzv6zx0a7vjj6qk5qh8jmrqd7x269sy54r")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit 1.4.1 From ca89f21a7f6641569034611763a2a06b24e8ce43 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Feb 2021 16:19:23 -0500 Subject: gnu: boinc-server: Use a supported version of OpenSSL. * gnu/packages/distributed.scm (boinc-server)[inputs]: Replace openssl-1.0 with openssl. --- gnu/packages/distributed.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index 0e5fe5ef69..e6dab08f23 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -89,7 +89,7 @@ resources). It supports virtualized, parallel, and GPU-based applications.") #:tests? #f)) ; FIXME: Looks like bad test syntax in the ; source package, 2 tests fail. Disable for ; now. - (inputs `(("openssl" ,openssl-1.0) + (inputs `(("openssl" ,openssl) ("curl" ,curl) ("mariadb:dev" ,mariadb "dev") ("zlib" ,zlib))) -- cgit 1.4.1 From 6dbe4b12df46ed4b33e6d8ebf28fd478442dabf3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Feb 2021 22:35:13 +0100 Subject: gnu: r-rserve: Install server binary. Missing Rserve reported by awb99 on #guix. * gnu/packages/cran.scm (r-rserve)[arguments]: Add an 'install-server-binary phase. --- gnu/packages/cran.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1fe90619cd..e025ded315 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23538,6 +23538,17 @@ download images.") (base32 "017kkzv9lxlz9qhg3gprrf1wcyflxrif6wjk27x9b4bdzylw6bsx")))) (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'install-server-binary + ;; Makevars tries to install to R's store directory. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (substitute* "src/Makevars.in" + (("\\$\\(R_HOME\\)") out)) + (mkdir-p bin))))))) (propagated-inputs `(("r-checkmate" ,r-checkmate) ("r-mime" ,r-mime) -- cgit 1.4.1 From f5177a0642687edc3dd58030dc0edfacf14ce104 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 00:08:11 +0100 Subject: gnu: emacs-fish-mode: Update to 0.1.6. * gnu/packages/emacs-xyz.scm (emacs-fish-mode): Update to 0.1.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0d7e5df5cb..e346c4d6be 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22297,7 +22297,7 @@ provides a minor mode that autoformats the buffer upon saving.") (define-public emacs-fish-mode (package (name "emacs-fish-mode") - (version "0.1.4") + (version "0.1.6") (source (origin (method git-fetch) @@ -22307,7 +22307,7 @@ provides a minor mode that autoformats the buffer upon saving.") (file-name (git-file-name name version)) (sha256 (base32 - "0a74ghmjjrxfdhk4mvq6lar4w6l6lc4iilabs99smqr2fn5rsslq")))) + "1spxxkji9xa930sbwvzyjm8jrqk9ra0xqhivw7zd12a4c56nhna9")))) (build-system emacs-build-system) (home-page "https://github.com/wwwjfy/emacs-fish") (synopsis "Major mode for Fish shell scripts") -- cgit 1.4.1 From 0a5e76e2f9ddb5df535eb4f98eb4f3903d4dfee6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 00:12:03 +0100 Subject: gnu: emacs-dotenv-mode: Update to 0.2.5. * gnu/packages/emacs-xyz.scm (emacs-dotenv-mode): Update to 0.2.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e346c4d6be..422a3e833f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22605,7 +22605,7 @@ files, and sends rendered Markdown to a web browser.") (define-public emacs-dotenv-mode (package (name "emacs-dotenv-mode") - (version "0.2.4") + (version "0.2.5") (source (origin (method git-fetch) @@ -22615,7 +22615,7 @@ files, and sends rendered Markdown to a web browser.") (file-name (git-file-name name version)) (sha256 (base32 - "1fplkhxnsgdrg10iqsmw162zny2idz4vvv35spsb9j0hsk8imclc")))) + "0ys1czramj3c8zbnxxc599bqc0nqp3nnn3n45ac9cjglx5iaydq3")))) (build-system emacs-build-system) (home-page "https://github.com/preetpalS/emacs-dotenv-mode") (synopsis "Major mode for @file{.env} files") -- cgit 1.4.1 From ac37bfe811dd1d23fed6153099a907cd0e5b8fc5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 00:13:37 +0100 Subject: gnu: emacs-rjsx-mode: Update to 0.5.0. * gnu/packages/emacs-xyz.scm (emacs-rjsx-mode): Update to 0.5.0. --- gnu/packages/emacs-xyz.scm | 48 ++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 422a3e833f..ff51f65f94 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22673,32 +22673,30 @@ definition-jumping and type-checking on demand.") (license license:bsd-3)))) (define-public emacs-rjsx-mode - (let ((commit "0e7fa6b4facdec4f85a7a8865bdf59dfd57217b5") - (revision "2")) - (package - (name "emacs-rjsx-mode") - (version (git-version "0.4" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/felipeochoa/rjsx-mode") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0s0871sx3ch09kgvbcp9na4zdrfrda62xjq8m9knbq5vnj8q8qpi")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-js2-mode" ,emacs-js2-mode))) - (arguments - `(#:tests? #t - #:test-command '("make" "test"))) - (home-page "https://github.com/felipeochoa/rjsx-mode") - (synopsis "Major mode for JSX files") - (description "This package extends the parser of @code{js2-mode} to + (package + (name "emacs-rjsx-mode") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/felipeochoa/rjsx-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08b4hdgq4hc1yfd9pvyir2j3cqqdqa3j5svgaba97x5fzhsz7y8i")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-js2-mode" ,emacs-js2-mode))) + (arguments + `(#:tests? #t + #:test-command '("make" "test"))) + (home-page "https://github.com/felipeochoa/rjsx-mode") + (synopsis "Major mode for JSX files") + (description "This package extends the parser of @code{js2-mode} to support JSX syntax.") - (license license:expat)))) + (license license:expat))) (define-public emacs-origami-el (let ((commit "1f38085c8f9af7842765ed63f7d6dfe4dab59366") -- cgit 1.4.1 From 82ddc8ff5803dadfc1c77b924b29487ee6867a61 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 00:14:58 +0100 Subject: gnu: emacs-counsel-etags: Update to 1.9.16. * gnu/packages/emacs-xyz.scm (emacs-counsel-etags): Update to 1.9.16. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ff51f65f94..5f1d1a8132 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22752,7 +22752,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (define-public emacs-counsel-etags (package (name "emacs-counsel-etags") - (version "1.9.11") + (version "1.9.16") (source (origin (method git-fetch) @@ -22761,7 +22761,7 @@ previewed by scrolling up and down within a @code{dired} buffer.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0h0br41vkrx9l7bqr55bafqd715drxxwm41qif6iffhgdpvf69ym")))) + (base32 "01si554r0s6m7ypx1m2n0z6j6q6yihifz76dha6q6v56ixdlv626")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-counsel" ,emacs-counsel))) -- cgit 1.4.1 From 27ae8da87e41b9e0bace62168191da171273b5f4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Feb 2021 15:14:55 -0500 Subject: gnu: linux-libre: Update to 5.10.17. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.17. (linux-libre-5.10-pristine-source): Update hash. (deblob-scripts-5.10): Use linux-libre-5.10-version. --- gnu/packages/linux.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f4ba4ffffb..72fcd14e1f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,17 +366,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.11))) -(define-public linux-libre-5.10-version "5.10.16") +(define-public linux-libre-5.10-version "5.10.17") (define deblob-scripts-5.10 (linux-libre-deblob-scripts - ;; XXX While linux-libre.fsfla.org is offline, use the cached deblob - ;; scripts for the previous version on ci.guix.gnu.org. - "5.10.15" + linux-libre-5.10-version (base32 "0i99adbfjnir8p8ihhac58dv8p7mnqg4z2jpgvhj35lksdskngf7") (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0dqa40yd1yf488pd5vv8c30wsnqazykv7lvi6lmwgz1v4zmf6vsk"))) + (hash (base32 "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From b1b8ac09d7862b4ddac8a9343ed0f044322623e4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Feb 2021 15:15:20 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.99. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.99. (linux-libre-5.4-pristine-source): Update hash. (deblob-scripts-5.4): Use linux-libre-5.4-version. --- gnu/packages/linux.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 72fcd14e1f..3346b94021 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,17 +382,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.98") +(define-public linux-libre-5.4-version "5.4.99") (define deblob-scripts-5.4 (linux-libre-deblob-scripts - ;; XXX While linux-libre.fsfla.org is offline, use the cached deblob - ;; scripts for the previous version on ci.guix.gnu.org. - "5.4.97" + linux-libre-5.4-version (base32 "0q3gwf3b404brjld7aj9krzv0wdpzvs8fgy088ag7q106cwgqg8i") (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1ca6pn7pgb9pnlsc1wb6kny7lxjlnwv6ywwxfqrz3273zgb4i8l3"))) + (hash (base32 "09qs6nqzq7hsaq928jvbri4nfjm0m6rf0lfx6vc30g95d4nd3njv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From ee6f789787bea47f1b037fcddf5d1f4f20eeab86 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 18 Feb 2021 09:38:17 +0200 Subject: gnu: freeipmi: Update to 1.6.7. * gnu/packages/freeipmi.scm (freeipmi): Update to 1.6.7. --- gnu/packages/freeipmi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm index 0bb2692461..eb10b509c9 100644 --- a/gnu/packages/freeipmi.scm +++ b/gnu/packages/freeipmi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Ludovic Courtès -;;; Copyright © 2015, 2016, 2017, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2020, 2021 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -28,14 +28,14 @@ (define-public freeipmi (package (name "freeipmi") - (version "1.6.6") + (version "1.6.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/freeipmi/freeipmi-" version ".tar.gz")) (sha256 (base32 - "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg")))) + "1gyyx99q02p3v2nqm3h53mkjd33l0hrapwg4alg6qr9k74qik1dv")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From cc4752da0940774d305e44c8f90db208574c1c13 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 17 Feb 2021 22:18:21 +0100 Subject: gnu: mujs: Update to 1.1.0. * gnu/packages/javascript.scm (mujs): Update to 1.1.0. Signed-off-by: Efraim Flashner --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 8434836c6f..00e89612a5 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -557,7 +557,7 @@ external server.") (define-public mujs (package (name "mujs") - (version "1.0.9") + (version "1.1.0") (source (origin (method git-fetch) @@ -566,7 +566,7 @@ external server.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "146lmmigqlvx36d3fzb9kk7sy6y4ddv0ih4pkjz4zyj30zl84gy2")))) + (base32 "00j748hzf4azgjgykc8x9xalh70hj1dm8qvqzvldbf08zq0s3n5j")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 70ec53834e13988824f6ead0ea7b5f92e6e90a56 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 10:54:54 +0100 Subject: gnu: emacs-xr: Update to 1.21. * gnu/packages/emacs-xyz.scm (emacs-xr): Update to 1.21. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5f1d1a8132..f6cc03a5d6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1399,13 +1399,13 @@ in certain cases. It also enables recursion for anonymous functions.") (define-public emacs-xr (package (name "emacs-xr") - (version "1.20") + (version "1.21") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xr-" version ".tar")) (sha256 - (base32 "0i3vfsp110z60gabn9x9rv21fvm7nnr234mvmpp7gx4l4hpadvzy")))) + (base32 "0mc10d33lsqs0ihcja8w78jzh2pk0dfm9m86kap6r3hi6wkr1cmi")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/xr.html") (synopsis "Convert string regexp to rx notation") -- cgit 1.4.1 From c319b965e07b4a62247d7da5d17529369cf0d77e Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Thu, 18 Feb 2021 05:24:07 +0000 Subject: gnu: esbuild: Update to 0.8.47. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (esbuild): Update to 0.8.47. Signed-off-by: 宋文武 --- 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 d55e3ac70c..e4ba0d5bf9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1479,7 +1479,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.46") + (version "0.8.47") (source (origin (method git-fetch) @@ -1488,7 +1488,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00mfw812ssvlflzy9rbxbn2srlyzwix2kjv0gbaqv9qazi7vrgdl")) + (base32 "1gq50sx40qr22w0iy09rdcy1y9nmqpc3impwmyk5zi4z0hl9id0h")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From e6bc150b0c8a72da115ba3243031215137991761 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 15:18:45 +0100 Subject: gnu: Add r-cner. * gnu/packages/bioconductor.scm (r-cner): New variable. --- gnu/packages/bioconductor.scm | 51 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 8fe56c4a5b..38a34912ef 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8875,6 +8875,57 @@ variety of commonly used matrix types, including sparse and HDF5-backed matrices.") (license license:gpl3))) +;; This package includes files that have been taken from kentutils. Some +;; parts of kentutils are not released under a free license, but this package +;; only uses files that are also found in the free parts of kentutils. +(define-public r-cner + (package + (name "r-cner") + (version "1.26.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "CNEr" version)) + (sha256 + (base32 "0qy4pm23vyy23zwsjkf0mpf2c0p54nq26w9lq7j0ld4bx9l3jc6c")))) + (properties `((upstream-name . "CNEr"))) + (build-system r-build-system) + (inputs `(("zlib" ,zlib))) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biostrings" ,r-biostrings) + ("r-dbi" ,r-dbi) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-go-db" ,r-go-db) + ("r-iranges" ,r-iranges) + ("r-keggrest" ,r-keggrest) + ("r-powerlaw" ,r-powerlaw) + ("r-r-utils" ,r-r-utils) + ("r-readr" ,r-readr) + ("r-reshape2" ,r-reshape2) + ("r-rsqlite" ,r-rsqlite) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/ge11232002/CNEr") + (synopsis "CNE Detection and Visualization") + (description + "This package provides tools for large-scale identification and +advanced visualization of sets of conserved noncoding elements.") + ;; For all files in src/ucsc "license is hereby granted for all use - + ;; public, private or commercial"; this includes those files that don't + ;; have a license header, because they are included in the free parts of + ;; the kentutils package. + (license (list license:gpl2 + (license:non-copyleft + "https://raw.githubusercontent.com/ucscGenomeBrowser/kent/v410_base/src/lib/LICENSE"))))) + (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") -- cgit 1.4.1 From 2def2e203f51fd6448267d87085a3ab95663c7a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 15:35:38 +0100 Subject: gnu: Add r-tfbstools. * gnu/packages/bioconductor.scm (r-tfbstools): New variable. --- gnu/packages/bioconductor.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 38a34912ef..4e8b92841c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8926,6 +8926,52 @@ advanced visualization of sets of conserved noncoding elements.") (license:non-copyleft "https://raw.githubusercontent.com/ucscGenomeBrowser/kent/v410_base/src/lib/LICENSE"))))) +(define-public r-tfbstools + (package + (name "r-tfbstools") + (version "1.28.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "TFBSTools" version)) + (sha256 + (base32 + "0p42hnwhipmcvrsqk3s8qfiian1fvh6izfd9m961bsx99r2clnha")))) + (properties `((upstream-name . "TFBSTools"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) + ("r-catools" ,r-catools) + ("r-cner" ,r-cner) + ("r-dbi" ,r-dbi) + ("r-dirichletmultinomial" ,r-dirichletmultinomial) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-gtools" ,r-gtools) + ("r-iranges" ,r-iranges) + ("r-rsqlite" ,r-rsqlite) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-seqlogo" ,r-seqlogo) + ("r-tfmpvalue" ,r-tfmpvalue) + ("r-xml" ,r-xml) + ("r-xvector" ,r-xvector))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/ge11232002/TFBSTools") + (synopsis "Transcription factor binding site (TFBS) analysis") + (description + "TFBSTools is a package for the analysis and manipulation of +transcription factor binding sites. It includes matrices conversion +between @dfn{Position Frequency Matrix} (PFM), @dfn{Position Weight +Matrix} (PWM) and @dfn{Information Content Matrix} (ICM). It can also +scan putative TFBS from sequence/alignment, query JASPAR database and +provides a wrapper of de novo motif discovery software.") + (license license:gpl2))) + (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") -- cgit 1.4.1 From 9a38f39ec0b51864b126fc48218c3e27ca6d98eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 15:40:44 +0100 Subject: gnu: Add r-motifmatchr. * gnu/packages/bioconductor.scm (r-motifmatchr): New variable. --- gnu/packages/bioconductor.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4e8b92841c..a98971e294 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8972,6 +8972,40 @@ scan putative TFBS from sequence/alignment, query JASPAR database and provides a wrapper of de novo motif discovery software.") (license license:gpl2))) +(define-public r-motifmatchr + (package + (name "r-motifmatchr") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "motifmatchr" version)) + (sha256 + (base32 + "0zrpn0hqdg0hm80ydkfpiqncwyb8y0xp6mlin7g955p8zcpcm67z")))) + (properties `((upstream-name . "motifmatchr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-tfbstools" ,r-tfbstools))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/motifmatchr") + (synopsis "Fast motif matching in R") + (description + "Quickly find motif matches for many motifs and many sequences. +This package wraps C++ code from the MOODS motif calling library.") + (license license:gpl3))) + (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") -- cgit 1.4.1 From 26db713f0c6f0bcfae94167e2a66d8aececdc03b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Feb 2021 06:14:49 -0500 Subject: gnu: libtgvoip: Replace libopusenc with opus. * gnu/packages/telephony.scm (libtgvoip) [inputs]: Replace libopusenc with opus. Signed-off-by: Leo Prikler --- gnu/packages/telephony.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 48e30abfc3..df6df83dd2 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -886,8 +886,8 @@ Initiation Protocol (SIP) and a multimedia framework.") (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) - ("libopusenc" ,libopusenc) ("openssl" ,openssl) + ("opus" ,opus) ("pulseaudio" ,pulseaudio))) (arguments `(#:phases -- cgit 1.4.1 From 81ffe22415a7f9bdeb70833089c663af2e5f60f1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Feb 2021 06:24:13 -0500 Subject: gnu: webrtc-for-telegram-desktop: Update to revision 83. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to revision 83. [inputs]: Add libx11, libxext, and libxtst. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 9b27b86e50..660234f549 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -69,8 +69,8 @@ #:use-module (guix build-system qt)) (define-public webrtc-for-telegram-desktop - (let ((commit "fa86fcc00c218813d61a272a56feab55c76a1ab9") - (revision "52")) + (let ((commit "a19877363082da634a3c851a4698376504d2eaee") + (revision "83")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -86,7 +86,7 @@ (file-name (git-file-name name version)) (sha256 - (base32 "06gcrlym6vqqw7zlds9lpwyg37d5m81d87h16aps19v0v9gzan0l")) + (base32 "0961zm1m1mc2kh54dx5ax95q8sw13impvpjvg9jv12bmfkgm17wr")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -158,7 +158,10 @@ ("openssl" ,openssl) ("opus" ,opus) ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio))) + ("pulseaudio" ,pulseaudio) + ("x11" ,libx11) + ("xext" ,libxext) + ("xtst" ,libxtst))) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by Telegram project, for its use in telegram desktop client.") -- cgit 1.4.1 From b89b5ff3fe9b22ad831bb393a3d26e80b2e40e5f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Feb 2021 06:27:07 -0500 Subject: gnu: libtgvoip-for-telegram-desktop: Update to revision 88. * gnu/packages/telegram.scm (libtgvoip-for-telegram-desktop): Update to revision 88. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 660234f549..3d88c5a14b 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -216,8 +216,8 @@ Telegram project, for its use in telegram desktop client.") #t))))))))) (define-public libtgvoip-for-telegram-desktop - (let ((commit "37d98e984fd6fa389262307db826d52ab86c8241") - (revision "87")) + (let ((commit "13a5fcb16b04472d808ce122abd695dbf5d206cd") + (revision "88")) (hidden-package (package (inherit libtgvoip) @@ -233,7 +233,7 @@ Telegram project, for its use in telegram desktop client.") (file-name (git-file-name "libtgvoip-for-telegram-desktop" version)) (sha256 - (base32 "13dzvyq8p20nlhjihv18aj6y97czk07qdl0k6v81vp6mbwcldg7h")))) + (base32 "12p6s7vxkf1gh1spdckkdxrx7bjzw881ds9bky7l5fw751cwb3xd")))) (arguments `(#:configure-flags (list -- cgit 1.4.1 From b7f75432a529a0a12aa21a9e748a37842a296dd1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Feb 2021 06:30:46 -0500 Subject: gnu: telegram-desktop: Update to 2.5.9. * gnu/packages/telegram.scm (telegram-desktop): Update to 2.5.9. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 3d88c5a14b..2430242241 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -262,7 +262,7 @@ Telegram project, for its use in telegram desktop client.") (define-public telegram-desktop (package (name "telegram-desktop") - (version "2.5.1") + (version "2.5.9") (source (origin (method git-fetch) @@ -274,7 +274,7 @@ Telegram project, for its use in telegram desktop client.") (file-name (git-file-name name version)) (sha256 - (base32 "0drirhkr9gnm1g03lcqmvap5ljlk859c29gbsm63hhsgv15dlw0y")) + (base32 "1lqs06scqvzg37a2py8jk7nnlvk42jjifcpnhdd5rgd5biw70nyx")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -360,11 +360,11 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/cmake_helpers.git") - (commit "a81345a28d407fb5acd5267ec6afa1864f4e8d5b"))) + (commit "695fabda6830b58bdc02d09db70531d5dececcd0"))) (file-name (git-file-name "cmake-helpers-for-telegram-desktop" version)) (sha256 - (base32 "0s5hxip68dmkaspjq6j30wx1r5v4prnrjza79hdbznz6i57a2248")))) + (base32 "1j3ppgfmihcjl22w5jk8jhwif10i9wbycq5zqnssn6pnhnj7di5i")))) ("cmake-shared" ,cmake-shared) ("extra-cmake-modules" ,extra-cmake-modules) ("gcc" ,gcc-9) @@ -398,17 +398,18 @@ Telegram project, for its use in telegram desktop client.") ("hime" ,hime) ("hunspell" ,hunspell) ("iconv" ,libiconv) + ("kwayland" ,kwayland) ("lib-base-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_base.git") - (commit "81df0d0b7842be2b6c88f93dfa136b8efea4c9ad"))) + (commit "f1e4168081428fa451d2f50eee7b1c448268c43a"))) (file-name (git-file-name "lib-base-for-telegram-desktop" version)) (sha256 - (base32 "0ikddprjnjvg0ic8jr2886xq0f18syp587q6z2kci9xmdnvjl217")))) + (base32 "0piqp7llwi7sfy4c15g0p8ihr90rz1qps6q5fkl1iasrf5ysw8qc")))) ("lib-crl-source" ,(origin (method git-fetch) @@ -503,22 +504,22 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/desktop-app/lib_ui.git") - (commit "1e2799245cf2720a329ecb5cf5644fded669cce6"))) + (commit "e14bc4681d69c1b538b8c5af51501077ae5a8a86"))) (file-name (git-file-name "lib-ui-for-telegram-desktop" version)) (sha256 - (base32 "0kd4njcvic2700f00qn25vn3b80vsd2flsm3pi2synnldkiy8lcw")))) + (base32 "04b1x4bswk3bxqrwpv5g7w4frkprrwf0px6aibh6z4drinv08wsv")))) ("lib-webrtc-source" ,(origin (method git-fetch) (uri (git-reference (url "https://github.com/desktop-app/lib_webrtc.git") - (commit "4bc51d6f6d5740159fdb51cb1593e80ce149ed4e"))) + (commit "60d5c43daf882a6c03944a3e6198b5f35b654a0e"))) (file-name (git-file-name "lib-webrtc-for-telegram-desktop" version)) (sha256 - (base32 "06hpyq4qglrj3cb1xg8ghlmzm9ra8f5n6vm7hcy67n2wk8sy4cal")))) + (base32 "0mxmbw8i37axllg9h976p6np2gcfyci6xwwl9hc9mhs49vwwsw5s")))) ("libdbusmenu-qt" ,libdbusmenu-qt) ("libjpeg" ,libjpeg-turbo) ("libtgvoip" ,libtgvoip-for-telegram-desktop) @@ -543,11 +544,11 @@ Telegram project, for its use in telegram desktop client.") (uri (git-reference (url "https://github.com/TelegramMessenger/tgcalls.git") - (commit "178983f72312ca8bd422bc73810fd63f1a89bd9d"))) + (commit "71addf5b41cb6bb6844f75e977edae0020938930"))) (file-name (git-file-name "tgcalls-for-telegram-desktop" version)) (sha256 - (base32 "1xad65c9m6mj6zdj08flafvh8xjkd7xi9r1agcyc64y69lr427d0")))) + (base32 "1zrjxf03n3ad8b95gwjarmq4gj5i5cwhlg93qcjv2232kksh29iy")))) ("webrtc" ,webrtc-for-telegram-desktop) ("x11" ,libx11) ("xcb" ,libxcb) -- cgit 1.4.1 From a447f26263cce728b74a5735e0a7df2a40e50a93 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 15:57:05 +0100 Subject: gnu: emacs-eval-sexp-fu-el: Update to 0.6.0. * gnu/packages/emacs-xyz.scm (emacs-eval-sexp-fu-el): Update to 0.6.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f6cc03a5d6..c19ba6589c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23043,7 +23043,7 @@ nodes, and more.") (define-public emacs-eval-sexp-fu-el (package (name "emacs-eval-sexp-fu-el") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -23053,7 +23053,7 @@ nodes, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "01mpnpgmlnfbi2yw9dxz5iw72mw3lk223bj172i4fnx3xdrrxbij")))) + "19rv0kwajq0j8inglp84sml23ci74wdcvp5bl6zxbw5skqpf6phr")))) (build-system emacs-build-system) (home-page "https://github.com/hchbaw/eval-sexp-fu.el") (synopsis "Enhancements for evaluating s-expressions") -- cgit 1.4.1 From ff4b952325fef5e1b7f1550ce10617d76e684c63 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 15:57:17 +0100 Subject: gnu: emacs-eacl: Update to 2.0.4. * gnu/packages/emacs-xyz.scm (emacs-eacl): Update to 2.0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c19ba6589c..6f7990c5c9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23147,7 +23147,7 @@ with passwords for paths matching regexps.") (define-public emacs-eacl (package (name "emacs-eacl") - (version "2.0.1") + (version "2.0.4") (source (origin (method git-fetch) @@ -23157,7 +23157,7 @@ with passwords for paths matching regexps.") (file-name (git-file-name name version)) (sha256 (base32 - "0ksn11sm3g1ja5lpjz3hrzzw8b480mfcb3q589m52qjgvvn5iyfv")))) + "0fxb2lv4cqdjxarqhzjgfc43sncc1c6m96n0aflm8l4gdmm090kq")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) -- cgit 1.4.1 From 89d7c8efc62c7b445ee6cf9a33b69abf47d60a33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 15:55:57 +0100 Subject: gnu: Add r-chromvar. * gnu/packages/bioconductor.scm (r-chromvar): New variable. --- gnu/packages/bioconductor.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a98971e294..a4d97fad65 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9006,6 +9006,53 @@ provides a wrapper of de novo motif discovery software.") This package wraps C++ code from the MOODS motif calling library.") (license license:gpl3))) +(define-public r-chromvar + (package + (name "r-chromvar") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "chromVAR" version)) + (sha256 + (base32 "0dn04ijgq8fncn2bkvnd0lnabjg2s4mpb91b3kwvv3nkgjgfx819")))) + (properties `((upstream-name . "chromVAR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) + ("r-dt" ,r-dt) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-miniui" ,r-miniui) + ("r-nabor" ,r-nabor) + ("r-plotly" ,r-plotly) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rsamtools" ,r-rsamtools) + ("r-rtsne" ,r-rtsne) + ("r-s4vectors" ,r-s4vectors) + ("r-shiny" ,r-shiny) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-tfbstools" ,r-tfbstools))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/release/bioc/html/chromVAR.html") + (synopsis "Determine chromatin variation across regions") + (description + "This package @code{r-chromvar} determines variation in chromatin +accessibility across sets of annotations or peaks. @code{r-chromvar} is +designed primarily for single-cell or sparse chromatin accessibility data like +single cell assay for transposase-accessible chromatin using +sequencing (@code{scATAC-seq} or sparse bulk ATAC or deoxyribonuclease +sequence (@code{DNAse-seq}) experiments.") + (license license:expat))) + (define-public r-singlecellexperiment (package (name "r-singlecellexperiment") -- cgit 1.4.1 From 32e2d9c7f84c42c7cbcd05d4d65c1481f30d452b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 18 Feb 2021 15:58:38 +0100 Subject: gnu: guile-simple-zmq: Update to 0.0.0-7.c8b1fa0. * gnu/packages/guile-xyz.scm (guile-simple-zmq): Update to 0.0.0-7.c8b1fa0. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 984c2b1109..8d9126df44 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1009,8 +1009,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "b5f1aeed71d76a4bd9f7a19bfd482d2d320fa287") - (revision "6")) + (let ((commit "c8b1fa09e08e12207cf84023fc3d569936c886d7") + (revision "7")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -1022,7 +1022,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "0rxzww1lwy4dvqmylmsd0picqiwkmcz93lz2hl7zng95sm4n64rb")) + "0ilyviny3c2am20d192cqhq7rsdy3jvbvmvqqg7qv9myrcwqg26y")) (file-name (git-file-name name version)))) (build-system guile-build-system) (arguments -- cgit 1.4.1 From 200b119266c8bb05a6b56ecc50f7b8343ab179ab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:03:34 +0100 Subject: gnu: emacs-zerodark-theme: Update to 4.7. * gnu/packages/emacs-xyz.scm (emacs-zerodark-theme): Update to 4.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6f7990c5c9..6172ff3736 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23613,7 +23613,7 @@ connections using TLS encryption.") (define-public emacs-zerodark-theme (package (name "emacs-zerodark-theme") - (version "4.6") + (version "4.7") (source (origin (method git-fetch) @@ -23623,7 +23623,7 @@ connections using TLS encryption.") (file-name (git-file-name name version)) (sha256 (base32 - "0pfyd1iqs7l2ngwgvj9n0r9k1px7yl16h8n502xdyf0pprxcs4p6")))) + "1r5s4mvwlxsb9ylr6dkfxpm1l0pbqkmn5gwjdcfk762cnxlam8cm")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck) -- cgit 1.4.1 From 49387c5e0c23d611f2815edd72efe98f10ca9e1c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:03:45 +0100 Subject: gnu: emacs-wc-mode: Update to 1.4. * gnu/packages/emacs-xyz.scm (emacs-wc-mode): Update to 1.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6172ff3736..d7e62fbf35 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23741,7 +23741,7 @@ files to numerous other formats via Pandoc.") (define-public emacs-wc-mode (package (name "emacs-wc-mode") - (version "1.3") + (version "1.4") (source (origin (method git-fetch) (uri (git-reference @@ -23750,7 +23750,7 @@ files to numerous other formats via Pandoc.") (file-name (git-file-name name version)) (sha256 (base32 - "0pjlxv46zzqdq6q131jb306vqlg4sfqls1x8vag7mmfw462hafqp")))) + "01icd63mb2hg1bgbmkq3jm8kc3ic8whfy2awcgx53zqkmyz87qxc")))) (build-system emacs-build-system) (home-page "https://github.com/bnbeckwith/wc-mode") (synopsis "Running word count with goals (minor mode)") -- cgit 1.4.1 From e8bac62c6f4f4ab9819176fd49cf372e3c1cdd64 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:06:24 +0100 Subject: gnu: emacs-org-jira: Update to 4.3.2. * gnu/packages/emacs-xyz.scm (emacs-org-jira): Update to 4.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d7e62fbf35..bbc40cbdd0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23902,7 +23902,7 @@ contains a track position, playback will start at the specified position.") (define-public emacs-org-jira (package (name "emacs-org-jira") - (version "4.3.1") + (version "4.3.2") (source (origin (method git-fetch) @@ -23912,7 +23912,7 @@ contains a track position, playback will start at the specified position.") (file-name (git-file-name name version)) (sha256 (base32 - "1l80r2a9zzbfk2c78i40h0ww79vm9v4j6xi2h5i4w9kqh10rs6h2")))) + "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-request" ,emacs-request) -- cgit 1.4.1 From 19e841768978c5f356a6e6059237075b01d8a061 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:09:47 +0100 Subject: gnu: emacs-tao-theme: Update to 1.1.1-1.468ee4f. * gnu/packages/emacs-xyz.scm (emacs-tao-theme): Update to 1.1.1-1.468ee4f. --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bbc40cbdd0..133e5f3adb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24028,11 +24028,11 @@ passphrase until the first time you push to a remote.") (license license:gpl3+))) (define-public emacs-tao-theme - (let ((commit "c5107fbe7e752f4e58c2d2147ff18a1ebb12937c") - (revision "0")) + (let ((commit "468ee4f6ba7afb9dbfc8855ae2c333cb16ca4408") + (revision "1")) (package (name "emacs-tao-theme") - (version (git-version "0" revision commit)) + (version (git-version "1.1.1" revision commit)) (source (origin (method git-fetch) @@ -24042,7 +24042,7 @@ passphrase until the first time you push to a remote.") (file-name (git-file-name name version)) (sha256 (base32 - "07vvlglmkj87hpxz79s3bl2cjn71vain57fdxs7j9vlr5jkchxwn")))) + "0yqibx6wcdsj5k6130c3qp0hmj6zwhfjrrvw98lny23ksw6k0s3s")))) (build-system emacs-build-system) (home-page "https://github.com/11111000000/tao-theme-emacs") (synopsis "Parameterized uncolored color themes for Emacs") -- cgit 1.4.1 From 83607059488d687f34a654676b7009a53786c33b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 16:09:40 +0100 Subject: gnu: Add r-archr. * gnu/packages/bioinformatics.scm (r-archr): New variable. --- gnu/packages/bioinformatics.scm | 49 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f3e0e41e4d..4e7e49fecf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7203,6 +7203,55 @@ clustering analysis, differential analysis, motif inference and exploration of single cell ATAC-seq sequencing data.") (license license:gpl3))) +(define-public r-archr + (let ((commit "46b519ffb6f73edf132497ac31650d19ef055dc1") + (revision "1")) + (package + (name "r-archr") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GreenleafLab/ArchR") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1zj3sdfhgn2q2256fmz61a92vw1wylyck632d7842d6knd0v92v8")))) + (properties `((upstream-name . "ArchR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biostrings" ,r-biostrings) + ("r-chromvar" ,r-chromvar) + ("r-complexheatmap" ,r-complexheatmap) + ("r-data-table" ,r-data-table) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-gridextra" ,r-gridextra) + ("r-gtable" ,r-gtable) + ("r-gtools" ,r-gtools) + ("r-magrittr" ,r-magrittr) + ("r-matrix" ,r-matrix) + ("r-matrixstats" ,r-matrixstats) + ("r-motifmatchr" ,r-motifmatchr) + ("r-nabor" ,r-nabor) + ("r-plyr" ,r-plyr) + ("r-rcpp" ,r-rcpp) + ("r-rhdf5" ,r-rhdf5) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-uwot" ,r-uwot))) + (home-page "https://github.com/GreenleafLab/ArchR") + (synopsis "Analyze single-cell regulatory chromatin in R") + (description + "This package is designed to streamline scATAC analyses in R.") + (license license:gpl2+)))) + (define-public r-scde (package (name "r-scde") -- cgit 1.4.1 From b21c9e7572c616b1b21dc3c1b335079ff6d4a563 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:13:46 +0100 Subject: gnu: emacs-elixir-mode: Update to 2.3.2. * gnu/packages/emacs-xyz.scm (emacs-elixir-mode): Update to 2.3.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 133e5f3adb..37329997b8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24231,7 +24231,7 @@ and it should work well with 256 color terminals.") (define-public emacs-elixir-mode (package (name "emacs-elixir-mode") - (version "2.3.1") + (version "2.3.2") (source (origin (method git-fetch) @@ -24240,7 +24240,7 @@ and it should work well with 256 color terminals.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "06bi68x49v6f7flpz279mm4jpg31ll3s274givm3pvr8slcxs6xg")))) + (base32 "0f2a360h8bizvqk6bmgxm59g8n7id5rzwlbv6d383h15w298mcga")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-pkg-info" ,emacs-pkg-info))) -- cgit 1.4.1 From d5e139bedc5d7c8f8feb59f958214ddc56f06c1e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:13:53 +0100 Subject: gnu: emacs-unfill: Update to 0.3. * gnu/packages/emacs-xyz.scm (emacs-unfill): Update to 0.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 37329997b8..950c74889d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24350,7 +24350,7 @@ commands that bear resemblance to the input command.") (define-public emacs-unfill (package (name "emacs-unfill") - (version "0.2") + (version "0.3") (home-page "https://github.com/purcell/unfill") (source (origin @@ -24360,7 +24360,7 @@ commands that bear resemblance to the input command.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc")))) + (base32 "0pg64nza2mp4xyr69pjq51jsq1aaym0g38g4jzaxr0hh3w0ris1n")))) (build-system emacs-build-system) (synopsis "Inverse of Emacs' @code{fill-paragraph} and @code{fill-region}") (description -- cgit 1.4.1 From dba6389c4730ca1dd0eefde0462baffc696f4d67 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Feb 2021 22:37:00 +0000 Subject: gnu: Add cl-trivial-channels. * gnu/packages/lisp-xyz.scm (cl-trivial-channels, ecl-trivial-channels, sbcl-trivial-channels): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 79fcbd5395..0ef1360f28 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13427,6 +13427,37 @@ backtick. It has been forked from SHELISP.") (define-public ecl-clesh (sbcl-package->ecl-package sbcl-clesh)) +(define-public sbcl-trivial-channels + (let ((commit "e2370118d8983ba69c0360a7695f8f2e2fd6a8a6") + (revision "1")) + (package + (name "sbcl-trivial-channels") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rpav/trivial-channels") + (commit commit))) + (file-name (git-file-name "trivial-channels" version)) + (sha256 + (base32 "04wnxcgk40x8p0gxnz9arv1a5wasdqrdxa8c4p5v7r2mycfps6jj")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("trivial-timeout" ,sbcl-trivial-timeout))) + (home-page "https://github.com/rpav/trivial-channels") + (synopsis "Common Lisp simple thread-safe channels with timeout") + (description + "It's very basic implementation of channels and queue for Common Lisp.") + (license license:bsd-2)))) + +(define-public ecl-trivial-channels + (sbcl-package->ecl-package sbcl-trivial-channels)) + +(define-public cl-trivial-channels + (sbcl-package->cl-source-package sbcl-trivial-channels)) + (define-public sbcl-trivial-download (let ((commit "d2472061d86b1cf3d32f388daacd4e32a13af699")) (package -- cgit 1.4.1 From a6179f6822fb7c04a6b4bb262d971662cd1439d6 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Feb 2021 23:15:46 +0000 Subject: gnu: sbcl-lift: Update to 1.7.1-2.2594160. * gnu/packages/lisp-xyz.scm (sbcl-lift): Update to 1.7.1-2.2594160. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 0ef1360f28..6f95195dc8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2246,10 +2246,11 @@ new fiends in addition to old friends like @command{aif} and (sbcl-package->ecl-package sbcl-anaphora)) (define-public sbcl-lift - (let ((commit "7d49a66c62759535624037826891152223d4206c")) + (let ((commit "2594160d6ca3a77d8750110dfa63214256aab852") + (revision "2")) (package (name "sbcl-lift") - (version (git-version "1.7.1" "1" commit)) + (version (git-version "1.7.1" revision commit)) (source (origin (method git-fetch) @@ -2257,8 +2258,7 @@ new fiends in addition to old friends like @command{aif} and (url "https://github.com/gwkkwg/lift") (commit commit))) (sha256 - (base32 - "127v5avpz1i4m0lkaxqrq8hrl69rdazqaxf6s8awf0nd7wj2g4dp")) + (base32 "01xvz9sl5l5lai4h9dabmcjnm659wf5zllaxqbs55lffskp6jwq3")) (file-name (git-file-name "lift" version)) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From 75a4c8314283658e29761deb6d37625b4bca9261 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 18 Feb 2021 00:08:21 +0000 Subject: gnu: sbcl-numcl: Update to 0.2.0-1.d19f363. * gnu/packages/lisp-xyz.scm (sbcl-numcl): Update to 0.2.0-1.d19f363. [arguments]: Activate tests. [home-page]: Update URL. [description]: Simplify description. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 51 +++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6f95195dc8..3320337f77 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9498,49 +9498,43 @@ type correctness in Common Lisp. It is based on CLtL2 extensions.") ((#:tests? _ #f) #f)))))) (define-public sbcl-numcl - (let ((commit "3e8d40bf774e070e7af1d3dbf01bc8c37dbebd3a") - (revision "2")) + (let ((commit "d19f36356be900c600ef08560c9e1af441a166cb") + (revision "1")) (package (name "sbcl-numcl") - (version (git-version "0.1.0" revision commit)) + (version (git-version "0.2.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/numcl/numcl") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "numcl" version)) (sha256 - (base32 "1hqpr68f6xkxaj1hjjayyh97wcdmj51k20qrd3nsv1rcpmdc5ll4")))) + (base32 "0q4ylfr7hl0gz2ynr0c15h09dmnli2x6ndnm5wr58wfplf1wfj31")))) (build-system asdf-build-system/sbcl) - (synopsis "Numpy clone in Common Lisp") - (description - "This is a Numpy clone in Common Lisp. At the moment the -library is written in pure Common Lisp, focusing more on correctness -and usefulness, not speed. Track the progress at -@url{https://github.com/numcl/numcl/projects/1}.") - (home-page "https://github.com/numcl/numcl") - (license license:lgpl3+) + (arguments + `(#:test-asd-file "numcl.test.asd" + #:asd-files '("numcl.asd"))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) (inputs - `(("trivia" ,sbcl-trivia) - ("alexandria" ,sbcl-alexandria) - ("iterate" ,sbcl-iterate) - ("lisp-namespace" ,sbcl-lisp-namespace) - ("type-r" ,sbcl-type-r) - ("constantfold" ,sbcl-constantfold) + `(("alexandria" ,sbcl-alexandria) ("cl-randist" ,sbcl-cl-randist) + ("constantfold" ,sbcl-constantfold) ("float-features" ,sbcl-float-features) ("function-cache" ,sbcl-function-cache) + ("gtype" ,sbcl-gtype) + ("iterate" ,sbcl-iterate) + ("lisp-namespace" ,sbcl-lisp-namespace) ("specialized-function" ,sbcl-specialized-function) - ("gtype" ,sbcl-gtype))) - (native-inputs - `(("fiveam" ,sbcl-fiveam))) - (arguments - `(#:asd-files '("numcl.asd") - #:test-asd-file "numcl.test.asd" - ;; Tests fail on SBCL with "Heap exhausted, game over", - ;; but they pass on ECL. - #:tests? #f))))) + ("trivia" ,sbcl-trivia) + ("type-r" ,sbcl-type-r))) + (home-page "https://numcl.github.io/numcl/") + (synopsis "Numpy clone in Common Lisp") + (description + "This package is a Python Numpy clone implemented in pure Common Lisp.") + (license license:lgpl3+)))) (define-public cl-numcl (sbcl-package->cl-source-package sbcl-numcl)) @@ -9551,6 +9545,7 @@ and usefulness, not speed. Track the progress at (inherit pkg) (arguments (substitute-keyword-arguments (package-arguments pkg) + ;; TODO: (Sharlatan-20210218T000554+0000): Tests freezed after 20min ((#:tests? _ #f) #t)))))) (define-public sbcl-pzmq -- cgit 1.4.1 From bed78cde49fd79a6d265f44811a7a3aa35aa6ec9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 18 Feb 2021 15:32:49 +0100 Subject: gnu: ecl-numcl: Simplify package definition. * gnu/packages/lisp-xyz.scm (ecl-numcl)[arguments]: Remove obsolete keyword substitution. --- gnu/packages/lisp-xyz.scm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3320337f77..3fdf4a741f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9540,13 +9540,7 @@ type correctness in Common Lisp. It is based on CLtL2 extensions.") (sbcl-package->cl-source-package sbcl-numcl)) (define-public ecl-numcl - (let ((pkg (sbcl-package->ecl-package sbcl-numcl))) - (package - (inherit pkg) - (arguments - (substitute-keyword-arguments (package-arguments pkg) - ;; TODO: (Sharlatan-20210218T000554+0000): Tests freezed after 20min - ((#:tests? _ #f) #t)))))) + (sbcl-package->ecl-package sbcl-numcl)) (define-public sbcl-pzmq (let ((commit "7c7390eedc469d033c72dc497984d1536ee75826") -- cgit 1.4.1 From dbeebb2821feda4d4b3acb500bb97b21137d41bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:26:09 +0100 Subject: gnu: emacs-rime: Update to 1.0.4. * gnu/packages/emacs-xyz.scm (emacs-rime): Update to 1.0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 950c74889d..9d5b21f11c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24874,7 +24874,7 @@ REPL appropriate to the current major mode.") (define-public emacs-rime (package (name "emacs-rime") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) @@ -24883,7 +24883,7 @@ REPL appropriate to the current major mode.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08rzkiqwcl8j3i2yyibll5lcsj8720plzm9zfdgmxgkw7vhcyix5")))) + (base32 "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit 1.4.1 From 0bfb6f03f1316640c9302b631888dd34105d9532 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:26:16 +0100 Subject: gnu: emacs-parseedn: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-parseedn): Update to 0.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9d5b21f11c..3db68172c6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25140,7 +25140,7 @@ data, including buffers, window configuration, variables, and more.") (define-public emacs-parseedn (package (name "emacs-parseedn") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) @@ -25150,7 +25150,7 @@ data, including buffers, window configuration, variables, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "11wi3hwcgmy54p6ivpijqm7v0hj6j75a19qk5z779bqfrp79b4pc")))) + "0271amhw63650rrzikcyqxa8sb42npnk7q3yrsay2v79wbqkdaw9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-a" ,emacs-a) -- cgit 1.4.1 From 8c7ef61523bee6422afb5fd55c062601dc629f47 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:26:21 +0100 Subject: gnu: emacs-parseedn: Fix description. * gnu/packages/emacs-xyz.scm (emacs-parseedn): [description]: Use full sentence. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3db68172c6..a98f6242c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25158,7 +25158,7 @@ data, including buffers, window configuration, variables, and more.") (home-page "https://cider.mx") (synopsis "EDN parser for Emacs Lisp") (description - "An Emacs Lisp library for parsing EDN (Clojure) data. + "Parseedn is an Emacs Lisp library for parsing EDN (Clojure) data. It uses parseclj's shift-reduce parser internally.") (license license:gpl3+))) -- cgit 1.4.1 From f5949d7709705ae4afa59a238317a5a0e572d806 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:27:33 +0100 Subject: gnu: emacs-parseclj: Update to 0.2.0. * gnu/packages/emacs-xyz.scm (emacs-parseclj): Update to 0.2.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a98f6242c3..436e17f87f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25165,7 +25165,7 @@ It uses parseclj's shift-reduce parser internally.") (define-public emacs-parseclj (package (name "emacs-parseclj") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) @@ -25175,7 +25175,7 @@ It uses parseclj's shift-reduce parser internally.") (file-name (git-file-name name version)) (sha256 (base32 - "03bm5dm4hmkqimv4wqxjjh5814pxysmm7z54bv2rf7zwv1x7dggr")))) + "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-a" ,emacs-a))) (home-page "https://cider.mx") -- cgit 1.4.1 From cedd80550fb4e48a1787791b5fe1dc4ca041f55c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:27:51 +0100 Subject: gnu: emacs-parseclj: Fix description. * gnu/packages/emacs-xyz.scm (emacs-parseclj)[description]: Use full sentence. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 436e17f87f..3688903e05 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25181,9 +25181,9 @@ It uses parseclj's shift-reduce parser internally.") (home-page "https://cider.mx") (synopsis "Clojure parser for Emacs Lisp") (description - "An Emacs Lisp library for parsing Clojure code and EDN data. -It supports several input and output formats, all powered by the -same shift-reduce parser function.") + "Parseclj is an Emacs Lisp library for parsing Clojure code and EDN data. +It supports several input and output formats, all powered by the same +shift-reduce parser function.") (license license:gpl3+))) (define-public emacs-hide-mode-line -- cgit 1.4.1 From c5876817220d52c9ef5611982c541647b56c9ffd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:33:32 +0100 Subject: gnu: emacs-no-littering: Update to 1.2.1. * gnu/packages/emacs-xyz.scm (emacs-no-littering): Update to 1.2.1. [synopsis]: Use appropriate Texinfo syntax. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3688903e05..cb2a5dc56f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25599,7 +25599,7 @@ launching other commands/applications from within Emacs, similar to the (define-public emacs-no-littering (package (name "emacs-no-littering") - (version "1.2.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -25608,10 +25608,10 @@ launching other commands/applications from within Emacs, similar to the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hma9var0nmrmjlh16s49hbfc1s4jvfd2prqxf14lxfd51404niw")))) + (base32 "00chkzpjcdll907vpzfzmf9p3jprisnr8i0h1x5gixidwbfc2whi")))) (build-system emacs-build-system) (home-page "https://github.com/emacscollective/no-littering") - (synopsis "Help keep ~/.emacs.d/ clean") + (synopsis "Help keep @file{~/.emacs.d/} clean") (description "The default paths used to store configuration files and persistent data are not consistent across Emacs packages, be them built-in or third-party ones. @code{no-littering} sets out to help clean -- cgit 1.4.1 From bae9378ea3082a696579b02e5146ebe5955721e0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:36:18 +0100 Subject: gnu: emacs-company-emoji: Update to 2.6.1. * gnu/packages/emacs-xyz.scm (emacs-company-emoji): Update to 2.6.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb2a5dc56f..b3ffef738c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25780,7 +25780,7 @@ variables.") (define-public emacs-company-emoji (package (name "emacs-company-emoji") - (version "2.6.0") + (version "2.6.1") (source (origin (method git-fetch) @@ -25789,7 +25789,7 @@ variables.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pa67yfcr8lrxdbvln8hs663gsxz38ggwpva7121ngascqgx42wp")))) + (base32 "1rhf2hr345953mkn52i58aiq8j16ps2ckapd5f7jxmhkcpzxxfhk")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-company" ,emacs-company))) -- cgit 1.4.1 From a83bc562b20008329c7721e2d61d7dcc03635343 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:39:11 +0100 Subject: gnu: emacs-org-roam: Update to 1.2.3. * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 1.2.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b3ffef738c..54217d13cd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26046,7 +26046,7 @@ snippets for Emacs.") (define-public emacs-org-roam (package (name "emacs-org-roam") - (version "1.2.2") + (version "1.2.3") (source (origin (method git-fetch) @@ -26055,7 +26055,7 @@ snippets for Emacs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fanv0nl03qn65amxsq4q544zrhv94a37gdg9bwydik9439avbsc")))) + (base32 "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-company" ,emacs-company) -- cgit 1.4.1 From 359e9053521bfab34b5861925398fc5f329d4ca3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 16:41:21 +0100 Subject: gnu: emacs-execline: Fix version string. * gnu/packages/emacs-xyz.scm (emacs-execline): Use version tag matching commit chosen. --- gnu/packages/emacs-xyz.scm | 52 ++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 54217d13cd..8be18c6572 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26227,32 +26227,30 @@ or region and use of locally installed binaries.") (license license:gpl3+))) (define-public emacs-execline - (let ((commit "c75dd9b2c54d8e59fc35fd4bd98d8e213948a3f5") - (revision "1")) - (package - (name "emacs-execline") - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/KAction/emacs-execline/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "02q531c9wvdwflhggflnci4a36h2bb90bq25bbhw6i2lvrd9sk55")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-s" ,emacs-s))) - (arguments - `(#:tests? #t - #:test-command '("emacs" "-Q" "-batch" "-L" "." - "-l" "t/indent.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://gitlab.com/KAction/emacs-execline/") - (synopsis "Major Emacs mode for editing execline scripts") - (description - "This package provides a major mode for editing execline scripts. + (package + (name "emacs-execline") + (version "1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/KAction/emacs-execline/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02q531c9wvdwflhggflnci4a36h2bb90bq25bbhw6i2lvrd9sk55")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-s" ,emacs-s))) + (arguments + `(#:tests? #t + #:test-command '("emacs" "-Q" "-batch" "-L" "." + "-l" "t/indent.el" + "-f" "ert-run-tests-batch-and-exit"))) + (home-page "https://gitlab.com/KAction/emacs-execline/") + (synopsis "Major Emacs mode for editing execline scripts") + (description + "This package provides a major mode for editing execline scripts. Features: @itemize @@ -26263,7 +26261,7 @@ Features: @item Automatic enable of mode in @file{*.exec} files. @item Automatic enable of mode in files with @code{execlineb} interpreter. @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-shell-pop (let ((commit "4b4394037940a890a313d715d203d9ead2d156a6") -- cgit 1.4.1 From 8dac2e0d1e2486f68ef8348c415a962035fc9f41 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 17:47:55 +0100 Subject: gnu: Add r-jquerylib. * gnu/packages/cran.scm (r-jquerylib): New variable. --- gnu/packages/cran.scm | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e025ded315..0daf67eabc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1344,6 +1344,65 @@ are used. Fastmap avoids this memory leak issue by implementing the map using data structures in C++.") (license license:expat))) +;; This package includes minified JavaScript files. When upgrading please +;; check that there are no new minified JavaScript files. +(define-public r-jquerylib + (package + (name "r-jquerylib") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "jquerylib" version)) + (sha256 + (base32 + "1s0d6mws13hwkx07jqmry7vp30a05b2p9w7ir68bmkhasidwkzdq")) + (snippet + '(for-each delete-file + '("inst/lib/jquery-1.12.4.min.js" + "inst/lib/jquery-2.2.4.min.js" + "inst/lib/jquery-3.5.1.min.js"))))) + (properties `((upstream-name . "jquerylib"))) + (build-system r-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build r-build-system) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/lib/" + (call-with-values + (lambda () + (unzip2 + `(("jquery-1.12.4.js" + "jquery-1.12.4.min.js") + ("jquery-2.2.4.js" + "jquery-2.2.4.min.js") + ("jquery-3.5.1.js" + "jquery-3.5.1.min.js")))) + (lambda (sources targets) + (for-each (lambda (source target) + (format #t "Processing ~a --> ~a~%" + source target) + (invoke "esbuild" source "--minify" + (string-append "--outfile=" target))) + sources targets))))))))) + (propagated-inputs + `(("r-htmltools" ,r-htmltools))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://cran.r-project.org/package=jquerylib") + (synopsis "Obtain jQuery as an HTML dependency object") + (description + "Obtain any major version of jQuery and use it in any webpage generated +by htmltools (e.g. shiny, htmlwidgets, and rmarkdown). Most R users don't +need to use this package directly, but other R packages (e.g. shiny, +rmarkdown, etc.) depend on this package to avoid bundling redundant copies of +jQuery.") + (license license:expat))) + (define-public r-shiny (package (name "r-shiny") -- cgit 1.4.1 From 281df0d225877bf784c562cbdec0400f7f4c4513 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 17:48:15 +0100 Subject: gnu: Add r-sass. * gnu/packages/cran.scm (r-sass): 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 0daf67eabc..c385066694 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1403,6 +1403,36 @@ rmarkdown, etc.) depend on this package to avoid bundling redundant copies of jQuery.") (license license:expat))) +(define-public r-sass + (package + (name "r-sass") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "sass" version)) + (sha256 + (base32 + "1cxqwsdyz71mgflqqa65mfr161jlv8q9mshs1y19pxp6pz5wnv0s")))) + (properties `((upstream-name . "sass"))) + (build-system r-build-system) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-fs" ,r-fs) + ("r-htmltools" ,r-htmltools) + ("r-r6" ,r-r6) + ("r-rappdirs" ,r-rappdirs) + ("r-rlang" ,r-rlang))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/rstudio/sass") + (synopsis "Syntactically Awesome Style Sheets (SASS)") + (description + "This package provides an SCSS compiler, powered by the libsass library. +With this, R developers can use variables, inheritance, and functions to +generate dynamic style sheets. The package uses the Sass CSS extension +language, which is stable, powerful, and CSS compatible.") + (license license:expat))) + (define-public r-shiny (package (name "r-shiny") -- cgit 1.4.1 From 22f78a3c813177ceb825ec3ea87e4c711a8addf7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 17:48:56 +0100 Subject: gnu: Add r-bslib. * gnu/packages/cran.scm (r-bslib): New variable. --- gnu/packages/cran.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c385066694..f9b3811296 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1433,6 +1433,80 @@ generate dynamic style sheets. The package uses the Sass CSS extension language, which is stable, powerful, and CSS compatible.") (license license:expat))) +;; This package includes minified JavaScript files. When upgrading please +;; check that there are no new minified JavaScript files. +(define-public r-bslib + (package + (name "r-bslib") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "bslib" version)) + (sha256 + (base32 + "0qlpv2lqr3hjykszmnll7vi4zhmrz4rgcfl0sifxc6cha6jy2nac")) + (snippet + '(for-each delete-file + '("inst/lib/bs-a11y-p/plugins/js/bootstrap-accessibility.min.js" + "inst/lib/bs-colorpicker/js/bootstrap-colorpicker.min.js" + "inst/lib/bs-sass/assets/javascripts/bootstrap.min.js" + "inst/lib/bs/dist/js/bootstrap.bundle.min.js"))))) + (properties `((upstream-name . "bslib"))) + (build-system r-build-system) + (arguments + `(#:modules ((guix build utils) + (guix build r-build-system) + (srfi srfi-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'process-javascript + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "inst/lib/" + (call-with-values + (lambda () + (unzip2 + `(("bs-a11y-p/plugins/js/bootstrap-accessibility.js" + "bs-a11y-p/plugins/js/bootstrap-accessibility.min.js") + ("bs-colorpicker/js/bootstrap-colorpicker.js" + "bs-colorpicker/js/bootstrap-colorpicker.min.js") + ("bs-sass/assets/javascripts/bootstrap.js" + "bs-sass/assets/javascripts/bootstrap.min.js") + (,(assoc-ref inputs "js-bootstrap-bundle") + "bs/dist/js/bootstrap.bundle.min.js")))) + (lambda (sources targets) + (for-each (lambda (source target) + (format #t "Processing ~a --> ~a~%" + source target) + (invoke "esbuild" source "--minify" + (string-append "--outfile=" target))) + sources targets))))))))) + (propagated-inputs + `(("r-digest" ,r-digest) + ("r-htmltools" ,r-htmltools) + ("r-jquerylib" ,r-jquerylib) + ("r-jsonlite" ,r-jsonlite) + ("r-magrittr" ,r-magrittr) + ("r-rlang" ,r-rlang) + ("r-sass" ,r-sass))) + (native-inputs + `(("esbuild" ,esbuild) + ("js-bootstrap-bundle" + ,(origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/twbs/bootstrap/v4.5.3/dist/js/bootstrap.bundle.js") + (sha256 + (base32 + "1lcsxj7gcm56va3gck47ggpwzjxrzq27sgjzdw6c54qkp0487sak")))))) + (home-page "https://rstudio.github.io/bslib/") + (synopsis "Custom Bootstrap Sass themes for shiny and rmarkdown") + (description + "This package simplifies custom CSS styling of both shiny and rmarkdown +via Bootstrap Sass. It supports both Bootstrap 3 and 4 as well as their +various Bootswatch themes. An interactive widget is also provided for +previewing themes in real time.") + (license license:expat))) + (define-public r-shiny (package (name "r-shiny") -- cgit 1.4.1 From a03a3ab0434fc39c19d1cfda7d7ff95ad97c5af3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 18 Feb 2021 17:49:54 +0100 Subject: gnu: r-shiny: Update to 1.6.0. * gnu/packages/cran.scm (r-shiny): Update to 1.6.0. [source]: Remove minified JavaScript files in a snippet. [arguments]: Update phase replace-bundled-minified-JavaScript. [propagated-inputs]: Add r-bslib, r-cachem, r-commonmark, r-ellipsis, r-glue, and r-lifecycle. [inputs]: Remove js-html5shiv, js-json2, js-respond, and js-es5-shim. [native-inputs]: Add js-bootstrap-accessibility. --- gnu/packages/cran.scm | 69 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f9b3811296..4a88cf1677 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1507,10 +1507,12 @@ various Bootswatch themes. An interactive widget is also provided for previewing themes in real time.") (license license:expat))) +;; This package includes minified JavaScript files. When upgrading please +;; check that there are no new minified JavaScript files. (define-public r-shiny (package (name "r-shiny") - (version "1.4.0.2") + (version "1.6.0") (source (origin (method git-fetch) @@ -1520,7 +1522,23 @@ previewing themes in real time.") (file-name (git-file-name name version)) (sha256 (base32 - "005wgcxq7f2q9g6wvfk29n2nms262w0abpz93sfvx79yv6qxppzs")))) + "0f6cwx5xyqzs40msq271sqhwl8736rwbm7kd1ldkcvxngzr4vlx9")) + (snippet + '(for-each delete-file + '("inst/www/shared/bootstrap/js/bootstrap.min.js" + "inst/www/shared/bootstrap/accessibility/js/bootstrap-accessibility.min.js" ; TODO + "inst/www/shared/datatables/js/jquery.dataTables.min.js" + "inst/www/shared/datepicker/js/bootstrap-datepicker.min.js" + "inst/www/shared/highlight/highlight.pack.js" + "inst/www/shared/ionrangeslider/js/ion.rangeSlider.min.js" + "inst/www/shared/jquery.min.js" + "inst/www/shared/jqueryui/jquery-ui.min.js" + "inst/www/shared/legacy/jquery.min.js" + "inst/www/shared/selectize/accessibility/js/selectize-plugin-a11y.min.js" + "inst/www/shared/selectize/js/selectize.min.js" + "inst/www/shared/shiny.min.js" + "inst/www/shared/showdown/compressed/showdown.js" + "inst/www/shared/strftime/strftime-min.js"))))) (build-system r-build-system) (arguments `(#:modules ((guix build r-build-system) @@ -1535,21 +1553,11 @@ previewing themes in real time.") (lambda* (#:key inputs #:allow-other-keys) (let ((replace-file (lambda (old new) (format #t "replacing ~a with ~a\n" old new) - (delete-file old) (symlink new old)))) ;; NOTE: Files in ./inst/www/shared/datepicker/js/locales/ ;; contain just data. They are not minified code, so we don't ;; replace them. (with-directory-excursion "inst/www/shared" - (replace-file "bootstrap/shim/respond.min.js" - (string-append (assoc-ref inputs "js-respond") - "/share/javascript/respond.min.js")) - (replace-file "bootstrap/shim/html5shiv.min.js" - (string-append (assoc-ref inputs "js-html5shiv") - "/share/javascript/html5shiv.min.js")) - (replace-file "json2-min.js" - (string-append (assoc-ref inputs "js-json2") - "/share/javascript/json2-min.js")) (replace-file "strftime/strftime-min.js" (string-append (assoc-ref inputs "js-strftime") "/share/javascript/strftime.min.js")) @@ -1562,14 +1570,10 @@ previewing themes in real time.") (replace-file "selectize/js/selectize.min.js" (string-append (assoc-ref inputs "js-selectize") "/share/javascript/selectize.min.js")) - (replace-file "selectize/js/es5-shim.min.js" - (string-append (assoc-ref inputs "js-es5-shim") - "/share/javascript/es5-shim.min.js")) (for-each (match-lambda ((source . target) - (delete-file target) (minify source #:target target))) - '(("jqueryui/jquery-ui.js" . + `(("jqueryui/jquery-ui.js" . "jqueryui/jquery-ui.min.js") ("datepicker/js/bootstrap-datepicker.js" . "datepicker/js/bootstrap-datepicker.min.js") @@ -1577,23 +1581,32 @@ previewing themes in real time.") "ionrangeslider/js/ion.rangeSlider.min.js") ("bootstrap/js/bootstrap.js" . "bootstrap/js/bootstrap.min.js") + (,(assoc-ref inputs "js-bootstrap-accessibility") . + "bootstrap/accessibility/js/bootstrap-accessibility.min.js") ("shiny.js" . "shiny.min.js") ("jquery.js" . "jquery.min.js") ("legacy/jquery.js" . "legacy/jquery.min.js") + ("selectize/accessibility/js/selectize-plugin-a11y.js" . + "selectize/accessibility/js/selectize-plugin-a11y.min.js") ("showdown/src/showdown.js" . - "showdown/compressed/showdown.js"))))) - #t))))) + "showdown/compressed/showdown.js")))))))))) (propagated-inputs - `(("r-crayon" ,r-crayon) + `(("r-bslib" ,r-bslib) + ("r-cachem" ,r-cachem) + ("r-commonmark" ,r-commonmark) + ("r-crayon" ,r-crayon) ("r-digest" ,r-digest) + ("r-ellipsis" ,r-ellipsis) ("r-fastmap" ,r-fastmap) + ("r-glue" ,r-glue) ("r-htmltools" ,r-htmltools) ("r-httpuv" ,r-httpuv) ("r-jsonlite" ,r-jsonlite) ("r-later" ,r-later) + ("r-lifecycle" ,r-lifecycle) ("r-mime" ,r-mime) ("r-promises" ,r-promises) ("r-r6" ,r-r6) @@ -1603,16 +1616,20 @@ previewing themes in real time.") ("r-xtable" ,r-xtable))) (inputs `(("js-datatables" ,js-datatables) - ("js-html5shiv" ,js-html5shiv) - ("js-json2" ,js-json2) - ("js-respond" ,js-respond) ("js-selectize" ,js-selectize) ("js-strftime" ,js-strftime) - ("js-highlight" ,js-highlight) - ("js-es5-shim" ,js-es5-shim))) + ("js-highlight" ,js-highlight))) (native-inputs `(("uglify-js" ,uglify-js) - ("gfortran" ,gfortran))) + ("gfortran" ,gfortran) + ("js-bootstrap-accessibility" + ,(origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/paypal/bootstrap-accessibility-plugin/\ +v1.0.7/_site/plugins/js/bootstrap-accessibility.js") + (sha256 + (base32 + "1489wyzwrpf86y7vhc13n4v3mszmsfybhd3f75jkpnbvyp5sncm8")))))) (home-page "http://shiny.rstudio.com") (synopsis "Easy interactive web applications with R") (description -- cgit 1.4.1 From ac19e83b52673b21a11f95cb5369a1da84576da3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Feb 2021 17:59:56 +0100 Subject: gnu: emacs-eldev: Update to 0.8.1. * gnu/packages/emacs-xyz.scm (emacs-eldev): Update to 0.8.1. [arguments]: Skip failing tests in an additional phase. --- gnu/packages/emacs-xyz.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8be18c6572..450e120959 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15611,7 +15611,7 @@ according to a parsing expression grammar.") (define-public emacs-eldev (package (name "emacs-eldev") - (version "0.7.2") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -15620,7 +15620,7 @@ according to a parsing expression grammar.") (file-name (git-file-name name version)) (sha256 (base32 - "1xxcxgycn0a03irjcdq2pcb4p1bddhfjspni7lliwpv6zjqgkyhb")))) + "19s45hdhcg5l608awfxvmhd61xzp7dd5pvviv89xzzksx74l1188")))) (build-system emacs-build-system) (arguments `(#:tests? #t @@ -15633,6 +15633,12 @@ according to a parsing expression grammar.") (make-file-writable "test/project-i/project-i-autoloads.el") #t)) + (add-after 'unpack 'skip-failing-tests + ;; FIXME: 10 tests are failing. Skip them for now. + (lambda _ + (substitute* '("test/init.el" "test/targets.el") + (("(targets-project-e-[34]|init-[1-8]).*" line) + (string-append line "(skip-unless nil)\n"))))) (add-after 'install 'install-eldev-executable ;; This constructs the eldev executable from templates and ;; installs it in the specified directory. -- cgit 1.4.1 From 7cd0247eb4d22d47f76e26fd7b65ec45cb5d7ccb Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 11 Feb 2021 19:08:35 +0000 Subject: gnu: gperftools: Update to 2.8.1. * gnu/packages/cpp.scm (gperftools): Update to 2.8.1. [arguments]: Set '#:parallel-tests? #f'. Co-authored-by: Leo Famulari --- gnu/packages/cpp.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ae47490755..331afc2e3e 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -512,7 +512,7 @@ maintained anymore.") (define-public gperftools (package (name "gperftools") - (version "2.8") + (version "2.8.1") (source (origin (method git-fetch) @@ -520,9 +520,13 @@ maintained anymore.") (url "https://github.com/gperftools/gperftools") (commit (string-append "gperftools-" version)))) (sha256 - (base32 "1rnc53kaxlljgbpsff906vdsry9jl9gcvcnmxgkprwzxq1wipyd0")) + (base32 "19bj2vlsbfwq7m826v2ccqg47kd7cb5vcz1yw2x0v5qzhaxbakk1")) (file-name (git-file-name name version)))) (build-system gnu-build-system) + (arguments + ;; The tests are flaky when run in parallel. For more info: + ;; https://bugs.gnu.org/46562 + '(#:parallel-tests? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From caf8f369b09f71028cf69f3a032a666cdd29ae5c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Feb 2021 13:21:25 -0500 Subject: gnu: isc-dhcp: Update bundled BIND to 9.11.28 [fixes CVE-2020-8625]. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bundled BIND to 9.11.28. --- 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 282a513320..6ac34fa02c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1042,7 +1042,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "22") + (bind-patch-version "28") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -1179,7 +1179,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "1j9a4r83a77mp8k1y8z524c9rzdqgd8rzwczd6zwmw86a00xiimg")))) + "0x2yjy0d8p7i5mr2s5y65fdax0jjgvd8fn07s42c8dxsrbkcp40h")))) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit 1.4.1 From 11feecc23a20ad98088a2ed7b7b8a8940550e0ff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 18 Feb 2021 13:24:25 -0500 Subject: gnu: BIND: Point out where to find the release notes. The isc.org web page is hard to navigate and designed to steer users into support contracts, so let's give a hint for Guix packagers. * gnu/packages/dns.scm (bind): Add comment. --- gnu/packages/dns.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 1b98efcb19..2c4008559f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -317,6 +317,8 @@ and BOOTP/TFTP for network booting of diskless machines.") (package (name "bind") ;; When updating, check whether isc-dhcp's bundled copy should be as well. + ;; The BIND release notes are available here: + ;; https://www.isc.org/bind/ (version "9.16.12") (source (origin (method url-fetch) -- cgit 1.4.1 From 690aa1c59db1ba08bc79fcaf1e948c4cd821c1be Mon Sep 17 00:00:00 2001 From: Yurii Kholodkov Date: Thu, 18 Feb 2021 21:01:19 +0100 Subject: gnu: Add emacs-kbd. * gnu/packages/emacs-xyz.scm (emacs-kbd): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 450e120959..4344520430 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -91,6 +91,7 @@ ;;; Copyright © 2020, 2021 Noah Evans ;;; Copyright © 2020 Brit Butler ;;; Copyright © 2021 Alexandr Vityazev +;;; Copyright © 2021 Yurii Kholodkov ;;; ;;; This file is part of GNU Guix. ;;; @@ -3146,6 +3147,36 @@ depicting stroke orders for all Kanji. The collection is a slightly modified and limited version of the images provided by the KanjiVG project.") (license license:gpl3+)))) +(define-public emacs-kbd + ;; Package has no release. Version is extracted from "Version:" keyword in + ;; main file. + (let ((commit "a7f4c9b9770fa6a58895c5f121df82652bb1b737") + (revision "0")) + (package + (name "emacs-kbd") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/slotThe/kbd-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jv9yfsncgf96308c041hvps3jlc151xb0aipm0vasbma3x83ygm")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'enter-lisp-directory + (lambda _ (chdir "lisp") #t))))) + (home-page "https://github.com/slotThe/kbd-mode") + (synopsis "Minor mode for syntax highlighting kmonad's @file{.kbd} files") + (description + "This minor mode provides syntax highlighting for Lisp-like DSL used in +kmonad's configuration files (@file{.kbd}).") + (license license:gpl3+)))) + (define-public emacs-keycast (package (name "emacs-keycast") -- cgit 1.4.1 From 13de68587730aa812926256b3269ada315944b99 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 18 Feb 2021 11:23:16 -0500 Subject: gnu: webrtc-for-telegram-desktop: Adjust native inputs. This fixes a segmentation fault in telegram-desktop. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop) [native-inputs]: Add gcc-9 and perl. Signed-off-by: Leo Prikler --- gnu/packages/telegram.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 2430242241..daff57a544 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -126,7 +126,9 @@ (copy-recursively libyuv-from libyuv-to)) #t))))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("gcc" ,gcc-9) ; keep in line with telegram-desktop + ("perl" ,perl) + ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("yasm" ,yasm))) (inputs -- cgit 1.4.1 From 5fccdbc079402eee345684bcbd1b1d0306cab1e8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 13:26:59 -0500 Subject: gnu: emacs-elpy: Fix build. Fixes , which was caused by commit 41abf3b3a0fabe06817f3940cba778974ce79c46. * gnu/packages/emacs-xyz.scm (emacs-elpy)[phases] {patch-ffip-project-search-call}: New phase. Reported-by: Simon Streit and others. --- gnu/packages/emacs-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4344520430..3c3dad73f2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9166,6 +9166,15 @@ indentation guides in Emacs: `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-ffip-project-search-call + (lambda _ + ;; Since version 6.0.0 of find-file-in-project, + ;; ffip-project-search doesn't accept a third argument anymore + ;; (see: https://github.com/jorgenschaefer/elpy/issues/1889). + (substitute* "elpy.el" + (("\\((ffip-project-search nil nil) project-root\\)" _ signature) + (format #f "(let ((ffip-project-root project-root)) (~a))" + signature))))) ;; The default environment of the RPC uses Virtualenv to install ;; Python dependencies from PyPI. We don't want/need this in Guix. (add-before 'check 'do-not-use-virtualenv -- cgit 1.4.1 From a30f250d7426df48f5532cd339b8f53dd6e4dd3a Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Thu, 18 Feb 2021 21:26:06 +0100 Subject: gnu: Add vitetris. * gnu/packages/games.scm (vitetris): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index d8c98a9a2f..6726cef303 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Olivier Rojon +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -545,6 +546,40 @@ 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 vitetris + (package + (name "vitetris") + (version "0.59.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vicgeralds/vitetris") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ah1c5g7abksif0n8v5rb7r4pn2az20c3mkp4ak13vgs23ddmds5")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + ;; the non standard configure script does not accept + ;; standard parameters -> invoke configure by hand + (invoke "./configure" "prefix=") + ;; src/src-conf.mk must be writable for the build step + (make-file-writable "src/src-conf.mk")))))) + (home-page "http://victornils.net/tetris/") + (synopsis "Terminal-based Tetris clone") + (description "Vitetris is a classic multiplayer Tetris clone for the +terminal.") + (license license:bsd-2))) + (define-public blobwars (package (name "blobwars") -- cgit 1.4.1 From 0ce63d11b5e27bfc7f5082c3021be7561ffc8c76 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 18 Feb 2021 22:18:08 +0000 Subject: gnu: Add cl-glsl-packing. * gnu/packages/lisp-xyz.scm (cl-glsl-packing, ecl-glsl-packing, sbcl-glsl-packing): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3fdf4a741f..40d756649d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2707,6 +2707,37 @@ non-consing thread safe queues and fibonacci priority queues.") (define-public ecl-queues (sbcl-package->ecl-package sbcl-queues)) +(define-public sbcl-glsl-packing + (let ((commit "03628159468a8e5b7f2a1d5e78b77053e136794a") + (revision "1")) + (package + (name "sbcl-glsl-packing") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/glsl-packing/") + (commit commit))) + (file-name (git-file-name "glsl-packing" version)) + (sha256 + (base32 "0k2f1771wd9kdrcasldy1r00k5bdgi9fd07in52zmjggc0i7dd80")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/3b/glsl-packing/") + (synopsis "Common Lisp utilities to calculate OpenGL layouts") + (description + "This is a Common Lisp library to calculate std140 or std430 layouts for +a glsl UBO/SSBO.") + (license license:expat)))) + +(define-public ecl-glsl-packing + (sbcl-package->ecl-package sbcl-glsl-packing)) + +(define-public cl-glsl-packing + (sbcl-package->cl-source-package sbcl-glsl-packing)) + (define-public sbcl-glsl-spec (let ((commit "f04476f7da89355ae6856b33283c60ba95c6555d") (revision "1")) -- cgit 1.4.1 From f90bbba4cc3b85e1fc0dec9efe87f323ea97caef Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 19 Feb 2021 10:42:05 +0100 Subject: gnu: nushell: Update to 0.27.1. * gnu/packages/shells.scm (nushell): Update to 0.27.1. [arguments]: Add rust-serial-test to Cargo development inputs. (rust-nu-cli-0.27): (rust-nu-command-0.27): (rust-nu-data-0.27): (rust-nu-engine-0.27): (rust-nu-errors-0.27): (rust-nu-json-0.27): (rust-nu-parser-0.27): (rust-nu-plugin-0.27): (rust-nu-plugin-binaryview-0.27): (rust-nu-plugin-chart-0.27): (rust-nu-plugin-fetch-0.27): (rust-nu-plugin-from-bson-0.27): (rust-nu-plugin-from-sqlite-0.27): (rust-nu-plugin-inc-0.27): (rust-nu-plugin-match-0.27): (rust-nu-plugin-post-0.27): (rust-nu-plugin-ps-0.27): (rust-nu-plugin-s3-0.27): (rust-nu-plugin-selector-0.27): (rust-nu-plugin-start-0.27): (rust-nu-plugin-sys-0.27): (rust-nu-plugin-textview-0.27): (rust-nu-plugin-to-bson-0.27): (rust-nu-plugin-to-sqlite-0.27): (rust-nu-plugin-tree-0.27): (rust-nu-plugin-xpath-0.27): (rust-nu-protocol-0.27): (rust-nu-source-0.27): (rust-nu-stream-0.27): (rust-nu-table-0.27): (rust-nu-test-support-0.27): (rust-nu-value-ext-0.27): Update to 0.27.1. --- gnu/packages/shells.scm | 135 ++++++++++++++++++++++++------------------------ 1 file changed, 68 insertions(+), 67 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 8a62105e22..a6db301149 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -940,7 +940,7 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.27.0") + (version "0.27.1") (source (origin (method git-fetch) @@ -949,7 +949,7 @@ files and text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0gi477kfin9vpi7cmijqgbshm54r2winp4pkravrd7v3pqw0isrr")))) + (base32 "19l42qdqmc9g2qxy4b856z0xlq2g4qrfxj8l7dmdv99vymyfik9j")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.47 @@ -992,7 +992,8 @@ files and text.") ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) #:cargo-development-inputs (("rust-dunce" ,rust-dunce-1) - ("rust-nu-test-support" ,rust-nu-test-support-0.27)))) + ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-serial-test" ,rust-serial-test-0.5)))) (native-inputs `(("pkg-config" ,pkg-config) ("python" ,python))) @@ -1018,14 +1019,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-cli-0.27 (package (name "rust-nu-cli") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kj0n4lkzmscvya1m5psf1n3ijpzxn4avw2a71rqgcdjyk3phahb")))) + (base32 "0rv4g5vfs81gans9npa2yyz893jqnd1yqcc16h0w6xlbsgdx2712")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1134,14 +1135,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-command-0.27 (package (name "rust-nu-command") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16syx1sb3bj4hdh1l294byqqzbrgm24jp6h339rf9sn4k1m9fwd3")))) + (base32 "1kpf72fw310mnywv3y678cgxkdzhfss14228p0ndhr2knxz8gdki")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1247,14 +1248,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-data-0.27 (package (name "rust-nu-data") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0k024pgzq3r6rh3j3d3pnsnsg5vnz6w21g7xabsfm1ylv074d8i9")))) + (base32 "0v7rkbrbzjy9794isz1z3dz1kpciadgg7hdfr6107i3qw11j8pq3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1291,14 +1292,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-engine-0.27 (package (name "rust-nu-engine") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14463wafn4am6c7sc942zqjs4ckd3yxm8l786qhhkxw7gwq7m76s")))) + (base32 "0a1b8j7k2rawdimxr7yknw6yk0pbs69qj5p73sg4a24pyx0f7zkp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1346,14 +1347,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-errors-0.27 (package (name "rust-nu-errors") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0j9w8fyjgrb602v35871vychh2b9m3bzjmmk8jgcbm41458ji5sl")))) + (base32 "0h81034cmlra627bnq7kp46s3k61j5xhzbbk61lxybmyg1m5dr74")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1379,14 +1380,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-json-0.27 (package (name "rust-nu-json") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0s3bv8hcqfric8ib9da71cjfa298pn3154lyziv55yg2wrmqn9kr")))) + (base32 "1ymdiv606kiw6m79rr7blflk1m7cnk96ahxx5j82ygamkr4mckf3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1403,14 +1404,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-parser-0.27 (package (name "rust-nu-parser") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jyl29c16hmyfbmp4w0yay441dc3c54hwknqsaq7bppg5kyxhvx9")))) + (base32 "1zv68yzkrgdk8c50bbsrx3jfsg46621522zgg1glbv0809gcns5p")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1440,7 +1441,7 @@ of commands called a ``pipeline''.") (define-public rust-nu-plugin-0.27 (package (name "rust-nu-plugin") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) @@ -1448,7 +1449,7 @@ of commands called a ``pipeline''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1k5hjaisig9syx442qslnipq6anphi67wvqhig1l6alwf95d7mps")))) + (base32 "12x01n7x9bqn0pp5pymmaxmd32gjm6lcs3hd3zhp1y15swrj2kr9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1471,14 +1472,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-plugin-binaryview-0.27 (package (name "rust-nu-plugin-binaryview") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dqh50v3whd9vdcjyyymwh9jcxjrx73ixzdwp3ga8vgcg4fsy2xp")))) + (base32 "0py5wzzf0527dj43k5lah2da9ws9w4n4mi2i6dprswmy4pvplhq1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1502,14 +1503,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-plugin-chart-0.27 (package (name "rust-nu-plugin-chart") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14bh7qa2a6hwrggcb9qi92d9dqdrsr6hz5bhplbb8ym9yhr1b43k")))) + (base32 "07im3fcd9lxfnj3b81j1jky3yl1sfx3gqgcf8n46gfqh5gmgismb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1532,14 +1533,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-plugin-fetch-0.27 (package (name "rust-nu-plugin-fetch") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cyn462vpb1njhcdmad63c672xc3si2l4kvgbjf7z57zsg4ldf1i")))) + (base32 "06mgd7vis7g3br3acswq24v4ffi15zq5fi0i7v65jz418vapvmzp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1560,14 +1561,14 @@ of commands called a ``pipeline''.") (define-public rust-nu-plugin-from-bson-0.27 (package (name "rust-nu-plugin-from-bson") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02r66fm1ih690d5z9il4lawnk53vv51d6cxga7s4bj68yn7b5sig")))) + (base32 "16ksyzsxyy2wd138y1zz9sdq6s5zvrh7rrsvyhwdd4w7irk2q474")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1590,14 +1591,14 @@ Nushell.") (define-public rust-nu-plugin-from-sqlite-0.27 (package (name "rust-nu-plugin-from-sqlite") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1l5li343ba8g6cvckjby78vl9d8nj5n679asdh103gr2y8pbrk4b")))) + (base32 "0z35aw6n2w4lmwp2797zd85ix64ch1msn5d0g3g2kdrihbpymxj2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1621,14 +1622,14 @@ Nushell.") (define-public rust-nu-plugin-inc-0.27 (package (name "rust-nu-plugin-inc") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0rpgbxk79wgg3wks9w1nz0pala2arq9kxrqm971ph10gl398dah0")))) + (base32 "1ykrfixf642zv0h6349mxsidm9m7j933imnw978v96ymzp7hdalk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1650,14 +1651,14 @@ Nushell.") (define-public rust-nu-plugin-match-0.27 (package (name "rust-nu-plugin-match") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0v8rdpxqf414mbz2yqgh6cqfi3cszir4mh6qdgijll1ywjib1xag")))) + (base32 "0ax8aanmr8clvz3abbc4mwhpp2bwwzfh03vydwa50dadnrhrh51s")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1676,14 +1677,14 @@ Nushell.") (define-public rust-nu-plugin-post-0.27 (package (name "rust-nu-plugin-post") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0i2jd19rw4dpi44qfw1yavzyhljqxcr4angyk4q3rn49isdz2njg")))) + (base32 "19zsvddd5lb1y1jm1wldk8padxl3a4w55xh82hpxz4igvjblpcz6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1706,14 +1707,14 @@ Nushell.") (define-public rust-nu-plugin-ps-0.27 (package (name "rust-nu-plugin-ps") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xh55xi1w8393dyk9vp8l74r73pva4rbl5rrz4flx692vw5i40f5")))) + (base32 "1d8i1hfpcjpiwikdi5i2gdnxxm43nnmmyfz1y7zivx5hzha1qjg1")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1735,14 +1736,14 @@ Nushell.") (define-public rust-nu-plugin-s3-0.27 (package (name "rust-nu-plugin-s3") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g8dx1llizvg98g9jw80iz2jpcnjq4zvw70drsllzlxygpap0rl5")))) + (base32 "14kk07rm62am24fp7cks8gcfp7h67zlcmfzpixh0rfwkfgr87mwq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1761,14 +1762,14 @@ Nushell.") (define-public rust-nu-plugin-selector-0.27 (package (name "rust-nu-plugin-selector") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v674fkmdb2y28blhvlg0ryp6ric621sfl8law1msvqxq4c7jn84")))) + (base32 "1nvqp8lzyiyk3n8c5gqr6wrk2pirzpyxpwc4r67fr9rsllyrfhw2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1787,14 +1788,14 @@ Nushell.") (define-public rust-nu-plugin-start-0.27 (package (name "rust-nu-plugin-start") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0i98qchvslw0chbzzscfnib1yf1w6wfi1bbp9766hjldnvac0rik")))) + (base32 "1kznb1npqbbak3xk9w6m6ng6h7ir164il7xydrhwrl45mll2g4yw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1818,7 +1819,7 @@ Nushell.") (define-public rust-nu-plugin-sys-0.27 (package (name "rust-nu-plugin-sys") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) @@ -1826,7 +1827,7 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zfyjdkga65ns8qdhxzjaj4b5q76pvqkv98sa3cj4sx4wl8q9zrg")))) + (base32 "1bdd745w5gmignfclp5fzwpyjfpqsmf6hrry3chn3jzdpl5gvgiw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1847,14 +1848,14 @@ Nushell.") (define-public rust-nu-plugin-textview-0.27 (package (name "rust-nu-plugin-textview") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1izjv2jwbpaw9y01wdhsv3fnyhrhn0rdx3nr86i9rab1xcgnxrny")))) + (base32 "10w5isqgc5mf7rhs49rglm3s6pcij0ch12xkvrq4930y8pr6cy9l")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1877,14 +1878,14 @@ Nushell.") (define-public rust-nu-plugin-to-bson-0.27 (package (name "rust-nu-plugin-to-bson") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1k5r4gwn5h48ix4wqyfj4lcymg61ssc5mw8zy7x6s0w2daj58f85")))) + (base32 "1x90r11wg46i2wx21gk42pyjjcpib66rrqgxrc690y376dn9ivlr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1906,14 +1907,14 @@ Nushell.") (define-public rust-nu-plugin-to-sqlite-0.27 (package (name "rust-nu-plugin-to-sqlite") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1n5xy6yfd5vgqz1vj4p7nrb200m8akcfhpqp5hjbn79c7w4nn5d1")))) + (base32 "055k5sksxv7q4ivy74c1ndxps30c5c97rz6v7dibckh9c0q1vbhk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1937,14 +1938,14 @@ Nushell.") (define-public rust-nu-plugin-tree-0.27 (package (name "rust-nu-plugin-tree") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "102zhj8sv0mybv0wnljsw48n0p6y5wx7lzv7w96kflxna40q1dm4")))) + (base32 "0bjir9f5fraz5n9bj99ba7djmnzb8ws0dbvdhwn5hz9lmb5ss0mg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1964,14 +1965,14 @@ Nushell.") (define-public rust-nu-plugin-xpath-0.27 (package (name "rust-nu-plugin-xpath") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1x9zn2xyqkyg0pjl8kzd9da3gmhknlrdga02rzyssnc0kjagkm7v")))) + (base32 "1cyq7qb8bzzf599fq24pg7z0svsdffkd26fplggdg4nihjv28clv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1992,14 +1993,14 @@ Nushell.") (define-public rust-nu-protocol-0.27 (package (name "rust-nu-protocol") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z6q6zdkhwx3axv5m788l4k8yds3zd161mwvmvaz0vzj6g10np51")))) + (base32 "1031mysphq7qczmilmdshcm4h6wh0132cvdc0346qz2q2b3qmrjr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2029,14 +2030,14 @@ Nushell.") (define-public rust-nu-source-0.27 (package (name "rust-nu-source") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dr8lssx8cf22cwrrjcpx4xlqxk8qv6nyar3i9jk218q34m6bgn2")))) + (base32 "1akfcn7138sfaawb7sl5311vgmcba32c79lnkmdzpb48xdr9ybp8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2056,14 +2057,14 @@ Nushell.") (define-public rust-nu-stream-0.27 (package (name "rust-nu-stream") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hz9n380rnvvg86qi9bfika6c702kn4b9ljsgcwrr984mm3vbb2n")))) + (base32 "09xm93mk0kyi4nd6f1x89yfk3139ahamirs2zwnzr97f7xng216v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2080,14 +2081,14 @@ Nushell.") (define-public rust-nu-table-0.27 (package (name "rust-nu-table") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rmxic6vif8vb5klsvlida7p24nqbnmj1xclmg0p9a10bykzp4gp")))) + (base32 "1vkn0kf7rwywrj8d31mr4j64rwjay9syjsvg94yi9rdxbccd5jf2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2103,14 +2104,14 @@ Nushell.") (define-public rust-nu-test-support-0.27 (package (name "rust-nu-test-support") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hwiymqhh6x37bn0vnyi8rxzn6rpq561hxs80fw5qs4q3dkx74nv")))) + (base32 "0yk1368by0s9p7j2diw5mdk88by00cw6q6wspasbprcr684g5kvn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2136,7 +2137,7 @@ tests.") (define-public rust-nu-value-ext-0.27 (package (name "rust-nu-value-ext") - (version "0.27.0") + (version "0.27.1") (source (origin (method url-fetch) @@ -2144,7 +2145,7 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11jj6v6i6hn66q9hbkj3vw5ccz3lkiypxcd1qg5qnlzxq8ba8mj1")))) + (base32 "1yhzqzafg0l1fj4pwlbjl0h74b0rj0x4gdx2rgc3nzndc7j00axn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 9daa9f2a6f32ae01c1a4b65d866809d5318c04e8 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Feb 2021 22:42:03 +0000 Subject: gnu: Add python-pytest-astropy-header. * gnu/packages/python-check.scm (python-pytest-astropy-header): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/python-check.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index c23741825b..c449a0fe43 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Edouard Klein ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Tanguy Le Carrour +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -196,6 +197,30 @@ interactions, which will update them to correspond to the new API.") of tests run in a specific order.") (license license:expat))) +(define-public python-pytest-astropy-header +(package + (name "python-pytest-astropy-header") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-astropy-header" version)) + (sha256 + (base32 "1y87agr324p6x5gvhziymxjlw54pyn4gqnd49papbl941djpkp5g")))) + (build-system python-build-system) + (native-inputs + `(("pytest" ,python-pytest) + ("setuptools-scm" ,python-setuptools-scm))) + (home-page "https://www.astropy.org/") + (synopsis + "Pytest plugin adding diagnostic data to the header of the test output") + (description + "This plugin package provides a way to include information about the system, +Python installation, and select dependencies in the header of the output when +running pytest. It can be used with packages that are not affiliated with the +Astropy project, but is optimized for use with astropy-related projects.") + (license license:bsd-3))) + (define-public python-pytest-arraydiff (package (name "python-pytest-arraydiff") -- cgit 1.4.1 From ac7d2eef807dfbd5e3279fd924f52a65ebe5d6f7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Feb 2021 22:51:24 +0000 Subject: gnu: Add python-pytest-astropy. * gnu/packages/python-check.scm (python-pytest-astropy): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/python-check.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index c449a0fe43..15efdd3297 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -221,6 +221,41 @@ running pytest. It can be used with packages that are not affiliated with the Astropy project, but is optimized for use with astropy-related projects.") (license license:bsd-3))) +(define-public python-pytest-astropy + (package + (name "python-pytest-astropy") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pytest-astropy" version)) + (sha256 + (base32 "18j6z6y2fvykmcs5z0mldhhaxxn6wzpnhlm2ps7m8r5z5kmh1631")))) + (build-system python-build-system) + (arguments + ;; No tests provided + '(#:tests? #f)) + (native-inputs + `(("attrs" ,python-attrs) + ("hypothesis" ,python-hypothesis) + ("pytest" ,python-pytest) + ("pytest-arraydiff" ,python-pytest-arraydiff) + ("pytest-astropy-header" ,python-pytest-astropy-header) + ("pytest-cov" ,python-pytest-cov) + ("pytest-doctestplus" ,python-pytest-doctestplus) + ("pytest-filter-subpackage" ,python-pytest-filter-subpackage) + ("pytest-mock" ,python-pytest-mock) + ("pytest-openfiles" ,python-pytest-openfiles) + ("pytest-remotedata" ,python-pytest-remotedata) + ("setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/astropy/pytest-astropy") + (synopsis + "Metapackage for all the testing machinery used by the Astropy Project") + (description + "This is a meta-package that pulls in the dependencies that are used by +astropy related packages.") + (license license:bsd-3))) + (define-public python-pytest-arraydiff (package (name "python-pytest-arraydiff") -- cgit 1.4.1 From 74acb300a34cc19a10e72d7d7f67635ef59b8eb7 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Feb 2021 23:29:45 +0000 Subject: gnu: Add python-extension-helpers. * gnu/packages/python-xyz.scm (python-extension-helpers): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a504bb521b..dbb79e608c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -96,6 +96,7 @@ ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2020 EuAndreh +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -2382,6 +2383,30 @@ software.") (inherit (package-with-python2 scons)) (name "scons-python2"))) +(define-public python-extension-helpers +(package + (name "python-extension-helpers") + (version "0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "extension-helpers" version)) + (sha256 + (base32 "10iqjzmya2h4sk765dlm1pbqypwlqyh8rw59a5m9i63d3klnz2mc")))) + (build-system python-build-system) + (native-inputs + `(("coverage" ,python-coverage) + ("pytest" ,python-pytest-astropy) + ("pytest-cov" ,python-pytest-cov) + ("setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/astropy/astropy-helpers") + (synopsis + "Utilities for building and installing packages in the Astropy ecosystem") + (description + "The extension-helpers package includes many build, installation, and +documentation-related tools used by the Astropy project.") + (license license:bsd-3))) + (define-public python-extras (package (name "python-extras") -- cgit 1.4.1 From 8fa76b836ddc651ff3ca3637af27a5c977af367d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Feb 2021 23:38:58 +0000 Subject: gnu: Add python-skyfield. * gnu/packages/astronomy.scm (python-skyfield): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 07dee4b462..c239a02f3b 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -48,6 +48,8 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) @@ -726,3 +728,30 @@ more.") "The package is a Python implementation of the mathematics that standard JPL ephemerides use to predict raw (x,y,z) planetary positions.") (license license:expat))) + +(define-public python-skyfield + (package + (name "python-skyfield") + (version "1.36") + (source + (origin + (method url-fetch) + (uri (pypi-uri "skyfield" version)) + (sha256 + (base32 "1dm1327a4qv3klj9blrvddbhl72v1fqz52ym9km8qjj9vdkpywh6")))) + (build-system python-build-system) + (arguments + ;; NOTE: (Sharlatan-20210207T163305+0000): tests depend on custom test + ;; framework https://github.com/brandon-rhodes/assay + `(#:tests? #f)) + (inputs + `(("certifi" ,python-certifi) + ("jplephem" ,python-jplephem) + ("numpy" ,python-numpy) + ("sgp4" ,python-sgp4))) + (home-page "https://rhodesmill.org/skyfield/") + (synopsis "Astronomy for Python") + (description + "Skyfield computes positions for the stars, planets, and satellites in +orbit around the Earth.") + (license license:expat))) -- cgit 1.4.1 From c1563fc116584cec517c9f5c866c661d3e7cec4e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 13 Feb 2021 14:30:01 +0000 Subject: gnu: Add qfits. * gnu/packages/astronomy.scm (qfits): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c239a02f3b..9f6b102af7 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -94,6 +94,25 @@ in FITS files.") (license (license:non-copyleft "file://License.txt" "See License.txt in the distribution.")))) +(define-public qfits + (package + (name "qfits") + (version "6.2.0") + (source + (origin + (method url-fetch) + (uri + (string-append "ftp://ftp.eso.org/pub/qfits/qfits-" version ".tar.gz")) + (sha256 + (base32 "0m2b21mim3a7wgfg3ph2w5hv7mdvr03jmmhzipc0wcahijglcw9j")))) + (build-system gnu-build-system) + (home-page "https://www.eso.org/sci/software/eclipse/qfits/") + (synopsis "C library offering access to astronomical FITS files") + (description + "@code{qfits} is a C library giving access to FITS file internals, both +for reading and writing.") + (license license:gpl2+))) + (define-public eye (package (name "eye") -- cgit 1.4.1 From 4fac8b8f9bcc6742ea148ffcd52bd3cdbc746e16 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 10:00:56 +0100 Subject: gnu: Add erfa. * gnu/packages/astronomy.scm (erfa): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 9f6b102af7..09ac9e0157 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -113,6 +113,32 @@ in FITS files.") for reading and writing.") (license license:gpl2+))) +(define-public erfa + (package + (name "erfa") + (version "1.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/liberfa/erfa") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vsqwvzlk7r8q7nwyb7i710blcfdl5kwcm2va9km07a820nsp84a")))) + (build-system gnu-build-system) + (native-inputs + `(("automake" ,automake) + ("autoreconf" ,autoconf) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/liberfa/erfa") + (synopsis "Essential Routines for Fundamental Astronomy") + (description + "ERFA is a C library containing key algorithms for astronomy, and is based +on the SOFA library published by the International Astronomical Union (IAU).") + (license license:bsd-3))) + (define-public eye (package (name "eye") -- cgit 1.4.1 From 56ec8d6281b072e14d0442b6a55b1c315f9015cb Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 10:07:28 +0100 Subject: gnu: Add python-pyerfa. * gnu/packages/astronomy.scm (python-pyerfa): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 09ac9e0157..3d12a87f8a 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) #:use-module (gnu packages python-xyz) @@ -774,6 +775,47 @@ more.") JPL ephemerides use to predict raw (x,y,z) planetary positions.") (license license:expat))) +(define-public python-pyerfa + (package + (name "python-pyerfa") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyerfa" version)) + (sha256 + (base32 "1s78mdyrxha2jcckfs0wg5ynkf0pwh1bw9mmh99vprinxh9n4xri")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled submodule library. + (delete-file-recursively "liberfa") + #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'use-system-liberfa + (lambda _ + (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1") + #t))))) + (native-inputs + `(("pytest" ,python-pytest) + ("setuptools-scm" ,python-setuptools-scm) + ("pytest-doctestplus" ,python-pytest-doctestplus))) + (inputs + `(("liberfa" ,erfa) + ("numpy" ,python-numpy))) + (home-page "https://github.com/liberfa/pyerfa") + (synopsis "Python bindings for ERFA") + (description + "PyERFA is the Python wrapper for the ERFA library (Essential +Routines for Fundamental Astronomy), a C library containing key algorithms for +astronomy, which is based on the SOFA library published by the International +Astronomical Union (IAU). All C routines are wrapped as Numpy universal +functions, so that they can be called with scalar or array inputs.") + (license license:bsd-3))) + (define-public python-skyfield (package (name "python-skyfield") -- cgit 1.4.1 From d1bd22b9fb17e94931b7ebe23c6d9735b195442a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 10:13:02 +0100 Subject: gnu: Add python-sep. * gnu/packages/astronomy.scm (python-sep): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 3d12a87f8a..98ef7b3a7e 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -816,6 +816,31 @@ Astronomical Union (IAU). All C routines are wrapped as Numpy universal functions, so that they can be called with scalar or array inputs.") (license license:bsd-3))) +(define-public python-sep + (package + (name "python-sep") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sep" version)) + (sha256 + (base32 "0wxdqn92q1grv8k7xi7h88ac6wnznw4xh5bdlz1vz6za2dgsyj4m")))) + (build-system python-build-system) + (native-inputs + `(("cython" ,python-cython) + ("pytest" ,python-pytest))) + (inputs + `(("numpy" ,python-numpy))) + (home-page "https://github.com/kbarbary/sep") + (synopsis "Astronomical source extraction and photometry library") + (description + "SEP makes the core algorithms of Source Extractor available as a library +of stand-alone functions and classes.") + (license (list license:bsd-3 + license:expat + license:lgpl3+)))) + (define-public python-skyfield (package (name "python-skyfield") -- cgit 1.4.1 From d6996fa05277f240b70b18c227419c371cfc737f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 10:18:45 +0100 Subject: gnu: Add python-astroalign. * gnu/packages/astronomy.scm (python-astroalign): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 98ef7b3a7e..b10b8013cb 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -841,6 +841,32 @@ of stand-alone functions and classes.") license:expat license:lgpl3+)))) +(define-public python-astroalign + (package + (name "python-astroalign") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "astroalign" version)) + (sha256 + (base32 "19qzv3552lgrd9qmj0rxs51wmx485hw04cbf76ds5pin85kfaiy1")))) + (build-system python-build-system) + (arguments + ;; TODO: (Sharlatan-20210213T162940+0000): I could not make tests run + `(#:tests? #f)) + (inputs + `(("numpy" ,python-numpy) + ("scikit-image" ,python-scikit-image) + ("scipy" ,python-scipy) + ("sep" ,python-sep))) + (home-page "https://astroalign.readthedocs.io/") + (synopsis "Astrometric Alignment of Images") + (description + "ASTROALIGN is a python module that will try to align two stellar +astronomical images, especially when there is no WCS information available.") + (license license:expat))) + (define-public python-skyfield (package (name "python-skyfield") -- cgit 1.4.1 From 87530f7b4d4ec26a648e71df0592dbf9987417e3 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Feb 2021 22:44:03 +0000 Subject: gnu: Add libskry. * gnu/packages/astronomy.scm (libskry): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b10b8013cb..5e5a9a2634 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -54,6 +54,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages version-control) + #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) @@ -514,6 +515,48 @@ Mechanics, Astrometry and Astrodynamics library.") (license (list license:lgpl2.0+ license:gpl2+)))) ; examples/transforms.c & lntest/*.c +(define-public libskry + (package + (name "libskry") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GreatAttractor/libskry") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14kwng0j8wqzlb0gqg3ayq36l15dpz7kvxc56fa47j55b376bwh6")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list + (string-append + "LIBAV_INCLUDE_PATH=" (assoc-ref %build-inputs "ffmpeg") "/include")) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;; no configure provided + (delete 'check) ;; no tests provided + (replace 'install + ;; The Makefile lacks an ‘install’ target. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (include (string-append out "/include"))) + (copy-recursively "bin" lib) + (copy-recursively "include" include)) + #t))))) + (inputs + `(("ffmpeg" ,ffmpeg))) + (home-page "https://github.com/GreatAttractor/libskry") + (synopsis "Astronimical lucky imaging library") + (description + "@code{libskry} implements the lucky imaging principle of astronomical +imaging: creating a high-quality still image out of a series of many thousands) +low quality ones") + (license license:gpl3+))) + (define-public libpasastro ;; NOTE: (Sharlatan-20210122T215921+0000): the version tag has a build ;; error on spice which is resolved with the latest commit. -- cgit 1.4.1 From 19e081138b43b50e505f86c7e1321d8fa064980d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 16 Feb 2021 22:51:19 +0000 Subject: gnu: Add stackistry. * gnu/packages/astronomy.scm (stackistry): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/astronomy.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 5e5a9a2634..f617d7b361 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -332,6 +332,70 @@ astronomical fields. SkyMaker is part of the EFIGI (@url{https://www.astromatic.net/projects/efigi}) development project.") (license license:gpl3+))) +(define-public stackistry + (package + (name "stackistry") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/GreatAttractor/stackistry") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rz29v33n0x0k40hv3v79ym5ylch1v0pbph4i21809gz2al5p7dq")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags + (list + (string-append + "SKRY_INCLUDE_PATH=" (assoc-ref %build-inputs "libskry") "/include") + (string-append + "SKRY_LIB_PATH=-L" (assoc-ref %build-inputs "libskry") "/lib") + (string-append + "LIBAV_INCLUDE_PATH=" (assoc-ref %build-inputs "ffmpeg") "/include")) + #:phases + (modify-phases %standard-phases + ;; no configure and tests are provided + (delete 'configure) + (delete 'check) + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/main.cpp" + (("\"\\.\\.\", \"lang\"") + "\"../share/stackistry\", \"lang\"")) + (substitute* "src/utils.cpp" + (("\"\\.\\.\", \"icons\"") + "\"../share/stackistry\", \"icons\"")) + #t)) + (replace 'install + ;; The Makefile lacks an ‘install’ target. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (icons (string-append out "/share/stackistry/icons")) + (lang (string-append out "/share/stackistry/lang"))) + (copy-recursively "bin" bin) + (copy-recursively "icons" icons) + (copy-recursively "lang" lang)) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtkmm" ,gtkmm) + ("libskry" ,libskry) + ("ffmpeg" ,ffmpeg))) + (home-page "https://github.com/GreatAttractor/stackistry") + (synopsis "Astronomical lucky imaging/image stacking tool") + (description + "Stackistry implements the lucky imaging principle of astronomical +imaging: creating a high-quality still image out of a series of many (possibly +thousands) low quality ones (blurred, deformed, noisy). The resulting image +stack typically requires post-processing, including sharpening (e.g. via +deconvolution). Such post-processing is not performed by Stackistry.") + (license license:gpl3+))) + (define-public stellarium (package (name "stellarium") -- cgit 1.4.1 From ae66756a69350e2ca69a9a888dc92066e0cbaafa Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 22:30:37 -0500 Subject: gnu: python-gevent: Update to 21.1.2. * gnu/packages/python-xyz.scm (python-gevent): Update to 21.1.2. Delete trailing #t. --- gnu/packages/python-xyz.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dbb79e608c..5c7fde7d4d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12770,19 +12770,18 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "20.9.0") + (version "21.1.2") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "13aw9x6imsy3b369kfjblqiwfni69pp32m4r13n62r9k3l2lhvaz")) + "10f9y899y9nmq51pv4r1zb51b4w5yxx00sz5whvg9vm956hc432j")) (modules '((guix build utils))) (snippet '(begin ;; unbunding libev and c-ares - (delete-file-recursively "deps") - #t)))) + (delete-file-recursively "deps"))))) (build-system python-build-system) (arguments `(#:modules ((ice-9 ftw) @@ -12799,8 +12798,7 @@ graphviz.") (substitute* file (("/bin/sh") (which "sh")) (("/bin/true") (which "true")))) - (find-files "src/greentest" "\\.py$")) - #t)) + (find-files "src/greentest" "\\.py$")))) (add-before 'build 'do-not-use-bundled-sources (lambda _ (setenv "GEVENTSETUP_EMBED" "0") @@ -12808,8 +12806,7 @@ graphviz.") ;; Prevent building bundled libev. (substitute* "setup.py" (("run_make=_BUILDING") - "run_make=False")) - #t)) + "run_make=False")))) (add-before 'build 'add-greenlet-on-C_INCLUDE_PATH (lambda* (#:key inputs #:allow-other-keys) (let ((greenlet (string-append @@ -12822,16 +12819,14 @@ graphviz.") (setenv "C_INCLUDE_PATH" (string-append greenlet "/" python ":" (or (getenv "C_INCLUDE_PATH") - "")))))) - #t)) + "")))))))) (add-before 'check 'pretend-to-be-CI (lambda _ ;; A few tests are skipped due to network constraints or ;; get longer timeouts when running in a CI environment. ;; Piggy-back on that, as we need the same adjustments. (setenv "TRAVIS" "1") - (setenv "APPVEYOR" "1") - #t)) + (setenv "APPVEYOR" "1"))) (add-before 'check 'adjust-tests (lambda _ (let ((disabled-tests @@ -12863,8 +12858,7 @@ graphviz.") (call-with-output-file "skipped_tests.txt" (lambda (port) (format port "~a~%" - (string-join disabled-tests "\n")))) - #t))) + (string-join disabled-tests "\n"))))))) (replace 'check (lambda _ ;; Make sure the build directory is on PYTHONPATH. -- cgit 1.4.1 From c2baa33e4b5963ca3343b0d180e2566611ccd23e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 23:01:45 -0500 Subject: gnu: python-greenlet: Update to 1.0.0. * gnu/packages/python-xyz.scm (python-greenlet): Update to 1.0.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5c7fde7d4d..956319dab4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12723,13 +12723,13 @@ multiple processes (imagine multiprocessing, billiard, futures, celery etc). (define-public python-greenlet (package (name "python-greenlet") - (version "0.4.17") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "greenlet" version)) (sha256 (base32 - "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21")))) + "1y6wbg9yhm9dw6m768n4yslp56h85pnxkk3drz6icn15g6f1d7ki")))) (build-system python-build-system) (home-page "https://greenlet.readthedocs.io/") (synopsis "Lightweight in-process concurrent programming") -- cgit 1.4.1 From 5363d3751b272f5433c993d9944f9466455f6aa8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 23:06:42 -0500 Subject: gnu: python-geventhttpclient: Adjust to build with updated gevent. * gnu/packages/python-web.scm (python-geventhttpclient): Delete trailing #t. [phases]{fix-compatibility-issue}: New phase. {check}: Adjust comment and remove the extraneous string-append. --- gnu/packages/python-web.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ab3769b360..3cc20b2187 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018, 2019 Nicolas Goaziou ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2018, 2020 Maxim Cournoyer +;;; Copyright © 2018, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian ;;; Copyright © 2019 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois @@ -3032,16 +3032,20 @@ for the basic TCP/IP protocols.") '(begin ;; Delete pre-compiled files. (for-each delete-file (find-files "src/geventhttpclient" - ".*\\.pyc")) - #t)))) + ".*\\.pyc")))))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'delete-network-tests (lambda _ - (delete-file "src/geventhttpclient/tests/test_client.py") - #t)) + (delete-file "src/geventhttpclient/tests/test_client.py"))) + (add-after 'unpack 'fix-compatibility-issue + ;; See: https://github.com/gwik/geventhttpclient/issues/137. + (lambda _ + (substitute* "src/geventhttpclient/tests/test_ssl.py" + ((".*sock.last_seen_sni = None.*") + "")))) (replace 'check (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) @@ -3049,10 +3053,9 @@ for the basic TCP/IP protocols.") ;; Append the test modules to sys.path to avoid ;; namespace conflict which breaks SSL tests. "--import-mode=append" - ;; XXX: Disable test fails with Python 3.8: + ;; XXX: This test fails with Python 3.8: ;; https://github.com/gwik/geventhttpclient/issues/119 - "-k" (string-append "not test_cookielib_compatibility")) - #t))))) + "-k" "not test_cookielib_compatibility")))))) (native-inputs `(("python-dpkt" ,python-dpkt) ("python-pytest" ,python-pytest))) -- cgit 1.4.1 From a386d29c18c4b483bd38321e4c1d842ec379af7d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 23:15:58 -0500 Subject: gnu: python-psutil: Update to 5.8.0. * gnu/packages/python-xyz.scm (python-psutil): Update to 5.8.0. [home-page]: Update. [description]: Please lint and re-flow text. --- gnu/packages/python-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 956319dab4..c19429cff2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -550,28 +550,28 @@ data for video and audio files.") (define-public python-psutil (package (name "python-psutil") - (version "5.7.2") + (version "5.8.0") (source (origin (method url-fetch) (uri (pypi-uri "psutil" version)) (sha256 - (base32 "1svv985vmqsls35kmvp3vhh26nsgz229324s9k29awf6qgqhm6ch")))) + (base32 "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c")))) (build-system python-build-system) (arguments ;; FIXME: some tests do not return and time out. Some tests fail because ;; some processes survive kill(). '(#:tests? #f)) - (home-page "https://www.github.com/giampaolo/psutil") + (home-page "https://github.com/giampaolo/psutil") (synopsis "Library for retrieving information on running processes") (description - "psutil (Python system and process utilities) is a library for retrieving -information on running processes and system utilization (CPU, memory, disks, -network) in Python. It is useful mainly for system monitoring, profiling and -limiting process resources and management of running processes. It implements -many functionalities offered by command line tools such as: ps, top, lsof, -netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, iotop, uptime, -pidof, tty, taskset, pmap.") + "@code{psutil} (Python system and process utilities) is a library for +retrieving information on running processes and system utilization (CPU, +memory, disks, network) in Python. It is useful mainly for system monitoring, +profiling and limiting process resources and management of running processes. +It implements many functionalities offered by command line tools such as: ps, +top, lsof, netstat, ifconfig, who, df, kill, free, nice, ionice, iostat, +iotop, uptime, pidof, tty, taskset, pmap.") (properties `((python2-variant . ,(delay python2-psutil)))) (license license:bsd-3))) -- cgit 1.4.1 From 8999d2b44c5d26add1a60ea1fc84497b9ad501fd Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 18 Feb 2021 08:28:57 -0500 Subject: gnu: python-locust: Update to 1.4.3. * gnu/packages/benchmark.scm (python-locust): Update to 1.4.3. [phases]: Remove trailing #t. {check}: Disable the 'test_html_report_option', 'test_custom_exit_code' and 'test_webserver' tests. --- gnu/packages/benchmark.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 3470f3860b..cb97c9c7a5 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019 Ludovic Courtès ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 malte Frank Gerdes -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Greg Hogan ;;; ;;; This file is part of GNU Guix. @@ -284,14 +284,14 @@ file metadata operations that can be performed per second.") (define-public python-locust (package (name "python-locust") - (version "1.4.1") + (version "1.4.3") (source (origin (method url-fetch) (uri (pypi-uri "locust" version)) (sha256 (base32 - "1q2nza37fwsqf8qdmisfz6bmjpss90shi1bajrclf6gkbslhryxl")))) + "0vmw151xcaznd2j85n96iyv9fniss0bkk91xn4maw2gwzym424xk")))) (build-system python-build-system) (arguments `(#:phases @@ -302,8 +302,7 @@ file metadata operations that can be performed per second.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (setenv "PATH" (string-append out "/bin:" - (getenv "PATH")))) - #t)) + (getenv "PATH")))))) (replace 'check (lambda _ (invoke "python" "-m" "pytest" @@ -313,12 +312,19 @@ file metadata operations that can be performed per second.") "not test_default_headless_spawn_options" "not test_default_headless_spawn_options_with_shape" "not test_headless_spawn_options_wo_run_time" - ;; This test depends on networking. + ;; These tests depend on networking. + "not test_html_report_option" "not test_web_options" ;; This test fails because of the warning "System open ;; file limit '1024' is below minimum setting '10000'". - "not test_skip_logging") " and ")) - #t))))) + "not test_skip_logging" + ;; On some (slow?) machines, the following tests + ;; fail, with the processes returning exit code + ;; -15 instead of the expected 42 and 0, + ;; respectively (see: + ;; https://github.com/locustio/locust/issues/1708). + "not test_custom_exit_code" + "not test_webserver") " and "))))))) (propagated-inputs `(("python-configargparse" ,python-configargparse) ("python-flask" ,python-flask) @@ -341,5 +347,9 @@ use, scriptable and scalable. The test scenarios are described in plain Python. It provides a web-based user interface to visualize the results in real-time, but can also be run non-interactively. Locust is primarily geared toward testing HTTP-based applications or services, but it can be customized to -test any system or protocol.") +test any system or protocol. + +Note: Locust will complain if the available open file descriptors limit for +the user is too low. To raise such limit on a Guix System, refer to +@samp{info guix --index-search=pam-limits-service}.") (license license:expat))) -- cgit 1.4.1 From 80d3150c94a1b33072747a81020f805779530324 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 17:24:21 +0100 Subject: gnu: Add ngshmmalign. * gnu/packages/bioinformatics.scm (ngshmmalign): New variable. --- gnu/packages/bioinformatics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4e7e49fecf..a84c1c812c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7825,6 +7825,31 @@ clusters.") (home-page "https://sourceforge.net/projects/pardre/") (license license:gpl3+))) +(define-public ngshmmalign + (package + (name "ngshmmalign") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/cbg-ethz/ngshmmalign/" + "releases/download/" version + "/ngshmmalign-" version ".tar.bz2")) + (sha256 + (base32 + "0jryvlssi2r2ii1dxnx39yk6bh4yqgq010fnxrgfgbaj3ykijlzv")))) + (build-system cmake-build-system) + (arguments '(#:tests? #false)) ; there are none + (inputs + `(("boost" ,boost))) + (home-page "https://github.com/cbg-ethz/ngshmmalign/") + (synopsis "Profile HMM aligner for NGS reads") + (description + "ngshmmalign is a profile HMM aligner for NGS reads designed particularly +for small genomes (such as those of RNA viruses like HIV-1 and HCV) that +experience substantial biological insertions and deletions.") + (license license:gpl2+))) + (define-public ruby-bio-kseq (package (name "ruby-bio-kseq") -- cgit 1.4.1 From f3318fefe42d773297267ad940a2ec5893c5c094 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 17:56:52 +0100 Subject: gnu: Add perl-math-matrixreal. * gnu/packages/perl-maths.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/local.mk | 1 + gnu/packages/perl-maths.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 gnu/packages/perl-maths.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c3398c62fd..0dd5fc2a29 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -436,6 +436,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/perl.scm \ %D%/packages/perl-check.scm \ %D%/packages/perl-compression.scm \ + %D%/packages/perl-maths.scm \ %D%/packages/perl-web.scm \ %D%/packages/perl6.scm \ %D%/packages/photo.scm \ diff --git a/gnu/packages/perl-maths.scm b/gnu/packages/perl-maths.scm new file mode 100644 index 0000000000..e03458a9c0 --- /dev/null +++ b/gnu/packages/perl-maths.scm @@ -0,0 +1,48 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Ricardo Wurmus +;;; +;;; 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 perl-maths) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system perl) + #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check)) + +(define-public perl-math-matrixreal + (package + (name "perl-math-matrixreal") + (version "2.13") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/L/LE/LETO/Math-MatrixReal-" + version ".tar.gz")) + (sha256 + (base32 + "1cml5wqd99hm398gl8f147ccsck9v179l7a6vqjj4kfkdnja37sg")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-test-most" ,perl-test-most))) + (home-page "https://metacpan.org/release/Math-MatrixReal") + (synopsis "Manipulate NxN matrices of real numbers") + (description "This package provides the @code{Math::MatrixReal} module. +It implements the data type \"matrix of real numbers\" (and consequently also +\"vector of real numbers\").") + (license license:perl-license))) -- cgit 1.4.1 From 0d9c9502694984a800be9df3bf6ed518c3ce2aca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 18:04:03 +0100 Subject: gnu: Add perl-want. * gnu/packages/perl.scm (perl-want): New variable. --- gnu/packages/perl.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index e279562b32..ca754868d1 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8892,6 +8892,26 @@ straightforward and (perhaps someday) standard way. Spiffy borrows ideas from other OO languages like Python, Ruby, Java and Perl 6.") (license (package-license perl)))) +(define-public perl-want + (package + (name "perl-want") + (version "0.29") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/R/RO/ROBIN/Want-" + version ".tar.gz")) + (sha256 + (base32 + "1xsjylbxxcbkjazqms49ipi94j1hd2ykdikk29cq7dscil5p9r5l")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Want") + (synopsis "Generalization of wantarray") + (description "This module generalises the mechanism of the +@code{wantarray} function, allowing a function to determine in some detail how +its return value is going to be immediately used.") + (license license:perl-license))) + (define-public perl-statistics-basic (package (name "perl-statistics-basic") -- cgit 1.4.1 From fceda92f8651cd7b527aec67fbeb49c9a4adffbc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 18:04:37 +0100 Subject: gnu: Add perl-contextual-return. * gnu/packages/perl.scm (perl-contextual-return): New variable. --- gnu/packages/perl.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ca754868d1..ea520fe65a 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8912,6 +8912,28 @@ other OO languages like Python, Ruby, Java and Perl 6.") its return value is going to be immediately used.") (license license:perl-license))) +(define-public perl-contextual-return + (package + (name "perl-contextual-return") + (version "0.004014") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DC/DCONWAY/Contextual-Return-" + version ".tar.gz")) + (sha256 + (base32 + "0y4zf5qkpayp4kkg7lw9ydbbin1z99m6xvy02fgacjbfw4ai9zh9")))) + (build-system perl-build-system) + (propagated-inputs + `(("perl-want" ,perl-want))) + (home-page "https://metacpan.org/release/Contextual-Return") + (synopsis "Create context-sensitive return values") + (description "This module provides a collection of named blocks that allow +a return statement to return different values depending on the context in +which it is called.") + (license license:perl-license))) + (define-public perl-statistics-basic (package (name "perl-statistics-basic") -- cgit 1.4.1 From f57b7cea748c1e8284373811c13398d9f69aec89 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 19 Feb 2021 19:09:00 +0100 Subject: tests: Export %simple-os. * gnu/tests.scm (%simple-os): Export it. --- gnu/tests.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/tests.scm b/gnu/tests.scm index 83528a40f0..3b10a6d5ac 100644 --- a/gnu/tests.scm +++ b/gnu/tests.scm @@ -45,6 +45,7 @@ marionette-operating-system define-os-with-source + %simple-os simple-operating-system system-test -- cgit 1.4.1 From 25ad6e1d8ee268bbf57a48481467a1b13a4fbbb2 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 19 Feb 2021 19:09:18 +0100 Subject: tests: cuirass: Add an operating system argument. Rewrite so that "run-cuirass-test" takes an operating-system argument. This is functionally equivalent. * gnu/tests/cuirass.scm (%derivation-file, git-service, cow-service, %cuirass-specs): New variables. (cuirass-services): New procedure. (run-cuirass-test): Add an "operating-system" argument. (%cuirass-test): Adapt it. (%cuirass-remote-test): Ditto. --- gnu/tests/cuirass.scm | 242 ++++++++++++++++++++++++++------------------------ 1 file changed, 126 insertions(+), 116 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 86a06d3069..760aef8245 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -31,20 +31,89 @@ #:use-module (gnu services databases) #:use-module (gnu services networking) #:use-module (gnu system nss) + #:use-module (guix channels) #:use-module (guix gexp) #:use-module (guix store) #:export (%cuirass-test %cuirass-remote-test)) -(define* (run-cuirass-test name #:key remote-build?) - (define %cuirass-specs +(define %derivation-file + (scheme-file + "derivation.scm" + '(begin + (use-modules (guix) + (srfi srfi-1) + (ice-9 match)) + + (define (derivation->alist store drv) + `((#:derivation . ,(derivation-file-name drv)) + (#:log . ,(log-file store (derivation-file-name drv))) + (#:outputs . ,(filter-map (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) + (#:nix-name . ,(derivation-name drv)) + (#:system . ,(derivation-system drv)) + (#:max-silent-time . 3600) + (#:timeout . 3600))) + + (define (cuirass-jobs store arguments) + (let* ((file (plain-file "test" "this is a test derivation")) + (job-name "test-job") + (drv (run-with-store store + (gexp->derivation + job-name + #~(begin + (mkdir #$output) + (symlink #$file + (string-append #$output "/file"))))))) + (list (lambda () + `((#:job-name . ,job-name) + ,@(derivation->alist store drv))))))))) + +(define git-service + ;; Create a Git repository to host Cuirass' specification. + (simple-service + 'create-git-directory activation-service-type + #~(begin + (let* ((git (string-append #$git "/bin/git")) + (main "/tmp/cuirass-main") + (file (string-append main "/build-aux/cuirass/gnu-system.scm"))) + (mkdir-p (dirname file)) + (with-directory-excursion main + (copy-file #$%derivation-file file) + (invoke git "config" "--global" "user.email" + "charlie@example.org") + (invoke git "config" "--global" "user.name" "A U Thor") + (invoke git "init") + (invoke git "add" ".") + (invoke git "commit" "-m" "That's a commit.")))))) + +(define cow-service + ;; The Guix-daemon & Cuirass will complain if the store is + ;; read-only. Create a store overlay to solve this issue. + (simple-service + 'mount-cow-store activation-service-type + #~(begin + (use-modules (guix build syscalls) + (guix build utils)) + (mkdir-p "/rw-store") + (mount "none" "/rw-store" "tmpfs") + + (mkdir-p "/rw-store/upper") + (mkdir-p "/rw-store/work") + (mount "none" "/gnu/store" "overlay" 0 + "lowerdir=/gnu/store,upperdir=/rw-store/upper,workdir=/rw-store/work")))) + +(define %cuirass-specs #~(list '((#:name . "test") (#:load-path-inputs . ()) (#:package-path-inputs . ()) (#:proc-input . "main") - (#:proc-file . "derivation.scm") - (#:proc . main) + (#:proc-file . "build-aux/cuirass/gnu-system.scm") + (#:proc . cuirass-jobs) (#:proc-args . ()) (#:inputs . (((#:name . "main") (#:url . "file:///tmp/cuirass-main/") @@ -54,103 +123,29 @@ (#:build-outputs . ()) (#:priority . 1)))) - (define %derivation-file - (scheme-file - "derivation.scm" - '(begin - (use-modules (guix) - (srfi srfi-1) - (ice-9 match)) - - (define (derivation->alist store drv) - `((#:derivation . ,(derivation-file-name drv)) - (#:log . ,(log-file store (derivation-file-name drv))) - (#:outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (#:nix-name . ,(derivation-name drv)) - (#:system . ,(derivation-system drv)) - (#:max-silent-time . 3600) - (#:timeout . 3600))) - - (define (main store arguments) - (let* ((file (plain-file "test" "this is a test derivation")) - (job-name "test-job") - (drv (run-with-store store - (gexp->derivation - job-name - #~(begin - (mkdir #$output) - (symlink #$file - (string-append #$output "/file"))))))) - (list (lambda () - `((#:job-name . ,job-name) - ,@(derivation->alist store drv))))))))) - - (define os - (marionette-operating-system - (simple-operating-system - (service cuirass-service-type - (cuirass-configuration - (specifications %cuirass-specs) - (remote-server (and remote-build? - (cuirass-remote-server-configuration))) - (host "0.0.0.0") - (use-substitutes? #t))) - (service dhcp-client-service-type) - ;; Create a Git repository to host Cuirass' specification. - (simple-service - 'create-git-directory activation-service-type - #~(begin - (let* ((git (string-append #$git "/bin/git")) - (main "/tmp/cuirass-main") - (file (string-append main "/derivation.scm"))) - (mkdir-p main) - (with-directory-excursion main - (copy-file #$%derivation-file file) - (invoke git "config" "--global" "user.email" - "charlie@example.org") - (invoke git "config" "--global" "user.name" "A U Thor") - (invoke git "init") - (invoke git "add" ".") - (invoke git "commit" "-m" "That's a commit."))))) - ;; The Guix-daemon & Cuirass will complain if the store is - ;; read-only. Create a store overlay to solve this issue. - (simple-service - 'mount-cow-store activation-service-type - #~(begin - (use-modules (guix build syscalls) - (guix build utils)) - (mkdir-p "/rw-store") - (mount "none" "/rw-store" "tmpfs") - - (mkdir-p "/rw-store/upper") - (mkdir-p "/rw-store/work") - (mount "none" "/gnu/store" "overlay" 0 - "lowerdir=/gnu/store,upperdir=/rw-store/upper,workdir=/rw-store/work"))) - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-10))) - (service postgresql-role-service-type)) - #:imported-modules '((gnu services herd) - (guix combinators) - (guix build syscalls) - (guix build utils)))) +(define* (cuirass-services #:key remote-build?) + (list + (service cuirass-service-type + (cuirass-configuration + (specifications %cuirass-specs) + (remote-server (and remote-build? + (cuirass-remote-server-configuration))) + (host "0.0.0.0") + (use-substitutes? #t))) + (service postgresql-service-type + (postgresql-configuration + (postgresql postgresql-10))) + (service postgresql-role-service-type))) +(define (run-cuirass-test name os) (define os* - (operating-system - (inherit os) - (name-service-switch %mdns-host-lookup-nss) - (services - (append (if remote-build? - (list - (service avahi-service-type) - (service cuirass-remote-worker-service-type - (cuirass-remote-worker-configuration))) - '()) - (operating-system-user-services os))))) + (let ((modules '((gnu services herd) + (guix combinators) + (guix build syscalls) + (guix build utils)))) + (marionette-operating-system + os + #:imported-modules modules))) (define cuirass-web-port 8081) (define forward-port 5000) @@ -219,8 +214,7 @@ #:times 5 #:delay 5))) - (test-equal "cuirass-web evaluation" - "test" + (test-assert "cuirass-web evaluation" (begin (retry (lambda () @@ -230,8 +224,9 @@ (false-if-exception (json-string->scm (utf8->string text))))) - (and result - (assoc-ref result "specification"))))) + (eq? (and result + (assoc-ref result "id")) + 1)))) #:times 5 #:delay 5))) @@ -249,11 +244,7 @@ (utf8->string text)))) (match (vector->list result) ((build) - (and (string=? (assoc-ref build "job") - "test-job") - (or (not #$remote-build?) - ;; Check if the build is started. - (= (assoc-ref build "buildstatus") -1)))) + (string=? (assoc-ref build "job") "test-job")) (else #f))))) #:times 5 #:delay 10))) @@ -264,13 +255,32 @@ (gexp->derivation name test)) (define %cuirass-test - (system-test - (name "cuirass") - (description "Connect to a Cuirass server.") - (value (run-cuirass-test name)))) + (let ((os (operating-system + (inherit %simple-os) + (services + (append (list cow-service + (service dhcp-client-service-type) + git-service) + (cuirass-services) + (operating-system-user-services %simple-os)))))) + (system-test + (name "cuirass") + (description "Connect to a Cuirass server.") + (value + (run-cuirass-test name os))))) (define %cuirass-remote-test - (system-test - (name "cuirass-remote") - (description "Connect to a Cuirass server with remote build.") - (value (run-cuirass-test name #:remote-build? #t)))) + (let ((os (operating-system + (inherit %simple-os) + (name-service-switch %mdns-host-lookup-nss) + (services + (append (list (service avahi-service-type) + cow-service + (service dhcp-client-service-type) + git-service) + (cuirass-services #:remote-build? #t) + (operating-system-user-services %simple-os)))))) + (system-test + (name "cuirass-remote") + (description "Connect to a Cuirass server with remote build.") + (value (run-cuirass-test name os))))) -- cgit 1.4.1 From e9bf51108272977d61a34e1af753f5064f0d57c7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 22 Jan 2021 09:44:45 +0100 Subject: services: cuirass: Add "simple-cuirass-services". * gnu/services/cuirass.scm (, ): New records. (build-manifest, build-manifest?, simple-cuirass-configuration, simple-cuirass-configuration?, simple-cuirass-services): New procedures. (%default-cuirass-config): New variable. * gnu/tests/cuirass.scm (%cuirass-simple-test): New variable. * doc/guix.texi (Continuous Integration): Document it. --- doc/guix.texi | 102 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/services/cuirass.scm | 102 ++++++++++++++++++++++++++++++++++++++++++++++- gnu/tests/cuirass.scm | 28 ++++++++++++- 3 files changed, 230 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 5d28fca837..30e9b052e0 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -27133,6 +27133,108 @@ The Cuirass package to use. @end table @end deftp +@cindex simple cuirass +@subsubheading Simple Cuirass + +The Cuirass service configuration described above can be a little +intimidating. The @code{simple-cuirass-services} procedure offers a way +to setup a continuous integration server more readily. + +It takes a @code{simple-cuirass-configuration} record as its first +argument. + +@deftp {Data Type} simple-cuirass-configuration +Data type representing the configuration of a simple Cuirass instance. + +@table @asis +@item @code{build} (default: @code{'all}) +The packages to be built by Cuirass. It defaults to @code{'all}, which +means that all the discovered packages in the subsequent @code{channels} +field are to be selected. + +It is also possible to set this field to a list of @code{build-manifest} +records, so that only the packages that are part of the declared +manifests are built. This record is described below. + +@deftp {Data Type} build-manifest +@table @asis +@item @code{channel-name} +The name of the channel where the manifest is located. + +@item @code{manifest} +The manifest path inside the channel. + +@end table +@end deftp + +@item @code{channels} (default: @code{%default-channels}) +The channels to be fetched by Cuirass, see @pxref{Channels}. + +@item @code{non-package-channels} (default: @code{'()}) +List the channel names that must not be searched for packages. That is +often the case for the channel containing the manifest. + +@item @code{systems} (default: @code{(list (%current-system))}) +Build every discovered package for each system in this list. By default +only the current system is selected. + +@end table +@end deftp + +Here is an example of how to setup a Cuirass instance that builds all +the packages declared by Guix and a user repository. The package list +is re-evaluated each time a commit is pushed in one of the declared +channels. + +@lisp +(simple-cuirass-services + (simple-cuirass-configuration + (build 'all) + (channels (cons (channel + (name 'my-guix) + (url "https://my-git-repo/guix.git")) + %default-channels)))) +@end lisp + +In the same spirit, this builds all the packages that are part of the +@code{'guix} or @code{'my-guix} channels and declared in the manifest +located in the @code{'conf} channel. + +@lisp +(simple-cuirass-services + (simple-cuirass-configuration + (build (list + (build-manifest + (channel-name 'conf) + (manifest "guix/manifest.scm")))) + (channels (cons* (channel + (name 'my-guix) + (url "https://my-git-repo/guix.git")) + (channel + (name 'conf) + (url "https://my-git-repo/conf.git")) + %default-channels)) + (non-package-channels '(conf)))) +@end lisp + +Finally, @code{simple-cuirass-services} takes as a second optional +argument a @code{cuirass-configuration} record. It can be used to +customize the configuration of the Cuirass instance. + +@lisp +(simple-cuirass-services + (simple-cuirass-configuration + (build 'all) + (channels (cons (channel + (name 'my-guix) + (url "https://my-git-repo/guix.git")) + %default-channels)) + (non-package-channels '(conf))) + (cuirass-configuration + (inherit %default-cuirass-config) + (host "0.0.0.0"))) ;listen on all interfaces. +@end lisp + @node Power Management Services @subsection Power Management Services diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index ea656c617e..99edd3d13e 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -22,11 +22,13 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu services cuirass) + #:use-module (guix channels) #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix utils) #:use-module (gnu packages admin) #:use-module (gnu packages ci) + #:use-module (gnu packages databases) #:use-module (gnu packages version-control) #:use-module (gnu services) #:use-module (gnu services base) @@ -34,6 +36,8 @@ #:use-module (gnu services shepherd) #:use-module (gnu services admin) #:use-module (gnu system shadow) + #:use-module (srfi srfi-1) + #:use-module (ice-9 match) #:export ( cuirass-remote-server-configuration cuirass-remote-server-configuration? @@ -46,7 +50,18 @@ cuirass-remote-worker-configuration cuirass-remote-worker-configuration? - cuirass-remote-worker-service-type)) + cuirass-remote-worker-service-type + + + build-manifest + build-manifest? + + + simple-cuirass-configuration + simple-cuirass-configuration? + + %default-cuirass-config + simple-cuirass-services)) ;;;; Commentary: ;;; @@ -373,3 +388,88 @@ CONFIG." cuirass-remote-worker-shepherd-service))) (description "Run the Cuirass remote build worker service."))) + +(define-record-type* + build-manifest make-build-manifest + build-manifest? + (channel-name build-manifest-channel-name) ;symbol + (manifest build-manifest-manifest)) ;string + +(define-record-type* + simple-cuirass-configuration make-simple-cuirass-configuration + simple-cuirass-configuration? + (build simple-cuirass-configuration-build + (default 'all)) ;symbol or list of + (channels simple-cuirass-configuration-channels + (default %default-channels)) ;list of + (non-package-channels simple-cuirass-configuration-package-channels + (default '())) ;list of channels name + (systems simple-cuirass-configuration-systems + (default (list (%current-system))))) ;list of strings + +(define %default-cuirass-config + (cuirass-configuration + (specifications #~()))) + +(define* (simple-cuirass-services config + #:optional + (cuirass %default-cuirass-config)) + (define (format-name name) + (if (string? name) + name + (symbol->string name))) + + (define (format-manifests build-manifests) + (map (lambda (build-manifest) + (match-record build-manifest + (channel-name manifest) + (cons (format-name channel-name) manifest))) + build-manifests)) + + (define (channel->input channel) + (let ((name (channel-name channel)) + (url (channel-url channel)) + (branch (channel-branch channel))) + `((#:name . ,(format-name name)) + (#:url . ,url) + (#:load-path . ".") + (#:branch . ,branch) + (#:no-compile? #t)))) + + (define (package-path channels non-package-channels) + (filter-map (lambda (channel) + (let ((name (channel-name channel))) + (and (not (member name non-package-channels)) + (not (eq? name 'guix)) + (format-name name)))) + channels)) + + (define (config->spec config) + (match-record config + (build channels non-package-channels systems) + `((#:name . "simple-config") + (#:load-path-inputs . ("guix")) + (#:package-path-inputs . ,(package-path channels + non-package-channels)) + (#:proc-input . "guix") + (#:proc-file . "build-aux/cuirass/gnu-system.scm") + (#:proc . cuirass-jobs) + (#:proc-args . ((systems . ,systems) + ,@(if (eq? build 'all) + '() + `((subset . "manifests") + (manifests . ,(format-manifests build)))))) + (#:inputs . ,(map channel->input channels)) + (#:build-outputs . ()) + (#:priority . 1)))) + + (list + (service cuirass-service-type + (cuirass-configuration + (inherit cuirass) + (specifications #~(list + '#$(config->spec config))))) + (service postgresql-service-type + (postgresql-configuration + (postgresql postgresql-10))) + (service postgresql-role-service-type))) diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 760aef8245..22eab3c456 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -35,7 +35,8 @@ #:use-module (guix gexp) #:use-module (guix store) #:export (%cuirass-test - %cuirass-remote-test)) + %cuirass-remote-test + %cuirass-simple-test)) (define %derivation-file (scheme-file @@ -284,3 +285,28 @@ (name "cuirass-remote") (description "Connect to a Cuirass server with remote build.") (value (run-cuirass-test name os))))) + +(define %cuirass-simple-test + (let ((os (operating-system + (inherit %simple-os) + (services + (append + (list cow-service + (service dhcp-client-service-type) + git-service) + (simple-cuirass-services + (simple-cuirass-configuration + (build 'all) + (channels (list (channel + (name 'guix) + (url "file:///tmp/cuirass-main/"))))) + (cuirass-configuration + (inherit %default-cuirass-config) + (host "0.0.0.0") + (use-substitutes? #t))) + (operating-system-user-services %simple-os)))))) + (system-test + (name "cuirass-simple") + (description "Connect to a simple Cuirass server.") + (value + (run-cuirass-test name os))))) -- cgit 1.4.1 From 319470bb3b75d619fd14ba16a8cf619342526000 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Feb 2021 14:08:27 -0500 Subject: gnu: Add GtkDatabox. * gnu/packages/gtk.scm (gtkdatabox): New variable. --- gnu/packages/gtk.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index c6b4b6197a..34876ddd8f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -2266,3 +2267,27 @@ foreground and background colors, text justification and more.") (variable "GLADE_MODULE_SEARCH_PATH") (files '("lib/glade/modules"))))) (license license:lgpl2.0+))) + +(define-public gtkdatabox + (package + (name "gtkdatabox") + (version "0.9.3.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/gtkdatabox/gtkdatabox/" + version "/gtkdatabox-" version ".tar.gz")) + (sha256 + (base32 + "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtk+-2" ,gtk+-2))) + (synopsis "Display widget for dynamic data") + (description "GtkDatabox is a widget for live display of large amounts of +fluctuating numerical data. It enables data presentation (for example, on +linear or logarithmic scales, as dots or lines, with markers/labels) as well as +user interaction (e.g. measuring distances).") + (home-page "https://sourceforge.net/projects/gtkdatabox/") + (license license:lgpl2.1+))) -- cgit 1.4.1 From c35157f78ef9a59db2d751d39d18b640414f04b2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Feb 2021 14:09:29 -0500 Subject: gnu: Add comedilib. * gnu/packages/electronics.scm (comedilib): New variable. --- gnu/packages/electronics.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 7cf6509b7d..152be06725 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -279,3 +280,24 @@ format support.") (description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok.") (license license:gpl3+))) + +(define-public comedilib + (package + (name "comedilib") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (string-append "https://www.comedi.org/download/comedilib-" + version ".tar.gz")) + (sha256 + (base32 + "0wzh23iyix4xj211fsd8hwrdcjhg2w5jswk9kywb1gpd3h8afajj")))) + (build-system gnu-build-system) + (synopsis "Library for Comedi") + (description "Comedilib is a user-space library that provides a +developer-friendly interface to Comedi devices. Comedi is a collection of +drivers for a variety of common data acquisition plug-in boards. The drivers +are implemented as a core Linux kernel module providing common functionality and +individual low-level driver modules.") + (home-page "https://www.comedi.org/") + (license license:lgpl2.1))) -- cgit 1.4.1 From ffe4f87c87a28a9b4ea5e2f389932f3591e21b2b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Feb 2021 14:10:33 -0500 Subject: gnu: Add xoscope. * gnu/packages/electronics.scm (xoscope): New variable. --- gnu/packages/electronics.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 152be06725..232a6c8c44 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -28,6 +28,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages boost) @@ -38,8 +39,10 @@ #:use-module (gnu packages gawk) #:use-module (gnu packages glib) #:use-module (gnu packages graphviz) + #:use-module (gnu packages gtk) #:use-module (gnu packages libftdi) #:use-module (gnu packages libusb) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages qt)) @@ -301,3 +304,30 @@ are implemented as a core Linux kernel module providing common functionality and individual low-level driver modules.") (home-page "https://www.comedi.org/") (license license:lgpl2.1))) + +(define-public xoscope + (package + (name "xoscope") + (version "2.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/xoscope/xoscope/" + version "/xoscope-" version ".tar.gz")) + (sha256 + (base32 + "1b9wxnrwz8qy6qyx5icrklb4720rlxnr1c4h3dr6g0dzj6nkc5av")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("comedilib" ,comedilib) + ("fftw" ,fftw) + ("gtk+-2" ,gtk+-2) + ("gtkdatabox" ,gtkdatabox))) + (synopsis "Digital oscilloscope") + (description "Xoscope is a digital oscilloscope that can acquire signals +from ALSA, ESD, and COMEDI sources. This package currently does not include +support for ESD sources.") + (home-page "http://xoscope.sourceforge.net/") + (license license:gpl2+))) -- cgit 1.4.1 From 80986c6ab64ff4d589e9451db827d3d93b96d2c7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Feb 2021 14:23:36 -0500 Subject: gnu: Add butt. * gnu/packages/audio.scm (butt): New variable. --- gnu/packages/audio.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0ec163e932..16e0eec418 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2018 Brendan Tildesley ;;; Copyright © 2019 Pierre Langlois -;;; Copyright © 2019 Leo Famulari +;;; Copyright © 2019, 2021 Leo Famulari ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2019 Mathieu Othacehe @@ -5058,3 +5058,57 @@ connected to a local network discover each other automatically and form a musica session in which each participant can perform independently: anyone can start or stop while still staying in time.") (license license:gpl2+))) + +(define-public butt + (package + (name "butt") + (version "0.1.28") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/butt/butt/butt-" + version "/butt-" version ".tar.gz")) + (sha256 + (base32 + "1rbp4v6dlyapld6y4aqbpfmcaiafa06f2zqd1rhk4r3ld3bndafm")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-documentation + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (manual (assoc-ref inputs "manual")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "README" doc) + (copy-file manual (string-append doc "/butt-manual.pdf")))))))) + (inputs + `(("dbus" ,dbus) + ("flac" ,flac) + ("fltk" ,fltk) + ("lame" ,lame) + ("libfdk" ,libfdk) + ("libsamplerate" ,libsamplerate) + ("libvorbis" ,libvorbis) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxfixes" ,libxfixes) + ("libxft" ,libxft) + ("libxrender" ,libxrender) + ("ogg" ,libogg) + ("openssl" ,openssl) + ("opus" ,opus) + ("portaudio" ,portaudio))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("manual" ,(origin + (method url-fetch) + (uri (string-append "https://danielnoethen.de/butt/butt-" + version "_manual.pdf")) + (sha256 + (base32 + "04wz2sqhk22h9gymwh5r6kp6sxc994mia8rg9lwpmy1r18w4pvsl")))))) + (home-page "https://danielnoethen.de/butt/") + (synopsis "Audio streaming tool") + (description "Butt is a tool to stream audio to a ShoutCast or +Icecast server.") + (license license:gpl2+))) -- cgit 1.4.1 From 1c701708a718f9bd5b3e0e6ebde25e2204ab6222 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 22:37:07 +0100 Subject: gnu: Add perl-math-cephes. * gnu/packages/perl-maths.scm (perl-math-cephes): New variable. --- gnu/packages/perl-maths.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl-maths.scm b/gnu/packages/perl-maths.scm index e03458a9c0..4f70c85fcf 100644 --- a/gnu/packages/perl-maths.scm +++ b/gnu/packages/perl-maths.scm @@ -24,6 +24,25 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-check)) +(define-public perl-math-cephes + (package + (name "perl-math-cephes") + (version "0.5305") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-Cephes-" + version ".tar.gz")) + (sha256 + (base32 + "18c3xg53d1vv7hlj43601jj7ks119fm6ndpwpv94irr2905806jn")))) + (build-system perl-build-system) + (home-page "https://metacpan.org/release/Math-Cephes") + (synopsis "Perl interface to the Cephes math library") + (description "The Math::Cephes module provides a Perl interface to over +150 functions of the Cephes math library.") + (license license:perl-license))) + (define-public perl-math-matrixreal (package (name "perl-math-matrixreal") -- cgit 1.4.1 From 113dabe831f5df1f5a745ee3c68c5ccd158e7141 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 22:37:22 +0100 Subject: gnu: Add perl-statistics-pca. * gnu/packages/perl.scm (perl-statistics-pca): New variable. --- gnu/packages/perl.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index ea520fe65a..23c3d38f2f 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-compression) + #:use-module (gnu packages perl-maths) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) @@ -8955,6 +8956,32 @@ which it is called.") @code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}.") (license license:lgpl2.0))) +(define-public perl-statistics-pca + (package + (name "perl-statistics-pca") + (version "0.0.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/D/DS/DSTH/Statistics-PCA-" + version ".tar.gz")) + (sha256 + (base32 + "1i3bskwibp54c9a2wx8gzr3hyds6mmhr3d550g8j6893005v3bgq")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build))) + (propagated-inputs + `(("perl-contextual-return" ,perl-contextual-return) + ("perl-math-cephes" ,perl-math-cephes) + ("perl-math-matrixreal" ,perl-math-matrixreal) + ("perl-text-simpletable" ,perl-text-simpletable))) + (home-page "https://metacpan.org/release/Statistics-PCA") + (synopsis "Perl implementation of Principal Component Analysis") + (description "This package provides the Statistics::PCA module, an +implementation of @dfn{Principal Component Analysis} (PCA).") + (license license:perl-license))) + (define-public perl-stream-buffered (package (name "perl-stream-buffered") -- cgit 1.4.1 From 15c0cc4aa2bc27145c29a5ebb9a0387866d01826 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 22:47:26 +0100 Subject: gnu: Add prinseq. * gnu/packages/bioinformatics.scm (prinseq): New variable. --- gnu/packages/bioinformatics.scm | 48 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a84c1c812c..7d5521e91d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7850,6 +7850,54 @@ for small genomes (such as those of RNA viruses like HIV-1 and HCV) that experience substantial biological insertions and deletions.") (license license:gpl2+))) +(define-public prinseq + (package + (name "prinseq") + (version "0.20.4") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/prinseq/standalone/" + "prinseq-lite-" version ".tar.gz")) + (sha256 + (base32 + "0vxmzvmm67whxrqdaaamwgjk7cf0fzfs5s673jgg00kz7g70splv")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #false ; no check target + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (for-each (lambda (file) + (chmod file #o555) + (install-file file bin) + (wrap-script (string-append bin "/" (basename file)) + `("PERL5LIB" ":" prefix + (,(getenv "PERL5LIB"))))) + (find-files "." "prinseq.*.pl")))))))) + (inputs + `(("guile" ,guile-3.0) ; for wrapper scripts + ("perl" ,perl) + ("perl-cairo" ,perl-cairo) + ("perl-data-dumper" ,perl-data-dumper) + ("perl-digest-md5" ,perl-digest-md5) + ("perl-getopt-long" ,perl-getopt-long) + ("perl-json" ,perl-json) + ("perl-statistics-pca" ,perl-statistics-pca))) + (home-page "http://prinseq.sourceforge.net/") + (synopsis "Preprocess sequence data in FASTA or FASTQ formats") + (description + "PRINSEQ is a bioinformatics tool to help you preprocess your genomic or +metagenomic sequence data in FASTA or FASTQ formats. The tool is written in +Perl and can be helpful if you want to filter, reformat, or trim your sequence +data. It also generates basic statistics for your sequences.") + (license license:gpl3+))) + (define-public ruby-bio-kseq (package (name "ruby-bio-kseq") -- cgit 1.4.1 From 96193caaa14e575cc2917d0fd7ca8c7499109635 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 23:24:05 +0100 Subject: gnu: python-scikit-learn: Update to 0.24.1. * gnu/packages/machine-learning.scm (python-scikit-learn): Update to 0.24.1. [propagated-inputs]: Add python-threadpoolctl. (python2-scikit-learn)[inputs,native-inputs,propagated-inputs]: Do not inherit these fields. --- gnu/packages/machine-learning.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4e35e3e369..2696deec13 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017, 2020 Marius Bakke ;;; Copyright © 2016 Hartmut Goebel @@ -802,7 +802,7 @@ computing environments.") (define-public python-scikit-learn (package (name "python-scikit-learn") - (version "0.22.1") + (version "0.24.1") (source (origin (method git-fetch) @@ -812,7 +812,7 @@ computing environments.") (file-name (git-file-name name version)) (sha256 (base32 - "1xqxv210gsmjw094vc5ghq2y9lmm74qkk22pq6flcjzj51b86jxf")))) + "0dd854hi9h81pa3y6gwa6r4qjwrwq5fndi312h6dkqzfh7jbvgvd")))) (build-system python-build-system) (arguments `(#:phases @@ -844,6 +844,7 @@ computing environments.") ("python-cython" ,python-cython))) (propagated-inputs `(("python-numpy" ,python-numpy) + ("python-threadpoolctl" ,python-threadpoolctl) ("python-scipy" ,python-scipy) ("python-joblib" ,python-joblib))) (home-page "https://scikit-learn.org/") @@ -869,7 +870,17 @@ data analysis.") (file-name (git-file-name "python-scikit-learn" version)) (sha256 (base32 - "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj"))))))) + "08zbzi8yx5wdlxfx9jap61vg1malc9ajf576w7a0liv6jvvrxlpj")))) + (inputs + `(("openblas" ,openblas))) + (native-inputs + `(("python2-pytest" ,python2-pytest) + ("python2-pandas" ,python2-pandas) ;for tests + ("python2-cython" ,python2-cython))) + (propagated-inputs + `(("python2-numpy" ,python2-numpy) + ("python2-scipy" ,python2-scipy) + ("python2-joblib" ,python2-joblib)))))) (define-public python-threadpoolctl (package -- cgit 1.4.1 From f310b06685cb9b1f95150b24f3eed82ca280c1d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 19 Feb 2021 23:30:28 +0100 Subject: gnu: nanopolish: Fix script wrapping. * gnu/packages/bioinformatics.scm (nanopolish)[arguments]: Fix wrap-programs phase. [inputs]: Add Guile for wrap-script; add bioperl and perl-getopt-long for Perl scripts. --- gnu/packages/bioinformatics.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7d5521e91d..c8ddf8e3d7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14249,18 +14249,24 @@ choosing which reads pass the filter.") #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))))) + (let ((pythonpath (getenv "PYTHONPATH")) + (perl5lib (getenv "PERL5LIB")) + (scripts (string-append (assoc-ref outputs "out") + "/share/nanopolish/scripts"))) + (for-each (lambda (file) + (wrap-program file `("PYTHONPATH" ":" prefix (,pythonpath)))) + (find-files scripts "\\.py")) + (for-each (lambda (file) + (wrap-script file `("PERL5LIB" ":" prefix (,perl5lib)))) + (find-files scripts "\\.pl")))))))) (inputs - `(("eigen" ,eigen) + `(("guile" ,guile-3.0) ; for wrappers + ("eigen" ,eigen) ("hdf5" ,hdf5) ("htslib" ,htslib) ("perl" ,perl) + ("bioperl" ,bioperl-minimal) + ("perl-getopt-long" ,perl-getopt-long) ("python" ,python-wrapper) ("python-biopython" ,python-biopython) ("python-numpy" ,python-numpy) -- cgit 1.4.1 From f08c7cb0c75e7d5305c82d6a4af68ddf74fb08b1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Feb 2021 17:45:05 -0500 Subject: gnu: Python 3.9: Fix CVE-2021-3177. * gnu/packages/patches/python-3.9-CVE-2021-3177.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-3.9)[source]: Use it. --- gnu/local.mk | 1 + .../patches/python-3.9-CVE-2021-3177.patch | 194 +++++++++++++++++++++ gnu/packages/python.scm | 3 +- 3 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-3.9-CVE-2021-3177.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0dd5fc2a29..5588cda2e1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,6 +1527,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-3.9-fix-tests.patch \ + %D%/packages/patches/python-3.9-CVE-2021-3177.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-CVE-2020-26116.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ diff --git a/gnu/packages/patches/python-3.9-CVE-2021-3177.patch b/gnu/packages/patches/python-3.9-CVE-2021-3177.patch new file mode 100644 index 0000000000..155f17deca --- /dev/null +++ b/gnu/packages/patches/python-3.9-CVE-2021-3177.patch @@ -0,0 +1,194 @@ +Fix CVE-2021-3177 for Python 3.9: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3177 + +Patch copied from upstream source repository: + +https://github.com/python/cpython/commit/c347cbe694743cee120457aa6626712f7799a932 + +From c347cbe694743cee120457aa6626712f7799a932 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 18 Jan 2021 13:29:31 -0800 +Subject: [PATCH] closes bpo-42938: Replace snprintf with Python unicode + formatting in ctypes param reprs. (GH-24247) + +(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) + +Co-authored-by: Benjamin Peterson + +Co-authored-by: Benjamin Peterson +--- + Lib/ctypes/test/test_parameters.py | 43 ++++++++++++++++ + .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + + Modules/_ctypes/callproc.c | 51 +++++++------------ + 3 files changed, 64 insertions(+), 32 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst + +diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py +index e4c25fd880cef..531894fdec838 100644 +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -201,6 +201,49 @@ def __dict__(self): + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegex(repr(c_bool.from_param(True)), r"^$") ++ self.assertEqual(repr(c_char.from_param(97)), "") ++ self.assertRegex(repr(c_wchar.from_param('a')), r"^$") ++ self.assertEqual(repr(c_byte.from_param(98)), "") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "") ++ self.assertEqual(repr(c_short.from_param(511)), "") ++ self.assertEqual(repr(c_ushort.from_param(511)), "") ++ self.assertRegex(repr(c_int.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_uint.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_long.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_ulong.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_longlong.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1e300)), "") ++ self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$") ++ self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$") ++ self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$") ++ self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$") ++ + ################################################################ + + if __name__ == '__main__': +diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +new file mode 100644 +index 0000000000000..7df65a156feab +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +@@ -0,0 +1,2 @@ ++Avoid static buffers when computing the repr of :class:`ctypes.c_double` and ++:class:`ctypes.c_longdouble` values. +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index b0a36a30248f7..f2506de54498e 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -489,58 +489,47 @@ is_literal_char(unsigned char c) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.l); +- break; + + case 'q': + case 'Q': +- sprintf(buffer, +-#ifdef MS_WIN32 +- "", +-#else +- "", +-#endif ++ return PyUnicode_FromFormat("", + self->tag, self->value.q); +- break; + case 'd': +- sprintf(buffer, "", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "", +- self->tag, self->value.f); +- break; +- ++ case 'f': { ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ return NULL; ++ } ++ PyObject *result = PyUnicode_FromFormat("", self->tag, f); ++ Py_DECREF(f); ++ return result; ++ } + case 'c': + if (is_literal_char((unsigned char)self->value.c)) { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.c); + } + else { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, (unsigned char)self->value.c); + } +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -549,22 +538,20 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.p); + break; + + default: + if (is_literal_char((unsigned char)self->tag)) { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + (unsigned char)self->tag, (void *)self); + } + else { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + (unsigned char)self->tag, (void *)self); + } +- break; + } +- return PyUnicode_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 27e9b70432..730c371fda 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016 Christopher Allan Webber ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2015, 2016 David Thompson -;;; Copyright © 2015, 2016, 2017 Leo Famulari +;;; Copyright © 2015, 2016, 2017, 2021 Leo Famulari ;;; Copyright © 2015, 2017 Ben Woodcroft ;;; Copyright © 2015, 2016 Erik Edrosa ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner @@ -531,6 +531,7 @@ data types.") version "/Python-" version ".tar.xz")) (patches (search-patches "python-3.9-fix-tests.patch" + "python-3.9-CVE-2021-3177.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) (sha256 -- cgit 1.4.1 From 10795c53f42b94b5e9c0e402943582024e4fceac Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 20 Feb 2021 10:05:21 +0100 Subject: gnu: emacs-oauth2: Update to 0.16. * gnu/packages/emacs-xyz.scm (emacs-oauth2): Update to 0.16. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3c3dad73f2..cec3723655 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13857,14 +13857,14 @@ write applications that use WebSockets, and is not useful by itself.") (define-public emacs-oauth2 (package (name "emacs-oauth2") - (version "0.15") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "oauth2-" version ".el")) (sha256 - (base32 "0ij17g6i8d4cyzc8v6sy2qglwhzd767331gavll6d507krdh3ca3")))) + (base32 "1rzly2nwjywrfgcmp8zidbmjl2ahyd8l8507lb1mxm4xqryvf316")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/oauth2.html") (synopsis "OAuth 2.0 authorization protocol implementation") -- cgit 1.4.1 From d4d0a1551b3989790c4fb342c4e44c7f11cc3db2 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Feb 2021 18:41:21 +0800 Subject: gnu: Add libretro-lowresnx. * gnu/packages/emulators.scm (libretro-lowresnx): New variable. --- gnu/packages/emulators.scm | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 05cd0d65c5..662542e759 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2015 Paul van der Walt -;;; Copyright © 2015, 2016 Sou Bunnbu +;;; Copyright © 2015, 2016, 2021 Sou Bunnbu ;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2018 David Thompson ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis @@ -36,6 +36,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix svn-download) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) @@ -1231,6 +1232,44 @@ System (NES/Famicom) emulator Nestopia, with enhancements from members of the emulation community. It provides highly accurate emulation.") (license license:gpl2+))) +(define-public libretro-lowresnx + (let ((commit "743ab43a6c4a13e0d5363b0d25ac12c7511c6581") + (revision "1")) + (package + (name "libretro-lowresnx") + (version (git-version "1.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/timoinutilis/lowres-nx") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r15kb5p5s2jwky6zy4v1j9i95i4rz36p9wxg0g6xdjksf04b5cf")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list "-C" "platform/LibRetro" + (string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (libretrodir (string-append out "/lib/libretro"))) + (install-file "platform/LibRetro/lowresnx_libretro.so" + libretrodir) + #t)))))) + (home-page "https://lowresnx.inutilis.com/") + (synopsis "Libretro core for LowRES NX") + (description "LowRES NX is a simulated retro game console, which can be +programmed in the classic BASIC language. This package provides a libretro +core allowing the lowRES NX programs to be used with libretro frontends such +as RetroArch.") + (license license:zlib)))) + (define-public retroarch (package (name "retroarch") -- cgit 1.4.1 From 291cf6ede55b753ef7735fdcb38fcae06cf6c3cf Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Wed, 17 Feb 2021 21:51:31 +0100 Subject: gnu: lynis: Update to 3.0.3. * gnu/packages/admin.scm (lynis): Update to 3.0.3. [native-inputs]: Update lynis-sdk accordingly. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6ac34fa02c..8e2e64837a 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3922,7 +3922,7 @@ Logitech Unifying Receiver.") (package (name "lynis") ;; Also update the ‘lynis-sdk’ input to the commit matching this release. - (version "2.7.5") + (version "3.0.3") (source (origin (method git-fetch) @@ -3931,7 +3931,7 @@ Logitech Unifying Receiver.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1lkkbvxm0rgrrlx0szaxmf8ghc3d26wal96sgqk84m37mvs1f7p0")) + (base32 "0sdjh2f1563qalp740vkaaxdxl56ny98h168cggpm10h2yq366gr")) (modules '((guix build utils))) (snippet '(begin @@ -3948,10 +3948,10 @@ Logitech Unifying Receiver.") (method git-fetch) (uri (git-reference (url "https://github.com/CISOfy/lynis-sdk") - (commit "bf1c1d95121da9ca79a9eac5a15ed8d81e34094d"))) + (commit "ea7a39774fbd71113a1955cf1a4937b489935174"))) (file-name (git-file-name "lynis-sdk" version)) (sha256 - (base32 "1ndz5v0039dqa87cva2dk55a8hkw0fibsw8hh2ddmny9qkr4l3dp")))))) + (base32 "0q5j2myshjkz9qwvcg8n7c33yw2cp80yvzhckd60qmzabv4g4qb5")))))) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 51697aab42f3dea316b5b396ebd342b44b65193d Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 19 Feb 2021 18:46:46 +0100 Subject: gnu: lrzip: Update to 0.640. * gnu/packages/compression.scm (lrzip): Update to 0.640. [source]: Remove obsolete patch 'lrzip-CVE-2017-8842.patch'. [inputs]: Add lz4. * gnu/packages/patches/lrzip-CVE-2017-8842.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - gnu/packages/compression.scm | 9 +++++---- gnu/packages/patches/lrzip-CVE-2017-8842.patch | 23 ----------------------- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 gnu/packages/patches/lrzip-CVE-2017-8842.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5588cda2e1..33da7b979a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1328,7 +1328,6 @@ dist_patch_DATA = \ %D%/packages/patches/llvm-9-fix-scev-miscompilation.patch \ %D%/packages/patches/lm-sensors-hwmon-attrs.patch \ %D%/packages/patches/lrcalc-includes.patch \ - %D%/packages/patches/lrzip-CVE-2017-8842.patch \ %D%/packages/patches/lsh-fix-x11-forwarding.patch \ %D%/packages/patches/lsof-fatal-test-failures.patch \ %D%/packages/patches/lua-CVE-2014-5461.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 89107141ec..1db8b093a3 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Léo Le Bouter ;;; Copyright © 2021 Antoine Côté +;;; Copyright © 2021 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -1109,16 +1110,15 @@ human-readable output.") (define-public lrzip (package (name "lrzip") - (version "0.631") + (version "0.640") (source (origin (method url-fetch) (uri (string-append - "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.bz2")) + "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz")) (sha256 (base32 - "0mb449vmmwpkalq732jdyginvql57nxyd31sszb108yps1lf448d")) - (patches (search-patches "lrzip-CVE-2017-8842.patch")))) + "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9")))) (build-system gnu-build-system) (native-inputs `(;; nasm is only required when building for 32-bit x86 platforms @@ -1129,6 +1129,7 @@ human-readable output.") ("perl" ,perl))) (inputs `(("bzip2" ,bzip2) + ("lz4" ,lz4) ("lzo" ,lzo) ("zlib" ,zlib))) (home-page "http://ck.kolivas.org/apps/lrzip/") diff --git a/gnu/packages/patches/lrzip-CVE-2017-8842.patch b/gnu/packages/patches/lrzip-CVE-2017-8842.patch deleted file mode 100644 index 89b4f2f5d9..0000000000 --- a/gnu/packages/patches/lrzip-CVE-2017-8842.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 38386bd482c0a8102a79958cb3eddcb97a167ca3 Mon Sep 17 00:00:00 2001 -From: Con Kolivas -Date: Fri, 9 Mar 2018 17:39:40 +1100 -Subject: [PATCH] CVE-2017-8842 Fix divide-by-zero in bufRead::get - ---- - libzpaq/libzpaq.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libzpaq/libzpaq.h b/libzpaq/libzpaq.h -index 93387da..cbe211d 100644 ---- a/libzpaq/libzpaq.h -+++ b/libzpaq/libzpaq.h -@@ -465,7 +465,8 @@ struct bufRead: public libzpaq::Reader { - - int get() { - if (progress && !(*s_len % 128)) { -- int pct = (total_len - *s_len) * 100 / total_len; -+ int pct = (total_len > 0) ? -+ (total_len - *s_len) * 100 / total_len : 100; - - if (pct / 10 != *last_pct / 10) { - int i; -- cgit 1.4.1 From 3c21da7c7984e3c05c023487cf649addbb134531 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 20 Feb 2021 21:53:05 +0000 Subject: gnu: artyfx: Update to 1.3.1. * gnu/packages/music.scm (artyfx): Update to 1.3.1. Signed-off-by: Leo Famulari --- 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 8ffc136b51..6e638f3a60 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5489,7 +5489,7 @@ for integration into status line generators or other command-line tools.") (define-public artyfx (package (name "artyfx") - (version "1.3") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -5499,7 +5499,7 @@ for integration into status line generators or other command-line tools.") (file-name (git-file-name name version)) (sha256 (base32 - "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9")))) + "0cxikdnxgjk5gp6kmml4dx2jy2cy4x0c837h7bwraj2pfz0nfgqq")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From b78202f8a8db6e2c4e8563b9ecbb82f29efdfb57 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 5 Jan 2021 11:57:27 +0100 Subject: gnu: Add libyang * gnu/packages/networking.scm (libyang): New variable. Signed-off-by: Leo Famulari --- gnu/packages/networking.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 804d4dce0c..ca8e5fa192 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3519,6 +3519,33 @@ libraries and instead utilizing features provided by the Linux kernel to the maximum extent possible.") (license license:lgpl2.1+))) +(define-public libyang + (package + (name "libyang") + (version "1.0.215") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CESNET/libyang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0mrs2ppmq77z8sbqgm2w0rl9bfgybd6bcxanakfww4chih6cy0dw")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + (list "-DENABLE_BUILD_TESTS=ON" "-DENABLE_LYD_PRIV=ON"))) + (propagated-inputs `(("pcre" ,pcre))) + (native-inputs `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/CESNET/libyang") + (synopsis "YANG data modelling language library") + (description "libyang is a YANG data modelling language parser and toolkit +written (and providing API) in C. Current implementation covers YANG 1.0 (RFC +6020) as well as YANG 1.1 (RFC 7950).") + (license license:bsd-3))) + (define-public batctl (package (name "batctl") -- cgit 1.4.1 From 55fddf93079fa6e75bbe2d748c6abf8b5897d2c3 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 5 Jan 2021 11:57:28 +0100 Subject: gnu: frrouting: Update to 7.5. * gnu/packages/networking.scm (frrouting): Update to 7.5. [inputs]: Add libcap and libyang. Signed-off-by: Leo Famulari --- gnu/packages/networking.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ca8e5fa192..d969ad854e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3436,7 +3436,7 @@ communication.") (define-public frrouting (package (name "frrouting") - (version "6.0.2") + (version "7.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/FRRouting/frr/releases/" @@ -3444,11 +3444,13 @@ communication.") ".tar.xz")) (sha256 (base32 - "0xfrvi62w8qlh46f504ka0skb7pm0g0p8vmdng4w90gsbirlzpdd")))) + "1a27wvxmc51sr0kchy0hjfpv19imlgrr3s9k48lik9k01g71yrdr")))) (build-system gnu-build-system) (inputs `(("c-ares" ,c-ares) ("json-c" ,json-c) + ("libcap" ,libcap) + ("libyang" ,libyang) ("readline" ,readline))) (native-inputs `(("perl" ,perl) -- cgit 1.4.1 From 9039f71b87347714270011f584cd1cc935a8b896 Mon Sep 17 00:00:00 2001 From: Ellis Kenyő via Guix-patches via Date: Wed, 17 Feb 2021 16:38:42 +0000 Subject: gnu: Add transcrypt. * gnu/packages/crypto.scm (transcrypt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crypto.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 19041c7cbe..b03cefa59d 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Hendur Saga ;;; Copyright © 2020 pukkamustard +;;; Copyright © 2021 Ellis Kenyő ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,6 +72,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -78,6 +80,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -1335,3 +1338,39 @@ version 3) onion addresses. It allows one to produce customized vanity .onion addresses using a brute-force method.") (home-page "https://github.com/cathugger/mkp224o") (license license:cc0))) + +(define-public transcrypt + (package + (name "transcrypt") + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/elasticdog/transcrypt") + (commit (string-append "v" version)))) + (sha256 + (base32 "0bpz1hazbhfb6pqi68x55kq6a31bgh6vwij836slmi4jqiwvnh5a")) + (file-name (git-file-name name version)))) + (inputs + `(("git" ,git) + ("openssl" ,openssl))) + (build-system copy-build-system) + (arguments + `(#:install-plan + '(("transcrypt" "bin/transcrypt") + ("man/transcrypt.1" "share/man/man1/transcrypt.1") + ("contrib/bash/transcrypt" + "share/bash-completion/completions/transcrypt") + ("contrib/zsh/_transcrypt" + "share/zsh/site-functions/_transcrypt")))) + (home-page "https://github.com/elasticdog/transcrypt") + (synopsis "Transparently encrypt files within a git repository") + (description + "Transcrypt is a script to configure transparent encryption of sensitive +files stored in a Git repository. Files that you choose will be automatically +encrypted when you commit them, and automatically decrypted when you check +them out. The process will degrade gracefully, so even people without your +encryption password can safely commit changes to the repository's +non-encrypted files.") + (license license:expat))) -- cgit 1.4.1 From 77ce4e22e4d70e9d3e181cc764e46403321d4baf Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 19 Feb 2021 06:06:24 +0100 Subject: gnu: xfce4-cpugraph-plugin: Update to 1.2.2. * gnu/packages/xfce.scm (xfce4-cpugraph-plugin): Update to 1.2.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index bb4b66cd0c..f575926eb4 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1357,7 +1357,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-cpugraph-plugin (package (name "xfce4-cpugraph-plugin") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1366,7 +1366,7 @@ A plugin for the Xfce panel is also available.") "/xfce4-cpugraph-plugin-" version ".tar.bz2")) (sha256 (base32 - "0jljxyvxq4kmf5wz7wkq6wma4bq1qsnlv3lx6527lhcipnddynk1")))) + "0pnm2lqcc9snzpcd25c2yvzcnikk5chc5bn1jh14r6726vx14z1l")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 5afcd25464c7bf25888b8f0047910c0c1fcffec9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 22:34:24 +0000 Subject: gnu: wcslib: Update to 7.4 * gnu/packages/astronomy.scm (wcslib): Update to 7.4 Signed-off-by: Nicolas Goaziou --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f617d7b361..d1022ee5da 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -167,7 +167,7 @@ feature detection and cosmetic corrections.") (define-public wcslib (package (name "wcslib") - (version "6.4") + (version "7.4") (source (origin (method url-fetch) @@ -175,7 +175,7 @@ feature detection and cosmetic corrections.") "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "003h23m6d5wcs29v2vbnl63f3z35k5x70lpsqlz5c9bp1bvizh8k")))) + (base32 "072i1id4zk08mwi2c1zpy8zxrabl8dqyklx9ikbd2nh56r0rc752")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) -- cgit 1.4.1 From f498823e7843379499d35ae397c38dc879fb9844 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 19 Feb 2021 22:41:42 +0000 Subject: gnu: Add asdf (Advanced Scientific Data Format) * gnu/packages/astronomy.scm (python-asdf): New variable Signed-off-by: Nicolas Goaziou --- gnu/packages/astronomy.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d1022ee5da..4ee7cd7fec 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -948,6 +948,38 @@ of stand-alone functions and classes.") license:expat license:lgpl3+)))) +(define-public python-asdf + (package + (name "python-asdf") + (version "2.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asdf" version)) + (sha256 + (base32 "1y47zhkd90i8wmm2i35amfl0rvjqlb3fcx90xp7n9kr2z0byzyzg")))) + (build-system python-build-system) + (arguments + ;; TODO: (Sharlatan-20210207T165820+0000): Tests depend on astropy, astropy + ;; depends on asdf. Disable circular dependence. + `(#:tests? #f)) + (native-inputs + `(("packaging" ,python-packaging) + ("semantic-version" ,python-semantic-version) + ("setuptools-scm" ,python-setuptools-scm))) + (inputs + `(("importlib-resources" ,python-importlib-resources) + ("jsonschema" ,python-jsonschema) + ("numpy" ,python-numpy) + ("pyyaml" ,python-pyyaml))) + (home-page "http://github.com/asdf-format/asdf") + (synopsis "Python tools to handle ASDF files") + (description + "The Advanced Scientific Data Format (ASDF) is a next-generation +interchange format for scientific data. This package contains the Python +implementation of the ASDF Standard.") + (license license:bsd-3))) + (define-public python-astroalign (package (name "python-astroalign") -- cgit 1.4.1 From 081d927409f0adc2ef32bdca055926a5b33cde2d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 19 Feb 2021 23:51:49 -0300 Subject: gnu: Add python-pillow-simd. * gnu/packages/python-xyz.scm (python-pillow-simd): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c19429cff2..2ca4625c2c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -82,7 +82,7 @@ ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Malte Frank Gerdes @@ -5919,6 +5919,39 @@ a general image processing tool.") ((#:tests? _ #f) #f))) (properties '((hidden? #t))))) +(define-public python-pillow-simd + (package + (inherit python-pillow) + (name "python-pillow-simd") + (version "7.1.2") + ;; The PyPI tarball does not include test files. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uploadcare/pillow-simd") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w11np4cybamry3jsg70x747c79zwjzfq0xiprfp6c186rd6nzp9")))) + (arguments + (substitute-keyword-arguments + (package-arguments python-pillow) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'make-tests-writable + (lambda _ + (for-each make-file-writable (find-files "Tests")) + #t)))))) + (inputs + `(("libraqm" ,libraqm) + ("libimagequant" ,libimagequant) + ,@(package-inputs python-pillow))) + (home-page "https://github.com/uploadcare/pillow-simd") + (synopsis "Fork of the Python Imaging Library (Pillow)") + (description "This package is a fork of Pillow which adds support for SIMD +parallelism."))) + (define-public python-roifile (package (name "python-roifile") -- cgit 1.4.1 From 659c2c5232df23d3a87b08dfa7cd272ae7fceb1b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 19 Feb 2021 23:53:54 -0300 Subject: gnu: Add imgp. * gnu/packages/image.scm (imgp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/image.scm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 28169b0295..68221afff1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Zhu Zihao -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. @@ -1581,6 +1581,39 @@ PNG, and performs PNG integrity checks and corrections.") (home-page "http://optipng.sourceforge.net/") (license license:zlib))) +(define-public imgp + (package + (name "imgp") + (version "2.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "imgp" version)) + (sha256 + (base32 "0q99h9wv9rynig0s0flnr9mxi541zzl0gw8vh4y6m5x132diilri")))) + (build-system python-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:phases + (modify-phases %standard-phases + ;; setup.py expects the file to be named 'imgp'. + (add-after 'unpack 'rename-imgp + (lambda _ + (rename-file "imgp.py" "imgp") + #t))))) + (inputs + `(("python-pillow" ,python-pillow))) + (home-page "https://github.com/jarun/imgp") + (synopsis "High-performance CLI batch image resizer & rotator") + (description + "@code{imgp} is a command line image resizer and rotator for JPEG and PNG +images. It can resize (or thumbnail) and rotate thousands of images in a go +while saving significantly on storage. + +This package may optionally be built with @code{python-pillow-simd} in place +of @{python-pillow} for SIMD parallelism.") + (license license:gpl3+))) + (define-public pngsuite (package (name "pngsuite") -- cgit 1.4.1 From 8067897fb940daa4db64decea76b1679610c3422 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:05:03 -0300 Subject: gnu: Add python-pdfminer-six. * gnu/packages/python-xyz.scm (python-pdfminer-six): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2ca4625c2c..b26fce72a9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12309,6 +12309,54 @@ encoding algorithms to do fuzzy string matching.") module, adding support for Unicode strings.") (license license:bsd-2))) +(define-public python-pdfminer-six + (package + (name "python-pdfminer-six") + (version "20201018") + ;; There are no tests in the PyPI tarball. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pdfminer/pdfminer.six") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Tests write to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) + (replace 'check + (lambda _ + (invoke "make" "test"))) + (add-before 'reset-gzip-timestamps 'make-files-writable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each make-file-writable + (find-files out "\\.gz$")) + #t)))))) + (propagated-inputs + `(("python-chardet" ,python-chardet) + ("python-cryptography" ,python-cryptography) + ("python-sortedcontainers" ,python-sortedcontainers))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-tox" ,python-tox))) + (home-page "https://github.com/pdfminer/pdfminer.six") + (synopsis "PDF parser and analyzer") + (description "@code{pdfminer.six} is a community maintained fork of +the original PDFMiner. It is a tool for extracting information from PDF +documents. It focuses on getting and analyzing text data. Pdfminer.six +extracts the text from a page directly from the sourcecode of the PDF. It +can also be used to get the exact location, font or color of the text.") + (license license:expat))) + (define-public python-rarfile (package (name "python-rarfile") -- cgit 1.4.1 From 242968eb1258526855f81b1ec29fe5220558f13c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:06:37 -0300 Subject: gnu: setzer: Update to 0.4.1. * gnu/packages/gnome.scm (setzer): Update to 0.4.1. [inputs]: Add python-pdfminer-six. Signed-off-by: Nicolas Goaziou --- 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 ebb21c08ce..0b46e2719b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11468,7 +11468,7 @@ and toolbars.") (define-public setzer (package (name "setzer") - (version "0.3.9") + (version "0.4.1") (source (origin (method git-fetch) @@ -11477,7 +11477,7 @@ and toolbars.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qmy2bxl8x6pijjaaj91v6rqdipha6iyy0b6b9y1lk3r2p3azd42")))) + (base32 "1rcx2c07jg1ij81pnvg3px49hfbjmkagn68d3gp79z3gcajbp2av")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -11509,6 +11509,7 @@ and toolbars.") ("gtksourceview" ,gtksourceview) ("pango" ,pango) ("poppler" ,poppler) + ("python-pdfminer" ,python-pdfminer-six) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-pyxdg" ,python-pyxdg) -- cgit 1.4.1 From 07351f06ec7444cfbe597580a8aeb7a064ca9517 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:08:08 -0300 Subject: gnu: darktable: Update to 3.4.1. * gnu/packages/photo.scm (darktable): Update to 3.4.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/photo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5402826fd6..7ed1f1745a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020. 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -469,7 +469,7 @@ photographic equipment.") (define-public darktable (package (name "darktable") - (version "3.4.0") + (version "3.4.1") (source (origin (method url-fetch) @@ -477,7 +477,7 @@ photographic equipment.") "https://github.com/darktable-org/darktable/releases/" "download/release-" version "/darktable-" version ".tar.xz")) (sha256 - (base32 "1nmx5lmhp7igav5pswqxmacsbnhgydgvxh1q53wlmyd9bqgxxlvd")))) + (base32 "07llfhhz5dhh43smhv4ax4xi1diym8hrzl7cad87rkcvv98zihvz")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DBINARY_PACKAGE_BUILD=On" -- cgit 1.4.1 From 48ed66a63249c2abb1c991b1b84945aa0c9eb52c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:08:36 -0300 Subject: gnu: libredwg: Update to 0.12.1. * gnu/packages/engineering.scm (libredwg): Update to 0.12.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 11585f6234..034dabc3f9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1215,14 +1215,14 @@ use on a given system.") (define-public libredwg (package (name "libredwg") - (version "0.12") + (version "0.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libredwg/libredwg-" version ".tar.xz")) (sha256 - (base32 "0z5algzi3alq166885y0qyj2gnc7gc6vhnz7nw0kwc0d236p6md8")))) + (base32 "0a1ih91nn5rh7v8li2ljppm8iacrnv8nkdpzshbdggl5f0mm1pyy")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-bindings"))) -- cgit 1.4.1 From df76cadf57779d7569100b74a5552ec722161300 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 20 Feb 2021 04:10:54 -0300 Subject: gnu: python-onnx: Update to 1.8.1. * gnu/packages/machine-learning.scm (python-onnx): Update to 1.8.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/machine-learning.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2696deec13..ddd600d0f0 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Edouard Klein -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. @@ -583,7 +583,7 @@ in terms of new algorithms.") (define-public python-onnx (package (name "python-onnx") - (version "1.8.0") + (version "1.8.1") (source (origin (method url-fetch) @@ -592,7 +592,7 @@ in terms of new algorithms.") ;; to use googletest from Guix and enable tests by default. (patches (search-patches "python-onnx-use-system-googletest.patch")) (sha256 - (base32 "0365zkikq6v3cl5hh2daa5z1alhij8xpn8rmlcny340jrv9pyy2z")))) + (base32 "1ys5f4kqkabm4mgivsw80zz8xj1svanfbpszqbw9j15914hcarcx")))) (build-system python-build-system) (native-inputs `(("cmake" ,cmake) -- cgit 1.4.1 From e687bbf497b8b18a8264888d8b5b9f7e9e804d8b Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Sat, 20 Feb 2021 20:03:21 +1200 Subject: gnu: herbstluftwm: Update to 0.9.2. * gnu/packages/wm.scm (herbstluftwm): Update to 0.9.2. [inputs]: Add libxft. [native-inputs]: Add python. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 8e3b4244ce..93189fc90b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -160,14 +160,14 @@ the leaves of a full binary tree.") (define-public herbstluftwm (package (name "herbstluftwm") - (version "0.8.3") + (version "0.9.2") (source (origin (method url-fetch) (uri (string-append "https://herbstluftwm.org/tarballs/herbstluftwm-" version ".tar.gz")) (sha256 - (base32 "1qmb4pjf2f6g0dvcg11cw9njwmxblhqzd70ai8qnlgqw1iz3nkm1")) + (base32 "0avfhr68f6fjnafjdcyxcx7dkg38f2nadmhpj971qyqzfq2f6i38")) (file-name (string-append "herbstluftwm-" version ".tar.gz")))) (build-system cmake-build-system) (inputs @@ -180,10 +180,12 @@ the leaves of a full binary tree.") ("libx11" ,libx11) ("libxext" ,libxext) ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr))) + ("libxrandr" ,libxrandr) + ("libxft" ,libxft))) (native-inputs `(("asciidoc" ,asciidoc) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (arguments '(#:tests? #f #:configure-flags -- cgit 1.4.1 From 5581279f79b394673c85b2761fb31dedba60b03c Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Sat, 20 Feb 2021 20:03:45 +1200 Subject: gnu: fontmanager: Update to 0.8.4. * gnu/packages/fontutils.scm (fontmanager): Update to 0.8.3. [inputs]: Add libsoup and webkitgtk. [native-inputs]: Remove vala; add vala-0.50. Signed-off-by: Nicolas Goaziou --- gnu/packages/fontutils.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index cacda2ed04..886de92d28 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -55,6 +55,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sqlite) + #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -843,7 +844,7 @@ generated list of fallback fonts are checked.") (define-public fontmanager (package (name "fontmanager") - (version "0.7.7") + (version "0.8.4") (source (origin (method git-fetch) @@ -853,7 +854,7 @@ generated list of fallback fonts are checked.") (file-name (git-file-name name version)) (sha256 (base32 - "1bzqvspplp1zj0n0869jqbc60wgbjhf0vdrn5bj8dfawxynh8s5f")))) + "09rv0srpj8ann2n1zpv1frlpxz0x10d2y21c5lys7pmfngljlxi9")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -863,19 +864,21 @@ generated list of fallback fonts are checked.") (assoc-ref %outputs "out") "/lib/font-manager")))) (native-inputs - `(("pkg-config" ,pkg-config) - ("vala" ,vala) - ("yelp-tools" ,yelp-tools) + `(("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) ("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("desktop-file-utils" ,desktop-file-utils))) + ("pkg-config" ,pkg-config) + ("vala" ,vala-0.50) + ("yelp-tools" ,yelp-tools))) (inputs - `(("json-glib" ,json-glib) - ("sqlite" ,sqlite) - ("fonconfig" ,fontconfig) + `(("fonconfig" ,fontconfig) ("freetype" ,freetype) - ("gtk+" ,gtk+))) + ("gtk+" ,gtk+) + ("json-glib" ,json-glib) + ("libsoup" ,libsoup) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (home-page "https://fontmanager.github.io/") (synopsis "Simple font management for GTK+ desktop environments") (description "Font Manager is intended to provide a way for users to -- cgit 1.4.1 From c7be46b7d754cbf0d0526b5d8a9d1ecee64b6154 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 21 Feb 2021 01:44:05 +0100 Subject: gnu: Add vmtouch. * gnu/packages/admin.scm (vmtouch): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/admin.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 8e2e64837a..a506b978f5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -3888,6 +3889,38 @@ support forum. It runs with the @code{/exec} command in most IRC clients.") (description "This package provides @code{udev} bindings for Python.") (license license:lgpl2.1))) +(define-public vmtouch + (package + (name "vmtouch") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hoytech/vmtouch/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08da6apzfkfjwasn4dxrlfxqfx7arl28apdzac5nvm0fhvws0dxk")))) + (build-system gnu-build-system) + (native-inputs + `(("perl" ,perl))) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list + (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/hoytech/vmtouch/") + (synopsis "Portable file system cache diagnostics and control") + (description + "vmtouch is a tool for learning about and controlling the file system +cache of unix and unix-like systems.") + (license license:bsd-3))) + (define-public solaar (package (name "solaar") -- cgit 1.4.1 From 703ccd583611b6efa689b7a2d1daf35d6cd83c35 Mon Sep 17 00:00:00 2001 From: EuAndreh via Guix-patches via Date: Mon, 8 Feb 2021 22:14:52 -0300 Subject: gnu: Add ghc-nixfmt. * gnu/packages/haskell-xyz.scm (ghc-nixfmt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/haskell-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d6c50ade71..c4440d4778 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2021 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -8693,6 +8694,35 @@ making this package a full replacement for the original newtype package, and an alternative to newtype-th.") (license license:bsd-3))) +(define-public ghc-nixfmt + (package + (name "ghc-nixfmt") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/nixfmt/nixfmt-" + version + ".tar.gz")) + (sha256 + (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-megaparsec" ,ghc-megaparsec) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-safe-exceptions" ,ghc-safe-exceptions))) + (arguments + `(#:cabal-revision + ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"))) + (home-page "https://github.com/serokell/nixfmt") + (synopsis "Opinionated formatter for Nix") + (description + "Nixfmt is a formatter for Nix that ensures consistent and clear +formatting by forgetting all existing formatting during parsing.") + (license license:mpl2.0))) + (define-public ghc-non-negative (package (name "ghc-non-negative") -- cgit 1.4.1 From 5ab0ca056691aaf88570a8c719e0104ab0a17c48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Feb 2021 01:56:04 +0100 Subject: gnu: asymptote: Update to 2.69. * gnu/packages/plotutils.scm (asymptote): Update to 2.69. --- gnu/packages/plotutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 93595d0baa..4e044fab75 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Maxim Cournoyer ;;; @@ -206,14 +206,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.68") + (version "2.69") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "1ch2bc28v0v76x9sbbn7xswvqi88plam9y4966j0kj2dn5fmms71")))) + (base32 "17gp9n0cgwlbsy16jya07cjw18drbg2gqhdghlvmkybpfh3mcr26")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not -- cgit 1.4.1 From b1ea2f057793589f324adb459bf076fa7be7efd0 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 21 Feb 2021 09:35:39 +0100 Subject: gnu: sbcl-utm-ups: Update to 1.1-0.ffcb7b6. * gnu/packages/lisp-xyz.scm (sbcl-utm-ups): Update to 1.1-0.ffcb7b6. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 40d756649d..4b99509900 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -13116,11 +13116,11 @@ scale statistical machine learning package") (sbcl-package->cl-source-package sbcl-clml)) (define-public sbcl-utm-ups - (let ((commit "780f1d8ab6290ad2be0f40e2cddc2535fa6fe979") + (let ((commit "ffcb7b6d5a56fb7d4b2b95b83bbd28ffe6e6961f") (revision "0")) (package (name "sbcl-utm-ups") - (version (git-version "1.0" revision commit)) + (version (git-version "1.1" revision commit)) (source (origin (method git-fetch) @@ -13129,7 +13129,7 @@ scale statistical machine learning package") (commit commit))) (file-name (git-file-name "utm-ups" version)) (sha256 - (base32 "0l3kr2m56skf5cx3kkkdcis7msmidcsixx9fqjapkcjsj8x67aqq")))) + (base32 "1rvyh0srgd81kvbzmq4ysd9y6c0qdwh23naqxc9asw1vh7fq08x1")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiveam" ,sbcl-fiveam))) -- cgit 1.4.1 From ae1f36f2a8b78dfac9ee1aaf7d9aa9f0e7ce8e51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Feb 2021 10:44:15 +0200 Subject: gnu: screen: Patch CVE-2021-26937. * gnu/packages/screen.scm (screen)[source]: Add patch. * gnu/packages/patches/screen-CVE-2021-26937.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/patches/screen-CVE-2021-26937.patch | 66 ++++++++++++++++++++++++ gnu/packages/screen.scm | 5 +- 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/screen-CVE-2021-26937.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 33da7b979a..8191c6917a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1619,6 +1619,7 @@ dist_patch_DATA = \ %D%/packages/patches/scheme48-tests.patch \ %D%/packages/patches/scotch-build-parallelism.patch \ %D%/packages/patches/scotch-integer-declarations.patch \ + %D%/packages/patches/screen-CVE-2021-26937.patch \ %D%/packages/patches/screen-hurd-path-max.patch \ %D%/packages/patches/sdl-libx11-1.6.patch \ %D%/packages/patches/seed-webkit.patch \ diff --git a/gnu/packages/patches/screen-CVE-2021-26937.patch b/gnu/packages/patches/screen-CVE-2021-26937.patch new file mode 100644 index 0000000000..d87a54a83f --- /dev/null +++ b/gnu/packages/patches/screen-CVE-2021-26937.patch @@ -0,0 +1,66 @@ +https://salsa.debian.org/debian/screen/-/raw/debian/4.8.0-5/debian/patches/99_CVE-2021-26937.patch + +Description: [CVE-2021-26937] Fix out of bounds array access +Author: Michael Schröder +Bug-Debian: https://bugs.debian.org/982435 +Bug: https://savannah.gnu.org/bugs/?60030 +Bug: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00000.html +Bug-OSS-Security: https://www.openwall.com/lists/oss-security/2021/02/09/3 +Origin: https://lists.gnu.org/archive/html/screen-devel/2021-02/msg00010.html + +--- a/encoding.c ++++ b/encoding.c +@@ -43,7 +43,7 @@ + # ifdef UTF8 + static int recode_char __P((int, int, int)); + static int recode_char_to_encoding __P((int, int)); +-static void comb_tofront __P((int, int)); ++static void comb_tofront __P((int)); + # ifdef DW_CHARS + static int recode_char_dw __P((int, int *, int, int)); + static int recode_char_dw_to_encoding __P((int, int *, int)); +@@ -1263,6 +1263,8 @@ + {0x30000, 0x3FFFD}, + }; + ++ if (c >= 0xdf00 && c <= 0xdfff) ++ return 1; /* dw combining sequence */ + return ((bisearch(c, wide, sizeof(wide) / sizeof(struct interval) - 1)) || + (cjkwidth && + bisearch(c, ambiguous, +@@ -1330,11 +1332,12 @@ + } + + static void +-comb_tofront(root, i) +-int root, i; ++comb_tofront(i) ++int i; + { + for (;;) + { ++ int root = i >= 0x700 ? 0x801 : 0x800; + debug1("bring to front: %x\n", i); + combchars[combchars[i]->prev]->next = combchars[i]->next; + combchars[combchars[i]->next]->prev = combchars[i]->prev; +@@ -1396,9 +1399,9 @@ + { + /* full, recycle old entry */ + if (c1 >= 0xd800 && c1 < 0xe000) +- comb_tofront(root, c1 - 0xd800); ++ comb_tofront(c1 - 0xd800); + i = combchars[root]->prev; +- if (c1 == i + 0xd800) ++ if (i == 0x800 || i == 0x801 || c1 == i + 0xd800) + { + /* completely full, can't recycle */ + debug("utf8_handle_comp: completely full!\n"); +@@ -1422,7 +1425,7 @@ + mc->font = (i >> 8) + 0xd8; + mc->fontx = 0; + debug3("combinig char %x %x -> %x\n", c1, c, i + 0xd800); +- comb_tofront(root, i); ++ comb_tofront(i); + } + + #else /* !UTF8 */ diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 0491731e20..4426d9d562 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2015, 2017 Eric Bavier -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -44,7 +44,8 @@ (method url-fetch) (uri (string-append "mirror://gnu/screen/screen-" version ".tar.gz")) - (patches (search-patches "screen-hurd-path-max.patch")) + (patches (search-patches "screen-hurd-path-max.patch" + "screen-CVE-2021-26937.patch")) (sha256 (base32 "18ascpjzsy70h6hk7wpg8zmzjwgdyrdr7c6z4pg5z4l9hhyv24bf")))) (build-system gnu-build-system) -- cgit 1.4.1 From f129ca0b181f2f08e8b7c9c263ad2520a4ef717d Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Sat, 20 Feb 2021 17:17:28 -0800 Subject: gnu: Add cli11. * gnu/packages/cpp.scm (cli11): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/cpp.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 331afc2e3e..abb50d81b2 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Brett Gilio +;;; Copyright © 2020 Milkey Mouse ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix modules) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) @@ -903,3 +905,51 @@ provides a number of utilities to make coding with expected cleaner.") (description "Magic Enum offers static reflection of enums, with conversions to and from strings, iteration and related functionality.") (license license:expat))) + +(define-public cli11 + (package + (name "cli11") + (version "1.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/CLIUtils/CLI11") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "extern") + #t)))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags + '("-DCLI11_SINGLE_FILE=OFF" + "-DCLI11_BUILD_EXAMPLES=OFF") + #:imported-modules ,(append %cmake-build-system-modules + (source-module-closure '((guix utils)))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'no-vendor-gtest + (lambda _ + (use-modules (guix utils)) + (substitute* "tests/CMakeLists.txt" + ;; We provide our own googletest, so this is not really a problem. + (("message\\(FATAL_ERROR \"You have requested tests be built, but googletest is not downloaded." msg) + (string-replace-substring msg "FATAL_ERROR" "TRACE"))) + (substitute* "cmake/AddGoogletest.cmake" + (("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)") + (("^set_target_properties\\(gtest gtest_main gmock gmock_main") "") + (("^ PROPERTIES FOLDER \"Extern\"\\)") "")) + #t))))) + (native-inputs + `(("doxygen" ,doxygen) + ("googletest" ,googletest))) + (synopsis "Command line parser for C++11") + (description + "CLI11 is a command line parser for C++11 and beyond that provides a rich +feature set with a simple and intuitive interface.") + (home-page "https://cliutils.github.io/CLI11/book/") + (license license:bsd-3))) -- cgit 1.4.1 From 5fb1bff1ca49f01245ef977d317f13ca69eb6a4f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 21 Feb 2021 09:34:36 +0100 Subject: gnu: hugin: Update to 2020.0.0. * gnu/packages/photo.scm (hugin): Update to 2020.0.0. [inputs]: Use current exiv2. Signed-off-by: Nicolas Goaziou --- gnu/packages/photo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 7ed1f1745a..5b15c1a727 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -694,7 +694,7 @@ off' shooting directly from the controlling computer.") (define-public hugin (package (name "hugin") - (version "2019.2.0") + (version "2020.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hugin/hugin/hugin-" @@ -702,7 +702,7 @@ off' shooting directly from the controlling computer.") "/hugin-" version ".tar.bz2")) (sha256 (base32 - "0gjsm5bgz10wbr5q3y74f8dzb238dh32xx0p5wa3yca6lbzbv9lb")))) + "1jyazc0mbr9g7vrichpqqnfl72lj21244csk0z5i8ycs4l0pcgi8")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -710,7 +710,7 @@ off' shooting directly from the controlling computer.") (inputs `(("boost" ,boost) ("enblend-enfuse" ,enblend-enfuse) - ("exiv2" ,exiv2-0.26) + ("exiv2" ,exiv2) ("fftw" ,fftw) ("flann" ,flann) ("freeglut" ,freeglut) -- cgit 1.4.1 From 0c6f1b1a6d78f1a59c030378a25d0346333bd40b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Feb 2021 10:35:43 +0100 Subject: gnu: exiv2-0.26: Remove variable. * gnu/packages/image.scm (exiv2-0.26): Remove variable. * gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch: * gnu/packages/patches/exiv2-CVE-2017-14860.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Apply removal. --- gnu/local.mk | 2 - gnu/packages/image.scm | 28 --------- .../patches/exiv2-CVE-2017-14859-14862-14864.patch | 66 ---------------------- gnu/packages/patches/exiv2-CVE-2017-14860.patch | 48 ---------------- 4 files changed, 144 deletions(-) delete mode 100644 gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch delete mode 100644 gnu/packages/patches/exiv2-CVE-2017-14860.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8191c6917a..95d5835fa4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,8 +972,6 @@ dist_patch_DATA = \ %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ - %D%/packages/patches/exiv2-CVE-2017-14860.patch \ - %D%/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch \ %D%/packages/patches/extempore-unbundle-external-dependencies.patch \ %D%/packages/patches/extundelete-e2fsprogs-1.44.patch \ %D%/packages/patches/farstream-make.patch \ diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 68221afff1..2d83313d9e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1352,34 +1352,6 @@ and XMP metadata of images in various formats.") ;; . (license license:gpl2+))) -(define-public exiv2-0.26 - (package - (inherit exiv2) - (version "0.26") - (source (origin - (method url-fetch) - (uri (list (string-append "https://www.exiv2.org/builds/exiv2-" - version "-trunk.tar.gz") - (string-append "https://www.exiv2.org/exiv2-" - version ".tar.gz") - (string-append "https://fossies.org/linux/misc/exiv2-" - version ".tar.gz"))) - (patches (search-patches "exiv2-CVE-2017-14860.patch" - "exiv2-CVE-2017-14859-14862-14864.patch")) - (sha256 - (base32 - "1yza317qxd8yshvqnay164imm0ks7cvij8y8j86p1gqi1153qpn7")))) - (build-system gnu-build-system) - (arguments '(#:tests? #f)) ; no `check' target - (propagated-inputs - `(("expat" ,expat) - ("zlib" ,zlib))) - (native-inputs - `(("intltool" ,intltool))) - - ;; People should rely on the newer version, so don't expose it. - (properties `((hidden? . #t))))) - (define-public devil (package (name "devil") diff --git a/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch b/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch deleted file mode 100644 index 69e65aeb6b..0000000000 --- a/gnu/packages/patches/exiv2-CVE-2017-14859-14862-14864.patch +++ /dev/null @@ -1,66 +0,0 @@ -Fix CVE-2017-14859, CVE-2017-14862 and CVE-2017-14864. - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14859 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14862 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14864 - -Copied from upstream: - -https://github.com/Exiv2/exiv2/commit/8a586c74bbe3fbca64e86e42a42282c73f427607 - -From 8a586c74bbe3fbca64e86e42a42282c73f427607 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Sat, 7 Oct 2017 23:08:36 +0200 -Subject: [PATCH] Fix for CVE-2017-14864, CVE-2017-14862 and CVE-2017-14859 - -The invalid memory dereference in -Exiv2::getULong()/Exiv2::StringValueBase::read()/Exiv2::DataValue::read() -is caused further up the call-stack, by -v->read(pData, size, byteOrder) in TiffReader::readTiffEntry() -passing an invalid pData pointer (pData points outside of the Tiff -file). pData can be set out of bounds in the (size > 4) branch where -baseOffset() and offset are added to pData_ without checking whether -the result is still in the file. As offset comes from an untrusted -source, an attacker can craft an arbitrarily large offset into the -file. - -This commit adds a check into the problematic branch, whether the -result of the addition would be out of bounds of the Tiff -file. Furthermore the whole operation is checked for possible -overflows. ---- - src/tiffvisitor.cpp | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp -index 4ab733d4..ef13542e 100644 ---- a/src/tiffvisitor.cpp -+++ b/src/tiffvisitor.cpp -@@ -47,6 +47,7 @@ EXIV2_RCSID("@(#) $Id$") - #include - #include - #include -+#include - - // ***************************************************************************** - namespace { -@@ -1517,7 +1518,19 @@ namespace Exiv2 { - size = 0; - } - if (size > 4) { -+ // setting pData to pData_ + baseOffset() + offset can result in pData pointing to invalid memory, -+ // as offset can be arbitrarily large -+ if ((static_cast(baseOffset()) > std::numeric_limits::max() - static_cast(offset)) -+ || (static_cast(baseOffset() + offset) > std::numeric_limits::max() - reinterpret_cast(pData_))) -+ { -+ throw Error(59); -+ } -+ if (pData_ + static_cast(baseOffset()) + static_cast(offset) > pLast_) { -+ throw Error(58); -+ } - pData = const_cast(pData_) + baseOffset() + offset; -+ -+ // check for size being invalid - if (size > static_cast(pLast_ - pData)) { - #ifndef SUPPRESS_WARNINGS - EXV_ERROR << "Upper boundary of data for " diff --git a/gnu/packages/patches/exiv2-CVE-2017-14860.patch b/gnu/packages/patches/exiv2-CVE-2017-14860.patch deleted file mode 100644 index 43e6076b71..0000000000 --- a/gnu/packages/patches/exiv2-CVE-2017-14860.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix CVE-2017-14860. - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-14860 -https://nvd.nist.gov/vuln/detail/CVE-2017-14860 - -Copied from upstream: - -https://github.com/Exiv2/exiv2/commit/ff18fec24b119579df26fd2ebb8bb012cde102ce - -From ff18fec24b119579df26fd2ebb8bb012cde102ce Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= -Date: Fri, 6 Oct 2017 23:09:08 +0200 -Subject: [PATCH] Fix for CVE-2017-14860 - -A heap buffer overflow could occur in memcpy when icc.size_ is larger -than data.size_ - pad, as then memcpy would read out of bounds of data. - -This commit adds a sanity check to iccLength (= icc.size_): if it is -larger than data.size_ - pad (i.e. an overflow would be caused) an -exception is thrown. - -This fixes #71. ---- - src/jp2image.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/jp2image.cpp b/src/jp2image.cpp -index 747145cf..748d39b5 100644 ---- a/src/jp2image.cpp -+++ b/src/jp2image.cpp -@@ -269,10 +269,15 @@ namespace Exiv2 - std::cout << "Exiv2::Jp2Image::readMetadata: " - << "Color data found" << std::endl; - #endif -- long pad = 3 ; // 3 padding bytes 2 0 0 -+ const long pad = 3 ; // 3 padding bytes 2 0 0 - DataBuf data(subBox.length+8); - io_->read(data.pData_,data.size_); -- long iccLength = getULong(data.pData_+pad, bigEndian); -+ const long iccLength = getULong(data.pData_+pad, bigEndian); -+ // subtracting pad from data.size_ is safe: -+ // size_ is at least 8 and pad = 3 -+ if (iccLength > data.size_ - pad) { -+ throw Error(58); -+ } - DataBuf icc(iccLength); - ::memcpy(icc.pData_,data.pData_+pad,icc.size_); - #ifdef DEBUG -- cgit 1.4.1 From d51c11fea3894c08821d92279424b0b71f317ebb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Feb 2021 14:39:22 +0200 Subject: gnu: ruby-rack-protection: Update to 2.0.8.1. * gnu/packages/ruby.scm (ruby-rack-protection): Update to 2.0.8.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 6c9583b3cf..3a3be592ce 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6921,14 +6921,14 @@ testing libraries to build on.") (define-public ruby-rack-protection (package (name "ruby-rack-protection") - (version "2.0.5") + (version "2.0.8.1") (source (origin (method url-fetch) (uri (rubygems-uri "rack-protection" version)) (sha256 (base32 - "15167q25rmxipqwi6hjqj3i1byi9iwl3xq9b7mdar7qiz39pmjsk")))) + "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi")))) (build-system ruby-build-system) (arguments '(;; Tests missing from the gem. -- cgit 1.4.1 From 869c416ceeaa9d46395b50e4b50553ada86ffd48 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 21 Feb 2021 11:04:26 +0000 Subject: gnu: ir: Remove whitespace at end of line. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (ir): Remove whitespace at end of line. Signed-off-by: Léo Le Bouter --- 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 16e0eec418..f45556630b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1911,7 +1911,7 @@ well suited to all musical instruments and vocals.") (modify-phases %standard-phases (delete 'configure) ; no configure script ;; See https://github.com/tomszilagyi/ir.lv2/pull/20 - (add-after 'unpack 'fix-type + (add-after 'unpack 'fix-type (lambda _ (substitute* '("ir_gui.cc" "lv2_ui.h") (("_LV2UI_Descriptor") "LV2UI_Descriptor")) -- cgit 1.4.1 From f099c3b3bdd464ef918d19d8aeeeeef340bbc09f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 21 Feb 2021 18:15:54 +0100 Subject: gnu: emacs-helm-pass: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-helm-pass): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cec3723655..59ef9f4b5e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19177,7 +19177,7 @@ e.g: @code{from:Peter to:Anne flag:attach search term}.") (define-public emacs-helm-pass (package (name "emacs-helm-pass") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -19187,7 +19187,7 @@ e.g: @code{from:Peter to:Anne flag:attach search term}.") (file-name (git-file-name name version)) (sha256 (base32 - "0vglaknmir3yv4iwibwn8r40ran8d04gcyp99hx73ldmf3zqpnxv")))) + "19w24isddzamkikq17vbv3y7ha22i7wc09d2nqw1j0qwhrrfkng9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-helm" ,emacs-helm) -- cgit 1.4.1 From a58f9966a50b6cb558fa57b369a5b16de02af255 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Feb 2021 16:22:57 +0100 Subject: gnu: ungoogled-chromium: Update to 88.0.4324.182-0.b98f2d5. * gnu/packages/chromium.scm (%chromium-version): Set to -88.0.4324.182. (%ungoogled-revision): Set to 27c9e9fabd38001b32d148f7b3f99b4d31e67277. (%ungoogled-origin, ungoogled-chromium): Update hashes. --- gnu/packages/chromium.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index cf4b57a92d..f9ca357933 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -310,8 +310,8 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "88.0.4324.150") -(define %ungoogled-revision "f7c33ded1674556b6e9e72d597c706666f490da8") +(define %chromium-version "88.0.4324.182") +(define %ungoogled-revision "b98f2d51406c84a75df96f0da9dee3c0d790963d") (define %debian-revision "debian/84.0.4147.105-1") (define %debian-patches @@ -329,7 +329,7 @@ (string-take %ungoogled-revision 7))) (sha256 (base32 - "0hzap19pbnfcskpzbqq7dqrankmlrq9q7m1xrf7aygqiir0ksp4y")))) + "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay")))) (define %guix-patches (list (local-file @@ -467,7 +467,7 @@ %chromium-version ".tar.xz")) (sha256 (base32 - "1hrqrggg4g1hjmaajbpydwsij2mfkfj5ccs1lj76nv4qj91yj4mf")) + "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) -- cgit 1.4.1 From 182d2ef5105c065832decfdbacf2dc568a92c874 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Feb 2021 11:43:19 +0100 Subject: gnu: ungoogled-chromium: Update default preferences. * gnu/packages/aux-files/chromium/master-preferences.json: Adjust for upstream changes. --- gnu/packages/aux-files/chromium/master-preferences.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/chromium/master-preferences.json b/gnu/packages/aux-files/chromium/master-preferences.json index df68804d5a..bedf791df8 100644 --- a/gnu/packages/aux-files/chromium/master-preferences.json +++ b/gnu/packages/aux-files/chromium/master-preferences.json @@ -4,12 +4,11 @@ "make_chrome_default": false, "make_chrome_default_for_user": false, "verbose_logging": true, - "skip_first_run_ui": true, - "suppress_first_run_default_browser_prompt": true + "skip_first_run_ui": true }, "browser": { "has_seen_welcome_page" : true, - "check_default_browser" : false + "default_browser_setting_enabled" : false }, "dns_prefetching": { "enabled": false @@ -17,6 +16,9 @@ "alternate_error_pages": { "enabled": false }, + "settings": { + "first_run_tutorial_shown": true + }, "default_apps": "noinstall", "hide_web_store_icon": true, "homepage": "https://www.gnu.org/software/guix/" -- cgit 1.4.1 From 4ac9db0d75edcacb3a0c98659620cfea3c1e1993 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 21 Feb 2021 21:15:05 +0100 Subject: image: Add rock64 support. * gnu/system/images/rock64.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/local.mk | 1 + gnu/system/images/rock64.scm | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 gnu/system/images/rock64.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 95d5835fa4..b8bccc1b7c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -664,6 +664,7 @@ GNU_SYSTEM_MODULES = \ %D%/system/images/novena.scm \ %D%/system/images/pine64.scm \ %D%/system/images/pinebook-pro.scm \ + %D%/system/images/rock64.scm \ \ %D%/machine.scm \ \ diff --git a/gnu/system/images/rock64.scm b/gnu/system/images/rock64.scm new file mode 100644 index 0000000000..3f193e8528 --- /dev/null +++ b/gnu/system/images/rock64.scm @@ -0,0 +1,64 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Marius Bakke +;;; +;;; 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 system images rock64) + #:use-module (gnu bootloader) + #:use-module (gnu bootloader u-boot) + #:use-module (gnu image) + #:use-module (gnu packages linux) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services networking) + #:use-module (gnu system) + #:use-module (gnu system file-systems) + #:use-module (gnu system image) + #:use-module (srfi srfi-26) + #:export (rock64-barebones-os + rock64-image-type + rock64-barebones-raw-image)) + +(define rock64-barebones-os + (operating-system + (host-name "jiehkkevarri") + (timezone "Europe/Oslo") + (locale "en_US.utf8") + (bootloader (bootloader-configuration + (bootloader u-boot-rock64-rk3328-bootloader) + (target "/dev/sda"))) + (initrd-modules '()) + (kernel linux-libre-arm64-generic) + (file-systems (cons (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4")) + %base-file-systems)) + (services (append (list (service dhcp-client-service-type)) + %base-services)))) + +(define rock64-image-type + (image-type + (name 'rock64-raw) + (constructor (cut image-with-os (arm64-disk-image (expt 2 24)) <>)))) + +(define rock64-barebones-raw-image + (image + (inherit + (os->image rock64-barebones-os #:type rock64-image-type)) + (name 'rock64-barebones-raw-image))) + +rock64-barebones-raw-image -- cgit 1.4.1 From e89c1dd4fb0d6b1e8f85a05e89e7ba8f7f4ce3bd Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 21 Feb 2021 19:22:11 +0100 Subject: gnu: ffmpeg: Update to 4.3.2. * gnu/packages/video.scm (ffmpeg): Update to 4.3.2. Signed-off-by: Leo Famulari --- 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 4c16b79465..029b5b6ebb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1418,14 +1418,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.3.1") + (version "4.3.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1yrg9nri54iav86vxy5i8pj51dhikksa04x20d77nc3fsi09405d")))) + "1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit 1.4.1 From f601cdc6981888f55882c942dab413cb783caecc Mon Sep 17 00:00:00 2001 From: Gerd Heber Date: Sun, 21 Feb 2021 12:57:51 -0600 Subject: gnu: Add HDF5 1.12.0. * gnu/packages/maths.scm (hdf5-1.12): New variable. Signed-off-by: Leo Famulari --- gnu/packages/maths.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 42f3881bbc..58433d4b0c 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Gerd Heber ;;; ;;; This file is part of GNU Guix. ;;; @@ -1219,6 +1220,25 @@ extremely large and complex data collections.") (base32 "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082")) (patches (search-patches "hdf5-config-date.patch")))))) +(define-public hdf5-1.12 + (package/inherit hdf5-1.8 + (version "1.12.0") + (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 "0qazfslkqbmzg495jafpvqp0khws3jkxa0z7rph9qvhacil6544p")) + (patches (search-patches "hdf5-config-date.patch")))))) + (define-public hdf5 ;; Default version of HDF5. hdf5-1.10) -- cgit 1.4.1 From 90ccb46a5534a031a6a6d994fd9b7ee2b5ccbf84 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 21 Feb 2021 15:29:59 -0800 Subject: gnu: diffoscope: Update to 167. * gnu/packages/diffoscope.scm (diffoscope): Update to 167. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index feb0324db2..c6af50e444 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "166") + (version "167") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0vc4a38ii6b10af4c7cxfkvj4lk4ihx1xs4q5lshnkyg74gmm21b")))) + "0v0l299igvjsxz7xbsfl7kfqw958v56khzda1ixdsax6qrnqcf6m")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From c53ee79c4ce187b185a070977f69ad9d4fb55179 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 2 Feb 2021 00:35:18 +0100 Subject: gnu: git: Add credential-libsecret output. * gnu/packages/version-control.scm (git)[native-inputs]: Add pkg-config. [inputs]: Add glib and libsecret. [outputs]: Add "credential-libsecret". [arguments]: Add 'install-credential-libsecret phase to #:phases to build and install "git-credential-libsecret" to "credential-libsecret" output. (git-minimal)[arguments]: Delete the 'install-credential-libsecret phase. Signed-off-by: Chris Marusich --- gnu/packages/version-control.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4100f9f9ef..f3f4936e1f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -34,6 +34,8 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Chris Marusich +;;; Copyright © 2021 Léo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -81,6 +83,8 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages golang) #:use-module (gnu packages groff) #:use-module (gnu packages guile) @@ -194,7 +198,8 @@ as well as the classic centralized workflow.") ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto))) + ("xmlto" ,xmlto) + ("pkg-config" ,pkg-config))) (inputs `(("curl" ,curl) ("expat" ,expat) @@ -220,11 +225,16 @@ as well as the classic centralized workflow.") ;; For 'git gui', 'gitk', and 'git citool'. ("tcl" ,tcl) - ("tk" ,tk))) + ("tk" ,tk) + + ;; For 'git-credential-libsecret' + ("glib" ,glib) + ("libsecret" ,libsecret))) (outputs '("out" ; the core "send-email" ; for git-send-email "svn" ; git-svn "credential-netrc" ; git-credential-netrc + "credential-libsecret" ; git-credential-libsecret "subtree" ; git-subtree "gui")) ; gitk, git gui (arguments @@ -262,6 +272,7 @@ as well as the classic centralized workflow.") #:modules ((srfi srfi-1) (srfi srfi-26) + ((guix build gnu-build-system) #:prefix gnu:) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases @@ -389,6 +400,14 @@ as well as the classic centralized workflow.") `("PERL5LIB" ":" prefix (,(string-append (assoc-ref outputs "out") "/share/perl5")))) #t))) + (add-after 'install 'install-credential-libsecret + (lambda* (#:key outputs #:allow-other-keys) + (let* ((libsecret (assoc-ref outputs "credential-libsecret"))) + (with-directory-excursion "contrib/credential/libsecret" + ((assoc-ref gnu:%standard-phases 'build)) + (install-file "git-credential-libsecret" + (string-append libsecret "/bin")) + #t)))) (add-after 'install 'install-subtree (lambda* (#:key outputs #:allow-other-keys) (let ((subtree (assoc-ref outputs "subtree"))) @@ -535,6 +554,7 @@ everything from small to very large projects with speed and efficiency.") (delete 'install-man-pages) (delete 'install-subtree) (delete 'install-credential-netrc) + (delete 'install-credential-libsecret) (add-after 'install 'remove-unusable-perl-commands (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From e4959cd5d436b30535c0411432f2fd2d66992da6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Feb 2021 10:10:16 +0200 Subject: gnu: autoconf-archive: Update to 2021.02.19. * gnu/packages/autotools.scm (autoconf-archive): Update to 2021.02.19. --- gnu/packages/autotools.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 09f4bf4122..e999688894 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2015, 2017, 2018 Mark H Weaver ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017 Nikita -;;; Copyright © 2017, 2019 Efraim Flashner +;;; Copyright © 2017, 2019, 2021 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Pierre-Moana Levesque @@ -273,7 +273,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" (define-public autoconf-archive (package (name "autoconf-archive") - (version "2019.01.06") + (version "2021.02.19") (source (origin (method url-fetch) @@ -281,7 +281,7 @@ exec ~a --no-auto-compile \"$0\" \"$@\" version ".tar.xz")) (sha256 (base32 - "0gqya7nf4j5k98dkky0c3bnr0paciya91vkqazg7knlq621mq68p")))) + "1gcwqspcxiygnyk02smsk8ivzs9r69ji38izxzzsijyx52fyp9p8")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/autoconf-archive/") (synopsis "Collection of freely reusable Autoconf macros") -- cgit 1.4.1 From 61a5305b395368816d8c594ae82bc794449a83c8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 09:11:01 +0100 Subject: gnu: cuirass: Update to 0.0.1-70.342c5ed * gnu/packages/ci.scm (cuirass): Update to 0.0.1-70.342c5ed. --- 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 f7480acc78..5c40183dac 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "860fffa2608dcdfd7fae474115bafa1b20f69b72") - (revision "69")) + (let ((commit "342c5edfe8c372f916aa82a486943086158f4e1a") + (revision "70")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0dscfjpv3rkf1wy3z1yxc3fp27q1x8nrmdhfxr5dvhayb5b3ibml")))) + "073ab67i4d37pbkpyn0aciwjyhxglmhf36nq0ly57v9183yfmi60")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 1443e2dd98ac6e2aecff726cfcc683dd9ba7240d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 09:26:06 +0100 Subject: services: cuirass: Add parameters support. * gnu/services/cuirass.scm ()[parameters]: New field. [zabbix-uri]: Remove it. (cuirass-shepherd-service): Honor it. --- gnu/services/cuirass.scm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 99edd3d13e..7b03ec88d7 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -108,6 +108,8 @@ (default "cuirass")) (interval cuirass-configuration-interval ;integer (seconds) (default 60)) + (parameters cuirass-configuration-parameters ;string + (default #f)) (remote-server cuirass-configuration-remote-server (default #f)) (database cuirass-configuration-database ;string @@ -124,8 +126,6 @@ (default #f)) (fallback? cuirass-configuration-fallback? ;boolean (default #f)) - (zabbix-uri cuirass-configuration-zabbix-uri ;string - (default #f)) (extra-options cuirass-configuration-extra-options (default '()))) @@ -138,6 +138,7 @@ (user (cuirass-configuration-user config)) (group (cuirass-configuration-group config)) (interval (cuirass-configuration-interval config)) + (parameters (cuirass-configuration-parameters config)) (remote-server (cuirass-configuration-remote-server config)) (database (cuirass-configuration-database config)) (port (cuirass-configuration-port config)) @@ -146,7 +147,6 @@ (use-substitutes? (cuirass-configuration-use-substitutes? config)) (one-shot? (cuirass-configuration-one-shot? config)) (fallback? (cuirass-configuration-fallback? config)) - (zabbix-uri (cuirass-configuration-zabbix-uri config)) (extra-options (cuirass-configuration-extra-options config))) `(,(shepherd-service (documentation "Run Cuirass.") @@ -159,6 +159,11 @@ #$(scheme-file "cuirass-specs.scm" specs) "--database" #$database "--interval" #$(number->string interval) + #$@(if parameters + (list (string-append + "--parameters=" + parameters)) + '()) #$@(if remote-server '("--build-remote") '()) #$@(if use-substitutes? '("--use-substitutes") '()) #$@(if one-shot? '("--one-shot") '()) @@ -186,13 +191,13 @@ "--port" #$(number->string port) "--listen" #$host "--interval" #$(number->string interval) - #$@(if use-substitutes? '("--use-substitutes") '()) - #$@(if fallback? '("--fallback") '()) - #$@(if zabbix-uri + #$@(if parameters (list (string-append - "--zabbix-uri=" - zabbix-uri)) + "--parameters=" + parameters)) '()) + #$@(if use-substitutes? '("--use-substitutes") '()) + #$@(if fallback? '("--fallback") '()) #$@extra-options) #:user #$user @@ -223,6 +228,11 @@ "--publish-port=" (number->string publish-port))) '()) + #$@(if parameters + (list (string-append + "--parameters=" + parameters)) + '()) #$@(if trigger-url (list (string-append -- cgit 1.4.1 From bbd26d60edaeafab032ffa70e09633a621eeed92 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 09:30:52 +0100 Subject: gnu: guile-mastodon: Build with Guile 3.0. * gnu/packages/guile-xyz.scm (guile-mastodon)[source]: Modify configure.ac to add Guile 3.0 support. [native-inputs]: Add "emacs" and "texinfo". [inputs]: Use Guile 3.0 and Guile Json 4.0. --- gnu/packages/guile-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8d9126df44..cbec2081f0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1308,16 +1308,27 @@ Scheme by using Guile’s foreign function interface.") (file-name (git-file-name name version)) (sha256 (base32 - "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry")))) + "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("^PKG_CHECK.*") "") + (("^GUILE_PKG.*") + "GUILE_PKG([3.0 2.2])\n")) + #t)))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) + ("emacs" ,emacs-minimal) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) (inputs - `(("guile" ,guile-2.2) + `(("guile" ,guile-3.0) ("gnutls" ,gnutls) - ("guile-json" ,guile-json-1))) + ("guile-json" ,guile-json-4))) (home-page "https://framagit.org/prouby/guile-mastodon") (synopsis "Guile Mastodon REST API module") (description "This package provides Guile modules to access the -- cgit 1.4.1 From 0e5bc144f35798b2a3d3336ee5cd040efde5bf85 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 09:37:55 +0100 Subject: gnu: cuirass: Update dependencies. * gnu/packages/ci.scm (cuirass)[inputs]: Add "guile-mastodon" and "mailutils". [arguments]: Adapt accordingly. --- gnu/packages/ci.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5c40183dac..22f1b6e7be 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -85,9 +85,11 @@ (bytes (assoc-ref inputs "guile-bytestructures")) (fibers (assoc-ref inputs "guile-fibers")) (zlib (assoc-ref inputs "guile-zlib")) + (matd (assoc-ref inputs "guile-mastodon")) + (mail (assoc-ref inputs "mailutils")) (guix (assoc-ref inputs "guix")) (deps (list avahi gcrypt json zmq squee git bytes - fibers zlib guix)) + fibers zlib matd mail guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ @@ -125,6 +127,8 @@ ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) + ("guile-mastodon" ,guile-mastodon) + ("mailutils" ,mailutils) ;; FIXME: this is propagated by "guile-git", but it needs to be among ;; the inputs to add it to GUILE_LOAD_PATH. ("guile-bytestructures" ,guile-bytestructures) -- cgit 1.4.1 From b4bbf3d1e9c86db8c418472b2f3a2622addd84dc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Feb 2021 10:39:55 +0100 Subject: gnu: Rename ghc-nixfmt into nixfmt * gnu/packages/haskell-xyz.scm (ghc-nixfmt): Move to... * gnu/packages/haskell-apps.scm (nixfmt): ... here. This is a followup to 703ccd583611b6efa689b7a2d1daf35d6cd83c35. --- gnu/packages/haskell-apps.scm | 30 ++++++++++++++++++++++++++++++ gnu/packages/haskell-xyz.scm | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a6fb33c31b..54266cd8bb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Brian Leung +;;; Copyright © 2021 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -690,6 +691,35 @@ By operating at a lower level than most similar tools, it supports X11, Wayland, and Linux console environments alike.") (license license:expat))) +(define-public nixfmt + (package + (name "ghc-nixfmt") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/nixfmt/nixfmt-" + version + ".tar.gz")) + (sha256 + (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) + (build-system haskell-build-system) + (inputs + `(("ghc-megaparsec" ,ghc-megaparsec) + ("ghc-parser-combinators" ,ghc-parser-combinators) + ("ghc-cmdargs" ,ghc-cmdargs) + ("ghc-safe-exceptions" ,ghc-safe-exceptions))) + (arguments + `(#:cabal-revision + ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"))) + (home-page "https://github.com/serokell/nixfmt") + (synopsis "Opinionated formatter for Nix") + (description + "Nixfmt is a formatter for Nix that ensures consistent and clear +formatting by forgetting all existing formatting during parsing.") + (license license:mpl2.0))) + (define-public raincat (package (name "raincat") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index c4440d4778..d6c50ade71 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber -;;; Copyright © 2021 EuAndreh ;;; ;;; This file is part of GNU Guix. ;;; @@ -8694,35 +8693,6 @@ making this package a full replacement for the original newtype package, and an alternative to newtype-th.") (license license:bsd-3))) -(define-public ghc-nixfmt - (package - (name "ghc-nixfmt") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (string-append - "https://hackage.haskell.org/package/nixfmt/nixfmt-" - version - ".tar.gz")) - (sha256 - (base32 "1ispgl8rc2scr6v8bb6sks7px856jf61x74zj2iyddrn5qamkb3n")))) - (build-system haskell-build-system) - (inputs - `(("ghc-megaparsec" ,ghc-megaparsec) - ("ghc-parser-combinators" ,ghc-parser-combinators) - ("ghc-cmdargs" ,ghc-cmdargs) - ("ghc-safe-exceptions" ,ghc-safe-exceptions))) - (arguments - `(#:cabal-revision - ("1" "1hsj0jh6siph3afd9c2wii09sffl48rzqv653n4clpd8qy0rn48d"))) - (home-page "https://github.com/serokell/nixfmt") - (synopsis "Opinionated formatter for Nix") - (description - "Nixfmt is a formatter for Nix that ensures consistent and clear -formatting by forgetting all existing formatting during parsing.") - (license license:mpl2.0))) - (define-public ghc-non-negative (package (name "ghc-non-negative") -- cgit 1.4.1 From 79d5005612f5a0d4fd3bf0f3601f85076983c98a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Feb 2021 11:05:47 +0100 Subject: gnu: nixfmt: Fix name. * gnu/packages/haskell-apps.scm (nixfmt): Fix name. --- gnu/packages/haskell-apps.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 54266cd8bb..16531cf290 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -693,7 +693,7 @@ Wayland, and Linux console environments alike.") (define-public nixfmt (package - (name "ghc-nixfmt") + (name "nixfmt") (version "0.4.0") (source (origin -- cgit 1.4.1 From 3c674b57342ebd866ac1a6f04ae1dacc1a975d0b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 11:20:46 +0100 Subject: gnu: cuirass: Update to 0.0.1-71.3e65617. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-71.3e65617. --- 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 22f1b6e7be..eac26a6dac 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "342c5edfe8c372f916aa82a486943086158f4e1a") - (revision "70")) + (let ((commit "3e6561740958ea06bf50f8086a4066b555beacc5") + (revision "71")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +61,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "073ab67i4d37pbkpyn0aciwjyhxglmhf36nq0ly57v9183yfmi60")))) + "1mrfjcfw9v7gpk4sp65jxfvikmdkxgkhwdjn29vjph04z82jh36z")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 03235402df031816d4dcd2dda6c97490eeaae9a5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Feb 2021 11:44:59 +0100 Subject: gnu: emacs-selectrum: Update to 3.1. * gnu/packages/emacs-xyz.scm (emacs-selectrum): Update to 3.1. --- gnu/packages/emacs-xyz.scm | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59ef9f4b5e..71564dcd0c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7174,26 +7174,22 @@ for Ivy and Company that make use of the library.") (license license:expat))) (define-public emacs-selectrum - ;; Release 3.0 has compatibility issues with recent versions of Emacs - ;; Consult. - (let ((commit "a2ba6333e59ddc853318ece229f34016400ca033") - (revision "0")) - (package - (name "emacs-selectrum") - (version (git-version "3.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/raxod502/selectrum") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1agpcazga6gxl6k28bdski1sx046699cici8a9hz0nj7s8rkx1zm")))) - (build-system emacs-build-system) - (home-page "https://github.com/raxod502/selectrum/") - (synopsis "Incremental narrowing in Emacs") - (description "Selectrum is a solution for incremental narrowing in + (package + (name "emacs-selectrum") + (version "3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/raxod502/selectrum") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02jrki6vzyfyi1bbslki5pk2348flh9dz18jkc4y7p60bvbr52cb")))) + (build-system emacs-build-system) + (home-page "https://github.com/raxod502/selectrum/") + (synopsis "Incremental narrowing in Emacs") + (description "Selectrum is a solution for incremental narrowing in Emacs, replacing Helm, Ivy, and IDO. Its design philosophy is based on choosing the right abstractions and prioritizing consistency and predictability over special-cased improvements for particular cases. @@ -7201,7 +7197,7 @@ As such, Selectrum follows existing Emacs conventions where they exist and are reasonable, and it declines to implement features which have marginal benefit compared to the additional complexity of a new interface.") - (license license:expat)))) + (license license:expat))) (define-public emacs-orderless (package -- cgit 1.4.1 From d70b0f92e975ddf95376ea27f72c136e93b5157f Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sun, 14 Feb 2021 16:26:54 -0500 Subject: gnu: guile-dsv: Update to 0.4.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-dsv): Update to 0.4.0 [arguments]: Remove phase "configure-support-guile3.0". Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index cbec2081f0..ce5aad8ec7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -464,16 +464,16 @@ you send to a FIFO file.") (define-public guile-dsv (package (name "guile-dsv") - (version "0.3.0") + (version "0.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/artyom-poptsov/guile-dsv") - (commit "6c867915dc4198eacc548a4834ef0e1aef852795"))) + (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1mxbbcsmbjfnh4yydqz44ihbkdnzdwz38xanaam128arlb7hwr8n")))) + "1mvyc8i38j56frjh3p6vwziv8lrzlyqndz30663h5nwcp0044sdn")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -489,14 +489,6 @@ you send to a FIFO file.") #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - ;; Support Guile 3.0 in configure from upstream commit - ;; 4c724577ccf19bb88580f72f2f6b166a0447ce3f - (add-before 'bootstrap 'configure-support-guile3.0 - (lambda _ - (substitute* "configure.ac" - (("GUILE_PKG.*") - "GUILE_PKG([3.0 2.0 2.2])")) - #t)) (add-before 'configure 'set-guilesitedir (lambda _ (substitute* "Makefile.in" -- cgit 1.4.1 From f500905ce1baf85a2407c5ccde148ee6c2ea2584 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 20 Feb 2021 22:30:22 -0800 Subject: gnu: Add python-sane. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sane): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b26fce72a9..ef811054b8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -180,6 +180,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages search) + #:use-module (gnu packages scanner) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages ssh) @@ -23906,3 +23907,25 @@ Application Programming Interface based on the Open Inventor 2.1 API.") Crayons automatically wraps a given string in the foreground color and restores the original state after the string is printed.") (license license:expat))) + +(define-public python-sane + (package + (name "python-sane") + (version "2.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 + "1pi597z94n2mkd821ln52fq0g727n2jxfskf280ip3kf7jw8w294")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + `(("sane-backends" ,sane-backends))) + (home-page "https://github.com/python-pillow/Sane") + (synopsis "Python interface to the SANE scanner") + (description "This package provides Python interface to the SANE scanner +and frame grabber interface.") + (license license:expat))) -- cgit 1.4.1 From 011ec41c253b9ac772734b3dd5623655c644ed93 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 22 Feb 2021 12:05:48 +0100 Subject: gnu: Fix "license:" prefix in scanner.scm. * gnu/packages/scanner.scm: Change "licence:" to "license:". --- gnu/packages/scanner.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index a97131b362..e3ff4243bc 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -36,7 +36,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) - #:prefix licence:) + #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) @@ -141,7 +141,7 @@ proving access to any raster image scanner hardware (flatbed scanner, hand-held scanner, video- and still-cameras, frame-grabbers, etc.). The package contains the library, but no drivers.") - (license licence:gpl2+))) ; plus linking exception + (license license:gpl2+))) ; plus linking exception ;; This variant links in the hpaio backend provided by hplip, which adds ;; support for HP scanners whose backends are not maintained by the SANE @@ -227,7 +227,7 @@ package contains the library and drivers."))) `(#:make-flags (list (string-append "xsanedocdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version)) - #:tests? #f ; no test suite + #:tests? #f ; no test suite #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-invalid-dereference @@ -273,4 +273,4 @@ as a GIMP plugin to acquire images directly from a scanner. XSane talks to scanners through the @acronym{SANE, Scanner Access Now Easy} back-end library, which supports almost all existing scanners.") - (license licence:gpl2+))) + (license license:gpl2+))) -- cgit 1.4.1 From dbc10e747428f31e5c84a2d9712af116ed6529b1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 14:45:59 +0100 Subject: gnu: cuirass: Update to 0.0.1-72.543e26a. * gnu/packages/ci.scm (guile-mastodon-dev): New variable. (guile-mastodon-dev): Update to 0.0.1-72.543e26a. [inputs]: Use guile-mastodon-dev instead of guile-mastodon. --- gnu/packages/ci.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index eac26a6dac..35bf285fab 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,9 +47,27 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu)) +(define-public guile-mastodon-dev + (let ((commit "88115d85221876b1baea4accb7c76995da32f479") + (revision "1")) + (package + (inherit guile-mastodon) + (name "guile-mastodon") + (version (git-version "0.0.1" revision commit)) + (home-page "https://framagit.org/mothacehe/guile-mastodon.git") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 + "04dgxliz9bmhn0f7h1n0dj0r5h0fzhg80nxl1rpbxh4zs1yw9qvj")) + (file-name (string-append name "-" version "-checkout"))))))) + (define-public cuirass - (let ((commit "3e6561740958ea06bf50f8086a4066b555beacc5") - (revision "71")) + (let ((commit "543e26addc6e2304611e2feb8dd3a5a0646507b6") + (revision "72")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -61,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1mrfjcfw9v7gpk4sp65jxfvikmdkxgkhwdjn29vjph04z82jh36z")))) + "01cxg0nwafzfg0phbv1b4cv24w7yaalkkdib3qfwf6jqagbfg85y")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -127,7 +145,7 @@ ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) - ("guile-mastodon" ,guile-mastodon) + ("guile-mastodon" ,guile-mastodon-dev) ("mailutils" ,mailutils) ;; FIXME: this is propagated by "guile-git", but it needs to be among ;; the inputs to add it to GUILE_LOAD_PATH. -- cgit 1.4.1 From 984d64388dcc1a4c5d9ea746700300abcac84d3e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Feb 2021 16:27:54 +0200 Subject: gnu: ruby-omniauth: Update to 2.0.3. * gnu/packages/ruby.scm (ruby-omniauth): Update to 2.0.3. [arguments]: Don't skip tests. [propagated-inputs]: Add ruby-rack-protector. [native-inputs]: Add ruby-rspec. --- gnu/packages/ruby.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 3a3be592ce..6412bf92c1 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2320,19 +2320,20 @@ with a similar style to the original OAuth spec.") (define-public ruby-omniauth (package (name "ruby-omniauth") - (version "1.9.1") + (version "2.0.3") (source (origin (method url-fetch) (uri (rubygems-uri "omniauth" version)) (sha256 - (base32 "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz")))) + (base32 "105mzgvmn2kjaacxw01h4wqv33r7hfn5z8fxlkk3jcjar14j71bh")))) (build-system ruby-build-system) - (arguments - '(#:tests? #f)) ; No included tests (propagated-inputs `(("ruby-hashie" ,ruby-hashie) - ("ruby-rack" ,ruby-rack))) + ("ruby-rack" ,ruby-rack) + ("ruby-rack-protection" ,ruby-rack-protection))) + (native-inputs + `(("ruby-rspec" ,ruby-rspec))) (synopsis "Generalized Rack framework for multiple-provider authentication") (description "This package provides a generalized Rack framework for multiple-provider -- cgit 1.4.1 From 51b3ea8d5bf6ad7eecc413fec9eec1d94f9d8c1f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Feb 2021 16:30:07 +0200 Subject: gnu: ruby-omniauth-oauth2: Update to 1.7.1. * gnu/packages/ruby.scm (ruby-omniauth-oauth2): Update to 1.7.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 6412bf92c1..fb0396dc52 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -2344,14 +2344,14 @@ authentication.") (define-public ruby-omniauth-oauth2 (package (name "ruby-omniauth-oauth2") - (version "1.6.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (rubygems-uri "omniauth-oauth2" version)) (sha256 (base32 - "11mi36l9d97r77q99jnafdc1yaa0a9wahhpp7dj7ank8q52g7g79")))) + "10fr2b58sp7l6nfdvxpbi67374hkrvsf507cvda89jjs0jacy319")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit 1.4.1 From b309a28678664c295e97a70607def02b0c9b4296 Mon Sep 17 00:00:00 2001 From: Christopher Lemmer Webber Date: Mon, 15 Feb 2021 17:57:04 -0500 Subject: services: tor: Add control-socket? option. * doc/guix.texi (Networking Services): Document new `control-socket?' option for `tor-configuration`. * gnu/services/networking.scm (): (tor-configuration->torrc): --- doc/guix.texi | 9 ++++++++- gnu/services/networking.scm | 13 +++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 7aae786ed0..8a86b7ee58 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45,7 +45,7 @@ Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* -Copyright @copyright{} 2017 Christopher Allan Webber@* +Copyright @copyright{} 2017, 2021 Christopher Lemmer Webber@* Copyright @copyright{} 2017, 2018, 2019, 2020 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020, 2021 Maxim Cournoyer@* @@ -16596,6 +16596,13 @@ If you want to customize the SOCKS socket in more detail, leave @end table @end deftp +@item @code{control-socket?} (default: @code{#f}) +Whether or not to provide a ``control socket'' by which Tor can be +controlled to, for instance, dynamically instantiate tor onion services. +If @code{#t}, Tor will listen for control commands on the UNIX domain socket +@file{/var/run/tor/control-sock}, which will be made writable by members of the +@code{tor} group. + @cindex hidden service @deffn {Scheme Procedure} tor-hidden-service @var{name} @var{mapping} Define a new Tor @dfn{hidden service} called @var{name} and implementing diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index a4d4ac0646..231a9f66c7 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Oleg Pykhalov +;;; Copyright © 2021 Christopher Lemmer Webber ;;; ;;; This file is part of GNU Guix. ;;; @@ -744,7 +745,9 @@ demand."))) (hidden-services tor-configuration-hidden-services (default '())) (socks-socket-type tor-configuration-socks-socket-type ; 'tcp or 'unix - (default 'tcp))) + (default 'tcp)) + (control-socket? tor-control-socket-path + (default #f))) (define %tor-accounts ;; User account and groups for Tor. @@ -766,7 +769,8 @@ demand."))) (define (tor-configuration->torrc config) "Return a 'torrc' file for CONFIG." (match config - (($ tor config-file services socks-socket-type) + (($ tor config-file services + socks-socket-type control-socket?) (computed-file "torrc" (with-imported-modules '((guix build utils)) @@ -786,6 +790,11 @@ Log notice syslog\n" port) (display "\ SocksPort unix:/var/run/tor/socks-sock UnixSocksGroupWritable 1\n" port)) + (when #$control-socket? + (display "\ +ControlSocket unix:/var/run/tor/control-sock GroupWritable RelaxDirModeCheck +ControlSocketsGroupWritable 1\n" + port)) (for-each (match-lambda ((service (ports hosts) ...) -- cgit 1.4.1 From 3bcfd41620bfe87903d54c73a100208922445f1b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 15:39:37 +0100 Subject: services: cuirass: Instantiate postgresql service. * gnu/services/cuirass.scm (cuirass-service-type): Instantiate postgresql service when missing. --- gnu/services/cuirass.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 7b03ec88d7..18163b59e2 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -324,6 +324,8 @@ (service-extension activation-service-type cuirass-activation) (service-extension shepherd-root-service-type cuirass-shepherd-service) (service-extension account-service-type cuirass-account) + ;; Make sure postgresql and postgresql-role are instantiated. + (service-extension postgresql-service-type (const #t)) (service-extension postgresql-role-service-type cuirass-postgresql-role))) (description -- cgit 1.4.1 From 8163f74542300720f6ee5dc061b79ddf0c345bb8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 15:40:30 +0100 Subject: services: postgresql: Define a default value. * gnu/services/databases.scm (postgresql-service-type): Define a default value. --- gnu/services/databases.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index d908b86af8..91ce503e82 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -331,7 +331,9 @@ host all all ::1/128 md5")) (const %postgresql-accounts)) (service-extension profile-service-type - (compose list postgresql-configuration-postgresql)))))) + (compose list postgresql-configuration-postgresql)))) + (default-value (postgresql-configuration + (postgresql postgresql-10))))) (define-deprecated (postgresql-service #:key (postgresql postgresql) (port 5432) -- cgit 1.4.1 From 108e2c6116f01c3b0a98498717d65a96c1857a51 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 16:23:49 +0100 Subject: gnu: cuirass: Add missing dependency. * gnu/packages/ci.scm (cuirass)[inputs]: Add gnutls. [arguments]: Adapt accordingly. --- gnu/packages/ci.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 35bf285fab..5fa800be4a 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -104,10 +104,11 @@ (fibers (assoc-ref inputs "guile-fibers")) (zlib (assoc-ref inputs "guile-zlib")) (matd (assoc-ref inputs "guile-mastodon")) + (tls (assoc-ref inputs "gnutls")) (mail (assoc-ref inputs "mailutils")) (guix (assoc-ref inputs "guix")) (deps (list avahi gcrypt json zmq squee git bytes - fibers zlib matd mail guix)) + fibers zlib matd tls mail guix)) (guile (assoc-ref %build-inputs "guile")) (effective (read-line (open-pipe* OPEN_READ @@ -146,6 +147,7 @@ ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) ("guile-mastodon" ,guile-mastodon-dev) + ("gnutls" ,gnutls) ("mailutils" ,mailutils) ;; FIXME: this is propagated by "guile-git", but it needs to be among ;; the inputs to add it to GUILE_LOAD_PATH. -- cgit 1.4.1 From ad06c29b37924ecf5eb3bd440c7456cad6415c3b Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 9 Jan 2021 14:42:47 +0000 Subject: gnu: Add python-screenkey. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-screenkey): New variable. Co-authored-by: Léo Le Bouter --- gnu/packages/python-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ef811054b8..e42cbc561c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -74,7 +74,7 @@ ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Josh Marshall -;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020, 2021 Alexandros Theodotou ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Matthew Kraai @@ -23929,3 +23929,57 @@ restores the original state after the string is printed.") (description "This package provides Python interface to the SANE scanner and frame grabber interface.") (license license:expat))) + +(define-public python-screenkey + (package + (name "python-screenkey") + (version "1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/screenkey/screenkey") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rfngmkh01g5192pi04r1fm7vsz6hg9k3qd313sn9rl9xkjgp11l")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dlopen-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((x11 (assoc-ref inputs "libx11")) + (xtst (assoc-ref inputs "libxtst"))) + (substitute* "Screenkey/xlib.py" + (("libX11.so.6") + (string-append x11 "/lib/libX11.so.6"))) + (substitute* "Screenkey/xlib.py" + (("libXtst.so.6") + (string-append xtst "/lib/libXtst.so.6"))) + #t))) + (add-after 'install 'wrap-screenkey + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program + (string-append (assoc-ref outputs "out") "/bin/screenkey") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" + ":" prefix (,(getenv "GI_TYPELIB_PATH")))) + #t))))) + (inputs + `(("python-distutils-extra" ,python-distutils-extra) + ("python-tokenize-rt" ,python-tokenize-rt) + ("libx11" ,libx11) + ("libxtst" ,libxtst) + ("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject) + ("python-pycairo" ,python-pycairo) + ("python-setuptools-git" ,python-setuptools-git) + ("python-babel" ,python-babel))) + (home-page "https://www.thregr.org/~wavexx/software/screenkey/") + (synopsis + "Screencast tool to display pressed keys") + (description + "A screencast tool to display your keys inspired by Screenflick.") + (license license:gpl3+))) -- cgit 1.4.1 From a821818fb78bc352aef81a5f8d162729de3e5c8a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Feb 2021 13:25:16 -0500 Subject: gnu: python-sane: Correct the license. This is a followup to commit f500905ce1baf85a2407c5ccde148ee6c2ea2584. * gnu/packages/python-xyz.scm (python-sane)[license]: Describe the license. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e42cbc561c..072cc3db53 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23928,7 +23928,9 @@ restores the original state after the string is printed.") (synopsis "Python interface to the SANE scanner") (description "This package provides Python interface to the SANE scanner and frame grabber interface.") - (license license:expat))) + (license (license:non-copyleft + ;; Yet another variant of the X/MIT license. + "https://github.com/python-pillow/Sane/blob/master/COPYING")))) (define-public python-screenkey (package -- cgit 1.4.1 From c0c652e01536ddea57e11dc54f58109738d135ad Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Mon, 22 Feb 2021 18:18:57 +0100 Subject: gnu: gita: Update to 0.12.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (gita): Update to 0.12.9. Signed-off-by: Léo Le Bouter --- 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 f3f4936e1f..3afb06ca79 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2926,11 +2926,11 @@ defects faster.") (license license:asl2.0))) (define-public gita - (let ((commit "62eb3d69874f75bdd6f95743e57315bc59890f70") + (let ((commit "e41b504dca90a25e9be27f296da7ce22e5782893") (revision "1")) (package (name "gita") - (version (git-version "0.10.10" revision commit)) + (version (git-version "0.12.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -2939,7 +2939,7 @@ defects faster.") (file-name (git-file-name name version)) (sha256 (base32 - "1jn5wnmjbdrrgz9fif7s81pv3g92q0wjcqy5qxl77kjy7iv0kpfp")))) + "1k03zgcbhl91cgyh4k7ywyjp00y63q4bqbimncqh5b3lni8l8j5l")))) (build-system python-build-system) (native-inputs `(("git" ,git) ;for tests -- cgit 1.4.1 From 9fe710645247421efd76797cd63bdb8bc4209c44 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Feb 2021 13:14:44 +0100 Subject: gnu: gnome-keyring: Propagate gcr to fix unlock prompts. On desktop environments other than GNOME, it is not obvious gcr package needs to be installed in the profile for gnome-keyring unlock prompts to work. Propagating it ensures no one will need to figure this out in the future. * gnu/packages/gnome.scm (gnome-keyring)[propagated-inputs]: Add "gcr". --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0b46e2719b..b8634d712a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2544,6 +2544,8 @@ GNOME Desktop.") ("libxslt" ,libxslt) ;for documentation ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl))) + (propagated-inputs + `(("gcr" ,gcr))) (home-page "https://www.gnome.org") (synopsis "Daemon to store passwords and encryption keys") (description -- cgit 1.4.1 From 515f561370ec0674f0484d074b53887c82e81d97 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Sun, 21 Feb 2021 21:55:58 +0100 Subject: gnu: Add dstask. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/task-management.scm (dstask): New variable. Signed-off-by: Léo Le Bouter --- gnu/packages/task-management.scm | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 6bd033ba2b..99bff5aa23 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Eric Bavier +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system cmake) + #:use-module (guix build-system go) #:use-module (guix build-system meson)) (define-public taskwarrior @@ -66,6 +68,53 @@ Done time management method. It supports network synchronization, filtering and querying data, exposing task data in multiple formats to other tools.") (license license:expat))) +(define-public dstask + (package + (name "dstask") + (version "0.24.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/naggie/dstask") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03rl2wh58xd6a80ji43c7ak3h0ysi3ddg570pn8ry24s7s45zsz2")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/naggie/dstask" + #:install-source? #f + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "build" "-o" "dstask" "cmd/dstask/main.go") + (invoke "go" "build" "-o" "dstask-import" + "cmd/dstask-import/main.go")))) + (replace 'install + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let* ((out (assoc-ref outputs "out")) + (bindir (string-append out "/bin")) + (zsh-completion (string-append + out "/share/zsh/site-functions/_dstask")) + (bash-completion + (string-append + out "/share/bash-completion/completions/_dstask"))) + (install-file "dstask" bindir) + (install-file "dstask-import" bindir) + (install-file ".dstask-bash-completions.sh" bash-completion) + (install-file ".dstask-zsh-completions.sh" zsh-completion))) + #t))))) + (synopsis "CLI-based TODO manager with git-based sync + markdown notes per task") + (description "dstask is a personal task tracker that uses git for +synchronization. It offers a note command to attach a Markdown based note to +a task.") + (home-page "https://github.com/naggie/dstask") + (license license:expat))) + (define-public blanket (package (name "blanket") -- cgit 1.4.1 From f1f6e49190a11f926af3bef0d45541cabf47c742 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 22 Feb 2021 16:37:29 +0100 Subject: gnu: star: Update to 2.7.8a. * gnu/packages/bioinformatics.scm (star): Update to 2.7.8a. --- 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 c8ddf8e3d7..3890bbc653 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6804,7 +6804,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (define-public star (package (name "star") - (version "2.7.3a") + (version "2.7.8a") (source (origin (method git-fetch) (uri (git-reference @@ -6813,7 +6813,7 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (file-name (git-file-name name version)) (sha256 (base32 - "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq")) + "0zc5biymja9zml9yizcj1h68fq9c6sxfcav8a0lbgvgsm44rvans")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 7c5e5e0e0fbf11ebaaeb8f98ed6c75289ca31795 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 14 Feb 2021 10:55:31 +0000 Subject: system: hurd: Have the static networking provision 'networking. Some services require networking, I'm looking at the Guix Build Coordinator agent. Networking seems to work in the childhurd VM, so I think this change makes sense. * gnu/system/hurd.scm (%base-services/hurd): Add 'networking to the provision parameter for the static-networking service. --- gnu/system/hurd.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 8b46e65e31..8f3a27834b 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -79,7 +79,7 @@ (list (static-networking (interface "lo") (ip "127.0.0.1") (requirement '()) - (provision '(loopback)) + (provision '(loopback networking)) (name-servers '("10.0.2.3"))))) (syslog-service) (service guix-service-type -- cgit 1.4.1 From 5c7874adb00c834e55e58a9b964ebc5fd1bb872c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 13 Feb 2021 15:26:17 +0000 Subject: gnu: Add temper-exporter. * gnu/packages/monitoring.scm (temper-exporter): New variable. --- gnu/packages/monitoring.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 75a422921c..81e3d9c156 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -508,6 +508,53 @@ written in Go with pluggable metric collectors.") (home-page "https://github.com/prometheus/node_exporter") (license license:asl2.0))) +(define-public temper-exporter + (let ((commit "a87bbab19c05609d62d9e4c7941178700c1ef84d") + (revision "0")) + (package + (name "temper-exporter") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yrro/temper-exporter") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0jk3ydi8s14q5kyl9j3gm2zrnwlb1jwjqpg5vqrgkbm9jrldrabc")))) + (build-system python-build-system) + (arguments + '(#:tests? #f ; One test failure: + ; test/test_exporter.py:33: + ; AssertionError + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-setup.py + (lambda _ + (substitute* "setup.py" + (("git_ref = .*\n") "git_ref = ''\n")) + #t)) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (install-file "debian/prometheus-temper-exporter.udev" + (string-append (assoc-ref outputs "out") + "/lib/udev/rules.d")) + #t))))) + (inputs + `(("python-prometheus-client" ,python-prometheus-client) + ("python-pyudev" ,python-pyudev))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-mock" ,python-pytest-mock) + ("python-pytest-runner" ,python-pytest-runner))) + (home-page "https://github.com/yrro/temper-exporter") + (synopsis "Prometheus exporter for PCSensor TEMPer sensor devices") + (description + "This package contains a Prometheus exporter for the TEMPer sensor +devices.") + (license license:expat)))) + (define-public fswatch (package (name "fswatch") -- cgit 1.4.1 From 21cdb35b609c0d5a4995126ee79ec6b71578d838 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 22 Feb 2021 16:46:55 -0500 Subject: gnu: isync: Update to 1.3.5 [fixes CVE-2021-20247]. * gnu/packages/mail.scm (isync): Update to 1.3.5. --- 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 2bd376a1a1..6b1dbdf92a 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath -;;; Copyright © 2016 Leo Famulari +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017 Troy Sankey @@ -1986,14 +1986,14 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (define-public isync (package (name "isync") - (version "1.3.3") + (version "1.3.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "10n8ykag0q3ws6fc15xqyg3v980v5nq3kzpablly2rh2z7vkn8gj")))) + "0mbnrwac0p9na307r7qigzcaga69xcih74ixhwmv0d6lvkjk5xb8")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 43cef0ba81aa5b7ba91173a66c2ca5f7fbb6b2da Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 22 Feb 2021 18:14:03 +0100 Subject: gnu: linux-libre-headers@5.11: Refer to 5.11, not 5.10. Fixes a typo introduced in b819512ca2cce1051c5fea26328da2e5d6a9a101. * gnu/packages/linux.scm (linux-libre-headers-5.11): Really refer to 5.11. --- 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 3346b94021..99f2be0318 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2021 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver @@ -587,8 +587,8 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (license license:gpl2))) (define-public linux-libre-headers-5.11 - (make-linux-libre-headers* linux-libre-5.10-version - linux-libre-5.10-source)) + (make-linux-libre-headers* linux-libre-5.11-version + linux-libre-5.11-source)) (define-public linux-libre-headers-5.10 (make-linux-libre-headers* linux-libre-5.10-version -- cgit 1.4.1 From d8c80c671bb7e836f464d159aede6bc0ca86ab36 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 22 Feb 2021 18:18:36 +0100 Subject: gnu: ocaml-llvm: Remove duplicate package. Commit 8f710cc598fb675d267f49a82cffc197f03ad52c introduced a duplicate ocaml-llvm@9.0.1 package, which was flagged by a test failure in tests/packages.scm. * gnu/packages/ocaml.scm (make-ocaml-llvm): Define as 'mlambdaq'. --- gnu/packages/ocaml.scm | 74 ++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index dec1f8405e..9e68359a42 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -87,6 +87,7 @@ #:use-module (guix packages) #:use-module (guix svn-download) #:use-module (guix utils) + #:use-module (guix memoization) #:use-module ((srfi srfi-1) #:hide (zip))) ;; A shortcut for files from ocaml forge. Downloaded files are computed from @@ -6198,41 +6199,44 @@ provides support to program with time varying values: declarative events and client chooses the concrete timeline.") (license license:lgpl2.1+))) -(define (make-ocaml-llvm llvm) - (package - (inherit llvm) - (name "ocaml-llvm") - (outputs '("out")) - (arguments - `(#:configure-flags - (list - (string-append "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=" - (assoc-ref %build-inputs "llvm") "/lib") - "-DBUILD_SHARED_LIBS=TRUE" - "-DLLVM_OCAML_OUT_OF_TREE=TRUE" - (string-append "-DLLVM_OCAML_INSTALL_PATH=" - (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "make" "ocaml_all"))) - (replace 'install - (lambda _ - (invoke "cmake" "-P" "bindings/ocaml/cmake_install.cmake")))))) - (inputs - `(("llvm" ,llvm))) - (native-inputs - `(("ocaml" ,ocaml) - ("ocaml-findlib" ,ocaml-findlib) - ("ocaml-ounit" ,ocaml-ounit) - ("python" ,python))) - (propagated-inputs - `(("ocaml-integers" ,ocaml-integers) - ("ocaml-ctypes" ,ocaml-ctypes))) - (synopsis "OCaml bindings to LLVM") - (description "This package contains the OCaml bindings distributed with -LLVM."))) +(define make-ocaml-llvm + ;; Make it a memoizing procedure so its callers below don't end up defining + ;; two equal-but-not-eq "ocaml-llvm" packages for the default LLVM. + (mlambdaq (llvm) + (package + (inherit llvm) + (name "ocaml-llvm") + (outputs '("out")) + (arguments + `(#:configure-flags + (list + (string-append "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=" + (assoc-ref %build-inputs "llvm") "/lib") + "-DBUILD_SHARED_LIBS=TRUE" + "-DLLVM_OCAML_OUT_OF_TREE=TRUE" + (string-append "-DLLVM_OCAML_INSTALL_PATH=" + (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "make" "ocaml_all"))) + (replace 'install + (lambda _ + (invoke "cmake" "-P" "bindings/ocaml/cmake_install.cmake")))))) + (inputs + `(("llvm" ,llvm))) + (native-inputs + `(("ocaml" ,ocaml) + ("ocaml-findlib" ,ocaml-findlib) + ("ocaml-ounit" ,ocaml-ounit) + ("python" ,python))) + (propagated-inputs + `(("ocaml-integers" ,ocaml-integers) + ("ocaml-ctypes" ,ocaml-ctypes))) + (synopsis "OCaml bindings to LLVM") + (description "This package contains the OCaml bindings distributed with +LLVM.")))) (define-public ocaml-llvm (make-ocaml-llvm llvm)) (define-public ocaml-llvm-9 (make-ocaml-llvm llvm-9)) -- cgit 1.4.1 From a239237b2fd7415095ee8e61576d471bd88f2f01 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Feb 2021 07:54:40 +0100 Subject: gnu: youtube-dl: Update to 2021.02.22. * gnu/packages/video.scm (youtube-dl): Update to 2021.02.22. --- 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 029b5b6ebb..86defcb239 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2196,14 +2196,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.01.16") + (version "2021.02.22") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1q8pvw5j45k8nvr3d9rvnhi6xaj1mdqlkrg7q7qq6zciq5r54fhi")) + "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From bdf72966660832a6e4b47216316b8620cad6dd9e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 23 Feb 2021 09:12:23 +0100 Subject: gnu: sbcl-trivial-clipboard: Update to 20210219. * gnu/packages/lisp-xyz.scm (sbcl-trivial-clipboard): Update to 20210219. --- gnu/packages/lisp-xyz.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4b99509900..17f8bbf091 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3563,10 +3563,10 @@ client and server.") (sbcl-package->cl-source-package sbcl-trivial-arguments)) (define-public sbcl-trivial-clipboard - (let ((commit "afcd3743b842f5a81fc86dba60f9db59970f49c5")) + (let ((commit "8a580cb97196be7cf096548eb1f46794cd22bb39")) (package (name "sbcl-trivial-clipboard") - (version (git-version "0.0.0.0" "3" commit)) + (version (git-version "0.0.0.0" "4" commit)) (source (origin (method git-fetch) @@ -3576,7 +3576,7 @@ client and server.") (file-name (git-file-name "trivial-clipboard" version)) (sha256 (base32 - "1qfbvkzmvkbqpc5s3sx31c5653sy6qlcixafgzd10qpykb843prr")))) + "0apkgqrscylw3hhm5x2vs0z3hz6h7zd7dl5y3wr2zl8qjpvpc80k")))) (build-system asdf-build-system/sbcl) (inputs `(("xclip" ,xclip))) @@ -3588,10 +3588,8 @@ client and server.") (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/text.lisp" - (("\\(executable-find \"xclip\"\\)") - (string-append "(executable-find \"" - (assoc-ref inputs "xclip") - "/bin/xclip\")")))))))) + (("\"xclip\"") + (string-append "\"" (assoc-ref inputs "xclip") "/bin/xclip\"")))))))) (home-page "https://github.com/snmsts/trivial-clipboard") (synopsis "Access system clipboard in Common Lisp") (description -- cgit 1.4.1 From 602f86d60bfd29bc4fd7f86fd9f92a37c0497f55 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 23 Feb 2021 09:25:40 +0100 Subject: gnu: sbcl-common-lisp-jupyter: Update to 20210217. * gnu/packages/lisp-xyz.scm (sbcl-common-lisp-jupyter): Update to 20210217. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 17f8bbf091..656404a5f5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14418,10 +14418,10 @@ and @code{doseq*}.") (sbcl-package->cl-source-package sbcl-trivial-do)) (define-public sbcl-common-lisp-jupyter - (let ((commit "61a9a8e7a18e2abd7af7c697ba5146fd19bd9d62")) + (let ((commit "011f60b69a3b8c70eefeafe7acb724cd00dd3e62")) (package (name "sbcl-common-lisp-jupyter") - (version (git-version "0.1" "1" commit)) + (version (git-version "0.1" "2" commit)) (source (origin (method git-fetch) @@ -14430,7 +14430,7 @@ and @code{doseq*}.") (commit commit))) (file-name (git-file-name name commit)) (sha256 - (base32 "0zyzl55l45w9z65ygi5pcwda5w5p1j1bb0p2zg2n5cpv8344dkh2")))) + (base32 "10jdghlcmp9p6ygrvw7g49i8f9jy71ybzn29n544fzb6g47siqhw")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit 1.4.1 From bebcf97600b2fa65482ae8ee870800dafa34d3f8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 22 Feb 2021 15:41:06 +0100 Subject: services: cuirass: Improve simple-cuirass-services. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of returning multiple services in simple-cuirass-services, rely on the instantiate-missing-services procedure to instantiate postgresql and postgresql-role-service-type when missing. Turn simple-cuirass-services procedure into simple-cuirass-configuration->specs, that takes a simple-cuirass-configuration record and returns a Cuirass specification. Suggested-by: Ludovic Courtès * gnu/services/cuirass.scm (%default-cuirass-config): Remove it. (simple-cuirass-services): Rename it to ... (simple-cuirass-configuration->specs): ... this procedure. * gnu/tests/cuirass.scm (cuirass-services): Remove postgresql and postgresql-role services that are automatically instantiated. (simple-cuirass-service): New variable. (%cuirass-simple-test): Adapt it to use simple-cuirass-configuration->specs instead of simple-cuirass-services. * doc/guix.texi (Simple Cuirass): Update it. --- doc/guix.texi | 62 ++++++++++++++++++++++++++++-------------------- gnu/services/cuirass.scm | 22 +++-------------- gnu/tests/cuirass.scm | 33 +++++++++++++------------- 3 files changed, 56 insertions(+), 61 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 5f55853159..1a467ce473 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -27145,11 +27145,15 @@ The Cuirass package to use. @subsubheading Simple Cuirass The Cuirass service configuration described above can be a little -intimidating. The @code{simple-cuirass-services} procedure offers a way -to setup a continuous integration server more readily. - -It takes a @code{simple-cuirass-configuration} record as its first -argument. +intimidating. In particular, getting the right @code{specifications} +can prove difficult. The @code{simple-cuirass-configuration->specs} +procedure offers a way to generate those @code{specifications} and thus +setup a continuous integration server more readily. + +@deffn {Scheme Procedure} simple-cuirass-configuration->specs @var{configuration} +This procedure takes a @code{simple-cuirass-configuration} record as +argument and returns the corresponding Cuirass specifications gexp. +@end deffn @deftp {Data Type} simple-cuirass-configuration Data type representing the configuration of a simple Cuirass instance. @@ -27195,13 +27199,16 @@ is re-evaluated each time a commit is pushed in one of the declared channels. @lisp -(simple-cuirass-services - (simple-cuirass-configuration - (build 'all) - (channels (cons (channel - (name 'my-guix) - (url "https://my-git-repo/guix.git")) - %default-channels)))) +(service cuirass-service-type + (cuirass-configuration + (specifications + (simple-cuirass-configuration->specs + (simple-cuirass-configuration + (build 'all) + (channels (cons (channel + (name 'my-guix) + (url "https://my-git-repo/guix.git")) + %default-channels))))))) @end lisp In the same spirit, this builds all the packages that are part of the @@ -27209,20 +27216,23 @@ In the same spirit, this builds all the packages that are part of the located in the @code{conf} channel. @lisp -(simple-cuirass-services - (simple-cuirass-configuration - (build (list - (build-manifest - (channel-name 'conf) - (manifest "guix/manifest.scm")))) - (channels (cons* (channel - (name 'my-guix) - (url "https://my-git-repo/guix.git")) - (channel - (name 'conf) - (url "https://my-git-repo/conf.git")) - %default-channels)) - (non-package-channels '(conf)))) +(service cuirass-service-type + (cuirass-configuration + (specifications + (simple-cuirass-configuration->specs + (simple-cuirass-configuration + (build (list + (build-manifest + (channel-name 'conf) + (manifest "guix/manifest.scm")))) + (channels (cons* (channel + (name 'my-guix) + (url "https://my-git-repo/guix.git")) + (channel + (name 'conf) + (url "https://my-git-repo/conf.git")) + %default-channels)) + (non-package-channels '(conf))))))) @end lisp Finally, @code{simple-cuirass-services} takes as a second optional diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 18163b59e2..b962f2f80a 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -60,8 +60,7 @@ simple-cuirass-configuration simple-cuirass-configuration? - %default-cuirass-config - simple-cuirass-services)) + simple-cuirass-configuration->specs)) ;;;; Commentary: ;;; @@ -419,13 +418,7 @@ CONFIG." (systems simple-cuirass-configuration-systems (default (list (%current-system))))) ;list of strings -(define %default-cuirass-config - (cuirass-configuration - (specifications #~()))) - -(define* (simple-cuirass-services config - #:optional - (cuirass %default-cuirass-config)) +(define* (simple-cuirass-configuration->specs config) (define (format-name name) (if (string? name) name @@ -475,13 +468,4 @@ CONFIG." (#:build-outputs . ()) (#:priority . 1)))) - (list - (service cuirass-service-type - (cuirass-configuration - (inherit cuirass) - (specifications #~(list - '#$(config->spec config))))) - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-10))) - (service postgresql-role-service-type))) + #~(list '#$(config->spec config))) diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 22eab3c456..e833a047ad 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -132,11 +132,7 @@ (remote-server (and remote-build? (cuirass-remote-server-configuration))) (host "0.0.0.0") - (use-substitutes? #t))) - (service postgresql-service-type - (postgresql-configuration - (postgresql postgresql-10))) - (service postgresql-role-service-type))) + (use-substitutes? #t))))) (define (run-cuirass-test name os) (define os* @@ -286,6 +282,20 @@ (description "Connect to a Cuirass server with remote build.") (value (run-cuirass-test name os))))) +(define simple-cuirass-service + (service cuirass-service-type + (cuirass-configuration + (specifications + (simple-cuirass-configuration->specs + (simple-cuirass-configuration + (build 'all) + (channels + (list (channel + (name 'guix) + (url "file:///tmp/cuirass-main/"))))))) + (host "0.0.0.0") + (use-substitutes? #t)))) + (define %cuirass-simple-test (let ((os (operating-system (inherit %simple-os) @@ -293,17 +303,8 @@ (append (list cow-service (service dhcp-client-service-type) - git-service) - (simple-cuirass-services - (simple-cuirass-configuration - (build 'all) - (channels (list (channel - (name 'guix) - (url "file:///tmp/cuirass-main/"))))) - (cuirass-configuration - (inherit %default-cuirass-config) - (host "0.0.0.0") - (use-substitutes? #t))) + git-service + simple-cuirass-service) (operating-system-user-services %simple-os)))))) (system-test (name "cuirass-simple") -- cgit 1.4.1 From 1a8cfb6d4c767d6cb19689404d7d0bca336ed0d6 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Feb 2021 11:00:18 +0100 Subject: services: postgresql-roles: Fix race condition. Make sure that the postgresql-roles script is completed before declaring the postgresql-roles service as started. * gnu/services/databases.scm (postgresql-create-roles): Return the command line instead of a program-file. (postgresql-role-shepherd-service): Use fork+exec-command to start the role creation script and wait for its completion before returning. --- gnu/services/databases.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 91ce503e82..979f3dd6c8 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -410,13 +410,8 @@ rolname = '" ,name "')) as not_exists;\n" (let ((host (postgresql-role-configuration-host config)) (roles (postgresql-role-configuration-roles config))) - (program-file - "postgresql-create-roles" - #~(begin - (let ((psql #$(file-append postgresql "/bin/psql"))) - (execl psql psql "-a" - "-h" #$host - "-f" #$(roles->queries roles))))))) + #~(let ((psql #$(file-append postgresql "/bin/psql"))) + (list psql "-a" "-h" #$host "-f" #$(roles->queries roles))))) (define (postgresql-role-shepherd-service config) (match-record config @@ -425,10 +420,14 @@ rolname = '" ,name "')) as not_exists;\n" (requirement '(postgres)) (provision '(postgres-roles)) (one-shot? #t) - (start #~(make-forkexec-constructor - (list #$(postgresql-create-roles config)) - #:user "postgres" #:group "postgres" - #:log-file #$log)) + (start + #~(lambda args + (let ((pid (fork+exec-command + #$(postgresql-create-roles config) + #:user "postgres" + #:group "postgres" + #:log-file #$log))) + (zero? (cdr (waitpid pid)))))) (documentation "Create PostgreSQL roles."))))) (define postgresql-role-service-type -- cgit 1.4.1 From f2b10e1b7f067538eaee9a578f8b3f7ae90b1521 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Feb 2021 11:22:22 +0100 Subject: services: cuirass: Fix services requirements. * gnu/services/cuirass.scm (cuirass-shepherd-service): Add "postgres-roles" to cuirass requirements. Set cuirass-web requirements to cuirass only. Remove "guix-daemon" and "networking" from cuirass-remote-server requirements as are already required by cuirass. --- gnu/services/cuirass.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index b962f2f80a..4d5e3a1041 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -150,7 +150,7 @@ `(,(shepherd-service (documentation "Run Cuirass.") (provision '(cuirass)) - (requirement '(guix-daemon postgres networking)) + (requirement '(guix-daemon postgres postgres-roles networking)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") "--cache-directory" #$cache-directory @@ -181,7 +181,7 @@ ,(shepherd-service (documentation "Run Cuirass web interface.") (provision '(cuirass-web)) - (requirement '(guix-daemon postgres networking)) + (requirement '(cuirass)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") "--cache-directory" #$cache-directory @@ -211,7 +211,7 @@ (shepherd-service (documentation "Run Cuirass remote build server.") (provision '(cuirass-remote-server)) - (requirement '(avahi-daemon cuirass guix-daemon networking)) + (requirement '(avahi-daemon cuirass)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/remote-server") (string-append "--database=" #$database) -- cgit 1.4.1 From ab054868afe6a4ba9d8aa9943e265bd6a871d0ae Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Feb 2021 11:24:47 +0100 Subject: tests: cuirass: Remove "cuirass running" test. * gnu/tests/cuirass.scm ("cuirass running"): Remove it as it fails if all the dependencies are not started yet. --- gnu/tests/cuirass.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index e833a047ad..4aa7a29cfb 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -191,15 +191,6 @@ (test-begin "cuirass") - ;; Wait for cuirass to be up and running. - (test-assert "cuirass running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'cuirass) - #t) - marionette)) - (test-assert "cuirass-web running" (begin (wait-for-tcp-port #$cuirass-web-port marionette) -- cgit 1.4.1 From 0de0074844f3391c7c85537f66bfcab288dce8dc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Feb 2021 11:54:53 +0100 Subject: tests: cuirass: Restore "cuirass running". This is a follow-up of ab054868afe6a4ba9d8aa9943e265bd6a871d0ae. The test was failing because the Shepherd control socket wasn't ready yet. Restore it but make sure that the control socket is available first. * gnu/tests/cuirass.scm ("shepherd socket ready"): New test. ("cuirass running"): Restore it. --- gnu/tests/cuirass.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 4aa7a29cfb..04a7a71dcf 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -191,6 +191,32 @@ (test-begin "cuirass") + ;; XXX: Shepherd reads the config file *before* binding its + ;; control socket, so /var/run/shepherd/socket might not exist yet + ;; when the 'marionette' service is started. + (test-assert "shepherd socket ready" + (marionette-eval + `(begin + (use-modules (gnu services herd)) + (let loop ((i 10)) + (cond ((file-exists? (%shepherd-socket-file)) + #t) + ((> i 0) + (sleep 1) + (loop (- i 1))) + (else + 'failure)))) + marionette)) + + ;; Wait for cuirass to be up and running. + (test-assert "cuirass running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (start-service 'cuirass) + #t) + marionette)) + (test-assert "cuirass-web running" (begin (wait-for-tcp-port #$cuirass-web-port marionette) -- cgit 1.4.1 From b4f28584d3b2844a91fe9690c8437b5b260d3cc1 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Feb 2021 12:39:15 +0100 Subject: gnu: cli11: Remove (guix utils) dependency. * gnu/packages/cpp.scm (cli11)[arguments]: Do not import (guix utils) that is not meant to go on the build side. --- gnu/packages/cpp.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index abb50d81b2..685dc02fca 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -928,17 +928,18 @@ conversions to and from strings, iteration and related functionality.") `(#:configure-flags '("-DCLI11_SINGLE_FILE=OFF" "-DCLI11_BUILD_EXAMPLES=OFF") - #:imported-modules ,(append %cmake-build-system-modules - (source-module-closure '((guix utils)))) + #:imported-modules ,%cmake-build-system-modules + #:modules ((guix build cmake-build-system) + (guix build utils)) #:phases (modify-phases %standard-phases (add-before 'configure 'no-vendor-gtest (lambda _ - (use-modules (guix utils)) (substitute* "tests/CMakeLists.txt" - ;; We provide our own googletest, so this is not really a problem. - (("message\\(FATAL_ERROR \"You have requested tests be built, but googletest is not downloaded." msg) - (string-replace-substring msg "FATAL_ERROR" "TRACE"))) + ;; We provide our own googletest, so this is not really a + ;; problem. + (("message\\(FATAL_ERROR \"You have requested") + "message(TRACE \"You have requested")) (substitute* "cmake/AddGoogletest.cmake" (("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)") (("^set_target_properties\\(gtest gtest_main gmock gmock_main") "") -- cgit 1.4.1 From d2299fe38a93c58c2a18861afecbb9b7b4e7f904 Mon Sep 17 00:00:00 2001 From: Masaya Tojo Date: Tue, 23 Feb 2021 19:54:22 +0900 Subject: gnu: Add emacs-ido-at-point. * gnu/packages/emacs-xyz.scm (emacs-ido-at-point): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 71564dcd0c..e2c069a032 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -60,7 +60,7 @@ ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Evan Straw -;;; Copyright © 2020 Masaya Tojo +;;; Copyright © 2020, 2021 Masaya Tojo ;;; Copyright © 2020, 2021 Martin Becze ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Brice Waegeneire @@ -18027,6 +18027,27 @@ bookmarks and history.") "This package provides an Emacs interface for IETF RFC document.") (license license:gpl3+))) +(define-public emacs-ido-at-point + (package + (name "emacs-ido-at-point") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/katspaugh/ido-at-point") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp")))) + (build-system emacs-build-system) + (synopsis "Ido-style completion at point") + (description + "This package is an alternative frontend for @code{completion-at-point}. +It replaces the standard completions buffer with Ido prompt.") + (home-page "https://github.com/katspaugh/ido-at-point") + (license license:gpl3+))) + (define-public emacs-ido-vertical-mode (package (name "emacs-ido-vertical-mode") -- cgit 1.4.1 From 25f00a2e443685bda2556aa18ab59df4be698796 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Sun, 21 Feb 2021 22:12:34 +0000 Subject: gnu: stockfish: Update to 13. * gnu/packages/games.scm (stockfish): Update to 13. [inputs]: Update neural network file. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6726cef303..99349eb66f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2020 Tomás Ortín Fernández ;;; Copyright © 2021 Olivier Rojon ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -11812,7 +11813,7 @@ etc. You can also play games on FICS or against an engine.") (define-public stockfish (package (name "stockfish") - (version "12") + (version "13") (source (origin (method git-fetch) @@ -11821,15 +11822,15 @@ etc. You can also play games on FICS or against an engine.") (commit (string-append "sf_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vcymbwp5nf114pp3ax40s21ki5dckda15vmhr77d1mnq3fn0l32")))) + (base32 "15dfp9fnl3w7dgxhqmsm461amsysn646rj1arnzvwhy2i6ijhg2m")))) (build-system gnu-build-system) (inputs `(("neural-network" ,(origin (method url-fetch) - (uri "https://tests.stockfishchess.org/api/nn/nn-82215d0fd0df.nnue") + (uri "https://tests.stockfishchess.org/api/nn/nn-62ef826d1a6d.nnue") (sha256 - (base32 "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2")))))) + (base32 "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2")))))) (arguments `(#:tests? #f #:make-flags (list "-C" "src" @@ -11851,7 +11852,7 @@ etc. You can also play games on FICS or against an engine.") (add-after 'unpack 'copy-net (lambda* (#:key inputs #:allow-other-keys) (copy-file (assoc-ref inputs "neural-network") - "src/nn-82215d0fd0df.nnue") + "src/nn-62ef826d1a6d.nnue") #t))))) (synopsis "Strong chess engine") (description -- cgit 1.4.1 From b76723041becf0917e8ebfdacd0452eefd0a2730 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 14:59:31 +0200 Subject: gnu: ruby-protobuf: Add missing input. * gnu/packages/protobuf.scm (ruby-protobuf)[propagated-inputs]: Add ruby-thread-safe. --- gnu/packages/protobuf.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index 61dee46d43..995d543059 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -394,7 +394,8 @@ source files.") (propagated-inputs `(("ruby-activesupport" ,ruby-activesupport) ("ruby-middleware" ,ruby-middleware) - ("ruby-thor" ,ruby-thor))) + ("ruby-thor" ,ruby-thor) + ("ruby-thread-safe" ,ruby-thread-safe))) (home-page "https://github.com/ruby-protobuf/protobuf") (synopsis "Implementation of Google's Protocol Buffers in Ruby") (description "Protobuf is an implementation of Google's Protocol Buffers -- cgit 1.4.1 From ae17c6c31da82d98e429751642bcf7a7cca142f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:05:37 +0200 Subject: gnu: Add ruby-mini-mime. * gnu/packages/ruby.scm (ruby-mini-mime): New variable. --- gnu/packages/ruby.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index fb0396dc52..d374e40b1c 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8823,6 +8823,23 @@ definitions.") (home-page "https://github.com/mime-types/ruby-mime-types") (license license:expat))) +(define-public ruby-mini-mime + (package + (name "ruby-mini-mime") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "mini_mime" version)) + (sha256 + (base32 + "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha")))) + (build-system ruby-build-system) + (synopsis "Lightweight mime type lookup toy") + (description "This package provides a lightweight mime type lookup toy.") + (home-page "https://github.com/discourse/mini_mime") + (license license:expat))) + (define-public ruby-fivemat (package (name "ruby-fivemat") -- cgit 1.4.1 From ab4b6ae6afb69dd142641225626512691abd9c88 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:06:55 +0200 Subject: gnu: ruby-mail: Update to 2.7.1. * gnu/packages/ruby.scm (ruby-mail): Update to 2.7.1. [propagated-inputs]: Remove ruby-mime-types, add ruby-mini-mime. [arguments]: Adjust comment about skipping tests. --- gnu/packages/ruby.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index d374e40b1c..9d394eef29 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -10077,21 +10077,19 @@ of the more insecure basic authentication scheme.") (define-public ruby-mail (package (name "ruby-mail") - (version "2.6.6") + (version "2.7.1") (source (origin (method url-fetch) (uri (rubygems-uri "mail" version)) (sha256 (base32 - "0d7lhj2dw52ycls6xigkfz6zvfhc6qggply9iycjmcyj9760yvz9")))) + "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc")))) (build-system ruby-build-system) (propagated-inputs - `(("ruby-mime-types" ,ruby-mime-types))) + `(("ruby-mini-mime" ,ruby-mini-mime))) (arguments - ;; Tests require extra gems not included in the Gemfile. - ;; XXX: Try enabling this for the next version with mini_mime. - `(#:tests? #f)) + '(#:tests? #f)) ; no rakefile (synopsis "Mail library for Ruby") (description "Mail is an internet library for Ruby that is designed to handle email -- cgit 1.4.1 From 8bb7ebc3d8c0b5a5980bf18421a2e981ca25fa27 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:08:41 +0200 Subject: gnu: ruby-loofah: Update to 2.3.1. * gnu/packages/ruby.scm (ruby-loofah): Update to 2.3.1. [arguments]: Adjust custom 'remove-unnecessary-dependencies phase for upstream changes. --- gnu/packages/ruby.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9d394eef29..df8d097444 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6335,14 +6335,14 @@ you about the changes.") (define-public ruby-loofah (package (name "ruby-loofah") - (version "2.2.3") + (version "2.3.1") (source (origin (method url-fetch) (uri (rubygems-uri "loofah" version)) (sha256 (base32 - "1ccsid33xjajd0im2xv941aywi58z7ihwkvaf1w2bv89vn5bhsjg")))) + "0npqav026zd7r4qdidq9x5nxcp2dzg71bnp421xxx7sngbxf2xbd")))) (build-system ruby-build-system) (arguments '(#:phases @@ -6351,11 +6351,9 @@ you about the changes.") (lambda _ ;; concourse is a development tool which is unused, so remove it ;; so it's not required. - (substitute* "Gemfile" - ((".*\"concourse\".*") "\n")) (substitute* "Rakefile" - (("require 'concourse'") "") - (("Concourse\\.new.*") "\n")) + (("require \"concourse\"") "") + (("Concourse\\.new.*") "task :concourse do\n")) #t))))) (native-inputs `(("ruby-hoe" ,ruby-hoe) -- cgit 1.4.1 From 945d5d039ac81489eba40c35ef6ea53ba8b26f7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:09:58 +0200 Subject: gnu: ruby-rails-dom-testing: Update to 2.0.3. * gnu/packages/rails.scm (ruby-rails-dom-testing): Update to 2.0.3. --- gnu/packages/rails.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 42cc240f1c..d61e351e9b 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2018 Tobias Geerinckx-Rice -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -285,7 +285,7 @@ directly.") (define-public ruby-rails-dom-testing (package (name "ruby-rails-dom-testing") - (version "2.0.2") + (version "2.0.3") (source (origin (method git-fetch) @@ -295,7 +295,7 @@ directly.") (file-name (git-file-name name version)) (sha256 (base32 - "0zrg6x1w3wjgklbhcphjmggl11jx5s8cl21qjqij7wknm412i5wl")))) + "17vdh273cmmfpzy5m546dd13zqmimv54jjx0f7sl0zi5lwz0gnck")))) (build-system ruby-build-system) (native-inputs `(("bundler" ,bundler))) -- cgit 1.4.1 From 6519e611293fd1b89dd3085fdbb99d8887116170 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:10:44 +0200 Subject: gnu: ruby-rails-html-sanitizer: Update to 1.3.0. * gnu/packages/rails.scm (ruby-rails-html-sanitizer): Update to 1.3.0. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index d61e351e9b..6adfe8e29e 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -260,14 +260,14 @@ applications, in pace of the default Minitest testing library.") (define-public ruby-rails-html-sanitizer (package (name "ruby-rails-html-sanitizer") - (version "1.0.4") + (version "1.3.0") (source (origin (method url-fetch) (uri (rubygems-uri "rails-html-sanitizer" version)) (sha256 (base32 - "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr")))) + "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f")))) (build-system ruby-build-system) (arguments '(;; No included tests -- cgit 1.4.1 From 76e1093b2bbd4f8ad49ed100e5cafe3dc7eb1783 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:13:08 +0200 Subject: gnu: ruby-tzinfo: Update to 2.0.4. * gnu/packages/ruby.scm (ruby-tzinfo): Update to 2.0.4. [source]: Download using git-fetch. [arguments]: Add custom 'pre-check, 'check phases. [propagated-inputs]: Remove ruby-thread-safe, add ruby-concurrent. [native-inputs]: Add ruby-simplecov. --- 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 df8d097444..dc38171176 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5770,14 +5770,18 @@ utilities for Ruby.") (define-public ruby-tzinfo (package (name "ruby-tzinfo") - (version "1.2.4") + (version "2.0.4") (source (origin - (method url-fetch) - (uri (rubygems-uri "tzinfo" version)) + (method git-fetch) + (uri (git-reference + ;; Pull from git because the gem has no tests. + (url "https://github.com/tzinfo/tzinfo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp")))) + "0jaq1givdaz5jxz47xngyj3j315n872rk97mnpm5njwm48wy45yh")))) (build-system ruby-build-system) (arguments '(#:phases @@ -5788,9 +5792,22 @@ utilities for Ruby.") (("def safe_test\\(options = \\{\\}\\)") "def safe_test(options = {}) skip('The Guix build environment has an unsafe load path')")) + #t)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + (substitute* "Gemfile" + (("simplecov.*") "simplecov'\n")) + #t)) + (replace 'check + (lambda* (#:key tests? test-target #:allow-other-keys) + (when tests? + (invoke "bundler" "exec" "rake" test-target)) #t))))) (propagated-inputs - `(("ruby-thread-safe" ,ruby-thread-safe))) + `(("ruby-concurrent-ruby" ,ruby-concurrent))) + (native-inputs + `(("ruby-simplecov" ,ruby-simplecov))) (synopsis "Time zone library for Ruby") (description "TZInfo is a Ruby library that provides daylight savings aware transformations between times in different time zones.") -- cgit 1.4.1 From ebd8e447e99c4847bc5cdb5738ac5413a7278ba2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:15:02 +0200 Subject: gnu: ruby-tzinfo-data: Update to 1.2021.1. * gnu/packages/ruby.scm (ruby-tzinfo-data): Update to 1.2021.1. [source]: Remove patch. [arguments]: Add custom 'patch-source, 'pre-check phases. [native-inputs]: Add IANA timezone data files. * gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../ruby-tzinfo-data-ignore-broken-test.patch | 13 ----- gnu/packages/ruby.scm | 61 +++++++++++++++++++--- 3 files changed, 54 insertions(+), 21 deletions(-) delete mode 100644 gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b8bccc1b7c..3591295f0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1598,7 +1598,6 @@ dist_patch_DATA = \ %D%/packages/patches/rnp-unbundle-googletest.patch \ %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ - %D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\ %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \ diff --git a/gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch b/gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch deleted file mode 100644 index 5d1f04b994..0000000000 --- a/gnu/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/tc_definitions.rb b/test/tc_definitions.rb -index 7b20a3d..75b9798 100644 ---- a/test/tc_definitions.rb -+++ b/test/tc_definitions.rb -@@ -58,7 +58,7 @@ class TCDefinitions < Minitest::Test - identifier = $3.to_sym - is_dst = $4 == '1' - -- if utc && local -+ if utc && local && !line.match(/Sun Oct 25 01:59:59 2037 UT = Sun Oct 25 02:59:59 2037 WEST isdst=1 gmtoff=3600/) - tzi_local = zone.utc_to_local(utc) - tzi_period = zone.period_for_utc(utc) - tzi_identifier = tzi_period.zone_identifier diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index dc38171176..bd25bd5373 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -78,6 +78,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages xml) @@ -5817,7 +5818,7 @@ aware transformations between times in different time zones.") (define-public ruby-tzinfo-data (package (name "ruby-tzinfo-data") - (version "1.2017.3") + (version "1.2021.1") (source (origin (method git-fetch) @@ -5829,15 +5830,61 @@ aware transformations between times in different time zones.") (file-name (git-file-name name version)) (sha256 (base32 - "0v3phl5l3jrm6waxcszqmj2dkjhqawxfsxb6mss7vkp1hlckqcdp")) - ;; Remove the known test failure. - ;; https://github.com/tzinfo/tzinfo-data/issues/10 - ;; https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1587128 - (patches (search-patches - "ruby-tzinfo-data-ignore-broken-test.patch")))) + "0yzyr3rf8qaw6kxfc0gwpxsb7gl3rhfpx9g1c2z15vapyminhi60")))) (build-system ruby-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Rakefile" + (("https://data.iana.org/time-zones/releases") + (assoc-ref inputs "tzdata"))) + #t)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + (substitute* "Rakefile" + ;; Don't need gpg, and it may break after a time. + (("gpg ") "echo ") + ((" sh\\(\\\"make -C" text) + (string-append " sh(\"sed -i 's@/bin/sh@sh@' #{tzdb_combined_path}/Makefile \")\n" + " sh(\"sed -i 's@cc=@cc?=@' #{tzdb_combined_path}/Makefile \")\n" text))) + (setenv "cc" ,(cc-for-target)) + #t))))) (propagated-inputs `(("ruby-tzinfo" ,ruby-tzinfo))) + (native-inputs + `(("tzdata" + ,(file-union "tzdata-for-ruby-tzdata-info" + `(("tzdata2021a.tar.gz" + ,(origin + (method url-fetch) + (uri "https://data.iana.org/time-zones/releases/tzdata2021a.tar.gz") + (sha256 + (base32 + "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr")))) + ("tzdata2021a.tar.gz.asc" + ,(origin + (method url-fetch) + (uri "https://data.iana.org/time-zones/releases/tzdata2021a.tar.gz.asc") + (sha256 + (base32 + "0n7h2w8ji1lrxpk0d44wyfshlhr7c9jmwj6lqbxlyvqnfi3gbicx")))) + ("tzcode2021a.tar.gz" + ,(origin + (method url-fetch) + (uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz") + (sha256 + (base32 + "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))) + ("tzcode2021a.tar.gz.asc" + ,(origin + (method url-fetch) + (uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc") + (sha256 + (base32 + "1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))))))) (synopsis "Data from the IANA Time Zone database") (description "This library provides @code{TZInfo::Data}, which contains data from the -- cgit 1.4.1 From fa0a244138196604cb735691493bed5c71477248 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:25:14 +0200 Subject: gnu: ruby-web-console: Update to 4.1.0. * gnu/packages/rails.scm (ruby-web-console): Update to 4.1.0. --- gnu/packages/rails.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 6adfe8e29e..5a0f3f94b3 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -527,7 +527,7 @@ application bootup, plugins, generators, and Rake tasks.") (define-public ruby-web-console (package (name "ruby-web-console") - (version "3.7.0") + (version "4.1.0") (source (origin ;; Download from GitHub as test files are not provided in the gem. @@ -538,7 +538,7 @@ application bootup, plugins, generators, and Rake tasks.") (file-name (git-file-name name version)) (sha256 (base32 - "0ir999p8cnm3l3zwbgpwxxcq1vwkj8d0d3r24362cyaf4v1rglq2")))) + "0azk8nmimnjbh74vxgwcj9jr588rj7kb5rrlclcjfjsw9jqjzckc")))) (build-system ruby-build-system) (arguments '(#:phases -- cgit 1.4.1 From 8bad3c8ddf9f71000bd6339ac33d98d6f0e8f12c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:26:11 +0200 Subject: gnu: Add ruby-zeitwerk. * gnu/packages/ruby.scm (ruby-zeitwerk): New variable. --- gnu/packages/ruby.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index bd25bd5373..1a86862ebd 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12112,6 +12112,35 @@ which snapshots to consider and what files to include.") "https://github.com/hartator/wayback-machine-downloader") (license license:expat))) +(define-public ruby-zeitwerk + (package + (name "ruby-zeitwerk") + (version "2.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; No tests in the released gem. + (url "https://github.com/fxn/zeitwerk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "119fgdyb57gmss2yvfwfr47wcy8nny38sai72446krpihyavpizw")))) + (build-system ruby-build-system) + (native-inputs + `(("ruby-minitest" ,ruby-minitest) + ("ruby-minitest-focus" ,ruby-minitest-focus) + ("ruby-minitest-reporters" ,ruby-minitest-reporters))) + (synopsis "Efficient and thread-safe code loader for Ruby") + (description + "Zeitwerk implements constant autoloading with Ruby semantics. Each gem +and application may have their own independent autoloader, with its own +configuration, inflector, and logger. Supports autoloading, reloading, and +eager loading.") + (home-page "https://github.com/fxn/zeitwerk") + (license license:expat))) + (define-public ruby-wwtd (package (name "ruby-wwtd") -- cgit 1.4.1 From c2fdc528dde477c74a59954b925b69c12a3f208c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:29:13 +0200 Subject: gnu: ruby-rack: Update to 2.2.3. * gnu/packages/ruby.scm (ruby-rack): Update to 2.2.3. [source]: Remove patch. Add snippet. [arguments]: Adjust custom 'fix-tests phase. Remove 'make-files-writable phase. [native-inputs]: Remove ruby-minitest-sprint, which. Add ruby-minitest-global-expectations. [propagated-inputs]: Remove ruby-concurrent. * gnu/packages/patches/ruby-rack-ignore-failing-test.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - .../patches/ruby-rack-ignore-failing-test.patch | 13 --------- gnu/packages/ruby.scm | 34 +++++++++------------- 3 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/ruby-rack-ignore-failing-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3591295f0c..a9294047eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1596,7 +1596,6 @@ dist_patch_DATA = \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ - %D%/packages/patches/ruby-rack-ignore-failing-test.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/runc-CVE-2019-5736.patch \ %D%/packages/patches/rust-1.19-mrustc.patch \ diff --git a/gnu/packages/patches/ruby-rack-ignore-failing-test.patch b/gnu/packages/patches/ruby-rack-ignore-failing-test.patch deleted file mode 100644 index f50d68c9c4..0000000000 --- a/gnu/packages/patches/ruby-rack-ignore-failing-test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/spec_server.rb b/test/spec_server.rb -index a3690bc..16c9536 100644 ---- a/test/spec_server.rb -+++ b/test/spec_server.rb -@@ -161,7 +161,7 @@ describe Rack::Server do - it "check pid file presence and not owned process" do - pidfile = Tempfile.open('pidfile') { |f| f.write(1); break f }.path - server = Rack::Server.new(:pid => pidfile) -- server.send(:pidfile_process_status).must_equal :not_owned -+ #server.send(:pidfile_process_status).must_equal :not_owned - end - - it "not write pid file when it is created after check" do diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1a86862ebd..8f3166ff31 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -45,7 +45,6 @@ (define-module (gnu packages ruby) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) - #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages c) #:use-module (gnu packages check) @@ -6890,21 +6889,25 @@ generates Ruby program.") (define-public ruby-rack (package (name "ruby-rack") - (version "2.0.6") + (version "2.2.3") (source (origin (method git-fetch) - ;; Download from GitHub so that the patch can be applied. + ;; Download from GitHub so that the snippet can be applied and tests run. (uri (git-reference (url "https://github.com/rack/rack") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1n7z4g1x6yxip096cdc04wq7yk7ywpinq28g2xjb46r4nlv5h0j6")) + "1qrm5z5v586738bnkr9188dvz0s25nryw6sgvx18jjlkizayw1g4")) ;; Ignore test which fails inside the build environment but works ;; outside. - (patches (search-patches "ruby-rack-ignore-failing-test.patch")))) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "test/spec_files.rb" + (("res.body.must_equal expected_body") "")) + #t)))) (build-system ruby-build-system) (arguments '(#:phases @@ -6918,30 +6921,19 @@ generates Ruby program.") ;; "/gnu/store". (let ((size-diff (- (string-length (which "ruby")) (string-length "/usr/bin/env ruby")))) - (substitute* '("test/spec_file.rb") - (("193") - (number->string (+ 193 size-diff))) + (substitute* '("test/spec_files.rb") + (("208" bytes) + (number->string (+ (string->number bytes) size-diff))) (("bytes(.)22-33" all delimiter) (string-append "bytes" delimiter (number->string (+ 22 size-diff)) "-" (number->string (+ 33 size-diff)))))) - #t)) - (add-before 'reset-gzip-timestamps 'make-files-writable - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure .gz files are writable so that the - ;; 'reset-gzip-timestamps' phase can do its work. - (let ((out (assoc-ref outputs "out"))) - (for-each make-file-writable - (find-files out "\\.gz$")) - #t)))))) + #t))))) (native-inputs `(("ruby-minitest" ,ruby-minitest) - ("ruby-minitest-sprint" ,ruby-minitest-sprint) - ("which" ,which))) - (propagated-inputs - `(("ruby-concurrent" ,ruby-concurrent))) + ("ruby-minitest-global-expectations" ,ruby-minitest-global-expectations))) (synopsis "Unified web application interface for Ruby") (description "Rack provides a minimal, modular and adaptable interface for developing web applications in Ruby. By wrapping HTTP requests and responses, -- cgit 1.4.1 From 3c548c3e0eade12d3e86b1201dbd95863ca64ea7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Feb 2021 15:35:49 +0200 Subject: gnu: ruby-rails: Update to 6.1.3. * gnu/packages/rails.scm (ruby-activemodel, ruby-activerecord, ruby-actionview, ruby-actionpack, ruby-actioncable, ruby-activejob, ruby-activestorage, ruby-actionmailer, ruby-railties, ruby-rails): Update to 6.1.3. (ruby-actiontext, ruby-actionmailbox): New variables. (ruby-actioncable)[propagated-inputs]: Add ruby-activesupport. (ruby-activestorage)[propagated-inputs]: Add ruby-activejob, ruby-activesupport, ruby-mimemagic. (ruby-actionmailer)[propagated-inputs]: Add ruby-activesupport. (ruby-railties)[propagated-inputs]: Add ruby-rake. (ruby-rails)[propagated-inputs]: Add ruby-actionmailbox, ruby-actiontext. * gnu/packages/ruby.scm (ruby-activesupport): Update to 6.1.3. [propagated-inputs]: Add ruby-zeitwerk. [home-page]: Use https. --- gnu/packages/rails.scm | 117 +++++++++++++++++++++++++++++++++++++------------ gnu/packages/ruby.scm | 9 ++-- 2 files changed, 95 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index 5a0f3f94b3..e9c390a1a0 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -180,14 +180,14 @@ Can I Use website.") (define-public ruby-activemodel (package (name "ruby-activemodel") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activemodel" version)) (sha256 (base32 - "1idmvqvpgri34k31s44pjb88rc3jad3yxra7fd1kpidpnv5f3v65")))) + "07m85r00cd1dzxg65zr9wjrdqppw51b5ka9c5mrz92vnw18kfb70")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -205,14 +205,14 @@ serialization, internationalization, and testing.") (define-public ruby-activerecord (package (name "ruby-activerecord") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activerecord" version)) (sha256 (base32 - "1c5cz9v7ggpqjxf0fqs1xhy1pb9m34cp31pxarhs9aqb71qjl98v")))) + "03kr6vslwd9iw89jidjpjlp7prr2rf7kpsfa4fz03g9by0kliivs")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -309,17 +309,44 @@ useful when writing tests.") (home-page "https://github.com/rails/rails-dom-testing") (license license:expat))) +(define-public ruby-actiontext + (package + (name "ruby-actiontext") + (version "6.1.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actiontext" version)) + (sha256 + (base32 + "04k4z4xj40sbzbgx0x9m6i8k0nc22jb6dkrlslj16p2z2dfnwhqg")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-activestorage" ,ruby-activestorage) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-nokogiri" ,ruby-nokogiri))) + (synopsis "Edit and display rich text in Rails applications") + (description + "ActionText edits and displays rich text in Rails applications.") + (home-page "https://rubyonrails.org") + (license license:expat))) + (define-public ruby-actionview (package (name "ruby-actionview") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "actionview" version)) (sha256 (base32 - "0832vlx37rly8ryfgi01b20mld8b3bv9cg62n5wax4zpzgn6jdxb")))) + "1s5kc1abi7id1g54lz1npgc42zl7pbz172wp8pi7j3s7qljafzw5")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -340,14 +367,14 @@ Ruby.") (define-public ruby-actionpack (package (name "ruby-actionpack") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "actionpack" version)) (sha256 (base32 - "1lxqzxa728dqg42yw0q4hqkaawqagiw1k0392an2ghjfgb16pafx")))) + "030yyaskzlic5cp4d9zbwwr3rhf4k6hsls44a7ihsfd6r8mlivq5")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -369,20 +396,21 @@ applications. These work with any Rack-compatible server.") (define-public ruby-actioncable (package (name "ruby-actioncable") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "actioncable" version)) (sha256 (base32 - "1x5fxhsr2mxq5r6258s48xsn7ld081d3qaavppvj7yp7w9vqn871")))) + "1cgb1l0gml1vklxka2djpi5q5b4bgzgm5pahzfjvvgm5vzvrvi9v")))) (build-system ruby-build-system) (arguments '(;; No included tests #:tests? #f)) (propagated-inputs `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activesupport" ,ruby-activesupport) ("ruby-nio4r" ,ruby-nio4r) ("ruby-websocket-driver" ,ruby-websocket-driver))) (synopsis "Integrate integrates WebSockets with Rails applications") @@ -395,14 +423,14 @@ WebSockets it allows for real-time features in web applications.") (define-public ruby-activejob (package (name "ruby-activejob") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activejob" version)) (sha256 (base32 - "1zma452lc3qp4a7r10zbdmsci0kv9a3gnk4da2apbdrc8fib5mr3")))) + "175d8q0achdlsxjsvq0w9znvfqfkgbj75kbmdrvg4fb277wwplmf")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -420,40 +448,71 @@ applications.") (define-public ruby-activestorage (package (name "ruby-activestorage") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activestorage" version)) (sha256 (base32 - "155xpbzrz0kr0argx0vsh5prvadd2h1g1m61kdiabvfy2iygc02n")))) + "0gkxvbi5w8zmdxpiyz3b10kzz8cxqqh9bj81sjl3fp8wa3v2ld4i")))) (build-system ruby-build-system) (arguments '(;; No included tests #:tests? #f)) (propagated-inputs `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activejob" ,ruby-activejob) ("ruby-activerecord" ,ruby-activerecord) - ("ruby-marcel" ,ruby-marcel))) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-marcel" ,ruby-marcel) + ("ruby-mimemagic" ,ruby-mimemagic))) (synopsis "Integrate file storage services in to Rails applications") (description "ActiveStorage integrates file storage services with Rails applications, -allowing files to be attached to ActiveRecord models..") +allowing files to be attached to ActiveRecord models.") (home-page "https://rubyonrails.org/") (license license:expat))) +(define-public ruby-actionmailbox + (package + (name "ruby-actionmailbox") + (version "6.1.3") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "actionmailbox" version)) + (sha256 + (base32 + "0wv2p24xn4f0kj8kiyagkn934hzrcp98vzjqxwd4r75qq0cijadp")))) + (build-system ruby-build-system) + (arguments + '(;; No included tests + #:tests? #f)) + (propagated-inputs + `(("ruby-actionpack" ,ruby-actionpack) + ("ruby-activejob" ,ruby-activejob) + ("ruby-activerecord" ,ruby-activerecord) + ("ruby-activestorage" ,ruby-activestorage) + ("ruby-activesupport" ,ruby-activesupport) + ("ruby-mail" ,ruby-mail))) + (synopsis "Receive and process incoming emails in Rails applications") + (description + "ActionMailbox receives and processes incoming emails in Rails applications.") + (home-page "https://rubyonrails.org") + (license license:expat))) + (define-public ruby-actionmailer (package (name "ruby-actionmailer") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "actionmailer" version)) (sha256 (base32 - "10n2v2al68rsq5ghrdp7cpycsc1q0m19fcd8cd5i528n30nl23iw")))) + "0lic4mc6wqi3p9ipdqljl64vd9ndabm0k8hww0m07sfdhwsl5ba9")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -462,6 +521,7 @@ allowing files to be attached to ActiveRecord models..") `(("ruby-actionpack" ,ruby-actionpack) ("ruby-actionview" ,ruby-actionview) ("ruby-activejob" ,ruby-activejob) + ("ruby-activesupport" ,ruby-activesupport) ("ruby-mail" ,ruby-mail) ("ruby-rails-dom-testing" ,ruby-rails-dom-testing))) (synopsis "Work with emails using the controller/view pattern") @@ -474,14 +534,14 @@ pattern. Including support for multipart email and attachments.") (define-public ruby-railties (package (name "ruby-railties") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "railties" version)) (sha256 (base32 - "0al6mvh2jvr3n7cxkx0yvhgiiarby6gxc93vl5xg1yxkvx27qzd6")))) + "1685y5dcfgcq0b38j13vrpkhiiblmrl64wa9w065669bkgmkw4ra")))) (build-system ruby-build-system) (arguments '(;; No included tests @@ -490,6 +550,7 @@ pattern. Including support for multipart email and attachments.") `(("ruby-actionpack" ,ruby-actionpack) ("ruby-activesupport" ,ruby-activesupport) ("ruby-method-source" ,ruby-method-source) + ("ruby-rake" ,ruby-rake) ("ruby-thor" ,ruby-thor))) (synopsis "Rails internals, including application bootup and generators") (description @@ -605,14 +666,14 @@ for locks.") (define-public ruby-rails (package (name "ruby-rails") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "rails" version)) (sha256 (base32 - "1jxmwrykwgbn116hhmi7h75hcsdifhj89wk12m7ch2f3mn1lrmp9")))) + "0hdancysa617lzyy5gmrcmnpgyb1mz1lawy0l34ycz2wary7y2bz")))) (build-system ruby-build-system) (arguments '(#:phases @@ -635,17 +696,19 @@ for locks.") (invoke "ruby" "-e" "gem 'rails'")) #t))))) (propagated-inputs - `(("ruby-activesupport" ,ruby-activesupport) + `(("ruby-actioncable" ,ruby-actioncable) + ("ruby-actionmailbox" ,ruby-actionmailbox) + ("ruby-actionmailer" ,ruby-actionmailer) ("ruby-actionpack" ,ruby-actionpack) + ("ruby-actiontext" ,ruby-actiontext) ("ruby-actionview" ,ruby-actionview) + ("ruby-activejob" ,ruby-activejob) ("ruby-activemodel" ,ruby-activemodel) ("ruby-activerecord" ,ruby-activerecord) - ("ruby-actionmailer" ,ruby-actionmailer) - ("ruby-activejob" ,ruby-activejob) - ("ruby-actioncable" ,ruby-actioncable) ("ruby-activestorage" ,ruby-activestorage) - ("ruby-railties" ,ruby-railties) + ("ruby-activesupport" ,ruby-activesupport) ("bundler" ,bundler) + ("ruby-railties" ,ruby-railties) ("ruby-sprockets-rails" ,ruby-sprockets-rails))) (synopsis "Full-stack web framework optimized for programmer happiness") (description diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8f3166ff31..4c9829612f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6434,14 +6434,14 @@ documents and fragments. It's built on top of Nokogiri and libxml2.") (define-public ruby-activesupport (package (name "ruby-activesupport") - (version "5.2.2.1") + (version "6.1.3") (source (origin (method url-fetch) (uri (rubygems-uri "activesupport" version)) (sha256 (base32 - "161bp4p01v1a1lvszrhd1a02zf9x1p1l1yhw79a3rix1kvzkkdqb")))) + "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h")))) (build-system ruby-build-system) (arguments `(#:phases @@ -6455,12 +6455,13 @@ documents and fragments. It's built on top of Nokogiri and libxml2.") ("ruby-i18n" ,ruby-i18n) ("ruby-minitest" ,ruby-minitest) ("ruby-tzinfo" ,ruby-tzinfo) - ("ruby-tzinfo-data" ,ruby-tzinfo-data))) + ("ruby-tzinfo-data" ,ruby-tzinfo-data) + ("ruby-zeitwerk" ,ruby-zeitwerk))) (synopsis "Ruby on Rails utility library") (description "ActiveSupport is a toolkit of support libraries and Ruby core extensions extracted from the Rails framework. It includes support for multibyte strings, internationalization, time zones, and testing.") - (home-page "http://www.rubyonrails.org") + (home-page "https://www.rubyonrails.org") (license license:expat))) (define-public ruby-crass -- cgit 1.4.1 From 892d39515251ae4de70a71e4d761c3decb428892 Mon Sep 17 00:00:00 2001 From: Alexey Abramov via Guix-patches via Date: Tue, 23 Feb 2021 13:40:20 +0100 Subject: gnu: emacs-oauth2: Fix source location. * gnu/packages/emacs-xyz.scm (emacs-oauth2): Replace .el extension with .tar Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e2c069a032..74b21b4508 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -92,6 +92,7 @@ ;;; Copyright © 2020 Brit Butler ;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2021 Yurii Kholodkov +;;; Copyright © 2021 Alexey Abramov ;;; ;;; This file is part of GNU Guix. ;;; @@ -13858,7 +13859,7 @@ write applications that use WebSockets, and is not useful by itself.") (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "oauth2-" version ".el")) + "oauth2-" version ".tar")) (sha256 (base32 "1rzly2nwjywrfgcmp8zidbmjl2ahyd8l8507lb1mxm4xqryvf316")))) (build-system emacs-build-system) -- cgit 1.4.1 From 33a212bf88904295ddc20fcb05a4c237205812f8 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 19 Feb 2021 22:16:16 +0100 Subject: gnu: Add pwsafe-cli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/password-utils.scm (pwsafe-cli): New variable. Signed-off-by: Léo Le Bouter --- gnu/packages/password-utils.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index ef4bf535a4..655834f754 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2020 Jean-Baptiste Note ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,6 +59,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages authentication) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -255,6 +257,49 @@ There are other programs that support the file format on different platforms.") (license license:artistic2.0))) +(define-public pwsafe-cli + (let ((commit "c49a0541b66647ad04d19ddb351d264054c67759") + (revision "0")) + (package + (name "pwsafe-cli") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nsd20463/pwsafe") + (commit commit))) + (sha256 + (base32 + "0ak09r1l7k57m6pdx468hhzvz0szmaq42vyr575fvsjc8rbrp8qq")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; FIXME: skip failing test suite (requires write access + ; to /tmp), patching path does not help somehow. + #:phases + (modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + (invoke "aclocal") + (invoke "autoheader") + (invoke "automake" "--add-missing") + (invoke "autoconf") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (inputs + `(("openssl" ,openssl) + ("libx11" ,libx11) + ("libxt" ,libxt) + ("libxmu" ,libxmu))) + (home-page "https://github.com/nsd20463/pwsafe") + (synopsis "CLI password manager") + (description "Command line tool compatible with Counterpane's +Passwordsafe.") + (license license:gpl2)))) + (define-public shroud (package (name "shroud") -- cgit 1.4.1 From 484c56593b4285a83718d88df70c1879b5fe3aa4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Feb 2021 18:23:43 +0100 Subject: gnu: pwsafe-cli: Fix license. * gnu/packages/password-utils.scm (pwsafe-cli)[license]: Use GPL2+. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 655834f754..d0d41323e4 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -298,7 +298,7 @@ platforms.") (synopsis "CLI password manager") (description "Command line tool compatible with Counterpane's Passwordsafe.") - (license license:gpl2)))) + (license license:gpl2+)))) (define-public shroud (package -- cgit 1.4.1 From aac6dd5bd67133e2ae67ac55780b1147051ea8df Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Feb 2021 18:27:45 +0100 Subject: gnu: pwsafe-cli: Small fixes. * gnu/packages/password-utils.scm (pwsafe-cli): Fix indentation. [inputs]: Re-order alphabetically. [description]: Use a full sentence. --- gnu/packages/password-utils.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index d0d41323e4..e7bf7ed0f0 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -275,29 +275,31 @@ platforms.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; FIXME: skip failing test suite (requires write access - ; to /tmp), patching path does not help somehow. + ;; FIXME: skip failing test suite (requires write access to /tmp), + ;; patching path does not help somehow. + `(#:tests? #f #:phases (modify-phases %standard-phases - (replace 'bootstrap - (lambda _ - (invoke "aclocal") - (invoke "autoheader") - (invoke "automake" "--add-missing") - (invoke "autoconf") - #t))))) + (replace 'bootstrap + (lambda _ + (invoke "aclocal") + (invoke "autoheader") + (invoke "automake" "--add-missing") + (invoke "autoconf") + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake))) (inputs - `(("openssl" ,openssl) - ("libx11" ,libx11) + `(("libx11" ,libx11) + ("libxmu" ,libxmu) ("libxt" ,libxt) - ("libxmu" ,libxmu))) + ("openssl" ,openssl))) (home-page "https://github.com/nsd20463/pwsafe") (synopsis "CLI password manager") - (description "Command line tool compatible with Counterpane's -Passwordsafe.") + (description + "@command{pwsafe} is a command line tool compatible with +Counterpane's Passwordsafe.") (license license:gpl2+)))) (define-public shroud -- cgit 1.4.1 From 9d76ff4304d1e9d0f413360ccdf2a2b14bf16c73 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Feb 2021 18:30:22 +0100 Subject: gnu: pwsafe-cli: Fix version. * gnu/packages/password-utils.scm (pwsafe-cli)[version]: Use 0.2.1 instead of 0. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index e7bf7ed0f0..2e18ae6b71 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -262,7 +262,7 @@ platforms.") (revision "0")) (package (name "pwsafe-cli") - (version (git-version "0" revision commit)) + (version (git-version "0.2.1" revision commit)) (source (origin (method git-fetch) -- cgit 1.4.1 From b158341dd4c936a498f67354cd7af5fcb9b11a68 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Feb 2021 18:36:00 +0100 Subject: gnu: pwsafe-cli: Fix version (again). * gnu/packages/password-utils.scm (pwsafe-cli)[version]: Actual version is 0.2.0, not 0.2.1. This is a followup to 9d76ff4304d1e9d0f413360ccdf2a2b14bf16c73. --- gnu/packages/password-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 2e18ae6b71..92c483f14b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -262,7 +262,7 @@ platforms.") (revision "0")) (package (name "pwsafe-cli") - (version (git-version "0.2.1" revision commit)) + (version (git-version "0.2.0" revision commit)) (source (origin (method git-fetch) -- cgit 1.4.1 From a31a3082458a9fc74b6253097a358d3ee65cfced Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Feb 2021 19:01:50 +0100 Subject: gnu: grammalecte: Update to 2.1.1. * gnu/packages/dictionaries.scm (grammalecte): Update to 2.1.1. --- gnu/packages/dictionaries.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index 538f3c7711..f73eb6fb96 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -216,14 +216,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (define-public grammalecte (package (name "grammalecte") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 "1j07zpqfvkxf52yhh0yf0xj1rh5whggc6s8fqrh6pbvz05lfdcr8")))) + (base32 "076jv3ywdgqqzg92bfbagc7ypy08xjq5zn4vgna6j9350fkfqhzn")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit 1.4.1 From 5d5bbd6fccc2160581740c54c614cb36a51e9126 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Feb 2021 19:38:48 +0100 Subject: gnu: Add star-for-pigx. This is a follow-up to commit f1f6e49190a11f926af3bef0d45541cabf47c742. * gnu/packages/bioinformatics.scm (star-for-pigx): New variable. (pigx-rnaseq, pigx-scrnaseq)[inputs]: Replace star with star-for-pigx. --- gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3890bbc653..1c42e503f2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6889,6 +6889,32 @@ sequences.") ;; STAR is licensed under GPLv3 or later; htslib is MIT-licensed. (license license:gpl3+))) +(define-public star-for-pigx + (package + (inherit star) + (name "star") + (version "2.7.3a") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alexdobin/STAR") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "source/Makefile" + (("/bin/rm") "rm")) + ;; Remove pre-built binaries and bundled htslib sources. + (delete-file-recursively "bin/MacOSX_x86_64") + (delete-file-recursively "bin/Linux_x86_64") + (delete-file-recursively "bin/Linux_x86_64_static") + (delete-file-recursively "source/htslib") + #t)))))) + (define-public starlong (package (inherit star) (name "starlong") @@ -12587,7 +12613,7 @@ once. This package provides tools to perform Drop-seq analyses.") ("snakemake" ,snakemake) ("fastqc" ,fastqc) ("multiqc" ,multiqc) - ("star" ,star) + ("star" ,star-for-pigx) ("trim-galore" ,trim-galore) ("htseq" ,htseq) ("samtools" ,samtools) @@ -12798,7 +12824,7 @@ methylation and segmentation.") ("pandoc-citeproc" ,pandoc-citeproc) ("samtools" ,samtools) ("snakemake" ,snakemake) - ("star" ,star) + ("star" ,star-for-pigx) ("r-minimal" ,r-minimal) ("r-argparser" ,r-argparser) ("r-cowplot" ,r-cowplot) -- cgit 1.4.1 From c60ab406308fd3c00922dddc4fbf6e49a78fd8e6 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 23 Feb 2021 18:51:05 +0000 Subject: gnu: Add midicomp. * gnu/packages/audio.scm (midicomp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/audio.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f45556630b..e60389fddf 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1223,6 +1223,37 @@ object library.") language and software synthesizer.") (license license:lgpl2.1+))) +(define-public midicomp + ;; The latest tagged release is 9 years old and there have been + ;; unreleased fixes, so we take the last commit. + (let ((commit "70f76963cb0cdb3cbe03ec6e7246b1fb885d3c68") + (revision "1")) + (package + (name "midicomp") + (version (git-version "0.0.8" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/markc/midicomp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12zh247c6v88ssy4l8v7yirh4bl2jcc1ch7f4gdry79a82kai1gf")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ; no "check" target + (synopsis "Convert SMF MIDI files to and from plain text") + (description + "midicomp can manipulate SMF (Standard MIDI File) files. It can both + read and write SMF files in 0 or format 1 and also read and write its own + plain text format. This means a SMF file can be turned into easily + parseable text, edited with any text editor or filtered through any script + language, and recompiled back into a binary SMF file.") + (home-page "https://github.com/markc/midicomp") + (license license:agpl3)))) + (define-public clalsadrv (package (name "clalsadrv") -- cgit 1.4.1 From 84e082e31706411e7f9c3189a83f8ed0b4016fe7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 19 Feb 2021 18:09:57 -0500 Subject: gnu: Python: Fix CVE-2021-3177. * gnu/packages/patches/python-3.8-CVE-2021-3177.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-3.8)[replacement]: New field. (python-3.8/fixed): New variable. --- gnu/local.mk | 1 + .../patches/python-3.8-CVE-2021-3177.patch | 194 +++++++++++++++++++++ gnu/packages/python.scm | 9 + 3 files changed, 204 insertions(+) create mode 100644 gnu/packages/patches/python-3.8-CVE-2021-3177.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a9294047eb..ae5a65cfcf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1524,6 +1524,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3.8-fix-tests.patch \ + %D%/packages/patches/python-3.8-CVE-2021-3177.patch \ %D%/packages/patches/python-3.9-fix-tests.patch \ %D%/packages/patches/python-3.9-CVE-2021-3177.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ diff --git a/gnu/packages/patches/python-3.8-CVE-2021-3177.patch b/gnu/packages/patches/python-3.8-CVE-2021-3177.patch new file mode 100644 index 0000000000..01f6b52865 --- /dev/null +++ b/gnu/packages/patches/python-3.8-CVE-2021-3177.patch @@ -0,0 +1,194 @@ +Fix CVE-2021-3177 for Python 3.8: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3177 + +Patch copied from upstream source repository: + +https://github.com/python/cpython/commit/ece5dfd403dac211f8d3c72701fe7ba7b7aa5b5f + +From ece5dfd403dac211f8d3c72701fe7ba7b7aa5b5f Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Mon, 18 Jan 2021 13:28:52 -0800 +Subject: [PATCH] closes bpo-42938: Replace snprintf with Python unicode + formatting in ctypes param reprs. (GH-24248) + +(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) + +Co-authored-by: Benjamin Peterson + +Co-authored-by: Benjamin Peterson +--- + Lib/ctypes/test/test_parameters.py | 43 ++++++++++++++++ + .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + + Modules/_ctypes/callproc.c | 51 +++++++------------ + 3 files changed, 64 insertions(+), 32 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst + +diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py +index e4c25fd880cef..531894fdec838 100644 +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -201,6 +201,49 @@ def __dict__(self): + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegex(repr(c_bool.from_param(True)), r"^$") ++ self.assertEqual(repr(c_char.from_param(97)), "") ++ self.assertRegex(repr(c_wchar.from_param('a')), r"^$") ++ self.assertEqual(repr(c_byte.from_param(98)), "") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "") ++ self.assertEqual(repr(c_short.from_param(511)), "") ++ self.assertEqual(repr(c_ushort.from_param(511)), "") ++ self.assertRegex(repr(c_int.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_uint.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_long.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_ulong.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_longlong.from_param(20000)), r"^$") ++ self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1e300)), "") ++ self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$") ++ self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$") ++ self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$") ++ self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$") ++ + ################################################################ + + if __name__ == '__main__': +#diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +#new file mode 100644 +#index 0000000000000..7df65a156feab +#--- /dev/null +#+++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst +#@@ -0,0 +1,2 @@ +#+Avoid static buffers when computing the repr of :class:`ctypes.c_double` and +#+:class:`ctypes.c_longdouble` values. +diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c +index a9b8675cd951b..de75918d49f37 100644 +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -484,58 +484,47 @@ is_literal_char(unsigned char c) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.l); +- break; + + case 'q': + case 'Q': +- sprintf(buffer, +-#ifdef MS_WIN32 +- "", +-#else +- "", +-#endif ++ return PyUnicode_FromFormat("", + self->tag, self->value.q); +- break; + case 'd': +- sprintf(buffer, "", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "", +- self->tag, self->value.f); +- break; +- ++ case 'f': { ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ return NULL; ++ } ++ PyObject *result = PyUnicode_FromFormat("", self->tag, f); ++ Py_DECREF(f); ++ return result; ++ } + case 'c': + if (is_literal_char((unsigned char)self->value.c)) { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.c); + } + else { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, (unsigned char)self->value.c); + } +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -544,22 +533,20 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + self->tag, self->value.p); + break; + + default: + if (is_literal_char((unsigned char)self->tag)) { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + (unsigned char)self->tag, (void *)self); + } + else { +- sprintf(buffer, "", ++ return PyUnicode_FromFormat("", + (unsigned char)self->tag, (void *)self); + } +- break; + } +- return PyUnicode_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 730c371fda..5c5be0d78c 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -364,6 +364,7 @@ data types.") (define-public python-3.8 (package (inherit python-2) (name "python") + (replacement python-3.8/fixed) (version "3.8.2") (source (origin (method url-fetch) @@ -521,6 +522,14 @@ data types.") (version-major+minor version) "/site-packages")))))))) +(define python-3.8/fixed + (package + (inherit python-3.8) + (source (origin + (inherit (package-source python-3.8)) + (patches (append (search-patches "python-3.8-CVE-2021-3177.patch") + (origin-patches (package-source python-3.8)))))))) + (define-public python-3.9 (package (inherit python-3.8) (name "python-next") -- cgit 1.4.1 From eec127822a74c6a1a6100b07d94c8fb275d571bf Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 23 Feb 2021 20:19:16 +0000 Subject: gnu: guix-build-coordinator: Update to 0-19.f9a257e. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-19.f9a257e. --- gnu/packages/package-management.scm | 64 +++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9fb8c40a31..9c0f649934 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1046,8 +1046,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "88fbb69264a412ca2c7e6c4de024414444bd2df8") - (revision "18")) + (let ((commit "f9a257ed61531eafc9727faebe50be1a1cb1648a") + (revision "19")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1058,7 +1058,7 @@ environments.") (commit commit))) (sha256 (base32 - "0bjf9bibamyk1d762w4nv0n0a7azww5bks2c9627zpzs2zqwqyiv")) + "1n9c5yn0crcqrrxng4xw1m2kvb9lin2fpym8ja75q6z3s7lpnjvg")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -1075,7 +1075,7 @@ environments.") (setenv "GUILE_AUTO_COMPILE" "0") #t)) (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs target #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (guile (assoc-ref inputs "guile")) @@ -1085,18 +1085,47 @@ environments.") (for-each (lambda (file) (simple-format (current-error-port) "wrapping: ~A\n" file) - (wrap-program file - `("PATH" ":" prefix - (,bin - ;; Support building without sqitch as an input, as it - ;; can't be cross-compiled yet - ,@(or (and=> (assoc-ref inputs "sqitch") - list) - '()))) - `("GUILE_LOAD_PATH" ":" prefix - (,scm ,(getenv "GUILE_LOAD_PATH"))) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix - (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) + (let ((guile-inputs `("guile-json" + "guile-gcrypt" + "guix" + "guile-prometheus" + "guile-lib" + "guile-lzlib" + "guile-zlib" + "gnutls"))) + (wrap-program file + `("PATH" ":" prefix + (,bin + ;; Support building without sqitch as an input, as it + ;; can't be cross-compiled yet + ,@(or (and=> (assoc-ref inputs "sqitch") + list) + '()))) + `("GUILE_LOAD_PATH" ":" prefix + (,scm ,(string-join + (map (lambda (input) + (simple-format + #f "~A/share/guile/site/~A" + (assoc-ref inputs input) + version)) + guile-inputs) + ":"))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,go ,(string-join + (map (lambda (input) + (simple-format + #f "~A/lib/guile/~A/site-ccache" + (assoc-ref inputs input) + version)) + guile-inputs) + ":")))) + (when target + ;; XXX work around wrap-program picking bash for the + ;; host rather than target + (let ((bash (assoc-ref inputs "bash"))) + (substitute* file + (("^#!.*/bash") + (string-append "#! " bash "/bin/bash"))))))) (find-files bin))) #t)) (delete 'strip)))) ; As the .go files aren't compatible @@ -1116,6 +1145,9 @@ environments.") ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + ,@(if (%current-target-system) + `(("bash" ,bash-minimal)) + '()) ("sqlite" ,sqlite) ,@(if (hurd-target?) '() -- cgit 1.4.1 From 1a2a0245cf365d021de7c41ac0949fb0d8d4367a Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 21 Feb 2021 09:57:46 +0000 Subject: gnu: zrythm: Update to 1.0.0-alpha.12.0.1. * gnu/packages/music.scm (zrythm): Update to 1.0.0-alpha.12.0.1. [inputs]: Add pulseaudio. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6e638f3a60..5621e0fcc5 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5985,7 +5985,7 @@ and as an LV2 plugin.") ;; distros to make necessary changes to integrate the software into the ;; distribution. (name "zrythm") - (version "1.0.0-alpha.6.0.1") + (version "1.0.0-alpha.12.0.1") (source (origin (method url-fetch) @@ -5993,7 +5993,7 @@ and as an LV2 plugin.") version ".tar.xz")) (sha256 (base32 - "1zfky3yj0k0rmbxighlk9sp4fsgw8rj7viv44yv626kldfvc04ab")))) + "1si4n8rdg0a3frlbj6yqpyzr4f20v3cpl4m6kv0yf7r25psyl5pk")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -6026,6 +6026,7 @@ and as an LV2 plugin.") ("libyaml" ,libyaml) ("lilv" ,lilv) ("lv2" ,lv2) + ("pulseaudio" ,pulseaudio) ("reproc" ,reproc) ("rubberband" ,rubberband) ("rtmidi" ,rtmidi) -- cgit 1.4.1 From 0bb40f8fc5a754dbf69fbb8888db9e88c6fb4c68 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 21 Feb 2021 10:33:31 +0000 Subject: gnu: geonkick: Update to 2.7.0. * gnu/packages/music.scm (geonkick): Update to 2.7.0. [inputs]: Remove cairo (included in redkite). [home-page]: Update URL. [source]: Update repository URL. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 5621e0fcc5..d1089fff9b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5788,16 +5788,16 @@ ZaMultiComp, ZaMultiCompX2 and ZamSynth.") (define-public geonkick (package (name "geonkick") - (version "2.3.8") + (version "2.7.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/geontime/geonkick.git") + (url "https://gitlab.com/iurie-sw/geonkick") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07809yy2q7dd6fcp0yndlg1vw2ca2zisnsplb3xrxvzdvrqlw910")))) + (base32 "0w1mvqm46qdwldcl81svaykwii4wvx7mcr57kwvnj0iv2qrc891i")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no tests included @@ -5807,8 +5807,7 @@ ZaMultiComp, ZaMultiCompX2 and ZamSynth.") (string-append "-DCMAKE_INSTALL_PREFIX=" (assoc-ref %outputs "out"))))) (inputs - `(("cairo" ,cairo) - ("hicolor-icon-theme" ,hicolor-icon-theme) + `(("hicolor-icon-theme" ,hicolor-icon-theme) ("jack" ,jack-1) ;for the standalone JACK application ("libsndfile" ,libsndfile) ("libx11" ,libx11) @@ -5824,7 +5823,7 @@ ZaMultiComp, ZaMultiCompX2 and ZamSynth.") (description "Geonkick is a synthesizer that can synthesize elements of percussion such as kicks, snares, hit-hats, shakers, claps and sticks. It can also play and mix samples.") - (home-page "https://gitlab.com/geontime/geonkick") + (home-page "https://gitlab.com/iurie-sw/geonkick") (license license:gpl3+))) (define-public dpf-plugins -- cgit 1.4.1 From 3fc49dae18dd16f58175ec19998ee63e50c920b6 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 21 Feb 2021 10:33:30 +0000 Subject: gnu: redkite: Update to 1.3.0. * gnu/packages/audio.scm (redkite): Update to 1.3.0. [propagated-inputs]: Move cairo from inputs. Signed-off-by: Nicolas Goaziou --- gnu/packages/audio.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index e60389fddf..19fca6f527 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4605,20 +4605,20 @@ workstations as well as consumer software such as music players.") (define-public redkite (package (name "redkite") - (version "1.0.3") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/geontime/redkite.git") + (url "https://gitlab.com/iurie-sw/redkite") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k")))) + (base32 "16j9zp5i7svq3g38rfb6h257qfgnd2brrxi7cjd2pdax9xxwj40y")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests included - (inputs + (propagated-inputs `(("cairo" ,cairo))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 53c40b3c77492740458a7b52723128c12c53d55b Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Tue, 23 Feb 2021 23:12:50 +0100 Subject: gnu: asciidoc: Update source URI. * gnu/packages/documentation.scm (asciidoc)[source]: Update URI. This fixes . They moved (and redirected) the repository to the new location . Here they changed the old commits in-place using now Python3, which caused the hash mismatch. The untouched Python2 version is still found under the ..-py2 repository. --- gnu/packages/documentation.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index eb3227ca63..ae8553436e 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -105,7 +105,7 @@ pages in HTML.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/asciidoc/asciidoc") + (url "https://github.com/asciidoc-py/asciidoc-py2") (commit version))) (file-name (git-file-name name version)) (sha256 -- cgit 1.4.1 From 46c5ae03cef60d78463edd2e5934ed90c1cebcd7 Mon Sep 17 00:00:00 2001 From: Dan Frumin Date: Sat, 27 Jul 2019 20:18:22 +0200 Subject: gnu: Add oshu. * gnu/packages/games.scm (oshu): New variable. Co-authored-by: Leo Prikler --- gnu/packages/games.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 99349eb66f..8c38f3aa98 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8414,6 +8414,45 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.") (home-page "https://www.stepmania.com") (license license:expat))) +(define-public oshu + (package + (name "oshu") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fmang/oshu") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g598incc6zlls876slgwqblwiwiszkmqa4xpzw0z7mbjmmzsizz")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + ;; `make test' doesn't actually build the test executable + (lambda _ (invoke "make" "zerotokei")))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("ffmpeg" ,ffmpeg) + ("pango" ,pango) + ("sdl2" ,sdl2) + ("sdl2-image" ,sdl2-image))) + (home-page "https://github.com/fmang/oshu/") + (synopsis "Rhythm game in which you click on circles") + (description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game, +which is played by pressing buttons and following along sliders as they appear +on screen. Its aim is to be able to play any beatmap even on low-end hardware. + +This package provides the core application, but no beatmaps. You need to +download and unpack them separately.") + (license license:gpl3+))) + (define-public btanks (package (name "btanks") -- cgit 1.4.1 From 266a37285c4b644416346adbd3d32897d75e7c24 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 19:37:30 -0500 Subject: gnu: libmesode: Update source, home-page URIs. * gnu/packages/messaging.scm (libmesode) [source]: Update to new upstream URI. [home-page]: Same. Signed-off-by: Leo Prikler --- 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 1878c71c7d..a20a322725 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2008,7 +2008,7 @@ is also scriptable and extensible via Guile.") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/boothj5/libmesode") + (url "https://github.com/profanity-im/libmesode") (commit version))) (file-name (git-file-name name version)) (sha256 @@ -2027,7 +2027,7 @@ is also scriptable and extensible via Guile.") (description "Libmesode is a fork of libstrophe for use with Profanity XMPP Client. In particular, libmesode provides extra TLS functionality such as manual SSL certificate verification.") - (home-page "https://github.com/boothj5/libmesode") + (home-page "https://github.com/profanity/libmesode") ;; Dual-licensed. (license (list license:gpl3+ license:x11)))) -- cgit 1.4.1 From 93dc9dc333e384fb1ad42647da45d5da096e455b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 20:24:15 -0500 Subject: gnu: libmesode: Disable static libraries. * gnu/packages/messaging.scm (libmesode)[arguments]: Add --disable-static configure flag. Patch Makefile.am to make tests link correctly. --- gnu/packages/messaging.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a20a322725..54810d6ac0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2015,6 +2015,15 @@ is also scriptable and extensible via Guile.") (base32 "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-make + (lambda _ + (substitute* "Makefile.am" + (("'\\^xmpp_'") "'.'")) + #t))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) -- cgit 1.4.1 From 22f303d70b4dd84e79ed4cb640a31b4e88fa02d5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 09:39:22 -0500 Subject: gnu: libstrophe: Update to 0.10.1. * gnu/packages/messaging.scm (libstrophe) [version]: Update to 0.10.1. Signed-off-by: Leo Prikler --- 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 54810d6ac0..e121a93181 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2043,7 +2043,7 @@ manual SSL certificate verification.") (define-public libstrophe (package (name "libstrophe") - (version "0.9.3") + (version "0.10.1") (source (origin (method git-fetch) @@ -2052,7 +2052,7 @@ manual SSL certificate verification.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1g1l0w9z9hdy5ncdvd9097gi7k7783did6py5h9camlpb2fnk5mk")))) + (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79")))) (build-system gnu-build-system) (inputs `(("expat" ,expat) -- cgit 1.4.1 From 1be08b1e0195062ffe165366838e208f19d40e38 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 12:03:23 -0500 Subject: gnu: libstrophe: Disable static libraries. * gnu/packages/messaging.scm (libstrope)[arguments]: Add --disable-static configure flag. Patch Makefile.am to make tests link correctly. Signed-off-by: Leo Prikler libstrophe oneline --- gnu/packages/messaging.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index e121a93181..fc204ffccc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2054,6 +2054,15 @@ manual SSL certificate verification.") (sha256 (base32 "11d341avsfr0z4lq15cy5dkmff6qpy91wkgzdpfdy31l27pa1g79")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-make + (lambda _ + (substitute* "Makefile.am" + (("'\\^xmpp_'") "'.'")) + #t))))) (inputs `(("expat" ,expat) ("openssl" ,openssl))) -- cgit 1.4.1 From dcfd7c7bc9622d4f1ab05cc601b378959de6bf4f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 19:46:39 -0500 Subject: gnu: profanity: Add missing inputs. * gnu/packages/messaging.scm (profanity) [inputs]: Add libgcrypt. Signed-off-by: Leo Prikler --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fc204ffccc..146d589f88 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2117,10 +2117,12 @@ are both supported).") ("glib" ,glib) ("gpgme" ,gpgme) ("gtk+" ,gtk+-2) + ("libgcrypt" ,libgcrypt) ("libmesode" ,libmesode) ("libnotify" ,libnotify) ("libotr" ,libotr) ("libsignal-protocol-c" ,libsignal-protocol-c) + ;; ("libxss" ,libxss) ("ncurses" ,ncurses) ("openssl" ,openssl) ("python" ,python-wrapper) -- cgit 1.4.1 From 22ba2bb83cd66c472a3d43cfbddd987360fa997b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Feb 2021 20:28:57 -0500 Subject: gnu: profanity: Disable static libraries. * gnu/packages/messaging.scm (profanity) [arguments]<#:configure-flag>: Add --disable-static. Signed-off-by: Leo Prikler --- gnu/packages/messaging.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 146d589f88..9812ca3905 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2096,6 +2096,7 @@ are both supported).") (arguments `(#:configure-flags (list + "--disable-static" "--enable-notifications" "--enable-python-plugins" "--enable-c-plugins" -- cgit 1.4.1 From c418c6b64cbfa7a4eb1bfb7d02a99083103dd40e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Feb 2021 01:18:33 +0100 Subject: gnu: emacs-csv-mode: Update to 1.15. * gnu/packages/emacs-xyz.scm (emacs-csv-mode): Update to 1.15. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 74b21b4508..9ec9e1dc79 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14075,14 +14075,14 @@ let users kill or mark things easily.") (define-public emacs-csv-mode (package (name "emacs-csv-mode") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "csv-mode-" version ".tar")) (sha256 - (base32 "1jz4134pk8dwzsqih9wybx4l9yl244cgcilw8rdnnqmm8i6vxgrp")))) + (base32 "0pigqhqg5mfza6jdskcr9yvrzdxnd68iyp3vyb8p8wskdacmbiyx")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/csv-mode.html") (synopsis "Major mode for editing comma/char separated values") -- cgit 1.4.1 From 15c4b98daa4a4cb020f38531eb6be1557f7ee398 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 23 Feb 2021 17:42:06 -0500 Subject: gnu: icecat: Update to 78.8.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2021-23968, CVE-2021-23969, CVE-2021-23973, and CVE-2021-23978. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update upstream source hash. --- gnu/packages/gnuzilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 7f33019606..dfc619448b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -694,8 +694,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.7.0-guix0-preview1") -(define %icecat-build-id "20210126000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.8.0-guix0-preview1") +(define %icecat-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -717,7 +717,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0hqnc98k4irq0lsp154binrl0c6kxy6xmab3ss9jwx6d53dl380s")))) + "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw")))) (upstream-icecat-base-version "78.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) -- cgit 1.4.1 From 5701e85107391733770a76160c77bd0655a4f9c0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 24 Feb 2021 09:18:51 +0000 Subject: gnu: patchwork: Update to 3.0.1. * gnu/packages/patchutils.scm (patchwork): Update to 3.0.1. --- gnu/packages/patchutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 1354c860a5..0896efeb82 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -321,7 +321,7 @@ you to figure out what is going on in that merge you keep avoiding.") (define-public patchwork (package (name "patchwork") - (version "3.0.0") + (version "3.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -330,7 +330,7 @@ you to figure out what is going on in that merge you keep avoiding.") (file-name (git-file-name name version)) (sha256 (base32 - "005irr5xsjpp3wrvvqs2xyr14ig9vp3h4v0qixhj1b8v69cfrgpi")))) + "049ih1fbbbmj11v5m9ilahifl8x7gi6wyba58552y9n9djzs8csc")))) (build-system python-build-system) (arguments `(;; TODO: Tests require a running database -- cgit 1.4.1 From 66fa2d318a1e4da3679fa1c5a70cd3972dc0efbf Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 16 Feb 2021 23:28:58 +0100 Subject: gnu: http-parser: Update to 2.9.4-1.ec8b5ee [fixes CVE-2020-8287]. Fixes CVE-2020-8287. * gnu/packages/web.scm (http-parser): Update to 2.9.4-1.ec8b5ee. [source]: Add patch to mitigate CVE. * gnu/packages/patches/patches/http-parser-CVE-2020-8287.patch: New file. * gnu/local.mk [dist_patch_DATA]: New patch. --- gnu/local.mk | 1 + .../patches/http-parser-CVE-2020-8287.patch | 75 ++++++++++++ gnu/packages/web.scm | 136 +++++++++++---------- 3 files changed, 146 insertions(+), 66 deletions(-) create mode 100644 gnu/packages/patches/http-parser-CVE-2020-8287.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ae5a65cfcf..ab0c1b0e97 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1164,6 +1164,7 @@ 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/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ diff --git a/gnu/packages/patches/http-parser-CVE-2020-8287.patch b/gnu/packages/patches/http-parser-CVE-2020-8287.patch new file mode 100644 index 0000000000..580f773099 --- /dev/null +++ b/gnu/packages/patches/http-parser-CVE-2020-8287.patch @@ -0,0 +1,75 @@ +From fc70ce08f5818a286fb5899a1bc3aff5965a745e Mon Sep 17 00:00:00 2001 +From: Fedor Indutny +Date: Wed, 18 Nov 2020 20:50:21 -0800 +Subject: [PATCH] http: unset `F_CHUNKED` on new `Transfer-Encoding` + +Duplicate `Transfer-Encoding` header should be a treated as a single, +but with original header values concatenated with a comma separator. In +the light of this, even if the past `Transfer-Encoding` ended with +`chunked`, we should be not let the `F_CHUNKED` to leak into the next +header, because mere presence of another header indicates that `chunked` +is not the last transfer-encoding token. + +CVE-ID: CVE-2020-8287 +PR-URL: https://github.com/nodejs-private/node-private/pull/235 +Reviewed-By: Fedor Indutny +--- + http_parser.c | 7 +++++++ + test.c | 26 ++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+) + +diff --git a/http_parser.c b/http_parser.c +index 9be003e7322..e9b2b9e83b9 100644 +--- a/http_parser.c ++++ b/http_parser.c +@@ -1344,6 +1344,13 @@ size_t http_parser_execute (http_parser *parser, + } else if (parser->index == sizeof(TRANSFER_ENCODING)-2) { + parser->header_state = h_transfer_encoding; + parser->uses_transfer_encoding = 1; ++ ++ /* Multiple `Transfer-Encoding` headers should be treated as ++ * one, but with values separate by a comma. ++ * ++ * See: https://tools.ietf.org/html/rfc7230#section-3.2.2 ++ */ ++ parser->flags &= ~F_CHUNKED; + } + break; + +diff --git a/test.c b/test.c +index 3f7c77b3494..2e5a9ebd678 100644 +--- a/test.c ++++ b/test.c +@@ -2154,6 +2154,32 @@ const struct message responses[] = + ,.body= "2\r\nOK\r\n0\r\n\r\n" + ,.num_chunks_complete= 0 + } ++#define HTTP_200_DUPLICATE_TE_NOT_LAST_CHUNKED 30 ++, {.name= "HTTP 200 response with `chunked` and duplicate Transfer-Encoding" ++ ,.type= HTTP_RESPONSE ++ ,.raw= "HTTP/1.1 200 OK\r\n" ++ "Transfer-Encoding: chunked\r\n" ++ "Transfer-Encoding: identity\r\n" ++ "\r\n" ++ "2\r\n" ++ "OK\r\n" ++ "0\r\n" ++ "\r\n" ++ ,.should_keep_alive= FALSE ++ ,.message_complete_on_eof= TRUE ++ ,.http_major= 1 ++ ,.http_minor= 1 ++ ,.status_code= 200 ++ ,.response_status= "OK" ++ ,.content_length= -1 ++ ,.num_headers= 2 ++ ,.headers= ++ { { "Transfer-Encoding", "chunked" } ++ , { "Transfer-Encoding", "identity" } ++ } ++ ,.body= "2\r\nOK\r\n0\r\n\r\n" ++ ,.num_chunks_complete= 0 ++ } + }; + + /* strnlen() is a POSIX.2008 addition. Can't rely on it being available so diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e4ba0d5bf9..010e01debb 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6162,78 +6162,82 @@ into your tests. It automatically starts up a HTTP server in a separate thread (license license:expat))) (define-public http-parser - (package - (name "http-parser") - (version "2.9.4") - (home-page "https://github.com/nodejs/http-parser") - (source - (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit (string-append "v" version)))) - (sha256 - (base32 "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c")) - (file-name (git-file-name name version)) - (patches - (list - (origin - ;; Treat an empty port (e.g. `http://hostname:/`) when parsing - ;; URLs as if no port were specified. This patch is applied - ;; to Fedora's http-parser and to libgit2's bundled version. - (method url-fetch) - (uri (string-append - "https://src.fedoraproject.org/rpms/http-parser/raw/" - "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" - "f/0001-url-treat-empty-port-as-default.patch")) - (sha256 - (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g"))))))) - (build-system gnu-build-system) - (arguments - `(#:test-target "test" - #:make-flags - (list (string-append "PREFIX=" - (assoc-ref %outputs "out")) - "library" - ,@(if (%current-target-system) - '() - '("CC=gcc"))) - #:phases - (modify-phases %standard-phases - ,@(match (%current-system) + (let ((commit "ec8b5ee63f0e51191ea43bb0c6eac7bfbff3141d") + (revision "1")) + (package + (name "http-parser") + (version (git-version "2.9.4" revision commit)) + (home-page "https://github.com/nodejs/http-parser") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit commit))) + (sha256 + (base32 "0f297hrbx0kvy3qwgm9rhmbnjww6iljlcz9grsc9d4km1qj1071i")) + (file-name (git-file-name name version)) + (patches + (append + (search-patches "http-parser-CVE-2020-8287.patch") + (list + (origin + ;; Treat an empty port (e.g. `http://hostname:/`) when parsing + ;; URLs as if no port were specified. This patch is applied + ;; to Fedora's http-parser and to libgit2's bundled version. + (method url-fetch) + (uri (string-append + "https://src.fedoraproject.org/rpms/http-parser/raw/" + "e89b4c4e2874c19079a5a1a2d2ccc61b551aa289/" + "f/0001-url-treat-empty-port-as-default.patch")) + (sha256 + (base32 + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "PREFIX=" + (assoc-ref %outputs "out")) + "library" + ,@(if (%current-target-system) + '() + '("CC=gcc"))) + #:phases + (modify-phases %standard-phases + ,@(match (%current-system) + ("armhf-linux" + '((add-before 'check 'apply-assertion.patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs "assertion.patch"))) + (invoke "patch" "-p1" "-i" patch) + #t))))) + (_ '())) + ,@(if (%current-target-system) + '((replace 'configure + (lambda* (#:key target #:allow-other-keys) + (substitute* (find-files "." "Makefile") + (("CC\\?=.*$") + (string-append "CC=" target "-gcc\n")) + (("AR\\?=.*$") + (string-append "AR=" target "-ar\n"))) + #t))) + '((delete 'configure)))))) + (native-inputs + `(,@(match (%current-system) ("armhf-linux" - '((add-before 'check 'apply-assertion.patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "assertion.patch"))) - (invoke "patch" "-p1" "-i" patch) - #t))))) - (_ '())) - ,@(if (%current-target-system) - '((replace 'configure - (lambda* (#:key target #:allow-other-keys) - (substitute* (find-files "." "Makefile") - (("CC\\?=.*$") - (string-append "CC=" target "-gcc\n")) - (("AR\\?=.*$") - (string-append "AR=" target "-ar\n"))) - #t))) - '((delete 'configure)))))) - (native-inputs - `(,@(match (%current-system) - ("armhf-linux" - ;; A fix for which in turn - ;; breaks i686-linux builds. - `(("assertion.patch" - ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) - (_ '())))) - (synopsis "HTTP request/response parser for C") - (description "This is a parser for HTTP messages written in C. It parses + ;; A fix for which in turn + ;; breaks i686-linux builds. + `(("assertion.patch" + ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) + (_ '())))) + (synopsis "HTTP request/response parser for C") + (description "This is a parser for HTTP messages written in C. It parses both requests and responses. The parser is designed to be used in high-performance HTTP applications. It does not make any syscalls nor allocations, it does not buffer data, it can be interrupted at anytime. Depending on your architecture, it only requires about 40 bytes of data per message stream (in a web server that is per connection).") - (license license:expat))) + (license license:expat)))) (define-public python-httpretty (package -- cgit 1.4.1 From 8f250012539675c9d43bd2e52f6eb058dc583850 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Wed, 17 Feb 2021 00:06:04 +0100 Subject: gnu: node: Update to 10.23.3. * gnu/packages/node.scm (node): Update to 10.23.3. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 77c47ec71f..051c4c3b41 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -50,14 +50,14 @@ (define-public node (package (name "node") - (version "10.22.1") + (version "10.23.3") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl")) + "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From ac2ff1ba6978a6758268d526f087250c04efcd57 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Feb 2021 13:52:45 +0100 Subject: gnu: emacs-pyim: Update to 3.2. * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.2. [source]: Use GNU ELPA URI. [description]: Use full sentence. --- gnu/packages/emacs-xyz.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9ec9e1dc79..09036c7e67 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12299,16 +12299,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "2.0") + (version "3.2") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumashu/pyim") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "06ahzyi2h353xj17mzsm9fxmkc6cyzd1mjzmvqfw8cyv538nijc0")))) + (base32 "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) @@ -12318,8 +12315,9 @@ containing words from the Rime project.") ("emacs-xr" ,emacs-xr))) (home-page "https://github.com/tumashu/pyim") (synopsis "Chinese input method") - (description "Chinese input method which supports quanpin, shuangpin, wubi -and cangjie.") + (description + "This package provides a Chinese input method which supports quanpin, +shuangpin, wubi and cangjie.") (license license:gpl2+))) (define-public emacs-posframe -- cgit 1.4.1 From 0d0c76b946ad3a1047ba8120362719f599482896 Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Wed, 24 Feb 2021 04:50:06 +0000 Subject: gnu: esbuild: Update to 0.8.51. * gnu/packages/web.scm (esbuild): Update to 0.8.51. Signed-off-by: Nicolas Goaziou --- 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 010e01debb..b3c0831ac4 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1479,7 +1479,7 @@ used to validate and fix HTML data.") (define-public esbuild (package (name "esbuild") - (version "0.8.47") + (version "0.8.51") (source (origin (method git-fetch) @@ -1488,7 +1488,7 @@ used to validate and fix HTML data.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gq50sx40qr22w0iy09rdcy1y9nmqpc3impwmyk5zi4z0hl9id0h")) + (base32 "1j4qza2chng3az1h1fh9zbhxh99q7bfrqbgppyyq5947svi8fvaz")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 95b3e16a3d1d79a7bd58a57187b039a08d3719eb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Feb 2021 14:13:39 +0100 Subject: gnu: Add go-github-com-mattn-go-sqlite3. * gnu/packages/golang.scm (go-github-com-mattn-go-sqlite3): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1d3fa59ce9..1b4be8acca 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -4849,6 +4850,28 @@ data serialization format.") directories. It is optimized for filewalking. ") (license license:expat))) +(define-public go-github-com-mattn-go-sqlite3 + (package + (name "go-github-com-mattn-go-sqlite3") + (version "1.14.6") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mattn/go-sqlite3") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04anvqkc37mmc3z1dy4xfa6cas67zlxnnab0ywii7sylk864mhxz")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/mattn/go-sqlite3")) + (home-page "https://github.com/mattn/go-sqlite3") + (synopsis "Sqlite3 driver for Go") + (description "This package provides a Sqlite3 driver for Go using +@code{database/sql}.") + (license license:expat))) + (define-public go-github-com-willf-bitset (package (name "go-github-com-willf-bitset") -- cgit 1.4.1 From 0911900034599ee6f1f48e87cfd55695b7706d4a Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Wed, 24 Feb 2021 14:42:27 +0100 Subject: gnu: icedove: Update to 78.8.0. * gnu/packages/gnuzilla.scm (icedove): Update to 78.8.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index dfc619448b..425ed81f9a 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1305,11 +1305,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20210205000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.7.1") + (version "78.8.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1589,7 +1589,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "1ef5b612ee43c806752ca215b142a9733210f3cc")) + ,(let ((changeset "d801a94f25867ca5f2f3488c4700532351987999")) (origin (method hg-fetch) (uri (hg-reference @@ -1598,7 +1598,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "0kpn6jvymryf2gpj0dl5lpgln8mc3kxi3makms0wb84aajn842jv"))))) + "19h1s9qcxzcvbd1m07xajk5lhpikj53k5fp3nwvl38xj7a3s0gxw"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit 1.4.1 From 9ef7937766dd2e79807f3b0a6cd141ed310650a9 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 14:42:28 +0100 Subject: gnu: Add ghc-protolude-0.2. * gnu/packages/haskell-xyz.scm (ghc-protolude-0.2): New variable. --- gnu/packages/haskell-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d6c50ade71..2578cc6d7d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10559,6 +10559,22 @@ the ideal templating system.") replace the standard one provided by GHC.") (license license:expat))) +(define-public ghc-protolude-0.2 + (package + (inherit ghc-protolude) + (name "ghc-protolude") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/protolude/protolude-" + version + ".tar.gz")) + (sha256 + (base32 + "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj")))))) + (define-public ghc-psqueue (package (name "ghc-psqueue") -- cgit 1.4.1 From 59c3ea22546f9bd7e0560a66f98a020af7d1ad6e Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 14:47:03 +0100 Subject: gnu: purescript: Move to version-specific ghc-protolude-0.2 input. * gnu/packages/purescript.scm (purescript)[inputs]: Replace ghc-protolude with ghc-protolude-0.2. --- gnu/packages/purescript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index cc51b163c9..be9dc69246 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -91,7 +91,7 @@ ("ghc-network" ,ghc-network) ("ghc-parallel" ,ghc-parallel) ("ghc-pattern-arrows" ,ghc-pattern-arrows) - ("ghc-protolude" ,ghc-protolude) + ("ghc-protolude" ,ghc-protolude-0.2) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) ("ghc-scientific" ,ghc-scientific) -- cgit 1.4.1 From a281a67f3ca56b5dfa670b4019d26d4c39e0c804 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 19 Feb 2021 21:04:25 +0100 Subject: gnu: ghc-protolude: Update to 0.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-xyz.scm (ghc-protolude): Update to 0.3.0. Signed-off-by: Léo Le Bouter --- gnu/packages/haskell-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 2578cc6d7d..3c3c642d8e 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -10535,7 +10536,7 @@ the ideal templating system.") (define-public ghc-protolude (package (name "ghc-protolude") - (version "0.2.3") + (version "0.3.0") (source (origin (method url-fetch) @@ -10545,7 +10546,7 @@ the ideal templating system.") ".tar.gz")) (sha256 (base32 - "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj")))) + "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit 1.4.1 From 212e473e806854c7d1d864a04d5c79158a65bcb4 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 19 Feb 2021 21:04:26 +0100 Subject: gnu: Add ghc-wordexp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-xyz.scm (ghc-wordexp): New variable. Signed-off-by: Léo Le Bouter --- gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3c3c642d8e..bd3d8f239c 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -15185,6 +15185,30 @@ modernized interface.") (description "Word8 library to be used with @code{Data.ByteString}.") (license license:bsd-3))) +(define-public ghc-wordexp + (package + (name "ghc-wordexp") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/wordexp/wordexp-" + version + ".tar.gz")) + (sha256 + (base32 + "1mbcrq89jz0dcibw66w0jdy4f4bfpx4zwjfs98rm3jjgdikwdzb4")))) + (build-system haskell-build-system) + (native-inputs `(("ghc-c2hs" ,ghc-c2hs))) + (inputs + `(("ghc-semigroups" ,ghc-semigroups))) + (home-page "https://hackage.haskell.org/package/wordexp") + (synopsis "Library wrapping @code{wordexp} for Haskell") + (description "@code{wordexp(3)} wrapper library for Haskell to perform +word expansion like a posix-shell.") + (license license:bsd-3))) + (define-public ghc-x11 (package (name "ghc-x11") -- cgit 1.4.1 From a1386815503036773a1092554f36d45dd9361efe Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 14:04:54 +0100 Subject: gnu: Add greenclip. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/haskell-apps.scm (greenclip): New variable. Signed-off-by: Léo Le Bouter --- gnu/packages/haskell-apps.scm | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 16531cf290..a4b88d22c1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Brian Leung ;;; Copyright © 2021 EuAndreh +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -50,7 +51,8 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages rsync) - #:use-module (gnu packages version-control)) + #:use-module (gnu packages version-control) + #:use-module (gnu packages xorg)) (define-public apply-refact (package @@ -720,6 +722,40 @@ Wayland, and Linux console environments alike.") formatting by forgetting all existing formatting during parsing.") (license license:mpl2.0))) +(define-public greenclip + (package + (name "greenclip") + (version "3.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/erebe/greenclip") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1baw360dcnyavacf7a8v6wq4m5g6bcmyybkckv4cz7r4xl5p3qws")))) + (build-system haskell-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("libx11" ,libx11) + ("libxext" ,libxext) + ("libxscrnsaver" ,libxscrnsaver) + ("ghc-x11" ,ghc-x11) + ("ghc-exceptions" ,ghc-exceptions) + ("ghc-hashable" ,ghc-hashable) + ("ghc-microlens" ,ghc-microlens) + ("ghc-microlens-mtl" ,ghc-microlens-mtl) + ("ghc-protolude" ,ghc-protolude) + ("ghc-vector" ,ghc-vector) + ("ghc-wordexp" ,ghc-wordexp))) + (home-page "https://github.com/erebe/greenclip") + (synopsis "Simple Clipboard manager") + (description "@code{greenclip} is a clipboard manager written in +Haskell.") + (license license:bsd-3))) + (define-public raincat (package (name "raincat") -- cgit 1.4.1 From 4be3c3df011183953105b7e5945ea04645761df2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Feb 2021 15:48:36 +0100 Subject: gnu: Add go-github-com-hanwen-fuse. * gnu/packages/file-systems.scm (go-github-com-hanwen-fuse): New variable. --- gnu/packages/file-systems.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index ef4b831373..1f9a54dfdf 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Gábor Boskovits -;;; Copyright © 2017, 2018 Ricardo Wurmus +;;; Copyright © 2017, 2018, 2021 Ricardo Wurmus ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2020 Raghav Gururajan @@ -31,6 +31,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system linux-module) #:use-module (guix build-system python) #:use-module (guix build-system trivial) @@ -53,6 +54,7 @@ #:use-module (gnu packages gawk) #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) + #:use-module (gnu packages golang) #:use-module (gnu packages kerberos) #:use-module (gnu packages libffi) #:use-module (gnu packages linux) @@ -1129,3 +1131,28 @@ Dropbox API v2.") "@code{dbxfs} allows you to mount your Dropbox folder as if it were a local file system using FUSE.") (license license:gpl3+))) + +(define-public go-github-com-hanwen-fuse + (package + (name "go-github-com-hanwen-fuse") + (version "2.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hanwen/go-fuse") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/hanwen/go-fuse")) + (propagated-inputs + `(("go-golang-org-x-sys" ,go-golang-org-x-sys))) + (home-page "https://github.com/hanwen/go-fuse") + (synopsis "FUSE bindings for Go") + (description + "This package provides Go native bindings for the FUSE kernel module.") + (license license:bsd-3))) -- cgit 1.4.1 From a4cc03a80fd80c230a8148f5fe7899e48c72d499 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Feb 2021 15:49:37 +0100 Subject: gnu: Add tmsu. * gnu/packages/file-systems.scm (tmsu): New variable. --- gnu/packages/file-systems.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 1f9a54dfdf..866e9e5392 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1156,3 +1156,36 @@ local file system using FUSE.") (description "This package provides Go native bindings for the FUSE kernel module.") (license license:bsd-3))) + +(define-public tmsu + (package + (name "tmsu") + (version "0.7.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/oniony/TMSU") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/oniony/TMSU" + #:unpack-path "..")) + (inputs + `(("go-github-com-mattn-go-sqlite3" ,go-github-com-mattn-go-sqlite3) + ("go-github-com-hanwen-fuse" ,go-github-com-hanwen-fuse))) + (home-page "https://github.com/oniony/TMSU") + (synopsis "Tag files and access them through a virtual filesystem") + (description + "TMSU is a tool for tagging your files. It provides a simple +command-line utility for applying tags and a virtual filesystem to give you a +tag-based view of your files from any other program. TMSU does not alter your +files in any way: they remain unchanged on disk, or on the network, wherever +your put them. TMSU maintains its own database and you simply gain an +additional view, which you can mount where you like, based upon the tags you +set up.") + (license license:gpl3+))) -- cgit 1.4.1 From 376329526be6660852ce8a3517c95607b3191ecb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Feb 2021 16:17:58 +0100 Subject: gnu: nano: Update to 5.6. * gnu/packages/nano.scm (nano): Update to 5.6. --- 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 5729448e18..c2879eb530 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "5.5") + (version "5.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "0jkyd3yzcidnvnj1k9bmplzlbd303x6xxblpp5np7zs1kfzq22rr")))) + (base32 "0ckscf3klm2k1zjvcv8mkza1yp80g7ss56n73790fk83lzj87qgw")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From b5586c666e13988ce7ec983907ffb06a564f1d4f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 24 Feb 2021 16:33:18 +0100 Subject: gnu: http-server: Fix build on i686-linux. * gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch: Remove it. * gnu/local.mk (dist_patch_DATA): Update it. * gnu/packages/web.scm (http-parser)[source]: Remove a test assertion failing on i686-linux. [arguments]: Remove the "assertion.patch" that is merged upstream. [native-inputs]: Ditto. [synopsis]: Wrap it. --- gnu/local.mk | 1 - .../http-parser-fix-assertion-on-armhf.patch | 39 ---------------------- gnu/packages/web.scm | 30 ++++++----------- 3 files changed, 11 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ab0c1b0e97..8d46cda639 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1165,7 +1165,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ - %D%/packages/patches/http-parser-fix-assertion-on-armhf.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hurd-cross.patch \ %D%/packages/patches/hurd-xattr.patch \ diff --git a/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch b/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch deleted file mode 100644 index 79bd3e8dbc..0000000000 --- a/gnu/packages/patches/http-parser-fix-assertion-on-armhf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Wed, 20 May 2020 19:17:13 +0200 -Subject: [PATCH] gnu: http-client: Fix assertion on armhf-linux. - -Copied verbatim from [0] to fix guix pull[1] on ARM systems. - -[0]: https://github.com/nodejs/http-parser/pull/510 -[1]: https://issues.guix.gnu.org/40604 - -From 0e5868aebb9eb92b078d27bb2774c2154dc167e2 Mon Sep 17 00:00:00 2001 -From: Ben Noordhuis -Date: Thu, 30 Apr 2020 11:22:50 +0200 -Subject: [PATCH] Fix sizeof(http_parser) assert - -The result should be 32 on both 32 bits and 64 bits architectures -because of struct padding. - -Fixes: https://github.com/nodejs/http-parser/issues/507 ---- - test.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/test.c b/test.c -index 7983424..f60a84f 100644 ---- a/test.c -+++ b/test.c -@@ -4220,8 +4220,11 @@ main (void) - patch = version & 255; - printf("http_parser v%u.%u.%u (0x%06lx)\n", major, minor, patch, version); - -+ /* Should be 32 on both 32 bits and 64 bits architectures because of -+ * struct padding, see https://github.com/nodejs/http-parser/issues/507. -+ */ - printf("sizeof(http_parser) = %u\n", (unsigned int)sizeof(http_parser)); -- assert(sizeof(http_parser) == 4 + 4 + 8 + 2 + 2 + 4 + sizeof(void *)); -+ assert(sizeof(http_parser) == 32); - - //// API - test_preserve_data(); diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b3c0831ac4..e9a17f3b78 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6191,7 +6191,15 @@ into your tests. It automatically starts up a HTTP server in a separate thread "f/0001-url-treat-empty-port-as-default.patch")) (sha256 (base32 - "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))))) + "0pbxf2nq9pcn299k2b2ls8ldghaqln9glnp79gi57mamx4iy0f6g")))))) + (modules '((guix build utils))) + (snippet + '(begin + ;; This assertion fails when building for i686-linux. + (substitute* "test.c" + (("assert\\(sizeof\\(http_parser\\) == 32\\);") + "assert(1);")) + #t)))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -6204,14 +6212,6 @@ into your tests. It automatically starts up a HTTP server in a separate thread '("CC=gcc"))) #:phases (modify-phases %standard-phases - ,@(match (%current-system) - ("armhf-linux" - '((add-before 'check 'apply-assertion.patch - (lambda* (#:key inputs #:allow-other-keys) - (let ((patch (assoc-ref inputs "assertion.patch"))) - (invoke "patch" "-p1" "-i" patch) - #t))))) - (_ '())) ,@(if (%current-target-system) '((replace 'configure (lambda* (#:key target #:allow-other-keys) @@ -6222,17 +6222,9 @@ into your tests. It automatically starts up a HTTP server in a separate thread (string-append "AR=" target "-ar\n"))) #t))) '((delete 'configure)))))) - (native-inputs - `(,@(match (%current-system) - ("armhf-linux" - ;; A fix for which in turn - ;; breaks i686-linux builds. - `(("assertion.patch" - ,@(search-patches "http-parser-fix-assertion-on-armhf.patch")))) - (_ '())))) (synopsis "HTTP request/response parser for C") - (description "This is a parser for HTTP messages written in C. It parses -both requests and responses. The parser is designed to be used in + (description "This is a parser for HTTP messages written in C. It +parses both requests and responses. The parser is designed to be used in high-performance HTTP applications. It does not make any syscalls nor allocations, it does not buffer data, it can be interrupted at anytime. Depending on your architecture, it only requires about 40 bytes of data per -- cgit 1.4.1 From b35bbb26a25b562877808bf675b275a93ffb3794 Mon Sep 17 00:00:00 2001 From: Vinícius dos Santos Oliveira Date: Tue, 23 Feb 2021 17:25:07 -0300 Subject: gnu: Add luajit-lua52-openresty. * gnu/packages/lua.scm (luajit-lua52-openresty): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/lua.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index b029400cb2..81846afe82 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -157,6 +157,38 @@ language. It may be embedded or used as a general-purpose, stand-alone language.") (license license:x11))) +(define-public luajit-lua52-openresty + (package + (inherit luajit) + (name "luajit-lua52-openresty") + (version "2.1-20201229") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openresty/luajit2.git") + (commit (string-append "v" version)))) + (sha256 + (base32 "07haj27kbpbnkv836c2nd36h2xislrmri52w0zbpxvl68xk6g96p")))) + (arguments + `(#:tests? #f ;no test + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'enable-lua52-compat + (lambda _ + (substitute* "src/Makefile" + (("#(XCFLAGS\\+= -DLUAJIT_ENABLE_LUA52COMPAT)" _ flag) flag)) + #t))))) + (home-page "https://github.com/openresty/luajit2") + (synopsis "OpenResty's Branch of LuaJIT 2") + (description + "This is the official OpenResty branch of LuaJIT. It is not to be +considered a fork, since changes are regularly synchronized from the upstream +LuaJIT project. This package also enables the Lua 5.2 compat mode needed by +some projects."))) + (define (make-lua-expat name lua) (package (name name) -- cgit 1.4.1 From 7cb188f8b235ef243c38de9b868127363be6c68e Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Wed, 24 Feb 2021 15:20:33 +0100 Subject: gnu: notmuch: Update to 0.31.4. * gnu/packages/mail.scm (notmuch): Update to 0.31.4. Signed-off-by: Nicolas Goaziou --- 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 6b1dbdf92a..bd2e48d533 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1249,14 +1249,14 @@ invoking @command{notifymuch} from the post-new hook.") (define-public notmuch (package (name "notmuch") - (version "0.31.3") + (version "0.31.4") (source (origin (method url-fetch) (uri (string-append "https://notmuchmail.org/releases/notmuch-" version ".tar.xz")) (sha256 (base32 - "1jisflxdly1nlyy17212ch3hk96dns4j9f5552jz724gs2p42h28")))) + "0magnyjjhhv11nwcm2596hdxszrj61y69i0hmwqdc3v6cxjvcqc6")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 02e0aa255933197d6c95ab9b66251ef0885b237e Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 20 Feb 2021 22:58:07 -0800 Subject: gnu: Add ocrfeeder. * gnu/packages/gnome.scm (ocrfeeder): New variable. Signed-off-by: Leo Famulari --- gnu/packages/gnome.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b8634d712a..32cecb75b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -56,7 +56,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tim Gesthuizen -;;; Copyright © 2020 Andy Tai +;;; Copyright © 2020, 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -149,6 +149,7 @@ #:use-module (gnu packages ninja) #:use-module (gnu packages node) #:use-module (gnu packages nss) + #:use-module (gnu packages ocr) #:use-module (gnu packages openldap) #:use-module (gnu packages package-management) #:use-module (gnu packages password-utils) @@ -12097,3 +12098,67 @@ for the GNOME 3.x platform with many features. It aims to be a very complete editing environment for translation issues within the GNU gettext/GNOME desktop world.") (license license:gpl3+))) + + +(define-public ocrfeeder + (package + (name "ocrfeeder") + (version "0.8.3") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/ocrfeeder/" + (version-major+minor version) "/" + "ocrfeeder-" version ".tar.xz")) + (sha256 + (base32 + "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after + 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/" "ocrfeeder")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("glib:bin" ,glib "bin") ; for glib-compile-resources + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache + ("intltool" ,intltool) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config) + ("xmllint" ,libxml2))) + (inputs + `(("enchant" ,enchant) + ("glib" ,glib) + ("goocanvas" ,goocanvas) + ("gtk" ,gtk+) + ("gtkspell3" ,gtkspell3) + ("libjpeg" ,libjpeg-turbo) + ("libtiff" ,libtiff) + ("libraw" ,libraw) + ("ocrad" ,ocrad) + ("python" ,python-wrapper) + ("python-pygobject" ,python-pygobject) + ("python-odfpy" ,python-odfpy) + ("python-pillow" ,python-pillow) + ("python-pyenchant" ,python-pyenchant) + ("python-reportlab" ,python-reportlab) + ("python-sane" ,python-sane) + ("sane-backends" ,sane-backends) + ("tesseract-ocr" ,tesseract-ocr))) + (home-page "https://wiki.gnome.org/Apps/OCRFeeder") + (synopsis "Complete OCR Suite") + (description "OCRFeeder is a complete Optical Character Recognition and +Document Analysis and Recognition program.") + (license license:gpl3+))) -- cgit 1.4.1 From 4354e2ed2bbf11aeabfcc7105b9bc7b431d28b93 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 23 Feb 2021 20:38:43 -0500 Subject: gnu: git-annex: Update to 8.20210223. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210223. Signed-off-by: Leo Famulari --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a4b88d22c1..e8bde69082 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -342,14 +342,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20210127") + (version "8.20210223") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1hsmaw70lfza1g5j6b9zbwqkkr374m18p7qb4nl952pj42a46vv3")))) + (base32 "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 52f3919f8eae05767cf92917052674342b27bb95 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:49:47 -0500 Subject: gnu: linux-libre: Update to 5.10.18. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.18. (linux-libre-5.10-pristine-source): 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 99f2be0318..819ca49db2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -366,7 +366,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.11))) -(define-public linux-libre-5.10-version "5.10.17") +(define-public linux-libre-5.10-version "5.10.18") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -374,7 +374,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8"))) + (hash (base32 "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 9099734300b1c49355fc8ffe2b1e2c427de33ebc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:50:12 -0500 Subject: gnu: linux-libre 5.11: Update to 5.11.1. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.1. (linux-libre-5.11-pristine-source): 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 819ca49db2..0341f59d60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -353,7 +353,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11") +(define-public linux-libre-5.11-version "5.11.1") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -361,7 +361,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0y76962qnnjxc5jgaw9vwrydzwjvj3q4xf7skp3ks2dab7vkhj33"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1d37w0zvmf8c1l99xvy1hy6p55icjhmbsv7f0amxy2nly1a7pw04"))) + (hash (base32 "1gmrckvl3039z80rr740c0d5knwgj6p1dmhw4x9gwc7rxli6az85"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 6ecaf5388586653187f8405724ed2245d12d0bb1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:54:45 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.100. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.100. (linux-libre-5.4-pristine-source): 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 0341f59d60..ffff7f3f23 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -382,7 +382,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.99") +(define-public linux-libre-5.4-version "5.4.100") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "09qs6nqzq7hsaq928jvbri4nfjm0m6rf0lfx6vc30g95d4nd3njv"))) + (hash (base32 "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 40930841637fcda6c5c55a296491cf973c774084 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:55:04 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.177. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.177. (linux-libre-4.19-pristine-source): Update hash. (deblob-scripts-4.19): Use linux-libre-4.19-version. --- gnu/packages/linux.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ffff7f3f23..409ac345e3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,17 +395,16 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.176") +(define-public linux-libre-4.19-version "4.19.177") (define deblob-scripts-4.19 (linux-libre-deblob-scripts - ;; XXX While linux-libre.fsfla.org is offline, use the cached deblob - ;; scripts for the previous version on ci.guix.gnu.org. - "4.19.175" + linux-libre-4.19-version (base32 "02zs405awaxydbapka4nz8h6lmnc0dahgczqsrs5s2bmzjyyqkcy") (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0wv0hb25c5jgw6h3zwbb24mfnn19yr0sgcmk1g2xa6x33g9bihz1"))) + (hash (base32 + "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 9732e905ff490e82891674ac7cbd5807f3380512 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:55:22 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.222. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.222. (linux-libre-4.14-pristine-source): 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 409ac345e3..1ffaa65b49 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.221") +(define-public linux-libre-4.14-version "4.14.222") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1sf7sagy88p20310klbxdacyalg3q6zg870c709nz17lbw3m88nf"))) + (hash (base32 "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From ae8014d2474341670e93c426fdc0e26c72ca3f97 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:55:39 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.258. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.258. (linux-libre-4.9-pristine-source): 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 1ffaa65b49..353ca6cdcc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.257") +(define-public linux-libre-4.9-version "4.9.258") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0kynyqk62hkfmamhvfp98i9kyr395chnwghslcbq5pl1zkzq1rwm"))) + (hash (base32 "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From ed27627fbd2a2028efcbd2bca86b303b39d9a2bf Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Feb 2021 13:55:54 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.258. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.258. (linux-libre-4.4-pristine-source): 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 353ca6cdcc..86cf30b471 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.257") +(define-public linux-libre-4.4-version "4.4.258") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0njb4gf77vix2xgnyhmrzf67czpqfng9np644l9j18dn4mb7q1iy"))) + (hash (base32 "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 2fdc8ca7fdf6617835c48276585df6d5ace7c46e Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 20 Feb 2021 21:42:24 -0800 Subject: gnu: Add monado. * gnu/packages/graphics.scm (monado): New variable. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7cb4aecec2..a76417a508 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2021 Antoine Côté +;;; Copyright © 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,7 @@ #:use-module (gnu packages imagemagick) #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages maths) @@ -97,6 +99,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages upnp) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -1914,3 +1917,40 @@ Some feature highlights: @item Automatic port forwarding with UPnP @end itemize\n") (license license:gpl3+)))) + +(define-public monado + (package + (name "monado") + (version "21.0.0") + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.freedesktop.org/" name "/" + name "/-/archive/v" version "/" + name "-v" version ".tar.bz2")) + (sha256 + (base32 + "0n04k7a8b0i8ga0kbzh7qxmvni1ijawgk98s83519vxg4d0yyjbq")))) + (build-system meson-build-system) + (inputs + `(("ffmpeg" ,ffmpeg) + ("glslang" ,glslang) + ("libudev" ,eudev) + ("libusb" ,libusb) + ("libxcb" ,libxcb) + ("libxrandr" ,libxrandr) + ("opengl" ,mesa) + ("v4l" ,v4l-utils) + ("vulkan-loader" ,vulkan-loader))) + (native-inputs + `(("eigen" ,eigen) + ("pkg-config" ,pkg-config) + ("vulkan-headers" ,vulkan-headers))) + (arguments + `(#:configure-flags + (list "-Dinstall-active-runtime=false"))) + (home-page "https://monado.freedesktop.org/") + (synopsis "OpenXR runtime") + (description "Monado is an OpenXR runtime delivering immersive experiences +such as VR and AR on mobile, PC/desktop, and any other device. Monado aims to be +a complete and conforming implementation of the OpenXR API made by Khronos.") + (license license:boost1.0))) -- cgit 1.4.1 From d4d40fa6836b20f5b71a6c0ebfd481f2e2978f75 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 16:53:36 +0100 Subject: gnu: Add ghc-protolude-0.3. * gnu/packages/haskell-xyz.scm (ghc-protolude-0.3): New variable. --- gnu/packages/haskell-xyz.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index bd3d8f239c..f9cc188dc1 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10576,6 +10576,22 @@ replace the standard one provided by GHC.") (base32 "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj")))))) +(define-public ghc-protolude-0.3 + (package + (inherit ghc-protolude) + (name "ghc-protolude") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://hackage/package/protolude/protolude-" + version + ".tar.gz")) + (sha256 + (base32 + "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))))) + (define-public ghc-psqueue (package (name "ghc-psqueue") -- cgit 1.4.1 From aa2392a0cf09e0d7a73eef9b5f7a5e9801f3d724 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 17:20:04 +0100 Subject: gnu: greenclip: Move to version-specific ghc-protolude-0.3 input. * gnu/packages/haskell-apps.scm (greenclip)[inputs]: Replace ghc-protolude with ghc-protolude-0.3. --- gnu/packages/haskell-apps.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index e8bde69082..a0a708a79c 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -747,7 +747,7 @@ formatting by forgetting all existing formatting during parsing.") ("ghc-hashable" ,ghc-hashable) ("ghc-microlens" ,ghc-microlens) ("ghc-microlens-mtl" ,ghc-microlens-mtl) - ("ghc-protolude" ,ghc-protolude) + ("ghc-protolude" ,ghc-protolude-0.3) ("ghc-vector" ,ghc-vector) ("ghc-wordexp" ,ghc-wordexp))) (home-page "https://github.com/erebe/greenclip") -- cgit 1.4.1 From 325098de344f87c8072f39871585dba779f8e5f1 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 17:38:18 +0100 Subject: Revert "gnu: ghc-protolude: Update to 0.3.0." This reverts commit a281a67f3ca56b5dfa670b4019d26d4c39e0c804. --- gnu/packages/haskell-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index f9cc188dc1..3a4fc714d9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -28,7 +28,6 @@ ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber -;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -10536,7 +10535,7 @@ the ideal templating system.") (define-public ghc-protolude (package (name "ghc-protolude") - (version "0.3.0") + (version "0.2.3") (source (origin (method url-fetch) @@ -10546,7 +10545,7 @@ the ideal templating system.") ".tar.gz")) (sha256 (base32 - "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0")))) + "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj")))) (build-system haskell-build-system) (inputs `(("ghc-async" ,ghc-async) -- cgit 1.4.1 From d1d8b52da38997600929a83fd216ad8345a4f75f Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 17:38:42 +0100 Subject: Revert "gnu: purescript: Move to version-specific ghc-protolude-0.2 input." This reverts commit 59c3ea22546f9bd7e0560a66f98a020af7d1ad6e. --- gnu/packages/purescript.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/purescript.scm b/gnu/packages/purescript.scm index be9dc69246..cc51b163c9 100644 --- a/gnu/packages/purescript.scm +++ b/gnu/packages/purescript.scm @@ -91,7 +91,7 @@ ("ghc-network" ,ghc-network) ("ghc-parallel" ,ghc-parallel) ("ghc-pattern-arrows" ,ghc-pattern-arrows) - ("ghc-protolude" ,ghc-protolude-0.2) + ("ghc-protolude" ,ghc-protolude) ("ghc-regex-tdfa" ,ghc-regex-tdfa) ("ghc-safe" ,ghc-safe) ("ghc-scientific" ,ghc-scientific) -- cgit 1.4.1 From 6bea71afac702fcab9fb420daa30aec95652e1a0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Feb 2021 17:51:10 +0100 Subject: Revert "gnu: Add ghc-protolude-0.2." This reverts commit 9ef7937766dd2e79807f3b0a6cd141ed310650a9. --- gnu/packages/haskell-xyz.scm | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 3a4fc714d9..47ee71bd08 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10559,22 +10559,6 @@ the ideal templating system.") replace the standard one provided by GHC.") (license license:expat))) -(define-public ghc-protolude-0.2 - (package - (inherit ghc-protolude) - (name "ghc-protolude") - (version "0.2.3") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/protolude/protolude-" - version - ".tar.gz")) - (sha256 - (base32 - "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj")))))) - (define-public ghc-protolude-0.3 (package (inherit ghc-protolude) -- cgit 1.4.1 From f3eecfd36cb537a1febc30eea1f6aa448203ba40 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Feb 2021 19:07:10 +0100 Subject: gnu: mame: Update to 0.229. * gnu/packages/emulators.scm (mame): Update to 0.229. --- 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 662542e759..6c044e3397 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1591,7 +1591,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.228") + (version "0.229") (source (origin (method git-fetch) @@ -1600,7 +1600,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "1xqd0b8xz9bc6ks9qbnrm7kkjcr81l0ksisvflr6gr6lxg2268xz")) + (base32 "0s5q6fjk739p1bfh72fmh35xi13fwbrgjqrn45i5xzx3v3gadmbg")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit 1.4.1 From 570c9c97bf64d9d0350044742aef403ad576b4ad Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Feb 2021 21:29:16 +0200 Subject: gnu: luajit-lua52-openresty: Use a source file-name. * gnu/packages/lua.scm (luajit-lua52-openresty)[source]: Add file-name field. --- gnu/packages/lua.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 81846afe82..c03eea3c70 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -168,6 +168,7 @@ language.") (uri (git-reference (url "https://github.com/openresty/luajit2.git") (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "07haj27kbpbnkv836c2nd36h2xislrmri52w0zbpxvl68xk6g96p")))) (arguments -- cgit 1.4.1 From 532406088a61fa629874ca993284d8fb4d67f819 Mon Sep 17 00:00:00 2001 From: lasnesne Date: Tue, 19 Jan 2021 23:00:49 +0900 Subject: gnu: solaar: Add missing dependencies for the GUI. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/admin.scm (solaar)[propagated-inputs]: Add PYTHON-PYYAML, PYTHON-PSUTIL, PYTHON-XLIB, GTK+, and PYTHON-PYGOBJECT. Signed-off-by: Ludovic Courtès --- gnu/packages/admin.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index a506b978f5..cf27eea084 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 qblade +;;; Copyright © 2021 Hyunseok Kim ;;; ;;; This file is part of GNU Guix. ;;; @@ -3944,7 +3945,14 @@ cache of unix and unix-like systems.") #t))))) (propagated-inputs `(("python-pygobject" ,python-pygobject) - ("python-pyudev" ,python-pyudev))) + ("python-pyudev" ,python-pyudev) + + ;; For GUI. + ("python-pyyaml" ,python-pyyaml) + ("python-psutil" ,python-psutil) + ("python-xlib" ,python-xlib) + ("gtk+" ,gtk+) + ("python-pygobject" ,python-pygobject))) (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 -- cgit 1.4.1 From fc03a1a3d793f4497f5fac560a724a63db51196c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Sat, 9 Jan 2021 20:15:06 +0800 Subject: gnu: Add chili-sddm-theme. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/display-managers.scm (chili-sddm-theme): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/display-managers.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index b6e5ab7d19..6ea6e1a161 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 L p R n d n ;;; Copyright © 2020 Fredrik Salomonsson ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -158,6 +159,36 @@ Guix's logo. Based on Arch linux's archlinux-simplyblack theme.") ;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0 (license (list license:cc-by-sa3.0 license:cc-by-sa4.0)))) +(define-public chili-sddm-theme + (package + (name "chili-sddm-theme") + (version "0.1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/MarianArlt/sddm-chili") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "036fxsa7m8ymmp3p40z671z163y6fcsa9a641lrxdrw225ssq5f3")))) + (build-system trivial-build-system) + (arguments + `(#:modules ((guix build utils)) + #:builder + (begin + (use-modules (guix build utils)) + (let* ((out (assoc-ref %outputs "out")) + (sddm-themes (string-append out "/share/sddm/themes"))) + (mkdir-p sddm-themes) + (copy-recursively (assoc-ref %build-inputs "source") + (string-append sddm-themes "/chili")))))) + (home-page "https://github.com/MarianArlt/sddm-chili") + (synopsis "Chili theme for SDDM") + (description "Chili reduces all the clutter and leaves you with a clean, +easy to use, login interface with a modern yet classy touch.") + (license license:gpl3+))) + (define-public lightdm (package (name "lightdm") -- cgit 1.4.1 From 4815f8162f7017925c74a5c80b03df635754f362 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Feb 2021 16:00:23 -0500 Subject: gnu: Open vSwitch: Update to 2.13.3 [fixes CVE-2020-35498]. * gnu/packages/networking.scm (openvswitch): Update to 2.13.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 d969ad854e..5e66ddc01e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2390,7 +2390,7 @@ procedure calls (RPCs).") (define-public openvswitch (package (name "openvswitch") - (version "2.13.0") + (version "2.13.3") (source (origin (method url-fetch) (uri (string-append @@ -2398,7 +2398,7 @@ procedure calls (RPCs).") version ".tar.gz")) (sha256 (base32 - "0cd5vmfr6zwgcnkwys6rag6cmz68v0librpaplianv734xs74pyx")))) + "1wc5zspy9aln7di7m9a1qy4lv3h05gmhgd1nffhb9nxdcxqgnpgp")))) (build-system gnu-build-system) (arguments '(;; FIXME: many tests fail with: -- cgit 1.4.1 From 3fef3cb8d2d9600764f5447f66dd2b4576dd0a61 Mon Sep 17 00:00:00 2001 From: Aurora Date: Tue, 23 Feb 2021 00:28:13 +0100 Subject: gnu: Add cl-irc. * gnu/packages/lisp-xyz.scm (cl-irc, ecl-cl-irc, sbcl-cl-irc): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 656404a5f5..c3811d6a2c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -279,6 +279,58 @@ interactive development model in mind.") (define-public ecl-fiveam (sbcl-package->ecl-package sbcl-fiveam)) +(define-public sbcl-cl-irc + (let ((commit "963823537c7bfcda2edd4c44d172192da6722175") + (revision "0")) + (package + (name "sbcl-cl-irc") + (version (git-version "0.9.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/common-lisp-team/cl-irc.git") + (commit commit))) + (file-name (git-file-name "cl-irc" version)) + (sha256 + (base32 "1b3nqbb4pj377lxl47rfgrs82pidadnrc65l48bk553c2f59b52w")))) + (build-system asdf-build-system/sbcl) + (native-inputs + ;; Tests only. + `(("rt" ,sbcl-rt))) + (inputs + `(("cl+ssl" ,sbcl-cl+ssl) + ("flexi-streams" ,sbcl-flexi-streams) + ("split-sequence" ,sbcl-split-sequence) + ("usocket" ,sbcl-usocket))) + (arguments + `(#:asd-systems '("cl-irc") ;; Some inexisting "c" system is + ;; found by guix otherwise. + #:asd-files '("cl-irc.asd") + #:test-asd-file "test/cl-irc-test.asd")) + (synopsis "IRC client library for Common Lisp") + (description "@code{cl-irc} is a Common Lisp IRC client library that +features (partial) DCC, CTCP and all relevant commands from the IRC +RFCs (RFC2810, RFC2811 and RFC2812). + +Features: +@itemize +@item implements all commands in the RFCs +@item extra convenience commands such as op/deop, ban, ignore, etc. +@item partial DCC SEND/CHAT support +@item event driven model with hooks makes interfacing easy +@item the user can keep multiple connections +@item all CTCP commands +@end itemize\n") + (home-page "https://common-lisp.net/project/cl-irc/") + (license license:bsd-2)))) + +(define-public cl-irc + (sbcl-package->cl-source-package sbcl-cl-irc)) + +(define-public ecl-cl-irc + (sbcl-package->ecl-package sbcl-cl-irc)) + (define-public sbcl-trivial-timeout (let ((commit "feb869357f40f5e109570fb40abad215fb370c6c") (revision "1")) -- cgit 1.4.1 From a85752cba225852494b94724c36bf10d3e0762df Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Wed, 24 Feb 2021 16:11:45 -0600 Subject: gnu: Add emacs-ecukes. * gnu/packages/emacs-xyz.scm (emacs-ecukes): New variable. --- gnu/packages/emacs-xyz.scm | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 09036c7e67..1121d73593 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -46,7 +46,7 @@ ;;; Copyright © 2019, 2020 Brian Leung ;;; Copyright © 2019 mikadoZero ;;; Copyright © 2019 Gabriel Hondet -;;; Copyright © 2019, 2020 Joseph LaFreniere +;;; Copyright © 2019, 2020, 2021 Joseph LaFreniere ;;; Copyright © 2019 Amar Singh ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi @@ -3728,6 +3728,37 @@ syntax. Most commonly Emacs Lisp Mock is used in conjunction with Emacs Lisp Expectations, but it can be used in other contexts.") (license license:gpl3+))) +(define-public emacs-ecukes + (package + (name "emacs-ecukes") + (version "0.6.17") + (home-page "https://github.com/ecukes/ecukes") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn")))) + (build-system emacs-build-system) + (arguments + `(#:include (cons* "^feature/" "^reporters/" "^templates/" %default-include))) + (propagated-inputs + `(("emacs-ansi" ,emacs-ansi) + ("emacs-commander" ,emacs-commander) + ("emacs-dash" ,emacs-dash) + ("emacs-espuds" ,emacs-espuds) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s))) + (synopsis "Cucumber for Emacs") + (description + "This package provides Ecukes, a Cucumber-inspired integration testing +tool for Emacs. Ecukes is not a complete clone of Cucumber and is not +intended to be.") + (license license:gpl3+))) + (define-public emacs-espuds (package (name "emacs-espuds") -- cgit 1.4.1 From 510b2f8447d8e4597e160b2bf74da3f6f8320d97 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Wed, 24 Feb 2021 16:12:21 -0600 Subject: gnu: Add emacs-keystore-mode. * gnu/packages/emacs-xyz.scm (emacs-keystore-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1121d73593..1706963d8e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -142,6 +142,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages haskell-apps) #:use-module (gnu packages ibus) + #:use-module (gnu packages java) #:use-module (gnu packages ncurses) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -26938,3 +26939,40 @@ to pastebin-like services. It supports more than one service and will failover if one service fails. More services can easily be added over time and prefered services can easily be configured.") (license license:gpl3+))) + +(define-public emacs-keystore-mode + (let ((release "0.0.1") + (revision "0") + (commit "43bd5926348298d077c7221f37902c990df3f951")) + (package + (name "emacs-keystore-mode") + (version (git-version release revision commit)) + (home-page "https://github.com/peterpaul/keystore-mode") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06cznkqkm04zz5lqfb514aqvsr2p13arzysixv0ss0bqpvdq7cv7")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command + '("emacs" "--no-init-file" "--batch" + "--eval=(require 'ecukes)" "--eval=(ecukes)"))) + (native-inputs + `(("emacs-ecukes" ,emacs-ecukes) + ("emacs-espuds" ,emacs-espuds) + ("emacs-undercover" ,emacs-undercover) + ("openjdk" ,openjdk9))) + (propagated-inputs + `(("emacs-origami" ,emacs-origami-el) + ("emacs-s" ,emacs-s))) + (synopsis "Major mode for viewing and managing Java keystores") + (description + "This package provides an Elisp wrapper around the Java +@command{keytool} command and major mode for viewing Java keystores.") + (license license:expat)))) -- cgit 1.4.1 From c1da9829f8b6d7c130ff3cc04ef7b15a5bb54825 Mon Sep 17 00:00:00 2001 From: qblade Date: Tue, 23 Feb 2021 01:13:09 +0000 Subject: gnu: Add python-esptool. * gnu/packages/engineering.scm (python-esptool-3.0): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/engineering.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 034dabc3f9..5e5cb02dd7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020, 2021 Morgan Smith +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -106,6 +107,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) @@ -1522,6 +1524,32 @@ bindings for Python, Java, OCaml and more.") (define-public python2-capstone (package-with-python2 python-capstone)) + +(define-public python-esptool-3.0 + (package + (name "python-esptool") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "esptool" version)) + (sha256 + (base32 + "0d69rd9h8wrzjvfrc66vmz4qd5hly2fpdcwj2bdrlb7dbwikv5c7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;XXX: require python-reedsolo + (propagated-inputs + `(("python-ecdsa" ,python-ecdsa) + ("python-pyaes" ,python-pyaes) + ("python-pyserial" ,python-pyserial))) + (home-page "https://github.com/espressif/esptool") + (synopsis "Bootloader utility for Espressif ESP8266 & ESP32 chips") + (description + "@code{esptool.py} is a Python-based utility to communicate with the ROM +bootloader in Espressif ESP8266 & ESP32 series chips.") + (license license:gpl2+))) + (define-public radare2 (package (name "radare2") -- cgit 1.4.1 From 73303067c77becb861d8e288bb115149ac6999cd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 25 Feb 2021 11:27:33 +0100 Subject: gnu: guile-simple-zmq: Update to 0.0.0-8.e944617. * gnu/packages/guile-xyz.scm (guile-simple-zmq): Update to 0.0.0-8.e944617. [build-system]: Switch to gnu-build-system. [arguments]: Remove the set-libzmq-file-name phase. [inputs]: Add autoconf, automake and pkg-config. --- gnu/packages/guile-xyz.scm | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index ce5aad8ec7..c75fc4b4ac 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1001,8 +1001,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "c8b1fa09e08e12207cf84023fc3d569936c886d7") - (revision "7")) + (let ((commit "e9446173280117e98ab4208e2aa5273128650e19") + (revision "8")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -1014,23 +1014,20 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "0ilyviny3c2am20d192cqhq7rsdy3jvbvmvqqg7qv9myrcwqg26y")) + "1nhlp5kl1095k1irvv0kgdbc7lp5qki3d3wg9rla6f7822hkmrzw")) (file-name (git-file-name name version)))) - (build-system guile-build-system) + (build-system gnu-build-system) (arguments - `(#:source-directory "src" - #:phases (modify-phases %standard-phases - (add-after 'unpack 'set-libzmq-file-name - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/simple-zmq.scm" - (("\\(dynamic-link \"libzmq\"\\)") - (format #f "(dynamic-link \"~a/lib/libzmq.so\")" - (assoc-ref inputs "zeromq")))) - #t))))) + '(#:make-flags + '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (native-inputs `(("guile" ,guile-3.0))) (inputs - `(("zeromq" ,zeromq))) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("zeromq" ,zeromq))) (home-page "https://github.com/jerry40/guile-simple-zmq") (synopsis "Guile wrapper over ZeroMQ library") (description -- cgit 1.4.1 From 120051e1b9358f75b228e97670843095d5fcdf49 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Feb 2021 10:01:56 +0100 Subject: machine: ssh: Use 'formatted-message'. * gnu/machine/ssh.scm (machine-check-initrd-modules): Use 'formatted-message' instead of 'format' + '&message'. --- gnu/machine/ssh.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 997d673e75..fa942169c4 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -270,11 +270,9 @@ not available in the initrd." (remote-let ((missing remote-exp)) (unless (null? missing) - (raise (condition - (&message - (message (format #f (G_ "missing modules for ~a:~{ ~a~}~%") + (raise (formatted-message (G_ "missing modules for ~a:~{ ~a~}~%") (file-system-device fs) - missing)))))))) + missing))))) (map missing-modules file-systems)) -- cgit 1.4.1 From 412e4f081e9cdf38db9859e1548ef2362cde678e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Feb 2021 10:58:20 +0100 Subject: services: shepherd: Make /run/booted-system a symlink to the store item. Fixes . Previously /run/booted-system would end up referring to /var/guix/profiles/system-NNN-link; consequently, the booted system would not be GC-protected. * gnu/services/shepherd.scm (shepherd-boot-gexp): Call 'canonicalize-path' instead of 'readlink'. --- gnu/services/shepherd.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index e2ec59f5aa..19a052c89b 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -97,7 +97,11 @@ #~(begin ;; Keep track of the booted system. (false-if-exception (delete-file "/run/booted-system")) - (symlink (readlink "/run/current-system") + + ;; Make /run/booted-system, an indirect GC root, point to the store item + ;; /run/current-system points to. Use 'canonicalize-path' rather than + ;; 'readlink' to make sure we get the store item. + (symlink (canonicalize-path "/run/current-system") "/run/booted-system") ;; Close any remaining open file descriptors to be on the safe -- cgit 1.4.1 From 60fd4118f7f01ac88bae1b44811afb34ea565685 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Feb 2021 11:25:57 +0100 Subject: system: vm: Use Guile 3.0 in Docker images. * gnu/system/vm.scm (system-docker-image): Use GUILE-3.0. --- gnu/system/vm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d7ae048b81..3d0935b3af 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -480,7 +480,7 @@ the operating system." (program-file "boot-program" #~(let ((system (cadr (command-line)))) (setenv "GUIX_NEW_SYSTEM" system) - (execl #$(file-append guile-2.2 "/bin/guile") + (execl #$(file-append guile-3.0 "/bin/guile") "guile" "--no-auto-compile" (string-append system "/boot"))))) -- cgit 1.4.1 From 2b0026813bc18258dd6fbecd69723df0267994b7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 25 Feb 2021 11:26:27 +0100 Subject: tests: docker-system: Increase VM memory. * gnu/tests/docker.scm (run-docker-system-test)[vm]: Increase 'memory-size'. --- gnu/tests/docker.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index c70c3ddb9e..cbb856b016 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic -;;; Copyright © 2019, 2020 Ludovic Courtès +;;; Copyright © 2019, 2020, 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -207,7 +207,7 @@ inside %DOCKER-OS." ;; load' must be able to store the whole image into memory, hence the ;; huge memory requirements. We should avoid the volatile-root setup ;; instead. - (memory-size 4000) + (memory-size 4500) (port-forwardings '()))) (define test -- cgit 1.4.1 From dcb640f02b1f9590c3bd4301a22bf31bd60c56d4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 22 Feb 2021 17:39:54 +0100 Subject: file-systems: 'mount-file-system' preserves source flags for bind mounts. Fixes . * gnu/build/file-systems.scm (mount-file-system): If FS is a bind mount, add its original mount flags to FLAGS. --- gnu/build/file-systems.scm | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index ddf6117b67..aca4aad848 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017 David Craven ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Guillaume Le Vaillant @@ -909,12 +909,27 @@ corresponds to the symbols listed in FLAGS." (if options (string-append "," options) ""))))) - (let ((type (file-system-type fs)) - (options (file-system-options fs)) - (source (canonicalize-device-spec (file-system-device fs))) - (mount-point (string-append root "/" - (file-system-mount-point fs))) - (flags (mount-flags->bit-mask (file-system-flags fs)))) + (let* ((type (file-system-type fs)) + (source (canonicalize-device-spec (file-system-device fs))) + (target (string-append root "/" + (file-system-mount-point fs))) + (flags (logior (mount-flags->bit-mask (file-system-flags fs)) + + ;; For bind mounts, preserve the original flags such + ;; as MS_NOSUID, etc. Failing to do that, the + ;; MS_REMOUNT call below fails with EPERM. + ;; See + (if (memq 'bind-mount (file-system-flags fs)) + (or (and=> (find (let ((devno (stat:dev + (lstat source)))) + (lambda (mount) + (= (mount-device-number mount) + devno))) + (mounts)) + mount-flags) + 0) + 0))) + (options (file-system-options fs))) (when (file-system-check? fs) (check-file-system source type)) @@ -925,24 +940,24 @@ corresponds to the symbols listed in FLAGS." ;; needed. (if (and (= MS_BIND (logand flags MS_BIND)) (not (file-is-directory? source))) - (unless (file-exists? mount-point) - (mkdir-p (dirname mount-point)) - (call-with-output-file mount-point (const #t))) - (mkdir-p mount-point)) + (unless (file-exists? target) + (mkdir-p (dirname target)) + (call-with-output-file target (const #t))) + (mkdir-p target)) (cond ((string-prefix? "nfs" type) - (mount-nfs source mount-point type flags options)) + (mount-nfs source target type flags options)) (else - (mount source mount-point type flags options))) + (mount source target type flags options))) ;; For read-only bind mounts, an extra remount is needed, as per ;; , which still applies to Linux ;; 4.0. (when (and (= MS_BIND (logand flags MS_BIND)) (= MS_RDONLY (logand flags MS_RDONLY))) - (let ((flags (logior MS_BIND MS_REMOUNT MS_RDONLY))) - (mount source mount-point type flags #f)))) + (let ((flags (logior MS_REMOUNT flags))) + (mount source target type flags options)))) (lambda args (or (file-system-mount-may-fail? fs) (apply throw args)))))) -- cgit 1.4.1 From 851abe022016549db0aaabf3d5a989777a651b64 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 25 Feb 2021 12:22:27 +0100 Subject: gnu: emacs-undo-tree: Update home-page. * gnu/packages/emacs-xyz.scm (emacs-undo-tree)[home-page]: Use new URL. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1706963d8e..5dad047173 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3252,7 +3252,7 @@ in the center.") (sha256 (base32 "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p")))) (build-system emacs-build-system) - (home-page "http://www.dr-qubit.org/emacs.php") + (home-page "https://www.dr-qubit.org/undo-tree.html") (synopsis "Treat undo history as a tree") (description "Tree-like interface to Emacs undo system, providing -- cgit 1.4.1 From a2ece4da1fdccb9e94681e38a3f3a79b0d43e061 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Thu, 25 Feb 2021 01:46:15 +0000 Subject: gnu: Add go-github-com-operatorfoundation-ed25519. * gnu/packages/golang.scm (go-github-com-operatorfoundation-ed25519): New variable. Co-authored-by: jgart Co-authored-by: Julien Lepiller Co-authored-by: Ryan Prior Co-authored-by: Raghav Gururajan Co-authored-by: Yasuaki Kudo Co-authored-by: Stephen Paul Weber Signed-off-by: Julien Lepiller --- 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 1b4be8acca..e54496c9aa 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6739,3 +6739,34 @@ compressed streams in Go.") (synopsis "Go library to get configuration values from gitconfig") (description "@{gitconfig} is a package to get configuration values from gitconfig.") (license license:expat))) + +(define-public go-github-com-operatorfoundation-ed25519 + (let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4") + (revision "0")) + (package + (name "go-github-com-operatorfoundation-ed25519") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OperatorFoundation/ed25519") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xrzqrjlghkgd1cy5rj4khryn4f59vas2vzrxc6d8jpj5ijf3xkv")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/OperatorFoundation/ed25519" + #:phases + (modify-phases %standard-phases + (add-before 'install 'remove-test-data + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/testdata")) + #t))))) + (home-page "https://github.com/OperatorFoundation/ed25519") + (synopsis "Ed25519 for go") + (description "Package ed25519 implements the Ed25519 signature +algorithm.") + (license license:bsd-3)))) -- cgit 1.4.1 From f16168744e8d5ab30cc77919cc06389c3f4a6abe Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 24 Feb 2021 14:13:13 +0000 Subject: gnu: Add caf. * gnu/packages/cpp.scm (caf): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cpp.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 685dc02fca..659eb1cdeb 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -954,3 +954,29 @@ conversions to and from strings, iteration and related functionality.") feature set with a simple and intuitive interface.") (home-page "https://cliutils.github.io/CLI11/book/") (license license:bsd-3))) + +(define-public caf + (package + (name "caf") + (version "0.18.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/actor-framework/actor-framework") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1c3spd6vm1h9qhlk5c4fdwi6nbqx5vwz2zvv6qp0rj1hx6xpq3cx")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DCAF_ENABLE_EXAMPLES=OFF"))) + (inputs + `(("openssl" ,openssl))) + (synopsis "C++ implementation of the actor model") + (description "The C++ Actor Framework (CAF) offers a high-level C++17 +programming environment using the actor model for concurrent, distributed +computation.") + (home-page "https://www.actor-framework.org/") + (license license:bsd-3))) -- cgit 1.4.1 From 10b909a0249fd53d589890b357232db4165690f5 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 24 Feb 2021 14:12:28 +0000 Subject: gnu: Python 3.9: Update to 3.9.2. * gnu/packages/python.scm (python-3.9): Update to 3.9.2. [source]: Remove obsolete patch. * gnu/packages/patches/python-3.9-CVE-2021-3177.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Leo Famulari --- gnu/local.mk | 1 - .../patches/python-3.9-CVE-2021-3177.patch | 194 --------------------- gnu/packages/python.scm | 6 +- 3 files changed, 3 insertions(+), 198 deletions(-) delete mode 100644 gnu/packages/patches/python-3.9-CVE-2021-3177.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8d46cda639..8d1465158a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1526,7 +1526,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3.8-fix-tests.patch \ %D%/packages/patches/python-3.8-CVE-2021-3177.patch \ %D%/packages/patches/python-3.9-fix-tests.patch \ - %D%/packages/patches/python-3.9-CVE-2021-3177.patch \ %D%/packages/patches/python-CVE-2018-14647.patch \ %D%/packages/patches/python-CVE-2020-26116.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ diff --git a/gnu/packages/patches/python-3.9-CVE-2021-3177.patch b/gnu/packages/patches/python-3.9-CVE-2021-3177.patch deleted file mode 100644 index 155f17deca..0000000000 --- a/gnu/packages/patches/python-3.9-CVE-2021-3177.patch +++ /dev/null @@ -1,194 +0,0 @@ -Fix CVE-2021-3177 for Python 3.9: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3177 - -Patch copied from upstream source repository: - -https://github.com/python/cpython/commit/c347cbe694743cee120457aa6626712f7799a932 - -From c347cbe694743cee120457aa6626712f7799a932 Mon Sep 17 00:00:00 2001 -From: "Miss Islington (bot)" - <31488909+miss-islington@users.noreply.github.com> -Date: Mon, 18 Jan 2021 13:29:31 -0800 -Subject: [PATCH] closes bpo-42938: Replace snprintf with Python unicode - formatting in ctypes param reprs. (GH-24247) - -(cherry picked from commit 916610ef90a0d0761f08747f7b0905541f0977c7) - -Co-authored-by: Benjamin Peterson - -Co-authored-by: Benjamin Peterson ---- - Lib/ctypes/test/test_parameters.py | 43 ++++++++++++++++ - .../2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst | 2 + - Modules/_ctypes/callproc.c | 51 +++++++------------ - 3 files changed, 64 insertions(+), 32 deletions(-) - create mode 100644 Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst - -diff --git a/Lib/ctypes/test/test_parameters.py b/Lib/ctypes/test/test_parameters.py -index e4c25fd880cef..531894fdec838 100644 ---- a/Lib/ctypes/test/test_parameters.py -+++ b/Lib/ctypes/test/test_parameters.py -@@ -201,6 +201,49 @@ def __dict__(self): - with self.assertRaises(ZeroDivisionError): - WorseStruct().__setstate__({}, b'foo') - -+ def test_parameter_repr(self): -+ from ctypes import ( -+ c_bool, -+ c_char, -+ c_wchar, -+ c_byte, -+ c_ubyte, -+ c_short, -+ c_ushort, -+ c_int, -+ c_uint, -+ c_long, -+ c_ulong, -+ c_longlong, -+ c_ulonglong, -+ c_float, -+ c_double, -+ c_longdouble, -+ c_char_p, -+ c_wchar_p, -+ c_void_p, -+ ) -+ self.assertRegex(repr(c_bool.from_param(True)), r"^$") -+ self.assertEqual(repr(c_char.from_param(97)), "") -+ self.assertRegex(repr(c_wchar.from_param('a')), r"^$") -+ self.assertEqual(repr(c_byte.from_param(98)), "") -+ self.assertEqual(repr(c_ubyte.from_param(98)), "") -+ self.assertEqual(repr(c_short.from_param(511)), "") -+ self.assertEqual(repr(c_ushort.from_param(511)), "") -+ self.assertRegex(repr(c_int.from_param(20000)), r"^$") -+ self.assertRegex(repr(c_uint.from_param(20000)), r"^$") -+ self.assertRegex(repr(c_long.from_param(20000)), r"^$") -+ self.assertRegex(repr(c_ulong.from_param(20000)), r"^$") -+ self.assertRegex(repr(c_longlong.from_param(20000)), r"^$") -+ self.assertRegex(repr(c_ulonglong.from_param(20000)), r"^$") -+ self.assertEqual(repr(c_float.from_param(1.5)), "") -+ self.assertEqual(repr(c_double.from_param(1.5)), "") -+ self.assertEqual(repr(c_double.from_param(1e300)), "") -+ self.assertRegex(repr(c_longdouble.from_param(1.5)), r"^$") -+ self.assertRegex(repr(c_char_p.from_param(b'hihi')), "^$") -+ self.assertRegex(repr(c_wchar_p.from_param('hihi')), "^$") -+ self.assertRegex(repr(c_void_p.from_param(0x12)), r"^$") -+ - ################################################################ - - if __name__ == '__main__': -diff --git a/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst -new file mode 100644 -index 0000000000000..7df65a156feab ---- /dev/null -+++ b/Misc/NEWS.d/next/Security/2021-01-18-09-27-31.bpo-42938.4Zn4Mp.rst -@@ -0,0 +1,2 @@ -+Avoid static buffers when computing the repr of :class:`ctypes.c_double` and -+:class:`ctypes.c_longdouble` values. -diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c -index b0a36a30248f7..f2506de54498e 100644 ---- a/Modules/_ctypes/callproc.c -+++ b/Modules/_ctypes/callproc.c -@@ -489,58 +489,47 @@ is_literal_char(unsigned char c) - static PyObject * - PyCArg_repr(PyCArgObject *self) - { -- char buffer[256]; - switch(self->tag) { - case 'b': - case 'B': -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.b); -- break; - case 'h': - case 'H': -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.h); -- break; - case 'i': - case 'I': -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.i); -- break; - case 'l': - case 'L': -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.l); -- break; - - case 'q': - case 'Q': -- sprintf(buffer, --#ifdef MS_WIN32 -- "", --#else -- "", --#endif -+ return PyUnicode_FromFormat("", - self->tag, self->value.q); -- break; - case 'd': -- sprintf(buffer, "", -- self->tag, self->value.d); -- break; -- case 'f': -- sprintf(buffer, "", -- self->tag, self->value.f); -- break; -- -+ case 'f': { -+ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); -+ if (f == NULL) { -+ return NULL; -+ } -+ PyObject *result = PyUnicode_FromFormat("", self->tag, f); -+ Py_DECREF(f); -+ return result; -+ } - case 'c': - if (is_literal_char((unsigned char)self->value.c)) { -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.c); - } - else { -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, (unsigned char)self->value.c); - } -- break; - - /* Hm, are these 'z' and 'Z' codes useful at all? - Shouldn't they be replaced by the functionality of c_string -@@ -549,22 +538,20 @@ PyCArg_repr(PyCArgObject *self) - case 'z': - case 'Z': - case 'P': -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - self->tag, self->value.p); - break; - - default: - if (is_literal_char((unsigned char)self->tag)) { -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - (unsigned char)self->tag, (void *)self); - } - else { -- sprintf(buffer, "", -+ return PyUnicode_FromFormat("", - (unsigned char)self->tag, (void *)self); - } -- break; - } -- return PyUnicode_FromString(buffer); - } - - static PyMemberDef PyCArgType_members[] = { diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5c5be0d78c..9d97050c66 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2018 Vagrant Cascadian ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -533,19 +534,18 @@ data types.") (define-public python-3.9 (package (inherit python-3.8) (name "python-next") - (version "3.9.1") + (version "3.9.2") (source (origin (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (patches (search-patches "python-3.9-fix-tests.patch" - "python-3.9-CVE-2021-3177.patch" "python-3-deterministic-build-info.patch" "python-3-search-paths.patch")) (sha256 (base32 - "1zq3k4ymify5ig739zyvx9s2ainvchxb1zpy139z74krr653y74r")) + "0z94vv5qhlwvcgc4sy9sdiqs0220s84wx3b62vslh5419z2k881w")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 42daea6503281dd29e093ba1f7185e6ae9d9a1b0 Mon Sep 17 00:00:00 2001 From: Tomás Ortín Fernández Date: Mon, 28 Dec 2020 01:27:53 +0100 Subject: gnu: Add ruby-e2mmap. * gnu/packages/ruby.scm (ruby-e2mmap): 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 4c9829612f..c3a15abe4d 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Holgr Peters ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2021 EuAndreh +;;; Copyright © 2020 Tomás Ortín Fernández ;;; ;;; This file is part of GNU Guix. ;;; @@ -12239,3 +12240,25 @@ multiple adapters, various log level combinations and message formatting options.") (home-page "https://github.com/rudionrails/yell") (license license:expat))) + +(define-public ruby-e2mmap + (package + (name "ruby-e2mmap") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "e2mmap" version)) + (sha256 + (base32 + "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #f)) ;; There is a rakefile but no tests + (synopsis + "Module for defining custom exceptions with specific messages") + (description + "Exception2MessageMapper (e2mmap) is a helper module for easily defining +exceptions with predefined messages.") + (home-page "https://github.com/ruby/e2mmap") + (license license:bsd-2))) -- cgit 1.4.1 From 2e932dc352aa090120f70c54480d68ffa70ea784 Mon Sep 17 00:00:00 2001 From: Tomás Ortín Fernández Date: Mon, 28 Dec 2020 01:36:46 +0100 Subject: gnu: Add ruby-benchmark. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-benchmark): New variable. Signed-off-by: Björn Höfling --- 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 c3a15abe4d..f2171c3c08 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12262,3 +12262,21 @@ options.") exceptions with predefined messages.") (home-page "https://github.com/ruby/e2mmap") (license license:bsd-2))) + +(define-public ruby-benchmark + (package + (name "ruby-benchmark") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "benchmark" version)) + (sha256 + (base32 + "1jvrl7400fv7v2jjri1r7ilj3sri36hzipwwgpn5psib4c9c59c6")))) + (build-system ruby-build-system) + (synopsis "Performance benchmarking library") + (description "This package provides methods for benchmarking Ruby code, +giving detailed reports on the time taken for each task.") + (home-page "https://github.com/ruby/benchmark") + (license license:bsd-2))) -- cgit 1.4.1 From cc628f255248777225b4fe4e4a011f6bb503632b Mon Sep 17 00:00:00 2001 From: Tomás Ortín Fernández Date: Mon, 28 Dec 2020 01:54:52 +0100 Subject: gnu: ruby-solargraph: Update to 0.40.3. * gnu/packages/ruby.scm (ruby-solargraph): Update to 0.40.3. [propagated-inputs]: Add ruby-benchmark, ruby-e2emap, ruby-kramdown, ruby-kramdown-parser-gfm. Remove ruby-htmlentities. --- gnu/packages/ruby.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f2171c3c08..cdb3502109 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12029,20 +12029,23 @@ application.") (define-public ruby-solargraph (package (name "ruby-solargraph") - (version "0.36.0") + (version "0.40.3") (source (origin (method url-fetch) (uri (rubygems-uri "solargraph" version)) (sha256 (base32 - "0b93xzkgd1h06da9gdnwivj1mzbil8lc072y2838dy6i7bxgpy9i")))) + "1gf049rm0yvw4r8r5yyi890idbfg8qh0dikqx5prvkh11srl73bz")))) (build-system ruby-build-system) (propagated-inputs `(("ruby-backport" ,ruby-backport) ("bundler" ,bundler) - ("ruby-htmlentities" ,ruby-htmlentities) + ("ruby-benchmark" ,ruby-benchmark) + ("ruby-e2mmap" ,ruby-e2mmap) ("ruby-jaro-winkler" ,ruby-jaro-winkler) + ("ruby-kramdown" ,ruby-kramdown) + ("ruby-kramdown-parser-gfm" ,ruby-kramdown-parser-gfm) ("ruby-maruku" ,ruby-maruku) ("ruby-nokogiri" ,ruby-nokogiri) ("ruby-parser" ,ruby-parser) -- cgit 1.4.1 From 337cb4a0481ed08b672cc70d601d1b60f2edcebd Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 25 Feb 2021 12:15:12 +0100 Subject: gnu: Add agent-proxy. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/embedded.scm (agent-proxy): New variable. Signed-off-by: Léo Le Bouter --- gnu/packages/embedded.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 16e9e6be76..51ee244f3c 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019 Clément Lassieur +;;; Copyright © 2018, 2019, 2021 Clément Lassieur ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2021 Julien Lepiller @@ -1547,3 +1547,40 @@ families, plus many of their variants.") (synopsis "Tool for dealing with AMD binary blobs") (description "PSPTool is a tool for dealing with AMD binary blobs") (license license:gpl3+))) + +(define-public agent-proxy + (let ((commit "8927798a71d246871ea8fc22b4512296a3fa1765") + (revision "0")) + (package + (name "agent-proxy") + (version (git-version "1.98" revision commit)) + (home-page + "https://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bxkzwsqfld4pknmiq8j3k55pv90n8s6kzh0xh42bhy2jv1wxz2z")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-after 'build 'build-kdmx + (lambda _ + (invoke "make" "-C" "kdmx") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin"))) + (install-file "agent-proxy" bin) + (install-file "kdmx/kdmx" bin) + #t)))))) + (synopsis "Proxies to run kgdb/gdbserver and console on a serial port") + (description "These programs are proxies allowing to run kgdb/gdbserver +and console on a single serial port. agent-proxy creates network sockets, +whereas kdmx creates pseudo-ttys.") + (license license:gpl2)))) -- cgit 1.4.1 From 866e2b121c297bafb801652b4ec856b4515a3559 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 23 Feb 2021 15:41:48 -0500 Subject: gnu: loudmouth: Update to 1.5.4. * gnu/packages/messaging.scm (loudmouth) [version]: Update to 1.5.4. Signed-off-by: Danny Milosavljevic --- 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 9812ca3905..88ecc0b953 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1889,7 +1889,7 @@ many bug fixes.") (define-public loudmouth (package (name "loudmouth") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -1897,7 +1897,7 @@ many bug fixes.") name "-" version ".tar.bz2")) (sha256 (base32 - "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl")))) + "03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) -- cgit 1.4.1 From 675086ad5b9aba5fdb6e5377a651de5211cd576f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 21:31:47 -0500 Subject: gnu: loudmouth: Disable static libraries. * gnu/packages/messaging.scm (loudmouth) [arguments]: Add --disable-static configure-flag and CFLAGS make-flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 88ecc0b953..4afc377913 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1899,6 +1899,13 @@ many bug fixes.") (base32 "03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--disable-static") + #:make-flags + (list + "CFLAGS=-Wno-error=all"))) (inputs `(("glib" ,glib) ("gnutls" ,gnutls) @@ -1906,7 +1913,7 @@ many bug fixes.") (native-inputs `(("pkg-config" ,pkg-config) ("check" ,check) - ("glib" ,glib "bin") ; gtester + ("glib" ,glib "bin") ; gtester ("gtk-doc" ,gtk-doc))) (home-page "https://mcabber.com/") (description -- cgit 1.4.1 From fcd984d7b80e3a19d33fbce7ce7b60602003fce0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 21:52:45 -0500 Subject: gnu: loudmouth: Enable GSSAPI. * gnu/packages/messaging.scm (loudmouth) [inputs]: Add mit-krb5. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4afc377913..afd9cebf4d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages kerberos) #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libidn) @@ -1909,6 +1910,7 @@ many bug fixes.") (inputs `(("glib" ,glib) ("gnutls" ,gnutls) + ("krb5" ,mit-krb5) ("libidn" ,libidn))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From c00b5be7a15224fe5e5874e2700f1cb213cb6373 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 22:48:01 -0500 Subject: gnu: loudmouth: Generate documentation. * gnu/packages/messaging.scm (loudmouth) [outputs]: New output "doc". [arguments]: Add --enable-gtk-doc and --with-html-dir configure-flags. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index afd9cebf4d..66176ddb36 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1900,10 +1900,15 @@ many bug fixes.") (base32 "03adv5xc84l9brcx0dpyqyffmsclans8yfrpnd357k6x3wfckjri")))) (build-system gnu-build-system) + (outputs '("out" "doc")) (arguments `(#:configure-flags (list - "--disable-static") + "--disable-static" + "--enable-gtk-doc" + (string-append "--with-html-dir=" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html")) #:make-flags (list "CFLAGS=-Wno-error=all"))) -- cgit 1.4.1 From 5e69fcf429adaef6c3ea9ad326d7a60d87bad012 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 22:54:15 -0500 Subject: gnu: mcabber: Update to 1.1.2. * gnu/packages/messaging.scm (mcabber) [version]: Update to 1.1.2. Signed-off-by: Danny Milosavljevic --- 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 66176ddb36..ef6db57f63 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1935,14 +1935,14 @@ protocol allows.") (define-public mcabber (package (name "mcabber") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://mcabber.com/files/" name "-" version ".tar.bz2")) (sha256 - (base32 "0ngrcc8nzpzk4vw36ni3w073149zsi0yjh922xy9cy5a7srwx2fp")))) + (base32 "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list "--enable-otr" -- cgit 1.4.1 From 7464c333dc6bca18ed56082c4977298ed39010a1 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 22:58:51 -0500 Subject: gnu: mcabber: Add missing native-inputs. * gnu/packages/messaging.scm (mcabber) [native-inputs]: Add perl and python-wrapper. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index ef6db57f63..0e43ed93c2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1956,7 +1956,9 @@ protocol allows.") ("ncurses" ,ncurses) ("loudmouth" ,loudmouth))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper))) (home-page "https://mcabber.com") (description "Mcabber is a small XMPP (Jabber) console client, which includes features -- cgit 1.4.1 From a3c675ee192fb852623ee93f36f0a440404ec76d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 23:09:27 -0500 Subject: gnu: mcabber: Disable static libraries. * gnu/packages/messaging.scm (mcabber) [arguments]: Add --disable-static configure-flag. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 0e43ed93c2..6e7867a15f 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1945,8 +1945,11 @@ protocol allows.") (base32 "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4")))) (build-system gnu-build-system) (arguments - '(#:configure-flags (list "--enable-otr" - "--enable-aspell"))) + `(#:configure-flags + (list + "--disable-static" + "--enable-otr" + "--enable-aspell"))) (inputs `(("gpgme" ,gpgme) ("libotr" ,libotr) -- cgit 1.4.1 From 703005e88e19b07d5a55e4dfd36b01e00e66fc1f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 24 Feb 2021 23:13:40 -0500 Subject: gnu: mcabber: Enable enchant support. * gnu/packages/messaging.scm (mcabber) [arguments]: Add --enable-enchant configure-flag. [inputs]: Add enchant. Signed-off-by: Danny Milosavljevic --- gnu/packages/messaging.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6e7867a15f..c3e4a5edd0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1949,11 +1949,13 @@ protocol allows.") (list "--disable-static" "--enable-otr" + "--enable-enchant" "--enable-aspell"))) (inputs `(("gpgme" ,gpgme) ("libotr" ,libotr) ("aspell" ,aspell) + ("enchant" ,enchant-1.6) ("libidn" ,libidn) ("glib" ,glib) ("ncurses" ,ncurses) -- cgit 1.4.1 From 811a2015a28f328e2076bb6a78562c3c2b81dd91 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 3 Feb 2021 20:21:31 +0000 Subject: gnu: make-nsis: Fix build * gnu/packages/installers.scm (make-nsis)[arguments]: Use C{,PLUS}_INCLUDE_PATH instead of CPATH environment variable to fix build. --- gnu/packages/installers.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index a8a5c36a18..775b91f0f7 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -92,13 +92,23 @@ ;; for native toolchain (setenv env-name (filter-delimited-string env-val (negate mingw-path?))) - ;; Add the removed paths back into - ;; CROSS_-prefixed version of env vars + ;; Add the removed paths back into CROSS_-prefixed + ;; version of env vars (setenv (string-append "CROSS_" env-name) (filter-delimited-string env-val mingw-path?)))) - '("CPATH" "LIBRARY_PATH")) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) ;; Hack to place mingw-w64 path at the end of search ;; paths. Could probably use a specfile and dirafter + (setenv "CROSS_C_INCLUDE_PATH" + (string-join + `(,@(map (cut string-append + (assoc-ref %build-inputs "xgcc") + "/lib/gcc/" ,triplet "/" + ,(package-version xgcc) <>) + '("/include" + "/include-fixed")) + ,(getenv "CROSS_C_INCLUDE_PATH")) + ":")) (setenv "CROSS_CPLUS_INCLUDE_PATH" (string-join `(,@(map (cut string-append (assoc-ref %build-inputs "xgcc") <>) @@ -108,21 +118,20 @@ ,@(map (cut string-append "/lib/gcc/" ,triplet "/" ,(package-version xgcc) <>) '("/include" "/include-fixed")))) - ,(getenv "CROSS_CPATH")) + ,(getenv "CROSS_CPLUS_INCLUDE_PATH")) ":")))) (add-before 'build 'fix-target-detection (lambda _ - ;; NSIS target detection is screwed up, manually - ;; change it ourselves + ;; NSIS target detection is screwed up, manually change + ;; it ourselves (substitute* "Source/build.cpp" (("m_target_type=TARGET_X86ANSI") (string-append "m_target_type=" ,nsis-target-type)))))))) (home-page "http://nsis.sourceforge.net/") (synopsis "A professional open source system to create Windows installers") (description - "NSIS (Nullsoft Scriptable Install System) is a professional open -source system to create Windows installers. It is designed to be as small and -flexible as possible and is therefore very suitable for internet -distribution.") + "NSIS (Nullsoft Scriptable Install System) is a professional open source +system to create Windows installers. It is designed to be as small and flexible +as possible and is therefore very suitable for internet distribution.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution."))))) -- cgit 1.4.1 From 62942992831249d6d1c047c0a11c41d2ecccc4fc Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Wed, 3 Feb 2021 18:08:35 -0500 Subject: gnu: Return appropriate defconfig for ppc64 (non-LE) * gnu/packages/linux.scm (system->defconfig): Add "powerpc64-" prefix. --- 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 86cf30b471..80afd125d9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -184,6 +184,7 @@ defconfig. Return the appropriate make target if applicable, otherwise return \"defconfig\"." (cond ((string-prefix? "powerpc-" system) "pmac32_defconfig") + ((string-prefix? "powerpc64-" system) "ppc64_defconfig") ((string-prefix? "powerpc64le-" system) "ppc64_defconfig") (else "defconfig"))) -- cgit 1.4.1 From f9dd7683c6740240895cfdd5f82d014277e2faf0 Mon Sep 17 00:00:00 2001 From: Adam Kandur Date: Fri, 26 Feb 2021 09:04:40 +0100 Subject: gnu: Add cffi-c-ref. * gnu/packages/lisp-xyz.scm (cl-cffi-c-ref, ecl-cffi-c-ref, sbcl-cffi-c-ref): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c3811d6a2c..9ebd1735ad 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2931,6 +2931,37 @@ package.") (define-public ecl-cffi (sbcl-package->ecl-package sbcl-cffi)) +(define-public sbcl-cffi-c-ref + (let ((commit "8123cbb6034c5f7921a0766107cfb8c4e8efd5ce") + (revision "0")) + (package + (name "sbcl-cffi-c-ref") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/cffi-c-ref") + (commit commit))) + (sha256 + (base32 "1a3pp6xcisabqir3rp1gvvjfdxcvpm8yr35p38nri9azsinmmc7z")) + (file-name (git-file-name "cffi-c-ref" version)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi))) + (synopsis "Streamlined access to foreign memory") + (description + "This Common Lisp library provides macros to access foreign memory.") + (home-page "https://github.com/borodust/cffi-c-ref") + (license license:expat)))) + +(define-public cl-cffi-c-ref + (sbcl-package->cl-source-package sbcl-cffi-c-ref)) + +(define-public ecl-cffi-c-ref + (sbcl-package->ecl-package sbcl-cffi-c-ref)) + (define-public sbcl-cl-sqlite (package (name "sbcl-cl-sqlite") -- cgit 1.4.1 From 3b3724760842f6ef95f6bbeeee67ae4237c54c8c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Feb 2021 09:50:44 +0100 Subject: gnu: python-pikepdf: Update to 2.6.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.6.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 072cc3db53..c10a55e8b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5807,13 +5807,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.5.2") + (version "2.6.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1wwfspm912388a61lailbpjpqihq9ha8yz05mjqx9yys4ixykhwg")))) + (base32 "1y3nmwjv0in0gbbcq53myx3sjf5j18iy556zvq9d67bg73y7l9s2")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 099026df5ba6443a9291e8f9d91ccacfdce2f00d Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 26 Feb 2021 10:44:09 +0100 Subject: gnu: cmh: Update to 1.1.0. * gnu/packages/algebra.scm (cmh): Update to 1.1.0. (fplll-4-cmh): Remove variable. --- gnu/packages/algebra.scm | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index aedfdb58e7..92e6c67c5d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -307,24 +307,10 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") (license license:gpl2) (home-page "https://pari.math.u-bordeaux.fr/"))) -(define fplll-4-cmh - (package - (inherit fplll) - (name "fplll") - (version "4.0.4") - (source - (origin - (method url-fetch) - (uri (string-append - "http://perso.ens-lyon.fr/damien.stehle/fplll/libfplll-" - version ".tar.gz")) - (sha256 - (base32 "1cbiby7ykis4z84swclpysrljmqhfcllpkcbll1m08rzskgb1a6b")))))) - (define-public cmh (package (name "cmh") - (version "1.0") + (version "1.1.0") (source (origin (method url-fetch) ;; Git repo at . @@ -332,14 +318,14 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.") version ".tar.gz")) (sha256 (base32 - "1a28xr9bs0igms0ik99x0w8lnb0jyfcmvyi26pbyh9ggcdivd33p")))) + "1ws2yhzxmm2l5xqqqcjcimmg40f9qq5l9i6d4i5434an9v9s8531")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) ("mpfr" ,mpfr) ("mpc" ,mpc) ("mpfrcx" ,mpfrcx) - ("fplll" ,fplll-4-cmh) + ("fplll" ,fplll) ("pari-gp" ,pari-gp))) (synopsis "Igusa class polynomial computations") (description -- cgit 1.4.1 From 8753bb4192410e6cd81a4072c1dd5f2ff822320e Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 26 Feb 2021 12:53:11 +0100 Subject: gnu: php: Disable failing test on Arm. * gnu/packages/php.scm (php): Disable timing sensitive failing test on Arm. --- gnu/packages/php.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 1c71c1f40f..46062facee 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -194,7 +194,8 @@ "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt" "ext/intl/tests/timezone_getOffset_error.phpt" "sapi/cli/tests/cli_process_title_unix.phpt" - "sapi/cli/tests/upload_2G.phpt"))) + "sapi/cli/tests/upload_2G.phpt" + "Zend/tests/concat_003.phpt"))) '()) ;; Drop tests that are known to fail. -- cgit 1.4.1 From 5e7388e15e68e7ea6e4f6c60a82cb08657d76de8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 26 Feb 2021 15:08:59 +0100 Subject: gnu: poke: Update to 1.0. * gnu/packages/engineering.scm (poke): Update to 1.0. [source]: Use URL-FETCH. [native-inputs]: Remove AUTOCONF, AUTOMAKE, GETTEXT, and HELP2MAN. [arguments]: Remove #:phases. [supported-systems]: New field. --- gnu/packages/engineering.scm | 99 ++++++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 58 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5e5cb02dd7..50cceeb1c0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016, 2018, 2020 Efraim Flashner ;;; Copyright © 2016 David Thompson -;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice @@ -2928,66 +2928,49 @@ GUI.") (license license:gpl3+))) (define-public poke - ;; Upstream has yet to tag any releases. - (let ((commit "d33317a46e3b7c48130a471a48cbfea1abab70d8") - (revision "0")) - (package - (name "poke") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.savannah.gnu.org/poke.git") - (commit commit) - (recursive? #t))) - (sha256 - (base32 "1dd0r1x123bqi78lrsk58rvg9c9wka0kywdyzn7g3i4hkh54xb7d")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - ;; The GUI, which we elide, requires tcl and tk. - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ;; Requires bison 3.6+ but we currently only have 3.5. - ;; Bison 3.6 will be available in the next core update. - ("bison-3.6" ,bison-3.6) - ("clisp" ,clisp) - ("dejagnu" ,dejagnu) - ("flex" ,flex) - ("gettext" ,gettext-minimal) - ("help2man" ,help2man) - ("libtool" ,libtool) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python-2" ,python-2) - ("python-3" ,python-3) - ("texinfo" ,texinfo))) - ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). - ;; FIXME: A "hyperlinks-capable" `libtexststyle' needed for the hserver. - (inputs `(("json-c" ,json-c) - ("libgc" ,libgc) - ("readline" ,readline))) - (arguments - ;; To build the GUI, add the `--enable-gui' configure flag. - ;; To enable the "hyperlink server", add the `--enable-hserver' flag. - `(#:configure-flags '("--enable-mi") - #:phases (modify-phases %standard-phases - ;; This is a non-trivial bootstrap that needs many of the - ;; native-inputs and thus must run after `patch-shebangs'. - (delete 'bootstrap) - (add-after 'patch-source-shebangs 'bootstrap - (lambda _ - (invoke "./bootstrap" "--no-git" - "--no-bootstrap-sync" - "--gnulib-srcdir=gnulib") - #t))))) - (home-page "http://jemarch.net/poke.html") - (synopsis "Interactive, extensible editor for binary data") - (description "GNU poke is an interactive, extensible editor for binary + (package + (name "poke") + (version "1.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/poke/poke-" version + ".tar.gz")) + (sha256 + (base32 + "02jvla69xd0nnlg2bil2vxxxglqgylswml6h5hy2nxy0023hp4yy")))) + + ;; XXX: Version 1.0 only supports 64-bit systems. + (supported-systems '("x86_64-linux" "aarch64-linux")) + + (build-system gnu-build-system) + ;; The GUI, which we elide, requires tcl and tk. + (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5. + ;; Bison 3.6 will be available in the next core update. + ("bison-3.6" ,bison-3.6) + ("clisp" ,clisp) + ("dejagnu" ,dejagnu) + ("flex" ,flex) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python-2" ,python-2) + ("python-3" ,python-3))) + ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). + ;; FIXME: A "hyperlinks-capable" `libtexststyle' needed for the hserver. + (inputs `(("json-c" ,json-c) + ("libgc" ,libgc) + ("readline" ,readline))) + (arguments + ;; To build the GUI, add the `--enable-gui' configure flag. + ;; To enable the "hyperlink server", add the `--enable-hserver' flag. + `(#:configure-flags '("--enable-mi"))) + (home-page "http://jemarch.net/poke.html") + (synopsis "Interactive, extensible editor for binary data") + (description "GNU poke is an interactive, extensible editor for binary data. Not limited to editing basic entities such as bits and bytes, it provides a full-fledged procedural, interactive programming language designed to describe data structures and to operate on them.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public pcb2gcode (package -- cgit 1.4.1 From d6544dc7b8b245fd44c51f0fd9a66c9afe2fbe3f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 26 Feb 2021 15:16:24 +0100 Subject: gnu: poke: Add dependency on libtextstyle. * gnu/packages/engineering.scm (poke)[inputs]: Add LIBTEXSTSTYLE. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 50cceeb1c0..fb6895f911 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2956,10 +2956,10 @@ GUI.") ("python-2" ,python-2) ("python-3" ,python-3))) ;; FIXME: Enable NBD support by adding `libnbd' (currently unpackaged). - ;; FIXME: A "hyperlinks-capable" `libtexststyle' needed for the hserver. (inputs `(("json-c" ,json-c) ("libgc" ,libgc) - ("readline" ,readline))) + ("readline" ,readline) + ("libtextstyle" ,libtextstyle))) (arguments ;; To build the GUI, add the `--enable-gui' configure flag. ;; To enable the "hyperlink server", add the `--enable-hserver' flag. -- cgit 1.4.1 From 6d70ec299b72aa9a5312977e4a7599d9b16cc7dc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:43:40 -0500 Subject: gnu: btrfs-progs: Update to 5.10.1. * gnu/packages/linux.scm (btrfs-progs): Update to 5.10.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 80afd125d9..1b44dd25aa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4939,7 +4939,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.9") + (version "5.10.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -4947,7 +4947,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "14d7hz07kfczfgmy1ixkgccjn393gpkjn7givz5kwxddcnk5i4xq")))) + "0i03vajakg1glbql1cv7xy0k71zvpd2whdwymmrz9rza3xrwqy8k")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit 1.4.1 From 04c2052dc437c5065056b66c2088d7f6ddda5e68 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:34:30 -0500 Subject: gnu: linux-libre 5.11: Update to 5.11.2. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.2. (linux-libre-5.11-pristine-source): 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 1b44dd25aa..8f6e079bb4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.1") +(define-public linux-libre-5.11-version "5.11.2") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0y76962qnnjxc5jgaw9vwrydzwjvj3q4xf7skp3ks2dab7vkhj33"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1gmrckvl3039z80rr740c0d5knwgj6p1dmhw4x9gwc7rxli6az85"))) + (hash (base32 "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From c4f60f6f3e5186413545708c0ef144d05c65943b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:35:09 -0500 Subject: gnu: linux-libre: Update to 5.10.19. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.19. (linux-libre-5.10-pristine-source): 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 8f6e079bb4..af5d3ca926 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,7 +367,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.11))) -(define-public linux-libre-5.10-version "5.10.18") +(define-public linux-libre-5.10-version "5.10.19") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -375,7 +375,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"))) + (hash (base32 "1mml5a30ky0khzj3r6ahybycbbszk86agq62qclwq2kzvsqbprr7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 68a9e933c7e319085541ba8e8e0e932ade36d8a4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:35:36 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.101. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.101. (linux-libre-5.4-pristine-source): 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 af5d3ca926..4eb2506407 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.4-version "5.4.100") +(define-public linux-libre-5.4-version "5.4.101") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"))) + (hash (base32 "179lv5vfxwbr40s505b69vahks7pb32yqcpzxbfhjcmy5l3qq4af"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From f4ac7571766d4192e9e7d4867ff1f589f0dd1c4b Mon Sep 17 00:00:00 2001 From: Vinícius dos Santos Oliveira Date: Thu, 25 Feb 2021 10:22:20 -0300 Subject: gnu: Add emilua. * gnu/packages/lua.scm (emilua): New variable. --- gnu/packages/lua.scm | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index c03eea3c70..5f9f859e93 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Simon South ;;; Copyright © 2020 Paul A. Patience +;;; Copyright © 2021 Vinícius dos Santos Oliveira ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,8 +38,11 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages gcc) + #:use-module (gnu packages build-tools) #:use-module (gnu packages readline) #:use-module (gnu packages m4) #:use-module (gnu packages tls) @@ -47,6 +51,11 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages boost) + #:use-module (gnu packages tls) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages vim) + #:use-module (gnu packages re2c) #:use-module (gnu packages xorg) #:use-module (gnu packages gtk)) @@ -1096,6 +1105,59 @@ signals to Linux processes.") shell command executions.") (license license:bsd-3))) +(define-public emilua + (package + (name "emilua") + (version "0.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/emilua/emilua.git") + (commit (string-append "v" version)) + ;; Current version requires bundled CLI11 and fmt, but at some + ;; future release the ones found in the system could be used + ;; instead. Current version also requires Trial.Protocol and + ;; the HTTP lib developed as part of GSoC 2014 for Boost, but + ;; these are dependencies unlikely to be "unbundled" in future + ;; releases. + (recursive? #t))) + (sha256 + (base32 + "1d6k5v6x85fbvz2ijq1imnfdwvqmsav4xp021a5v3ah4mgy7yann")))) + (build-system meson-build-system) + (arguments + `(#:meson ,meson-0.55 + ;; Tests are disabled for now due to an issue that affecs guix: + ;; + #:configure-flags '("-Denable_http=false" "-Denable_tests=false"))) + (native-inputs + `(("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs + ("luajit-lua52-openresty" ,luajit-lua52-openresty) + ("pkg-config" ,pkg-config) + ("re2c" ,re2c) + ("xxd" ,xxd))) + (inputs + `(("boost" ,boost) + ("boost-static" ,boost-static) + ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty + ;; fork. Emilua is severely affected by this limit, so the upstream package + ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT + ;; configure flag[2] for some features to work (e.g. __pairs on HTTP + ;; headers). + ;; + ;; [1] + ;; [2] + ("luajit-lua52-openresty" ,luajit-lua52-openresty) + ("ncurses" ,ncurses) + ("openssl" ,openssl))) + (home-page "https://gitlab.com/emilua/emilua") + (synopsis "Lua execution engine") + (description + "Emilua is a LuaJIT-based Lua execution engine that supports async IO, +fibers and actor-inspired threading. The experimental builtin HTTP module is +enabled.") + (license license:boost1.0))) + (define-public fennel (package (name "fennel") -- cgit 1.4.1 From f33e773ca7e76adcfcfb0dc879ff3c1040882ab4 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 27 Feb 2021 11:25:09 +0100 Subject: gnu: libspatialite: Update to 5.0.1. * gnu/packages/geo.scm (libspatialite, spatialite-tools): Update to 5.0.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/geo.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 4747791bdf..bd8dd6b9f7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines -;;; Copyright © 2020 Felix Gruber +;;; Copyright © 2020, 2021 Felix Gruber ;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. @@ -424,7 +424,7 @@ writing GeoTIFF information tags.") (define-public libspatialite (package (name "libspatialite") - (version "5.0.0") + (version "5.0.1") (source (origin (method url-fetch) @@ -432,7 +432,7 @@ writing GeoTIFF information tags.") version ".tar.gz")) (sha256 (base32 - "1b3dmkgwbfi43hj3jzy2mh707khavrnw91vdd5sv387m8c1dfzvv")))) + "164y82rw2lrp5glfc0rkn7n6xvx5dvlgmh7bb7815067251wkjzf")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1723,14 +1723,14 @@ associated attribute file (@file{.dbf}).") (define-public spatialite-tools (package (name "spatialite-tools") - (version "5.0.0") + (version "5.0.1") (source (origin (method url-fetch) (uri (string-append "https://www.gaia-gis.it/gaia-sins/" "spatialite-tools-" version ".tar.gz")) (sha256 - (base32 "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd")))) + (base32 "070p6pg541wvwb28wkn7k0z1qdyirik2qc2jpj4pf0vzx02w414n")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 72926ce5e5477c160a6ee3282870b1857a47b896 Mon Sep 17 00:00:00 2001 From: la snesne Date: Sat, 20 Feb 2021 23:47:52 +0900 Subject: gnu: Add rust-cbindgen-0.17. * gnu/packages/rust-apps.scm (rust-cbindgen-0.17): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/rust-apps.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d10008c9ca..d5567b8873 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages jemalloc) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) @@ -453,6 +454,38 @@ gitignore rules.") "This package provides a tool for generating C/C++ bindings to Rust code.") (license license:mpl2.0))) +(define-public rust-cbindgen-0.17 + (package + (inherit rust-cbindgen) + (name "rust-cbindgen") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cbindgen" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1f40hxj6h7wqmsj8dzxjm3m421hjqpz2m5zxasbn8kgnr6scykvl")))) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-2) + ("rust-heck" ,rust-heck-0.3) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-log" ,rust-log-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.5)) + #:cargo-development-inputs + (("rust-serial-test" ,rust-serial-test-0.5)))) + (native-inputs + `(("python-cython" ,python-cython))))) + (define-public rust-cbindgen-0.16 (package (inherit rust-cbindgen) -- cgit 1.4.1 From 5a402e0302d96bce5f18ff28ed5cac54cbacd29c Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 26 Feb 2021 16:54:20 +0000 Subject: gnu: Add kgraphviewer. * gnu/packages/kde-frameworks.scm (kgraphviewer): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/kde-frameworks.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 5482400f02..ef47a912ad 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages gperf) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) @@ -695,6 +697,36 @@ such as printers, to be discovered without any user intervention or centralized infrastructure.") (license license:lgpl2.1+))) +(define-public kgraphviewer + (package + (name "kgraphviewer") + (version "2.4.3") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/kgraphviewer/" + version "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l")))) + (build-system cmake-build-system) + (inputs + `(("qtbase" ,qtbase) + ("boost" ,boost) + ("graphviz" ,graphviz) + ("kiconthemes" ,kiconthemes) + ("kparts" ,kparts) + ("qtsvg" ,qtsvg))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (home-page "https://apps.kde.org/en/kgraphviewer") + (synopsis "Graphviz dot graph viewer for KDE") + (description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to +replace the other outdated Graphviz tools.") + (license license:gpl2+))) + (define-public kguiaddons (package (name "kguiaddons") -- cgit 1.4.1 From 6c304e02330617839ca95c106dcae12e02f6e39d Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Fri, 26 Feb 2021 16:54:21 +0000 Subject: gnu: Add massif-visualizer. * gnu/packages/kde.scm (massif-visualizer): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/kde.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 9173aea80f..3e05b26ea9 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Prafulla Giri ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -543,6 +544,43 @@ illustrators, matte and texture artists, and the VFX industry. Notable features include brush stabilizers, brush engines and wrap-around mode.") (license license:gpl2+))) +(define-public massif-visualizer + (package + (name "massif-visualizer") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/massif-visualizer/" version + "/src/massif-visualizer-" version ".tar.xz")) + (sha256 + (base32 "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q")))) + (build-system cmake-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("pkg-config" ,pkg-config) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("karchive" ,karchive) + ("kcoreaddons" ,kcoreaddons) + ("kparts" ,kparts) + ("kdiagram" ,kdiagram) + ("kgraphviewer" ,kgraphviewer) + ("kio" ,kio) + ("ki18n" ,ki18n) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtxmlpatterns" ,qtxmlpatterns))) + (home-page "https://apps.kde.org/en/massif-visualizer") + (synopsis "Visualize massif data generated by Valgrind") + (description + "Massif Visualizer is a tool that visualizes massif data. +You run your application in Valgrind with @code{--tool=massif} and then open +the generated @file{massif.out.%pid} in the visualizer. Gzip or Bzip2 +compressed massif files can also be opened transparently.") + (license license:gpl2+))) + (define-public libkomparediff2 (package (name "libkomparediff2") -- cgit 1.4.1 From 652861139fd92a5f8e55350c3d6286d9d8776ac3 Mon Sep 17 00:00:00 2001 From: qblade Date: Wed, 24 Feb 2021 11:35:35 +0000 Subject: gnu: add ekho. * gnu/packages/speech.scm (ekho): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/speech.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 66d8fca31b..4c9d3cf688 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -555,6 +556,40 @@ low level architecture and has a Scheme (SIOD) based command interpreter for control.") (license (license:non-copyleft "file://COPYING")))) +(define-public ekho + (package + (name "ekho") + (version "8.4") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/e-guidedog/Ekho/" + version "/ekho-" version ".tar.xz")) + (sha256 + (base32 "1v476kpw09ljj8mavasj4hya2w11jwlx7q22rh1lsn9jkkam5i2a")))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("espeak-ng" ,espeak-ng) + ("libsndfile" ,libsndfile) + ("pulseaudio" ,pulseaudio))) + (build-system gnu-build-system) + (native-search-paths + (list (search-path-specification + (variable "EKHO_DATA_PATH") + (files '("share/ekho-data"))))) + (home-page "https://eguidedog.net/ekho.php") + (synopsis "Chinese text-to-speech software") + (description + "Ehko is a Text-To-Speech (TTS) software. It supports Cantonese, +Mandarin, Toisanese, Zhaoan Hakka, Tibetan, Ngangien and Korean (in trial). +It can also speak English through eSpeak or Festival.") + (license (list license:gpl2+ + ;; libmusicxml + license:mpl2.0)))) + (define-public sphinxbase (package (name "sphinxbase") -- cgit 1.4.1 From 2c9a4c9a491ee3863d4540ed64788e654517424f Mon Sep 17 00:00:00 2001 From: David Wilson Date: Thu, 18 Feb 2021 14:34:25 -0800 Subject: gnu: Add obs-websocket. * gnu/packages/video.scm (obs-websocket): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/video.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 86defcb239..f083df1d65 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -49,6 +49,7 @@ ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Andrew Tropin +;;; Copyright © 2021 David Wilson ;;; ;;; This file is part of GNU Guix. ;;; @@ -3175,6 +3176,43 @@ and JACK.") OBS audio sources.") (license license:gpl2))) +(define-public obs-websocket + (package + (name "obs-websocket") + (version "4.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Palakis/obs-websocket") + (commit version) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1r47861ma1s3998clahbnbc216wcf706b1ps514k5p28h511l5w0")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-permission-change + (lambda* _ + (substitute* "CMakeLists.txt" + ;; Remove lines that set writeable permissions on outputs. + (("set\\(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS") "") + (("OWNER_READ.*\\)") "") + (("PERMISSIONS") ")")) + #t))))) + (inputs + `(("obs" ,obs) + ("qtbase" ,qtbase))) + (home-page "https://github.com/Palakis/obs-websocket") + (synopsis "OBS plugin for remote control via WebSockets") + (description "This OBS plugin allows you to establish a WebSocket channel +from within your running OBS instance so that you can control it remotely from +programs on your current machine or on other machines.") + (license license:gpl2+))) + (define-public obs-wlrobs (package (name "obs-wlrobs") -- cgit 1.4.1 From 186c559f9d47369007b106f30e63a5b0fbcd03e3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:21:27 +0100 Subject: gnu: emacs-chronometrist: Update to 0.6.5. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): Update to 0.6.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5dad047173..70d1eadee5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2390,7 +2390,7 @@ Lock key.") (define-public emacs-chronometrist (package (name "emacs-chronometrist") - (version "0.6.4") + (version "0.6.5") (source (origin (method git-fetch) @@ -2399,7 +2399,7 @@ Lock key.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wlvc73qrz3i8d2r37pyp5f2m1vb779li7z19wp6nrfs9hn6jd8i")))) + (base32 "1k7r5rc6vzrnhp9j5bkv45yzqz7zbqrkiry4fzc8w6f36pcw862f")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit 1.4.1 From 178f618c3a9039ed11f54d7f88955ce326ca34a2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:23:12 +0100 Subject: gnu: emacs-org-superstar: Update to 1.5.0. * gnu/packages/emacs-xyz.scm (emacs-org-superstar): Update to 1.5.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 70d1eadee5..3f03517e49 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6610,7 +6610,7 @@ email.") (define-public emacs-org-superstar (package (name "emacs-org-superstar") - (version "1.4.0") + (version "1.5.0") (source (origin (method git-fetch) @@ -6619,7 +6619,7 @@ email.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1aklp6nk05ghpq7ybsbvn28wrygfwqvq58k1hjll97nbhd7h0gyb")))) + (base32 "12inin2p6pm6vbv3yc06fx343dsp0vp07fjb35w088akhikmqh2a")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-org" ,emacs-org))) -- cgit 1.4.1 From a7e6e9ad3c7393cc984fc95a88b9e6f79e2dd1fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:26:06 +0100 Subject: gnu: fet: Update to 5.49.0. * gnu/packages/education.scm (fet): Update to 5.49.0. --- gnu/packages/education.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 13372489f5..c4ddc24ec7 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka @@ -614,14 +614,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.48.1") + (version "5.49.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "0k728l6zi0lkhzyipsb0f2jw53s4xicm7arp33ikhrvc4jlwcp4v")))) + (base32 "011bgr46bfi41hah1gr54va6arvr5zsvkk9zq2gfgavynwfnmny4")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From d97c8553b3c53ef49390ddb63237782b06d2c4a4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:28:43 +0100 Subject: gnu: emacs-prescient: Update to 5.1. * gnu/packages/emacs-xyz.scm (emacs-prescient): Update to 5.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3f03517e49..4d2e908df1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7184,7 +7184,7 @@ include installing, removing or visiting the homepage.") (define-public emacs-prescient (package (name "emacs-prescient") - (version "5.0") + (version "5.1") (source (origin (method git-fetch) @@ -7193,7 +7193,7 @@ include installing, removing or visiting the homepage.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "001q4l730bhw4d508jxlpzh1z459qzpg6rbncp12jrfm5yidksix")))) + (base32 "0d6kbczkamhhcmc8bf01q6k1x0g7dwjihwllzsldgga3dclyh4ks")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-company" ,emacs-company) -- cgit 1.4.1 From a8e60f372da99c2d93caaafc5cf3b434410eba29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:33:54 +0100 Subject: gnu: emacs-web-mode: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-web-mode)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4d2e908df1..02acb825a2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9544,7 +9544,7 @@ client/server side engines). Web mode is compatible with many template engines: PHP, JSP, ASP, Django, Twig, Jinja, Mustache, ERB, FreeMarker, Velocity, Cheetah, Smarty, CTemplate, Mustache, Blade, ErlyDTL, Go Template, Dust.js, React/JSX, Angularjs, ejs, etc.") - (home-page "http://web-mode.org/") + (home-page "https://web-mode.org/") (license license:gpl3+))) (define-public emacs-templatel -- cgit 1.4.1 From 49b1e484e1149f11f7e1537338cbfd3aac76b904 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:36:38 +0100 Subject: gnu: emacs-queue: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-queue)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 02acb825a2..3ff684695d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8427,7 +8427,7 @@ builtin JavaScript mode.") (base32 "0cx2848sqnnkkr4zisvqadzxngjyhmb36mh0q3if7q19yjjhmrkb")))) (build-system emacs-build-system) - (home-page "http://www.dr-qubit.org/tags/computing-code-emacs.html") + (home-page "https://www.dr-qubit.org/emacs_data-structures.html") (synopsis "Queue data structure for Emacs") (description "This Emacs library provides queue data structure. These queues can be -- cgit 1.4.1 From 044142379eaa16afc7484f82d0f62a22df565437 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:37:28 +0100 Subject: gnu: emacs-org-mime: Use HTTPS home page URI. * gnu/packages/emacs-xyz.scm (emacs-org-mime)[home-page]: Use HTTPS URI. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3ff684695d..7dbc74d868 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6598,7 +6598,7 @@ cards created in Org mode.") (sha256 (base32 "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj")))) (build-system emacs-build-system) - (home-page "http://github.com/org-mime/org-mime") + (home-page "https://github.com/org-mime/org-mime") (synopsis "Send HTML email using Org mode HTML export") (description "This program sends HTML email using Org-mode HTML export. -- cgit 1.4.1 From 98fb3ce8eb9db926075761c072d851de62f44a90 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:39:32 +0100 Subject: gnu: emacs-counsel-bbdb: Fix home page. * gnu/packages/emacs-xyz.scm (emacs-counsel-bbdb)[home-page]: Fix home-page. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7dbc74d868..96cf50f1de 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1967,7 +1967,7 @@ mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") "03g3lk8hz9a17vf5r16x054bhyk8xsbnfq0div8ig13fmhqi159q")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) - (home-page "https://github.com/redguard/counsel-bbdb") + (home-page "https://github.com/redguardtoo/counsel-bbdb") (synopsis "Ivy interface for BBDB") (description "This Ivy extension enables the use of @code{ivy-mode} to input email addresses from BBDB efficiently. The main functions are: -- cgit 1.4.1 From 7c2e063245a42b31f6495079a8d7921d6730e706 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:42:25 +0100 Subject: gnu: emacs-counsel-bbdb: Use GitHub repository. * gnu/packages/emacs-xyz.scm (emacs-counsel-bbdb)[version]: Use regular upstream version instead of MELPA's. [source]: Fetch from GitHub. --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 96cf50f1de..fe0703702c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1955,21 +1955,22 @@ mode, Rmail, Gnus, MH-E, and VM). BBDB is fully customizable.") (define-public emacs-counsel-bbdb (package - (name "emacs-counsel-bbdb") - (version "20181128.1320") - (source - (origin - (method url-fetch) - (uri (string-append "https://melpa.org/packages/counsel-bbdb-" - version ".el")) - (sha256 - (base32 - "03g3lk8hz9a17vf5r16x054bhyk8xsbnfq0div8ig13fmhqi159q")))) - (build-system emacs-build-system) - (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) - (home-page "https://github.com/redguardtoo/counsel-bbdb") - (synopsis "Ivy interface for BBDB") - (description "This Ivy extension enables the use of @code{ivy-mode} to input + (name "emacs-counsel-bbdb") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/redguardtoo/counsel-bbdb") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bki658mvlchqf3prkzxz4217a95cxm58c1qmf84yp2n8h6gd0d8")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/redguardtoo/counsel-bbdb") + (synopsis "Ivy interface for BBDB") + (description "This Ivy extension enables the use of @code{ivy-mode} to input email addresses from BBDB efficiently. The main functions are: @table @code @item counsel-bbdb-complete-mail to input email addresses; @@ -1979,7 +1980,7 @@ email addresses from BBDB efficiently. The main functions are: Since @code{counsel-bbdb} is based on @code{ivy-mode}, all Ivy key bindings are supported. For example, after @samp{C-u M-x counsel-bbdb-complete-mail}, you can press @samp{C-M-n} to input multiple email addresses.") - (license license:gpl3+))) + (license license:gpl3+))) (define-public emacs-bluetooth (package -- cgit 1.4.1 From 18eb35ac48957e9701334d5d31dcad187d998ca1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:47:53 +0100 Subject: gnu: emacs-git-gutter-fringe: Fix source location. * gnu/packages/emacs-xyz.scm (emacs-git-gutter-fringe)[source, home-page]: Update source location. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fe0703702c..f603aea757 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3567,7 +3567,7 @@ display and behaviour is easily customisable.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/syohex/git-gutter-fringe") + (url "https://github.com/emacsorphanage/git-gutter-fringe") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -3576,7 +3576,7 @@ display and behaviour is easily customisable.") (propagated-inputs `(("emacs-git-gutter" ,emacs-git-gutter) ("emacs-fringe-helper" ,emacs-fringe-helper))) - (home-page "https://github.com/syohex/git-gutter-fringe") + (home-page "https://github.com/emacsorphanage/git-gutter-fringe") (synopsis "See and manage hunks of text in a version control system") (description "This package extends @code{git-gutter} to use the fringe area of a -- cgit 1.4.1 From 8ef1f24f16354e08f23dfabf11396527b0417638 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 27 Feb 2021 17:50:43 +0100 Subject: gnu: extempore: Fix home page URL. * gnu/packages/music.scm (extempore)[home-page]: Fix URL. --- 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 d1089fff9b..2100e630fb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1023,7 +1023,7 @@ MusePack, Monkey's Audio, and WavPack files.") ("emacs" ,emacs-no-x))) ;; Extempore refuses to build on architectures other than x86_64 (supported-systems '("x86_64-linux")) - (home-page "https://digego.github.io/extempore/") + (home-page "https://github.com/digego/extempore") (synopsis "Programming environment for live coding of multimedia") (description "Extempore is a programming language and runtime environment designed -- cgit 1.4.1 From decd0dc6bcf88669d272e61f95de0a4d0649fbf8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 27 Feb 2021 14:12:32 -0500 Subject: gnu: python-aiohttp: Update to 3.7.4 [fixes CVE-2021-21330]. * gnu/packages/python-web.scm (python-aiohttp): Update to 3.7.4. --- 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 3cc20b2187..a8fe724551 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -94,13 +94,13 @@ (define-public python-aiohttp (package (name "python-aiohttp") - (version "3.7.3") + (version "3.7.4") (source (origin (method url-fetch) (uri (pypi-uri "aiohttp" version)) (sha256 - (base32 "1i3p4yrfgrf1zpbgnywqmb33ps4k51wylcxykhf2cwky0spq26lw")))) + (base32 "1pn79h8fng4xi5gl1f6saw31nxgmgyxl41yf3vba1l21673yr12x")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 23dcf4339d1dc102b2c509a151734f4caff793bd Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sat, 27 Feb 2021 22:57:11 +0100 Subject: gnu: java-snappy: Fix checks when build machine has too much memory. * gnu/packages/java-compression.scm (java-snappy)[arguments]: Add set-test-memory-size phase. This fixes . Thanks to zimoun for the solving idea. The CachingBufferPoolTest tries to allocate a lot of memory (20GB) and the test succeeds if there is not enough memory available in the JVM. When the build machine has a lot of memory (which is the case on the Guix CI system), the JVM will use more than 20GB as maximum heap size. In consequence, the test fails. The new phase adds a maxmemory size of 2G for the tests. Thus all other tests will have enough memory and the CachingBufferPoolTest will fail. --- gnu/packages/java-compression.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 654d138c33..5f653bcc94 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -99,6 +99,11 @@ (copy-recursively "src/main/resources/org/xerial/snappy/native" "build/classes/org/xerial/snappy/native") #t)) + (add-before 'build 'set-test-memory-size + (lambda _ + (substitute* "build.xml" + ((" Date: Sun, 28 Feb 2021 03:03:39 +0100 Subject: gnu: wpa-supplicant, hostapd: Fix CVE-2021-27803. See . * gnu/packages/patches/wpa-supplicant-CVE-2021-27803.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/admin.scm (wpa-supplicant-minimal, hostapd): Apply it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 8 +++- .../patches/wpa-supplicant-CVE-2021-27803.patch | 50 ++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/wpa-supplicant-CVE-2021-27803.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8d1465158a..f8ff065242 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1730,6 +1730,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2021-27803.patch \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index cf27eea084..2ca99774b8 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1656,7 +1656,9 @@ features of sudo with a fraction of the codebase.") ;; Disable D-Bus to save ~14MiB on the closure size. (("^CONFIG_CTRL_IFACE_DBUS" line _) (string-append "#" line))) - #t)))) + #t)) + (patches + (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) (build-system gnu-build-system) (arguments `(#:phases @@ -1820,7 +1822,9 @@ command.") ".tar.gz")) (sha256 (base32 - "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8")))) + "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8")) + (patches + (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/wpa-supplicant-CVE-2021-27803.patch b/gnu/packages/patches/wpa-supplicant-CVE-2021-27803.patch new file mode 100644 index 0000000000..1942bb3d55 --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-CVE-2021-27803.patch @@ -0,0 +1,50 @@ +From 8460e3230988ef2ec13ce6b69b687e941f6cdb32 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Tue, 8 Dec 2020 23:52:50 +0200 +Subject: [PATCH] P2P: Fix a corner case in peer addition based on PD Request + +p2p_add_device() may remove the oldest entry if there is no room in the +peer table for a new peer. This would result in any pointer to that +removed entry becoming stale. A corner case with an invalid PD Request +frame could result in such a case ending up using (read+write) freed +memory. This could only by triggered when the peer table has reached its +maximum size and the PD Request frame is received from the P2P Device +Address of the oldest remaining entry and the frame has incorrect P2P +Device Address in the payload. + +Fix this by fetching the dev pointer again after having called +p2p_add_device() so that the stale pointer cannot be used. + +Fixes: 17bef1e97a50 ("P2P: Add peer entry based on Provision Discovery Request") +Signed-off-by: Jouni Malinen +--- + src/p2p/p2p_pd.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/p2p/p2p_pd.c b/src/p2p/p2p_pd.c +index 3994ec03f86b..05fd593494ef 100644 +--- a/src/p2p/p2p_pd.c ++++ b/src/p2p/p2p_pd.c +@@ -595,14 +595,12 @@ void p2p_process_prov_disc_req(struct p2p_data *p2p, const u8 *sa, + goto out; + } + ++ dev = p2p_get_device(p2p, sa); + if (!dev) { +- dev = p2p_get_device(p2p, sa); +- if (!dev) { +- p2p_dbg(p2p, +- "Provision Discovery device not found " +- MACSTR, MAC2STR(sa)); +- goto out; +- } ++ p2p_dbg(p2p, ++ "Provision Discovery device not found " ++ MACSTR, MAC2STR(sa)); ++ goto out; + } + } else if (msg.wfd_subelems) { + wpabuf_free(dev->info.wfd_subelems); +-- +2.25.1 + -- cgit 1.4.1 From 6a67f4430f971c447b30d4b3a6f7db569d1cec37 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 28 Feb 2021 03:56:03 +0100 Subject: gnu: redis: Update to 6.0.11 [fixes CVE-2021-21309]. * gnu/packages/databases.scm (redis): Update to 6.0.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 6024d6eb5f..5c6ba05aaf 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2265,14 +2265,14 @@ similar to BerkeleyDB, LevelDB, etc.") (define-public redis (package (name "redis") - (version "6.0.10") + (version "6.0.11") (source (origin (method url-fetch) (uri (string-append "http://download.redis.io/releases/redis-" version".tar.gz")) (sha256 (base32 - "1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr")) + "0prwqap452m581nyc3cz642d1z3x9nd81896hlqdm3z8238z49y9")) (modules '((guix build utils))) (snippet ;; Delete bundled jemalloc, as the package will use the libc one -- cgit 1.4.1 From 9c30f26b8dca1be5b0cdaeea04a3484905cfd4f2 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 17 Feb 2021 19:50:33 +0800 Subject: gnu: retroarch: Update to 1.9.0. * gnu/packages/emulators.scm (retroarch): Update to 1.9.0. [source]: Remove 'retroarch-disable-online-updater.patch' and snippet. Add 'retroarch-LIBRETRO_DIRECTORY.patch'. [native-search-paths]: New field. * gnu/packages/patches/retroarch-disable-online-updater.patch: Remove file. * gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/emulators.scm | 24 ++++++------- .../patches/retroarch-LIBRETRO_DIRECTORY.patch | 32 +++++++++++++++++ .../patches/retroarch-disable-online-updater.patch | 41 ---------------------- 4 files changed, 44 insertions(+), 55 deletions(-) create mode 100644 gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch delete mode 100644 gnu/packages/patches/retroarch-disable-online-updater.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f8ff065242..76bb7ef1f0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1592,7 +1592,7 @@ dist_patch_DATA = \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-store-checksum-override.patch \ %D%/packages/patches/remake-impure-dirs.patch \ - %D%/packages/patches/retroarch-disable-online-updater.patch \ + %D%/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch \ %D%/packages/patches/rnp-add-version.cmake.patch \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 6c044e3397..dcbffa0a28 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1273,7 +1273,7 @@ as RetroArch.") (define-public retroarch (package (name "retroarch") - (version "1.8.1") + (version "1.9.0") (source (origin (method git-fetch) @@ -1282,18 +1282,9 @@ as RetroArch.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0y7rcpz7psf8k3agsrq277jdm651vbnn9xpqvmj2in1a786idya7")) + (base32 "1n0dcv85vqrdr79psnf009hi4r2mvsgsjbghrrc9pm5g7ywwwcvp")) (patches - (search-patches "retroarch-disable-online-updater.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Don't suggest using the Online Updater if available: it never - ;; is. This disables translation of this particular message. - (substitute* (find-files "menu/drivers" "\\.c$") - (("msg_hash_to_str\\(MSG_MISSING_ASSETS\\)") - "\"Warning: Missing assets, go get some\"")) - #t)))) + (search-patches "retroarch-LIBRETRO_DIRECTORY.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1328,7 +1319,9 @@ as RetroArch.") '("--enable-neon" "--enable-floathard") '()) (string-append "--prefix=" out) - (string-append "--global-config-dir=" etc) + ;; Non-free software are available through the core updater, + ;; disable it. See . + "--disable-update_cores" "--disable-builtinminiupnpc"))))))) (inputs `(("alsa-lib" ,alsa-lib) @@ -1354,6 +1347,11 @@ as RetroArch.") `(("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols) ("which" ,which))) + (native-search-paths + (list (search-path-specification + (variable "LIBRETRO_DIRECTORY") + (separator #f) ; single entry + (files '("lib/libretro"))))) (home-page "https://www.libretro.com/") (synopsis "Reference frontend for the libretro API") (description diff --git a/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch new file mode 100644 index 0000000000..30515cbe48 --- /dev/null +++ b/gnu/packages/patches/retroarch-LIBRETRO_DIRECTORY.patch @@ -0,0 +1,32 @@ +From f308dc91660954ab88bb41868c0b9809592923e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= +Date: Sat, 20 Feb 2021 20:37:39 +0800 +Subject: [PATCH] Allow set libretro_directory via environment variable + +--- + retroarch.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/retroarch.c b/retroarch.c +index 6a88c3108e..6807c12b5b 100644 +--- a/retroarch.c ++++ b/retroarch.c +@@ -36038,6 +36038,15 @@ static void retroarch_parse_input_and_config( + #endif + config_load(&p_rarch->g_extern); + ++ /* Override settings via environment variables */ ++ if (getenv("LIBRETRO_DIRECTORY")) { ++ settings_t *settings = p_rarch->configuration_settings; ++ retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO_DIRECTORY, NULL); ++ configuration_set_string(settings, ++ settings->paths.directory_libretro, ++ getenv("LIBRETRO_DIRECTORY")); ++ } ++ + /* Second pass: All other arguments override the config file */ + optind = 1; + +-- +2.30.0 + diff --git a/gnu/packages/patches/retroarch-disable-online-updater.patch b/gnu/packages/patches/retroarch-disable-online-updater.patch deleted file mode 100644 index ea74cc5409..0000000000 --- a/gnu/packages/patches/retroarch-disable-online-updater.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Tobias Geerinckx-Rice -Date: Fri, 29 Nov 2019 20:32:54 +0100 -Subject: [PATCH]: gnu: retroarch: Disable the on-line updater. - -This disables the entire ‘Online Updater’ sub-menu to address -. Perhaps that is more than is -necessary. - -diff -Naur a/menu/menu_displaylist.c b/menu/menu_displaylist.c ---- a/menu/menu_displaylist.c 1970-01-01 01:00:01.000000000 +0100 -+++ b/menu/menu_displaylist.c 2019-11-29 18:35:27.467948854 +0100 -@@ -8444,11 +8444,6 @@ - MENU_ENUM_LABEL_NETPLAY, - PARSE_ACTION, false) == 0) - count++; -- if (settings->bools.menu_show_online_updater) -- if (menu_displaylist_parse_settings_enum(info->list, -- MENU_ENUM_LABEL_ONLINE_UPDATER, -- PARSE_ACTION, false) == 0) -- count++; - if (menu_displaylist_parse_settings_enum(info->list, - MENU_ENUM_LABEL_SETTINGS, PARSE_ACTION, false) == 0) - count++; -diff -Naur retroarch.a/menu/menu_setting.c retroarch.c/menu/menu_setting.c ---- a/menu/menu_setting.c 1970-01-01 01:00:01.000000000 +0100 -+++ b/menu/menu_setting.c 2019-11-29 18:35:35.753957312 +0100 -@@ -7291,14 +7291,6 @@ - &group_info, - &subgroup_info, - parent_group); -- -- CONFIG_ACTION( -- list, list_info, -- MENU_ENUM_LABEL_ONLINE_UPDATER, -- MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER, -- &group_info, -- &subgroup_info, -- parent_group); - #endif - - CONFIG_ACTION( -- cgit 1.4.1 From 8eb9e759dc2aa0aaf150848094211a3efc6abecb Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 28 Feb 2021 04:17:31 +0100 Subject: gnu: owncloud-client: Update to 2.7.6.3261. * gnu/packages/sync.scm (owncloud-client): Update to 2.7.6.3261. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index f3d6e9013c..76b822ecbc 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -154,14 +154,14 @@ See also: megacmd, the official tool set by MEGA.") (define-public owncloud-client (package (name "owncloud-client") - (version "2.7.5.3180") + (version "2.7.6.3261") (source (origin (method url-fetch) (uri (string-append "https://download.owncloud.com/desktop/ownCloud/stable/" version "/source/ownCloud-" version ".tar.xz")) (sha256 - (base32 "13vlkmkr3i99ww3fkps7lwrx6vgr43rvmjcpsix259rj7f2ikkrp")) + (base32 "19jjlhbzhy4v5h1wj5a87ismxq2p7avb2bb4lfbh2rvl01r432vy")) (patches (search-patches "owncloud-disable-updatecheck.patch")))) ;; TODO: unbundle qprogessindicator, qlockedfile, qtokenizer and ;; qtsingleapplication which have not yet been packaged, but all are -- cgit 1.4.1 From e05c0b334d55d1399303ce097f70eaa2ca3ad7df Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 28 Feb 2021 04:40:05 +0100 Subject: gnu: qemu: Fix CVE-2021-20203. * gnu/packages/patches/qemu-CVE-2021-20203.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/virtualization.scm (qemu): Apply it. --- gnu/local.mk | 1 + gnu/packages/patches/qemu-CVE-2021-20203.patch | 172 +++++++++++++++++++++++++ gnu/packages/virtualization.scm | 3 +- 3 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/qemu-CVE-2021-20203.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 76bb7ef1f0..83753e6b4e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1561,6 +1561,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/pypy3-7.3.1-fix-tests.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ + %D%/packages/patches/qemu-CVE-2021-20203.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ diff --git a/gnu/packages/patches/qemu-CVE-2021-20203.patch b/gnu/packages/patches/qemu-CVE-2021-20203.patch new file mode 100644 index 0000000000..9d2ceaa649 --- /dev/null +++ b/gnu/packages/patches/qemu-CVE-2021-20203.patch @@ -0,0 +1,172 @@ +From mboxrd@z Thu Jan 1 00:00:00 1970 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_INVALID, + DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, + MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, + URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 87556C433E0 + for ; Sat, 30 Jan 2021 13:20:40 +0000 (UTC) +Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id EF26964DE1 + for ; Sat, 30 Jan 2021 13:20:39 +0000 (UTC) +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF26964DE1 +Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com +Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org +Received: from localhost ([::1]:42488 helo=lists1p.gnu.org) + by lists.gnu.org with esmtp (Exim 4.90_1) + (envelope-from ) + id 1l5qB3-0008CX-02 + for qemu-devel@archiver.kernel.org; Sat, 30 Jan 2021 08:20:37 -0500 +Received: from eggs.gnu.org ([2001:470:142:3::10]:45174) + by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) + (Exim 4.90_1) (envelope-from ) + id 1l5q9q-0007ld-1c + for qemu-devel@nongnu.org; Sat, 30 Jan 2021 08:19:22 -0500 +Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42898) + by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) + (Exim 4.90_1) (envelope-from ) + id 1l5q9k-0007Ia-TV + for qemu-devel@nongnu.org; Sat, 30 Jan 2021 08:19:21 -0500 +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; + s=mimecast20190719; t=1612012753; + h=from:from:reply-to:subject:subject:date:date:message-id:message-id: + to:to:cc:cc:mime-version:mime-version:content-type:content-type: + content-transfer-encoding:content-transfer-encoding; + bh=7vu4z8M+bFjhFzEuAYsQG4i3APx7aMqv7tFxRRO5+8Q=; + b=egCsTdgVBnRlHnVN84HsSpNOUl/NkqEnGuv9rRdG2AZ1Fee5ZatpJm5zJ7YUW2HvzB4rtO + EaDIKaN1wzf/yHf0CsJ60TPGG3DqQSC/EsTSr2l/GNGq4prDYTXVrS3rXFu9ofByUVvzwU + q9Iy1X1Bh3S21m7jXY0AYx4Tu9Ikq9w= +Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com + [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id + us-mta-588-1JF7mzMfP1KpRpNKj4cAWQ-1; Sat, 30 Jan 2021 08:19:08 -0500 +X-MC-Unique: 1JF7mzMfP1KpRpNKj4cAWQ-1 +Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com + [10.5.11.22]) + (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) + (No client certificate requested) + by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F0F439380; + Sat, 30 Jan 2021 13:19:07 +0000 (UTC) +Received: from localhost.localdomain (unknown [10.33.36.2]) + by smtp.corp.redhat.com (Postfix) with ESMTPS id 17D581002C11; + Sat, 30 Jan 2021 13:19:04 +0000 (UTC) +From: P J P +To: Dmitry Fleytman +Subject: [PATCH] net: vmxnet3: validate configuration values during activate + (CVE-2021-20203) +Date: Sat, 30 Jan 2021 18:46:52 +0530 +Message-Id: <20210130131652.954143-1-ppandit@redhat.com> +MIME-Version: 1.0 +X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 +Authentication-Results: relay.mimecast.com; + auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ppandit@redhat.com +X-Mimecast-Spam-Score: 0 +X-Mimecast-Originator: redhat.com +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset="US-ASCII" +Received-SPF: pass client-ip=63.128.21.124; envelope-from=ppandit@redhat.com; + helo=us-smtp-delivery-124.mimecast.com +X-Spam_score_int: -30 +X-Spam_score: -3.1 +X-Spam_bar: --- +X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.255, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, + SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no +X-Spam_action: no action +X-BeenThere: qemu-devel@nongnu.org +X-Mailman-Version: 2.1.23 +Precedence: list +List-Id: +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +Cc: Gaoning Pan , QEMU Developers , + Prasad J Pandit +Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org +Sender: "Qemu-devel" + +Archived-At: +List-Archive: + +From: Prasad J Pandit + +While activating device in vmxnet3_acticate_device(), it does not +validate guest supplied configuration values against predefined +minimum - maximum limits. This may lead to integer overflow or +OOB access issues. Add checks to avoid it. + +Fixes: CVE-2021-20203 +Buglink: https://bugs.launchpad.net/qemu/+bug/1913873 +Reported-by: Gaoning Pan +Signed-off-by: Prasad J Pandit +--- + hw/net/vmxnet3.c | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c +index eff299f629..4a910ca971 100644 +--- a/hw/net/vmxnet3.c ++++ b/hw/net/vmxnet3.c +@@ -1420,6 +1420,7 @@ static void vmxnet3_activate_device(VMXNET3State *s) + vmxnet3_setup_rx_filtering(s); + /* Cache fields from shared memory */ + s->mtu = VMXNET3_READ_DRV_SHARED32(d, s->drv_shmem, devRead.misc.mtu); ++ assert(VMXNET3_MIN_MTU <= s->mtu && s->mtu < VMXNET3_MAX_MTU); + VMW_CFPRN("MTU is %u", s->mtu); + + s->max_rx_frags = +@@ -1473,6 +1474,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) + /* Read rings memory locations for TX queues */ + pa = VMXNET3_READ_TX_QUEUE_DESCR64(d, qdescr_pa, conf.txRingBasePA); + size = VMXNET3_READ_TX_QUEUE_DESCR32(d, qdescr_pa, conf.txRingSize); ++ if (size > VMXNET3_TX_RING_MAX_SIZE) { ++ size = VMXNET3_TX_RING_MAX_SIZE; ++ } + + vmxnet3_ring_init(d, &s->txq_descr[i].tx_ring, pa, size, + sizeof(struct Vmxnet3_TxDesc), false); +@@ -1483,6 +1487,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) + /* TXC ring */ + pa = VMXNET3_READ_TX_QUEUE_DESCR64(d, qdescr_pa, conf.compRingBasePA); + size = VMXNET3_READ_TX_QUEUE_DESCR32(d, qdescr_pa, conf.compRingSize); ++ if (size > VMXNET3_TC_RING_MAX_SIZE) { ++ size = VMXNET3_TC_RING_MAX_SIZE; ++ } + vmxnet3_ring_init(d, &s->txq_descr[i].comp_ring, pa, size, + sizeof(struct Vmxnet3_TxCompDesc), true); + VMXNET3_RING_DUMP(VMW_CFPRN, "TXC", i, &s->txq_descr[i].comp_ring); +@@ -1524,6 +1531,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) + /* RX rings */ + pa = VMXNET3_READ_RX_QUEUE_DESCR64(d, qd_pa, conf.rxRingBasePA[j]); + size = VMXNET3_READ_RX_QUEUE_DESCR32(d, qd_pa, conf.rxRingSize[j]); ++ if (size > VMXNET3_RX_RING_MAX_SIZE) { ++ size = VMXNET3_RX_RING_MAX_SIZE; ++ } + vmxnet3_ring_init(d, &s->rxq_descr[i].rx_ring[j], pa, size, + sizeof(struct Vmxnet3_RxDesc), false); + VMW_CFPRN("RX queue %d:%d: Base: %" PRIx64 ", Size: %d", +@@ -1533,6 +1543,9 @@ static void vmxnet3_activate_device(VMXNET3State *s) + /* RXC ring */ + pa = VMXNET3_READ_RX_QUEUE_DESCR64(d, qd_pa, conf.compRingBasePA); + size = VMXNET3_READ_RX_QUEUE_DESCR32(d, qd_pa, conf.compRingSize); ++ if (size > VMXNET3_RC_RING_MAX_SIZE) { ++ size = VMXNET3_RC_RING_MAX_SIZE; ++ } + vmxnet3_ring_init(d, &s->rxq_descr[i].comp_ring, pa, size, + sizeof(struct Vmxnet3_RxCompDesc), true); + VMW_CFPRN("RXC queue %d: Base: %" PRIx64 ", Size: %d", i, pa, size); +-- +2.29.2 + + + diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8da57cf6ab..1f8c3beea0 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -141,7 +141,8 @@ (sha256 (base32 "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch")) + (patches (search-patches "qemu-build-info-manual.patch" + "qemu-CVE-2021-20203.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From ca36b0389cd2155bf6c7d045f3c77cbb3047b5fb Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 28 Feb 2021 05:17:41 +0100 Subject: gnu: java-xmlgraphics-commons: Update to 2.6 [fixes CVE-2020-11988]. * gnu/packages/batik.scm (java-xmlgraphics-commons): Update to 2.6. --- gnu/packages/batik.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index c8f4a34c72..9cff05d949 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -199,7 +199,7 @@ SAC is an interface for CSS parsers.") (define-public java-xmlgraphics-commons (package (name "java-xmlgraphics-commons") - (version "2.4") + (version "2.6") (source (origin (method url-fetch) @@ -207,7 +207,7 @@ SAC is an interface for CSS parsers.") "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-" version "-src.tar.gz")) (sha256 - (base32 "0zdkngb896cr35jq1v859j2kpqyn6a87k6a893h394hgvnz7yi3v")) + (base32 "18gndjwzdd6vhp59fn8cwn6i6q0v0ym8nmwn65rcykdrzz0nvl72")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From f35c9fd52116bf06e8200dfdade13b94659d217a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 27 Feb 2021 21:06:07 +0000 Subject: gnu: Add cl-daemon. * gnu/packages/lisp-xyz.scm (sbcl-daemon, cl-daemon, ecl-daemon): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9ebd1735ad..b7c5da97b8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14614,3 +14614,34 @@ adaptations.") (define-public cl-radiance (sbcl-package->cl-source-package sbcl-radiance)) + +(define-public sbcl-daemon + (let ((commit "d5652f4332c3cee21e9bf83b9237129605004597") + (revision "1")) + (package + (name "sbcl-daemon") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snmsts/daemon") + (commit commit))) + (file-name (git-file-name "daemon" version)) + (sha256 + (base32 "1kdxfnhh9fz34j8qs7pn7mwjz3v33q4v9nh0hqkyzraq5xs2j3f4")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("trivial-features" ,sbcl-trivial-features))) + (home-page "https://github.com/snmsts/daemon") + (synopsis "Daemonize Common Lisp processes") + (description + "DAEMON provides the functionality of daemonizing Common Lisp processes +on UNIX like platforms.") + (license license:expat)))) + +(define-public ecl-daemon + (sbcl-package->ecl-package sbcl-daemon)) + +(define-public cl-daemon + (sbcl-package->cl-source-package sbcl-daemon)) -- cgit 1.4.1 From 93a8b91a63bdb1a8db3f4bde799a5b686b5c748f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 10:53:47 +0100 Subject: gnu: emacs-tramp: Update to 2.5.0.2. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.0.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f603aea757..a0e09e1f59 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23182,14 +23182,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.0.1") + (version "2.5.0.2") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "0kqlc03bbsdywp0m3mf0m62hqyam8vg81phh7nqmpdjzskrdc1yy")))) + (base32 "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit 1.4.1 From 0ad438991914ec2d470f121521537fbbfa677af8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 10:56:31 +0100 Subject: gnu: emacs-transient: Update to 0.3.0. * gnu/packages/emacs-xyz.scm (emacs-transient): Update to 0.3.0. --- gnu/packages/emacs-xyz.scm | 74 ++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a0e09e1f59..783f7790e9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22088,48 +22088,46 @@ as Emacs Lisp.") (license license:gpl3+))) (define-public emacs-transient - (let ((revision "1") - (commit "a6e4cced303b3febd59412b24a97eaf1e855e6d7")) - (package - (name "emacs-transient") - (version (git-version "0.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/magit/transient") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01xsw9sxr50valc2q590ngy3ra2ll01p39l9cbzvqqz6mxyymxmd")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #f ;no test suite - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-info-manual - (lambda _ - (invoke "make" "info") - ;; Move the info file to lisp so that it gets installed by the - ;; emacs-build-system. - (rename-file "docs/transient.info" "lisp/transient.info") - #t)) - (add-after 'build-info-manual 'enter-lisp-directory - (lambda _ - (chdir "lisp") - #t))))) - (native-inputs - `(("texinfo" ,texinfo))) - (propagated-inputs - `(("dash" ,emacs-dash))) - (home-page "https://magit.vc/manual/transient") - (synopsis "Transient commands in Emacs") - (description "Taking inspiration from prefix keys and prefix arguments + (package + (name "emacs-transient") + (version "0.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magit/transient") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0g694ydmb9zjn99hxgfjd3m73kpmnkbrgqhr73b4crbxza5sl29c")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'build-info-manual + (lambda _ + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/transient.info" "lisp/transient.info") + #t)) + (add-after 'build-info-manual 'enter-lisp-directory + (lambda _ + (chdir "lisp") + #t))))) + (native-inputs + `(("texinfo" ,texinfo))) + (propagated-inputs + `(("dash" ,emacs-dash))) + (home-page "https://magit.vc/manual/transient") + (synopsis "Transient commands in Emacs") + (description "Taking inspiration from prefix keys and prefix arguments in Emacs, Transient implements a similar abstraction involving a prefix command, infix arguments and suffix commands. We could call this abstraction a \"transient command\", but because it always involves at least two commands (a prefix and a suffix) we prefer to call it just a \"transient\".") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-forge (let ((commit "05ef02913004826165c383bd6d2ff6574542b76c")) -- cgit 1.4.1 From 34bc222230b6a44c5a664cd5a532efac9b2d662e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 10:58:52 +0100 Subject: gnu: python-pikepdf: Update to 2.7.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c10a55e8b6..312df53d9b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5807,13 +5807,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1y3nmwjv0in0gbbcq53myx3sjf5j18iy556zvq9d67bg73y7l9s2")))) + (base32 "0xjr9qnv6z94ka1xj57am4a64vppdrplgmm359y1za1mqnfyabyk")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From bebfe06776c7848838dd8c286cf0e30c9f0a0f63 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:02:20 +0100 Subject: gnu: elpa: Use HTTPS home page URI. * gnu/packages/maths.scm (elpa)[home-page]: Use HTTPS URI. --- 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 58433d4b0c..83750cdaaa 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Amin Bandali -;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019, 2021 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka @@ -4870,7 +4870,7 @@ theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") ;; Test scripts are generated, patch the shebang (("#!/bin/bash") (string-append "#!" (which "sh")))) #t))))) - (home-page "http://elpa.mpcdf.mpg.de") + (home-page "https://elpa.mpcdf.mpg.de") (synopsis "Eigenvalue solvers for symmetric matrices") (description "The ELPA library provides efficient and scalable direct eigensolvers for -- cgit 1.4.1 From 3759df574d6c0fa48e144c511dc0e10d8fd166a6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:03:56 +0100 Subject: gnu: f-seq: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (f-seq)[home-page]: Use HTTPS URI. --- 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 1c42e503f2..42476a4b2f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11423,7 +11423,7 @@ browser.") (inputs `(("perl" ,perl) ("java-commons-cli" ,java-commons-cli))) - (home-page "http://fureylab.web.unc.edu/software/fseq/") + (home-page "https://fureylab.web.unc.edu/software/fseq/") (synopsis "Feature density estimator for high-throughput sequence tags") (description "F-Seq is a software package that generates a continuous tag sequence -- cgit 1.4.1 From 25b92e27fd124e0f957b4b1a96e0099a8648e981 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:04:34 +0100 Subject: gnu: festival: Use HTTPS home page URI. * gnu/packages/speech.scm (festival)[home-page]: Use HTTPS URI. --- gnu/packages/speech.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 4c9d3cf688..687a3c10cf 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -544,7 +544,7 @@ be used by the sighted.") (sha256 (base32 "1k2xh13miyv48gh06rgsq2vj25xwj7z6vwq9ilsn8i7ig3nrgzg4")))))) - (home-page "http://www.cstr.ed.ac.uk/projects/festival/") + (home-page "https://www.cstr.ed.ac.uk/projects/festival/") (synopsis "Speech synthesis system") (description "Festival offers a general framework for building speech synthesis systems as well as including examples of various modules. As a -- cgit 1.4.1 From 4b9805631b3afb63738a65b41a616f045d159036 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:05:19 +0100 Subject: gnu: fluidsynth: Use HTTPS home page URI. * gnu/packages/audio.scm (fluidsynth)[home-page]: Use HTTPS URI. --- 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 19fca6f527..cc5189abea 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2019 Christopher Lemmer Webber ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Hartmt Goebel -;;; Copyright © 2019 Nicolas Goaziou +;;; Copyright © 2019, 2021 Nicolas Goaziou ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Jonathan Frederickson @@ -1646,7 +1646,7 @@ follower.") ("glib" ,glib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.fluidsynth.org/") + (home-page "https://www.fluidsynth.org/") (synopsis "SoundFont synthesizer") (description "FluidSynth is a real-time software synthesizer based on the SoundFont 2 -- cgit 1.4.1 From 9045bf80a7b9aa3dc71ac14b7d53abf35431c471 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:06:26 +0100 Subject: gnu: flux: Use HTTPS home page URI. * gnu/packages/graphics.scm (flux)[home-page]: Use HTTPS URI. --- gnu/packages/graphics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a76417a508..7e83c7ea4e 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -320,7 +320,7 @@ minimum of resource usage and overhead.") (synopsis "Interface description language") (description "Flux is an interface description language used by DirectFB. Fluxcomp compiles .flux files to .cpp or .c files.") - (home-page "http://www.directfb.org/") + (home-page "https://www.directfb.org/") (license license:lgpl2.1+))) ; Same as DirectFB (define-public fox -- cgit 1.4.1 From 21f4a18e3643a9c717f10d1ef18854bcd1e82434 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:06:56 +0100 Subject: gnu: ganeti: Use HTTPS home page URI. * gnu/packages/virtualization.scm (ganeti)[home-page]: Use HTTPS URI. --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1f8c3beea0..3e15e72181 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -759,7 +759,7 @@ server and embedded PowerPC, and S390 guests.") ("python-bitarray" ,python-bitarray) ("python-paramiko" ,python-paramiko) ("python-psutil" ,python-psutil))) - (home-page "http://www.ganeti.org/") + (home-page "https://www.ganeti.org/") (synopsis "Cluster-based virtual machine management system") (description "Ganeti is a virtual machine management tool built on top of existing -- cgit 1.4.1 From e2b34de2dddb591c4486fa391c68b4eef049dffa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:07:22 +0100 Subject: gnu: gegl: Use HTTPS home page URI. * gnu/packages/gimp.scm (gegl)[home-page]: Use HTTPS URI. --- gnu/packages/gimp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4d229a1fd9..ddd9158f56 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -253,7 +253,7 @@ provided, as well as a framework to add new color models and data types.") `(("pkg-config" ,pkg-config) ("glib" ,glib "bin") ; for gtester ("intltool" ,intltool))) - (home-page "http://gegl.org") + (home-page "https://gegl.org") (synopsis "Graph based image processing framework") (description "GEGL (Generic Graphics Library) provides infrastructure to do demand based cached non destructive image editing on larger than RAM -- cgit 1.4.1 From ba8a246baa388bdb61a2b94fc51dc5f97c055334 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:08:02 +0100 Subject: gnu: gst123: Use HTTPS home page URI. * gnu/packages/gstreamer.scm (gst123)[home-page]: Use HTTPS URI. --- gnu/packages/gstreamer.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b582585d75..1c7ba98a86 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -989,7 +989,7 @@ be used by Python applications using GStreamer.") ("gst-plugins-base" ,gst-plugins-base))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://space.twc.de/~stefan/gst123.php") + (home-page "https://space.twc.de/~stefan/gst123.php") (synopsis "Flexible command line media player based on gstreamer") (description "The program gst123 is designed to be a more flexible command line player in the spirit of ogg123 and mpg123, based on the gstreamer media -- cgit 1.4.1 From 3f3b8e1a85f1b8ecf2570979c77c3a3cc94eb7db Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:11:37 +0100 Subject: gnu: ghc-indents: Update home page. * gnu/packages/haskell-xyz.scm (ghc-indents)[home-page]: Update URL. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 47ee71bd08..1fa7310fab 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 JoJo -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Christopher Lemmer Webber @@ -6432,7 +6432,7 @@ monads with anaphoric variants on @code{if} and @code{when} and a C-like (native-inputs `(("ghc-tasty" ,ghc-tasty) ("ghc-tasty-hunit" ,ghc-tasty-hunit))) - (home-page "http://patch-tag.com/r/salazar/indents") + (home-page "https://github.com/jaspervdj/indents") (synopsis "Indentation sensitive parser-combinators for parsec") (description "This library provides functions for use in parsing indentation sensitive -- cgit 1.4.1 From 42c4718853ebd6559b41456757f29f54d8eb8f2d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:12:32 +0100 Subject: gnu: heads-dev-cpio: Use HTTPS home page URI. * gnu/packages/heads.scm (heads-dev-cpio)[home-page]: Use HTTPS URI. --- gnu/packages/heads.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/heads.scm b/gnu/packages/heads.scm index 5f49265ebb..d5e36b9b3c 100644 --- a/gnu/packages/heads.scm +++ b/gnu/packages/heads.scm @@ -193,5 +193,5 @@ done (synopsis "@file{dev.cpio} for Heads") (description "This package provides a @file{dev.cpio} file usable as a base for heads' initrd.") - (home-page "http://osresearch.net/") + (home-page "https://osresearch.net/") (license license:bsd-2))) -- cgit 1.4.1 From c4178e1a78b32243291855c71af649c7e2a74d60 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:13:01 +0100 Subject: gnu: licenseheaders: Use HTTPS home page URI. * gnu/packages/license.scm (licenseheaders)[home-page]: Use HTTPS URI. --- gnu/packages/license.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 7b94c02558..857526bf22 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -231,7 +231,7 @@ designed to be simple.") #t))))) (propagated-inputs `(("python-regex" ,python-regex))) - (home-page "http://github.com/johann-petrak/licenseheaders") + (home-page "https://github.com/johann-petrak/licenseheaders") (synopsis "Add or change license headers for all files in a directory") (description "Licenseheaders is a Python 3 tool to update, change or add license -- cgit 1.4.1 From a431d93b6a7537fa856c29a49822ec6199f46fe6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:13:30 +0100 Subject: gnu: lttoolbox: Use HTTPS home page URI. * gnu/packages/dictionaries.scm (lttoolbox)[home-page]: Use HTTPS URI. --- 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 f73eb6fb96..2c2a7f0118 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -334,7 +334,7 @@ translation engines from your terminal.") ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) - (home-page "http://wiki.apertium.org/wiki/Lttoolbox") + (home-page "https://wiki.apertium.org/wiki/Lttoolbox") (synopsis "Lexical processing toolbox") (description "Lttoolbox is a toolbox for lexical processing, morphological analysis and generation of words. Analysis is the process of splitting a -- cgit 1.4.1 From b0d1ace5282b5907b9f8ad83c6c9573cd7f29e37 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:14:07 +0100 Subject: gnu: ocaml-astring: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-astring)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9e68359a42..9c301074eb 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1867,7 +1867,7 @@ functions.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/astring") + (home-page "https://erratique.ch/software/astring") (synopsis "Alternative String module for OCaml") (description "Astring exposes an alternative String module for OCaml. This module balances minimality and expressiveness for basic, index-free, string -- cgit 1.4.1 From 683e24355e2ed0c2f3c2bc8fc62800f4d6deae45 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:14:50 +0100 Subject: gnu: ocaml-bos: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-bos)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9c301074eb..9b8ce16678 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2194,7 +2194,7 @@ file system and is independent from any system library.") ("fpath" ,ocaml-fpath) ("logs" ,ocaml-logs) ("rresult" ,ocaml-rresult))) - (home-page "http://erratique.ch/software/bos") + (home-page "https://erratique.ch/software/bos") (synopsis "Basic OS interaction for OCaml") (description "Bos provides support for basic and robust interaction with the operating system in OCaml. It has functions to access the process -- cgit 1.4.1 From 7f37adfd6afbbab738a5f3ee0d8d9946b825ef23 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:15:19 +0100 Subject: gnu: ocaml-cmdliner: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-cmdliner)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 9b8ce16678..c5b0fdc01c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1803,7 +1803,7 @@ spans without being subject to operating system calendar time adjustments.") (("Sys.readdir dir") "let a = Sys.readdir dir in Array.sort String.compare a; a")) #t))))) - (home-page "http://erratique.ch/software/cmdliner") + (home-page "https://erratique.ch/software/cmdliner") (synopsis "Declarative definition of command line interfaces for OCaml") (description "Cmdliner is a module for the declarative definition of command line interfaces. It provides a simple and compositional mechanism to convert -- cgit 1.4.1 From b7c2df602b8f4598de129a2a9a74bb9f7cdcb0ab Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:15:45 +0100 Subject: gnu: ocaml-cudf: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-cudf)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c5b0fdc01c..89079686d7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -305,7 +305,7 @@ for day to day programming.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://www.mancoosi.org/cudf/") + (home-page "https://www.mancoosi.org/cudf/") (synopsis "CUDF library (part of the Mancoosi tools)") (description "CUDF (for Common Upgradeability Description Format) is a format for describing upgrade scenarios in package-based Free and Open Source -- cgit 1.4.1 From 45bfc108d7e5faba6c98048cf9a64070af4bac3e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:16:24 +0100 Subject: gnu: ocaml-dose3: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-dose3)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 89079686d7..3f23966b56 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -379,7 +379,7 @@ underlying solvers like Cplex, Gurobi, Lpsolver, Glpk, CbC, SCIP or WBO.") ("ocaml-extlib" ,ocaml-extlib) ("ocamlbuild" ,ocamlbuild) ("ocaml-cppo" ,ocaml-cppo))) - (home-page "http://www.mancoosi.org/software/") + (home-page "https://www.mancoosi.org/software/") (synopsis "Package distribution management framework") (description "Dose3 is a framework made of several OCaml libraries for managing distribution packages and their dependencies. Though not tied to -- cgit 1.4.1 From 5d47847751b193d52a62ec536c8313b796e19233 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:16:58 +0100 Subject: gnu: ocaml-fmt: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-fmt)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3f23966b56..8ef1266c42 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1839,7 +1839,7 @@ most of the POSIX and GNU conventions.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/fmt") + (home-page "https://erratique.ch/software/fmt") (synopsis "OCaml Format pretty-printer combinators") (description "Fmt exposes combinators to devise Format pretty-printing functions.") -- cgit 1.4.1 From e5d08d83016a071c8932a0caf3b05916ff054e36 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:17:32 +0100 Subject: gnu: ocaml-fpath: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-fpath)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 8ef1266c42..c114ca63ab 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2159,7 +2159,7 @@ message report is decoupled from logging and is handled by a reporter.") (propagated-inputs `(("topkg" ,ocaml-topkg) ("astring" ,ocaml-astring))) - (home-page "http://erratique.ch/software/fpath") + (home-page "https://erratique.ch/software/fpath") (synopsis "File system paths for OCaml") (description "Fpath is an OCaml module for handling file system paths with POSIX or Windows conventions. Fpath processes paths without accessing the -- cgit 1.4.1 From bc3a2c427480bdeb0a0243d05fceb4e5dda2461a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:17:55 +0100 Subject: gnu: ocaml-jsonm: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-jsonm)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c114ca63ab..ffee4f6b9c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2421,7 +2421,7 @@ string values and to directly encode characters in OCaml Buffer.t values.") (propagated-inputs `(("uutf" ,ocaml-uutf) ("cmdliner" ,ocaml-cmdliner))) - (home-page "http://erratique.ch/software/jsonm") + (home-page "https://erratique.ch/software/jsonm") (synopsis "Non-blocking streaming JSON codec for OCaml") (description "Jsonm is a non-blocking streaming codec to decode and encode the JSON data format. It can process JSON text without blocking on IO and -- cgit 1.4.1 From 3b50326df0f42b47db0602735503b431669c58e4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:18:27 +0100 Subject: gnu: ocaml-logs: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-logs)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index ffee4f6b9c..88f9293c58 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2128,7 +2128,7 @@ ocaml lwt.") ("result" ,ocaml-result) ("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) - (home-page "http://erratique.ch/software/logs") + (home-page "https://erratique.ch/software/logs") (synopsis "Logging infrastructure for OCaml") (description "Logs provides a logging infrastructure for OCaml. Logging is performed on sources whose reporting level can be set independently. Log -- cgit 1.4.1 From 331b5f833e84093ff2bd16a286ea0f010c54d5fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:18:52 +0100 Subject: gnu: ocaml-mtime: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-mtime)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 88f9293c58..c3b71dc738 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1768,7 +1768,7 @@ manipulate such data.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/mtime") + (home-page "https://erratique.ch/software/mtime") (synopsis "Monotonic wall-clock time for OCaml") (description "Access monotonic wall-clock time. It measures time spans without being subject to operating system calendar time adjustments.") -- cgit 1.4.1 From a0e343b93635128e19ee14cd84cb6b11691ae6aa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:19:18 +0100 Subject: gnu: ocaml-react: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-react)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c3b71dc738..6ec055cb04 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1960,7 +1960,7 @@ simple (yet expressive) query language to select the tests to run.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/react") + (home-page "https://erratique.ch/software/react") (synopsis "Declarative events and signals for OCaml") (description "React is an OCaml module for functional reactive programming (FRP). It provides support to program with time varying values: declarative -- cgit 1.4.1 From 1f0ace4ad950cf1375a43fb62082ebe3e1d6257d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:19:54 +0100 Subject: gnu: ocaml-rresult: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-rresult)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 6ec055cb04..55cbf4f588 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1672,7 +1672,7 @@ creation and publication procedures.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/rresult") + (home-page "https://erratique.ch/software/rresult") (synopsis "Result value combinators for OCaml") (description "Handle computation results and errors in an explicit and declarative manner, without resorting to exceptions. It defines combinators -- cgit 1.4.1 From 0e0153e3362d7f5055656576f203f1d7781667dd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:20:14 +0100 Subject: gnu: ocaml-topkg: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-topkg)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 55cbf4f588..5bbf64588c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1641,7 +1641,7 @@ defined in this library.") #:phases (modify-phases %standard-phases (delete 'configure)))) - (home-page "http://erratique.ch/software/topkg") + (home-page "https://erratique.ch/software/topkg") (synopsis "Transitory OCaml software packager") (description "Topkg is a packager for distributing OCaml software. It provides an API to describe the files a package installs in a given build -- cgit 1.4.1 From 0a55be06e38d6f5f39e1c5b439d94f9ab3f0c664 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:20:39 +0100 Subject: gnu: ocaml-uuidm: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-uuidm)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 5bbf64588c..77e25af420 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3213,7 +3213,7 @@ tool and piqi-ocaml.") (propagated-inputs `(("cmdliner" ,ocaml-cmdliner) ("topkg" ,ocaml-topkg))) - (home-page "http://erratique.ch/software/uuidm") + (home-page "https://erratique.ch/software/uuidm") (synopsis "Universally unique identifiers for OCaml") (description "Uuidm is an OCaml module implementing 128 bits universally unique identifiers (UUIDs) version 3, 5 (named based with MD5, SHA-1 hashing) -- cgit 1.4.1 From 1ac3e937616abf803a4638e9a66f3c26091f732d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:20:57 +0100 Subject: gnu: ocaml-uutf: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-uutf)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 77e25af420..44eee86e3a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2385,7 +2385,7 @@ and consumable.") (propagated-inputs `(("uchar" ,ocaml-uchar) ("cmdliner" ,ocaml-cmdliner))) - (home-page "http://erratique.ch/software/uutf") + (home-page "https://erratique.ch/software/uutf") (synopsis "Non-blocking streaming Unicode codec for OCaml") (description "Uutf is a non-blocking streaming codec to decode and encode the UTF-8, UTF-16, UTF-16LE and UTF-16BE encoding schemes. It can efficiently -- cgit 1.4.1 From 0ee39e0372e100c7fc93f132db0ea07c39169f2f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:21:19 +0100 Subject: gnu: ocaml-xmlm: Use HTTPS home page URI. * gnu/packages/ocaml.scm (ocaml-xmlm)[home-page]: Use HTTPS URI. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 44eee86e3a..3d75240ad3 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2224,7 +2224,7 @@ run command line programs.") `(("ocamlbuild" ,ocamlbuild) ("ocaml-topkg" ,ocaml-topkg) ("opam" ,opam))) - (home-page "http://erratique.ch/software/xmlm") + (home-page "https://erratique.ch/software/xmlm") (synopsis "Streaming XML codec for OCaml") (description "Xmlm is a streaming codec to decode and encode the XML data format. It can process XML documents without a complete in-memory -- cgit 1.4.1 From a359b807e16bc15623664cad500561a5183f776a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:21:49 +0100 Subject: gnu: perl-mojolicious: Use HTTPS home page URI. * gnu/packages/perl-web.scm (perl-mojolicious)[home-page]: Use HTTPS URI. --- gnu/packages/perl-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/perl-web.scm b/gnu/packages/perl-web.scm index 77a66f71d0..7bc406c206 100644 --- a/gnu/packages/perl-web.scm +++ b/gnu/packages/perl-web.scm @@ -40,7 +40,7 @@ (base32 "11whfrbafj191ahbhlhadws0vkg9kmvqswzkvswgwajhr1x678rh")))) (build-system perl-build-system) - (home-page "http://mojolicious.org/") + (home-page "https://mojolicious.org/") (synopsis "Real-time web framework") (description "Back in the early days of the web, many people learned Perl because of a wonderful Perl library called @code{CGI}. It was simple enough -- cgit 1.4.1 From 1cbc8f5f8ace8c7344c4a21e4dd8421ac4644675 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:22:28 +0100 Subject: gnu: praat: Use HTTPS home page URI. * gnu/packages/language.scm (praat)[home-page]: Use HTTPS URI. --- gnu/packages/language.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 93e125db7e..651b2305c9 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -1363,7 +1363,7 @@ noun phrases, verb phrases, etc.).") ("publesaudio" ,pulseaudio))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.fon.hum.uva.nl/praat/") + (home-page "https://www.fon.hum.uva.nl/praat/") (synopsis "Doing phonetics by computer") (description "Praat is a tool to perform phonetics tasks. It can do speech analysis (pitch, formant, intensity, ...), speech synthesis, labelling, segmenting -- cgit 1.4.1 From f63b3eae42261f7b4814b71cc6dc41db2ed15741 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:23:00 +0100 Subject: gnu: python-asdf: Use HTTPS home page URI. * gnu/packages/astronomy.scm (python-asdf)[home-page]: Use HTTPS URI. --- gnu/packages/astronomy.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 4ee7cd7fec..feb22eb592 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -972,7 +972,7 @@ of stand-alone functions and classes.") ("jsonschema" ,python-jsonschema) ("numpy" ,python-numpy) ("pyyaml" ,python-pyyaml))) - (home-page "http://github.com/asdf-format/asdf") + (home-page "https://github.com/asdf-format/asdf") (synopsis "Python tools to handle ASDF files") (description "The Advanced Scientific Data Format (ASDF) is a next-generation -- cgit 1.4.1 From 80a0a05f98d8a09b7565d85b27567daf33ab0c0f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:23:37 +0100 Subject: gnu: python-cycler: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-cycler)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 312df53d9b..8590494a5e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5077,7 +5077,7 @@ transcendental functions).") '(#:tests? #f)) (propagated-inputs `(("python-six" ,python-six))) - (home-page "http://matplotlib.org/cycler/") + (home-page "https://matplotlib.org/cycler/") (synopsis "Composable keyword argument iterator") (description "When using @code{matplotlib} and plotting more than one line, it is -- cgit 1.4.1 From f54b11b91d7a706c73ce9437f2690b94f79e281b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:24:32 +0100 Subject: gnu: python-flint: Use HTTPS home page URI. * gnu/packages/algebra.scm (python-flint)[home-page]: Use HTTPS URI. --- gnu/packages/algebra.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 92e6c67c5d..9d81cba4f5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -557,7 +557,7 @@ arithmetic). It supports integers, rationals, modular integers, real and complex ball arithmetic, polynomials and matrices over all these types and other mathematical functions.") (license license:expat) - (home-page "http://fredrikj.net/python-flint/"))) + (home-page "https://fredrikj.net/python-flint/"))) (define-public ntl (package -- cgit 1.4.1 From b0a869ff80afbc03669dfac663caccea540ffcec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:25:12 +0100 Subject: gnu: python-jose: Use HTTPS home page URI. * gnu/packages/python-web.scm (python-jose)[home-page]: Use HTTPS URI. --- 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 a8fe724551..b0268e5a31 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2015, 2016 David Thompson ;;; Copyright © 2017 Mark Meyer ;;; Copyright © 2018 Tomáš Čech -;;; Copyright © 2018, 2019 Nicolas Goaziou +;;; Copyright © 2018, 2019, 2021 Nicolas Goaziou ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2018, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vagrant Cascadian @@ -655,7 +655,7 @@ Swartz.") (package (name "python-jose") (version "3.2.0") - (home-page "http://github.com/mpdavis/python-jose") + (home-page "https://github.com/mpdavis/python-jose") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) -- cgit 1.4.1 From 21ec04e372a6a970ed653a5dc7a123c204519260 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:26:02 +0100 Subject: gnu: python-jupyter-client: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-jupyter-client)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8590494a5e..44bd1b3279 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7221,7 +7221,7 @@ without using the configuration machinery.") `(("python-pyzmq" ,python-pyzmq) ("python-traitlets" ,python-traitlets) ("python-jupyter-core" ,python-jupyter-core))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Jupyter protocol implementation and client libraries") (description "The @code{jupyter_client} package contains the reference implementation -- cgit 1.4.1 From 68295921591b63ef608868c417aab40f05037b18 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:26:38 +0100 Subject: gnu: python-jupyter-core: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-jupyter-core)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 44bd1b3279..277f31bdc3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7180,7 +7180,7 @@ without using the configuration machinery.") (arguments `(#:tests? #f)) (propagated-inputs `(("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Jupyter base package") (description "Jupyter core is the base package on which Jupyter projects rely.") -- cgit 1.4.1 From a6004b5fd27e56dc28786fe77e42d2468f9a0be8 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:27:14 +0100 Subject: gnu: python-mpmath: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-mpmath)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 277f31bdc3..631cb1405b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8074,7 +8074,7 @@ and statistical routines from scipy and statsmodels.") (replace 'check (lambda _ (invoke "python" "mpmath/tests/runtests.py" "-local")))))) - (home-page "http://mpmath.org") + (home-page "https://mpmath.org") (synopsis "Arbitrary-precision floating-point arithmetic in python") (description "@code{mpmath} can be used as an arbitrary-precision substitute for -- cgit 1.4.1 From 88f55605afcd885a7b44c80a7d5fc3eafcc56fda Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:27:54 +0100 Subject: gnu: python-msgpack-python: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-msgpack-python)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 631cb1405b..0ee4bbd245 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13415,7 +13415,7 @@ interfaces.") (base32 "16wh8qgybmfh4pjp8vfv78mdlkxfmcasg78lzlnm6nslsfkci31p")))) (build-system python-build-system) - (home-page "http://msgpack.org/") + (home-page "https://msgpack.org/") (synopsis "Package to deserialize messages in MessagePack binary format") (description "MessagePack is an efficient binary serialization format. It lets you -- cgit 1.4.1 From c48b66d6ed95cf205d74c47df52b09d51568968a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:28:22 +0100 Subject: gnu: python-nbconvert: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-nbconvert)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0ee4bbd245..08e064c561 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10192,7 +10192,7 @@ time.") ("python-nbformat" ,python-nbformat) ("python-pygments" ,python-pygments) ("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Converting Jupyter Notebooks") (description "The @code{nbconvert} tool, @{jupyter nbconvert}, converts notebooks to various other formats via Jinja templates. It allows you to -- cgit 1.4.1 From 6c70a7104a1cc0eda3485c7b0a8a1bcbcc4c6c4b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:28:50 +0100 Subject: gnu: python-nbformat: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-nbformat)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 08e064c561..c6c97854cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10003,7 +10003,7 @@ Debian-related files, such as: ("python-jsonschema" ,python-jsonschema) ("python-jupyter-core" ,python-jupyter-core) ("python-traitlets" ,python-traitlets))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Jupyter Notebook format") (description "This package provides the reference implementation of the Jupyter Notebook format and Python APIs for working with notebooks.") -- cgit 1.4.1 From c2424076fb5f0941a3c80c141b5da8c86b60ef8b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:29:11 +0100 Subject: gnu: python-notebook: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-notebook)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c6c97854cc..ceaed61950 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10249,7 +10249,7 @@ convert an @code{.ipynb} notebook file into various static formats including: `(("python-nose" ,python-nose) ("python-sphinx" ,python-sphinx) ("python-requests" ,python-requests))) - (home-page "http://jupyter.org/") + (home-page "https://jupyter.org/") (synopsis "Web-based notebook environment for interactive computing") (description "The Jupyter HTML notebook is a web-based notebook environment for -- cgit 1.4.1 From b6e90b3bedcd703b06f73ebb69c0cb12c4cc5d6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:32:03 +0100 Subject: gnu: python-pyev: Update home page. * gnu/packages/python-xyz.scm (python-pyev)[home-page]: Update URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ceaed61950..d7b7618cb4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14762,7 +14762,7 @@ Record Format (DWARF).") (string-append "libev_dll_name = \"" libev "\""))))))))) (inputs `(("libev" ,libev))) - (home-page "http://pythonhosted.org/pyev/") + (home-page "https://github.com/gabrielfalcao/pyev") (synopsis "Python libev interface") (description "Pyev provides a Python interface to libev.") (license license:gpl3))) -- cgit 1.4.1 From dfb67d2cc9e5dd6b87cb9f8fd0d14efccd86f9d6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:32:55 +0100 Subject: gnu: python2-pygame-sdl2: Use HTTPS home page URI. * gnu/packages/game-development.scm (python2-pygame-sdl2)[home-page]: Use HTTPS URI. --- 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 92c3da92ab..1f6ed0665a 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019, 2020, 2021 Leo Prikler ;;; Copyright © 2019 Jethro Cao -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Giacomo Leidi ;;; @@ -1131,7 +1131,7 @@ to create fully featured games and multimedia programs in the python language.") ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) (native-inputs `(("python2-cython" ,python2-cython))) - (home-page "http://www.renpy.org/") + (home-page "https://www.renpy.org/") (synopsis "Reimplementation of the Pygame API using SDL2") (description "Pygame_SDL2 reimplements the Pygame API using SDL2, staying close to the original, but also adding some SDL2-specific features. -- cgit 1.4.1 From c9370473cd5403d244ccaab3b9011a2811053a0a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:33:28 +0100 Subject: gnu: python-pylzma: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-pylzma)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d7b7618cb4..c0eccaab4c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20666,7 +20666,7 @@ format.") (base32 "074anvhyjgsv2iby2ql1ixfvjgmhnvcwjbdz8gk70xzkzcm1fx5q")))) (build-system python-build-system) - (home-page "http://www.joachim-bauch.de/projects/pylzma/") + (home-page "https://www.joachim-bauch.de/projects/pylzma/") (synopsis "Python bindings for the LZMA library by Igor Pavlov.") (description "This package provides Python bindings for the LZMA library by Igor Pavlov.") -- cgit 1.4.1 From d3bb41a71da9ae2c9c0940f10781503dcd6a5f51 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:35:31 +0100 Subject: gnu: python-pytest-timeout: Update home page. * gnu/packages/check.scm (python-pytest-timeout)[home-page]: Update URI. --- gnu/packages/check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 7163086ae0..0baf777393 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -1319,7 +1319,7 @@ result back.") `(("python-pytest" ,python-pytest))) (native-inputs `(("python-pexpect" ,python-pexpect))) - (home-page "http://bitbucket.org/pytest-dev/pytest-timeout/") + (home-page "https://github.com/pytest-dev/pytest-timeout") (synopsis "Plugin for py.test to abort hanging tests") (description "This package provides a py.test plugin that aborts hanging tests after a -- cgit 1.4.1 From c17e6604c11294534120b2849a63821715c8f526 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:36:20 +0100 Subject: gnu: python-pyzabbix: Use HTTPS home page URI. * gnu/packages/monitoring.scm (python-pyzabbix)[home-page]: Use HTTPS URI. --- 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 81e3d9c156..0a98544ae9 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -286,7 +286,7 @@ through a text-based interface.") (package (name "python-pyzabbix") (version "0.8.2") - (home-page "http://github.com/lukecyca/pyzabbix") + (home-page "https://github.com/lukecyca/pyzabbix") ;; No tests on PyPI, use the git checkout. (source (origin -- cgit 1.4.1 From 155d26ac2fdfccf785f5aa1fd2eee6681600f3bd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:36:46 +0100 Subject: gnu: python-qtconsole: Use HTTPS home page URI. * gnu/packages/python-xyz.scm (python-qtconsole)[home-page]: Use HTTPS URI. --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c0eccaab4c..a312558376 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10446,7 +10446,7 @@ Jupyter kernels such as IJulia and IRKernel.") ("python-ipython" ,python-ipython))) (native-inputs `(("python-pytest" ,python-pytest))) - (home-page "http://jupyter.org") + (home-page "https://jupyter.org") (synopsis "Jupyter Qt console") (description "This package provides a Qt-based console for Jupyter with support for rich media output.") -- cgit 1.4.1 From e0c6592c680edd47c7c03aeceafc29f0be9cb122 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:38:51 +0100 Subject: gnu: python-rstr: Update home page. * gnu/packages/python-xyz.scm (python-rstr)[home-page]: Update URI. --- gnu/packages/python-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a312558376..38dd0654d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3985,8 +3985,7 @@ for SSH and SFTP. It has the following main usages: (base32 "197dw8mbq0pjjz1l6h1ksi62vgn7x55d373ch74y06744qiq5sjx")))) (build-system python-build-system) - (home-page - "http://bitbucket.org/leapfrogdevelopment/rstr/overview") + (home-page "https://github.com/leapfrogonline/rstr") (synopsis "Generate random strings in Python") (description "This package provides a python module for generating random strings of various types. It could be useful for fuzz testing, -- cgit 1.4.1 From 3cb8cc255fbf4df5c36677ae07afd32f63d8b0dd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:39:47 +0100 Subject: gnu: qtractor: Use HTTPS home page URI. * gnu/packages/music.scm (qtractor)[home-page]: Use HTTPS URI. --- 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 2100e630fb..5673c111c2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3031,7 +3031,7 @@ from the command line.") (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) - (home-page "http://qtractor.org/") + (home-page "https://qtractor.org/") (synopsis "Audio/MIDI multi-track sequencer") (description "Qtractor is an Audio/MIDI multi-track sequencer application. It uses -- cgit 1.4.1 From 0cdb622c9c0fda129f8e8eb0b06f42ad2fde1e53 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:40:22 +0100 Subject: gnu: r-biased-urn: Use HTTPS home page URI. * gnu/packages/statistics.scm (r-biased-urn)[home-page]: Use HTTPS URI. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3821c86da9..ea428da9a1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3883,7 +3883,7 @@ data behind them) can be viewed and modified in a web browser.") "13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) - (home-page "http://www.agner.org/random/") + (home-page "https://www.agner.org/random/") (synopsis "Biased urn model distributions") (description "This package provides statistical models of biased sampling in the form -- cgit 1.4.1 From 8c23599e7a06fa8a3b74c7b7111868fe095e4156 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:40:57 +0100 Subject: gnu: r-boa: Use HTTPS home page URI. * gnu/packages/cran.scm (r-boa)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4a88cf1677..03c6c1fa7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23238,7 +23238,7 @@ as possible (with tests to prove it).") "04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp")))) (properties `((upstream-name . "boa"))) (build-system r-build-system) - (home-page "http://www.jstatsoft.org/v21/i11") + (home-page "https://www.jstatsoft.org/v21/i11") (synopsis "Library for @dfn{Bayesian Output Analysis Program} (BOA) for MCMC") (description "This package provides a menu-driven program and library of functions for -- cgit 1.4.1 From 30f958144048d5512229ee994dda4f60a48d00fd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:41:16 +0100 Subject: gnu: r-data-tree: Use HTTPS home page URI. * gnu/packages/cran.scm (r-data-tree)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 03c6c1fa7a..bfa88cda9f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7021,7 +7021,7 @@ JavaScript library) and interact with the igraph package.") ("r-stringi" ,r-stringi))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://github.com/gluc/data.tree") + (home-page "https://github.com/gluc/data.tree") (synopsis "General purpose hierarchical data structure") (description "Create tree structures from hierarchical data, and traverse the tree in -- cgit 1.4.1 From fef822f90aa579b83b83e5b2261f5b8901c91603 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:41:42 +0100 Subject: gnu: r-doby: Use HTTPS home page URI. * gnu/packages/cran.scm (r-doby)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index bfa88cda9f..8e1fd2045f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8450,7 +8450,7 @@ the work.") ("r-tibble" ,r-tibble))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://people.math.aau.dk/~sorenh/software/doBy/") + (home-page "https://people.math.aau.dk/~sorenh/software/doBy/") (synopsis "Groupwise statistics, LSmeans, linear contrasts, and utilities") (description "This package contains: -- cgit 1.4.1 From a35496d6e3aa992efef876a8e1206bf0bd95204c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:43:02 +0100 Subject: gnu: r-feature: Use HTTPS home page URI. * gnu/packages/cran.scm (r-feature)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e1fd2045f..b841290af6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11296,7 +11296,7 @@ hypothesis testing.") ("r-plot3d" ,r-plot3d))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://www.mvstat.net/tduong/") + (home-page "https://www.mvstat.net/tduong/") (synopsis "Inferential feature significance for kernel density estimation") (description "The feature package contains functions to display and compute kernel -- cgit 1.4.1 From e58cfe5fbdc70bb25d1ebb57b8e74603d3f94f02 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:43:26 +0100 Subject: gnu: r-ks: Use HTTPS home page URI. * gnu/packages/cran.scm (r-ks)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b841290af6..b443a47ce6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11269,7 +11269,7 @@ isosurfaces.") ("r-multicool" ,r-multicool) ("r-mvtnorm" ,r-mvtnorm) ("r-plot3d" ,r-plot3d))) - (home-page "http://www.mvstat.net/tduong/") + (home-page "https://www.mvstat.net/tduong/") (synopsis "Kernel smoothing") (description "This package provides kernel smoothers for univariate and multivariate -- cgit 1.4.1 From 3e592f8d4efb091f562055fe72007a6fcd1f2ac1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:43:49 +0100 Subject: gnu: r-lavaan: Use HTTPS home page URI. * gnu/packages/cran.scm (r-lavaan)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b443a47ce6..23d343a7fc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14311,7 +14311,7 @@ probabilities from a standard bivariate normal CDF.") ("r-mnormt" ,r-mnormt) ("r-numderiv" ,r-numderiv) ("r-pbivnorm" ,r-pbivnorm))) - (home-page "http://lavaan.ugent.be") + (home-page "https://lavaan.ugent.be") (synopsis "Latent variable analysis") (description "This package provides tools to fit a variety of latent variable models, -- cgit 1.4.1 From e96b71203c85125ad2e48ecf351be956c69d862e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:45:28 +0100 Subject: gnu: r-pastecs: Update home page. * gnu/packages/cran.scm (r-pastecs)[home-page]: Update URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 23d343a7fc..5d81820646 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2466,7 +2466,7 @@ Docstrings (PEP-0257) and Julia's Triple-Quoted String Literals.") (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot))) - (home-page "http://www.sciviews.org/pastecs") + (home-page "https://github.com/phgrosjean/pastecs") (synopsis "Analysis of space-time ecological series") (description "This package provides functions for regulation, decomposition and analysis -- cgit 1.4.1 From 2ee7eaba1e0b6d0880696dba8095321084fa942c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:46:19 +0100 Subject: gnu: r-pbkrtest: Use HTTPS home page URI. * gnu/packages/statistics.scm (r-pbkrtest)[home-page]: Use HTTPS URI. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index ea428da9a1..dfc0011309 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5219,7 +5219,7 @@ C++ library for numerical linear algebra and RcppEigen glue.") ("r-numderiv" ,r-numderiv))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "http://people.math.aau.dk/~sorenh/software/pbkrtest/") + (home-page "https://people.math.aau.dk/~sorenh/software/pbkrtest/") (synopsis "Methods for linear mixed model comparison") (description "This package implements a parametric bootstrap test and a Kenward Roger -- cgit 1.4.1 From e9d88c7b976159318a62c716f7417abb7e010170 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:49:51 +0100 Subject: gnu: r-shiny: Use HTTPS home page URI. * gnu/packages/cran.scm (r-shiny)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5d81820646..baf8e08f86 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1630,7 +1630,7 @@ v1.0.7/_site/plugins/js/bootstrap-accessibility.js") (sha256 (base32 "1489wyzwrpf86y7vhc13n4v3mszmsfybhd3f75jkpnbvyp5sncm8")))))) - (home-page "http://shiny.rstudio.com") + (home-page "https://shiny.rstudio.com") (synopsis "Easy interactive web applications with R") (description "Makes it incredibly easy to build interactive web applications -- cgit 1.4.1 From 8b2ec036a476f6017d3555680d3d0de909aa2e9d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:51:16 +0100 Subject: gnu: ruby-haml: Use HTTPS home page URI. * gnu/packages/ruby.scm (ruby-haml)[home-page]: Use HTTPS URI. --- 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 cdb3502109..88b0028df6 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2019 Diego N. Barbato ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Maxim Cournoyer -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Holgr Peters ;;; Copyright © 2020 Giacomo Leidi @@ -3119,7 +3119,7 @@ HTML or XML that is designed to express the structure of documents using indentation rather than closing tags. It was originally envisioned as a plugin for Ruby on Rails, but it can function as a stand-alone templating engine.") - (home-page "http://haml.info/") + (home-page "https://haml.info/") (license license:expat))) (define-public ruby-hamster -- cgit 1.4.1 From 7e3fd007b78bdb651dd04021f95533e219f89625 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:51:40 +0100 Subject: gnu: ruby-racc: Use HTTPS home page URI. * gnu/packages/ruby.scm (ruby-racc)[home-page]: Use HTTPS URI. --- 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 88b0028df6..f9202b7a77 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6881,7 +6881,7 @@ differences (added or removed nodes) between two XML/HTML documents.") (description "Racc is a LALR(1) parser generator. It is written in Ruby itself, and generates Ruby program.") - (home-page "http://i.loveruby.net/en/projects/racc/") + (home-page "https://i.loveruby.net/en/projects/racc/") (license (list ;; Generally licensed under the LGPL2.1, and some files also ;; available under the same license as Ruby. -- cgit 1.4.1 From 3c3ce6768bb759b0c666af3c4c0e9dc63f1de194 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:52:09 +0100 Subject: gnu: ruby-stackprof: Use HTTPS home page URI. * gnu/packages/ruby.scm (ruby-stackprof)[home-page]: Use HTTPS URI. --- 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 f9202b7a77..8d3646847a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7709,7 +7709,7 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (description "@code{stackprof} is a fast sampling profiler for Ruby code, with cpu, wallclock and object allocation samplers.") - (home-page "http://github.com/tmm1/stackprof") + (home-page "https://github.com/tmm1/stackprof") (license license:expat))) (define-public ruby-binding-of-caller -- cgit 1.4.1 From 4da4b4feb6d9a7f340154827c8a0e0b2a7bea130 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:52:54 +0100 Subject: gnu: rust-atk-0.8: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-atk-0.8)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index ebe2a4e45b..97d4d7a4cf 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Efraim Flashner -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,7 +88,7 @@ (inputs `(("atk" ,atk) ("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the ATK library") (description "Rust bindings for the ATK library") (license license:expat))) -- cgit 1.4.1 From d8bf9354e9ce93a6faa3e5502b864285da933378 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:53:14 +0100 Subject: gnu: rust-atk-sys-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-atk-sys-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 97d4d7a4cf..a38379ba3e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -57,7 +57,7 @@ (inputs `(("atk" ,atk) ("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libatk-1") (description "FFI bindings to libatk-1") (license license:expat))) -- cgit 1.4.1 From f7ba7a3c5487bbd419a78fdbacad04084a267823 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:53:40 +0100 Subject: gnu: rust-cairo-rs-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-cairo-rs-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index a38379ba3e..bfa91ab66a 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -120,7 +120,7 @@ (("rust-tempfile" ,rust-tempfile-3)))) (inputs `(("cairo" ,cairo))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the Cairo library") (description "Rust bindings for the Cairo library") (license license:expat))) -- cgit 1.4.1 From 5c125693718756220e817426c4a35d6022a809fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:54:15 +0100 Subject: gnu: rust-cairo-sys-rs-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-cairo-sys-rs-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index bfa91ab66a..68d5f8676e 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -199,7 +199,7 @@ ("rust-x11" ,rust-x11-2)))) (inputs `(("cairo" ,cairo))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libcairo") (description "This package provides FFI bindings to libcairo.") (license license:expat))) -- cgit 1.4.1 From 9b3cdf366ee90ae581674065d92ab1b19d60bd55 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:55:31 +0100 Subject: gnu: rust-gdk-0.13: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gdk-0.13)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 68d5f8676e..5cda0e5e04 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -260,7 +260,7 @@ ("glib" ,glib) ("gtk+" ,gtk+) ("pango" ,pango))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GDK 3 library") (description "This package provides Rust bindings for the GDK 3 library.") (license license:expat))) -- cgit 1.4.1 From d809bdc3d4f5d42ba829d47d21667fb7a3274f39 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:55:51 +0100 Subject: gnu: rust-gdk-pixbuf-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 5cda0e5e04..4e0103a5ae 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -322,7 +322,7 @@ (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GdkPixbuf library") (description "Rust bindings for the GdkPixbuf library") (license license:expat))) -- cgit 1.4.1 From 0b0888b65ecabc8cc92514e4e7a0cf56811227cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:56:12 +0100 Subject: gnu: rust-gdk-pixbuf-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gdk-pixbuf-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 4e0103a5ae..dce71fc605 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -406,7 +406,7 @@ ("rust-tempfile" ,rust-tempfile-3)))) (inputs `(("gdk-pixbuf" ,gdk-pixbuf))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libgdk_pixbuf-2.0") (description "This package provides FFI bindings to @code{libgdk_pixbuf-2.0}.") (license license:expat))) -- cgit 1.4.1 From 33a41f74239ed08462503a5e375a0083081ce008 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:56:31 +0100 Subject: gnu: rust-gdk-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gdk-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index dce71fc605..0c2030bd33 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -468,7 +468,7 @@ ("gtk+" ,gtk+) ("glib" ,glib) ("pango" ,pango))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libgdk-3") (description "FFI bindings to libgdk-3") (license license:expat))) -- cgit 1.4.1 From a073f6d7cee2b020ea7bb881fdfbe36b6ebb4b96 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:56:51 +0100 Subject: gnu: rust-gio-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gio-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 0c2030bd33..4fc64cb4d8 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -534,7 +534,7 @@ ("rust-serial-test" ,rust-serial-test-0.4)))) (inputs `(("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the Gio library") (description "Rust bindings for the Gio library") (license license:expat))) -- cgit 1.4.1 From f647d6b6bf4846120bf987863cdf6d8718159622 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:57:08 +0100 Subject: gnu: rust-gio-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gio-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 4fc64cb4d8..a31989df9d 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -622,7 +622,7 @@ ("rust-winapi" ,rust-winapi-0.3)))) (inputs `(("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libgio-2.0") (description "This package provides FFI bindings to libgio-2.0.") (license license:expat))) -- cgit 1.4.1 From 9842ff3a4e880de6db7e67e77e44e66c9fb7c11a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:57:25 +0100 Subject: gnu: rust-glib-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-glib-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index a31989df9d..83072cb571 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -698,7 +698,7 @@ ("rust-once-cell" ,rust-once-cell-1)))) (inputs `(("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GLib library") (description "Rust bindings for the GLib library") (license license:expat))) -- cgit 1.4.1 From e4f58c8e14055b937036cb81c6d9481e1cc976f5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:57:52 +0100 Subject: gnu: rust-glib-macros-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-glib-macros-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 83072cb571..1b51df00c7 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -781,7 +781,7 @@ ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GLib library, proc macros crate") (description "Rust bindings for the GLib library, proc macros crate.") (license license:expat))) -- cgit 1.4.1 From 904da7eb6721b6511cf61a0453ced0177a0efe88 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:58:10 +0100 Subject: gnu: rust-glib-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-glib-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 1b51df00c7..d582079d14 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -808,7 +808,7 @@ ("rust-tempfile" ,rust-tempfile-3)))) (inputs `(("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libglib-2.0") (description "This package provides FFI bindings to libglib-2.0.") (license license:expat))) -- cgit 1.4.1 From eb831cda8643c276b26e1983cfaf931446f193bb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:58:32 +0100 Subject: gnu: rust-gobject-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gobject-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index d582079d14..553d5bd800 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -859,7 +859,7 @@ ("rust-tempfile" ,rust-tempfile-3)))) (inputs `(("glib" ,glib))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libgobject-2.0") (description "This package provides FFI bindings to libgobject-2.0.") (license license:expat))) -- cgit 1.4.1 From 7acf748453335175e42f3c74d70bcda55fff47b4 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:58:55 +0100 Subject: gnu: rust-gtk-0.8: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gtk-0.8)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 553d5bd800..a21a75d5f1 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -930,7 +930,7 @@ ("glib" ,glib) ("gtk+" ,gtk+) ("pango" ,pango))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the GTK+ 3 library") (description "This package provides Rust bindings for the GTK+ 3 library.") (license license:expat))) -- cgit 1.4.1 From 5f6d4fa30a1eaf773d0b6f68ba79fb8088589b32 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:59:12 +0100 Subject: gnu: rust-gtk-sys-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-gtk-sys-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index a21a75d5f1..9c9a6265df 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -986,7 +986,7 @@ ("rust-tempfile" ,rust-tempfile-3)))) (inputs `(("gtk+" ,gtk+))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libgtk-3") (description "This package provides FFI bindings to libgtk-3.") (license license:expat))) -- cgit 1.4.1 From 05a9ca12231a49c2e38c188e86fadb8cb2878f8b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:59:31 +0100 Subject: gnu: rust-pango-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-pango-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 9c9a6265df..80b554c278 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1018,7 +1018,7 @@ (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (inputs `(("pango" ,pango))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the Pango library") (description "Rust bindings for the Pango library") (license license:expat))) -- cgit 1.4.1 From e72ae1d088ce953b2a74347cac89f7f631dff089 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 11:59:55 +0100 Subject: gnu: rust-pango-sys-0.10: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-pango-sys-0.10)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 80b554c278..2fb1743806 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1098,7 +1098,7 @@ ("rust-system-deps" ,rust-system-deps-1)))) (inputs `(("pango" ,pango))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "FFI bindings to libpango-1.0") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) -- cgit 1.4.1 From 9fcb1cb25e783af669da0fadf03e0384d5032c6d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:00:17 +0100 Subject: gnu: rust-pangocairo-0.9: Use HTTPS home page URI. * gnu/packages/crates-gtk.scm (rust-pangocairo-0.9)[home-page]: Use HTTPS URI. --- gnu/packages/crates-gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 2fb1743806..0d72fbf321 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -1157,7 +1157,7 @@ (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) (inputs `(("gtk+" ,gtk+))) - (home-page "http://gtk-rs.org/") + (home-page "https://gtk-rs.org/") (synopsis "Rust bindings for the PangoCairo library") (description "Rust bindings for the PangoCairo library.") -- cgit 1.4.1 From ac93e5831045bc9639cd706e9e3694aaf8ad1433 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:00:51 +0100 Subject: gnu: singular: Use HTTPS home page URI. * gnu/packages/algebra.scm (singular)[home-page]: Use HTTPS URI. --- gnu/packages/algebra.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 9d81cba4f5..6f36f267b0 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -651,7 +651,7 @@ geometry and singularity theory.") ;; libraries with which it links are licensed under lgpl3+, so the ;; combined work becomes gpl3. See COPYING in the source code. (license license:gpl3) - (home-page "http://www.singular.uni-kl.de/index.php"))) + (home-page "https://www.singular.uni-kl.de/index.php"))) (define-public gmp-ecm (package -- cgit 1.4.1 From 1ca4b76b52546c25d40f1aad927d51b65bb5f9e2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:01:20 +0100 Subject: gnu: slepc: Use HTTPS home page URI. * gnu/packages/maths.scm (slepc)[home-page]: Use HTTPS URI. --- 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 83750cdaaa..083c20dad3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2636,7 +2636,7 @@ savings are consistently > 5x.") "test.log" "error.log" "RDict.db" "uninstall.py")) #t)))))) - (home-page "http://slepc.upv.es") + (home-page "https://slepc.upv.es") (synopsis "Scalable library for eigenproblems") (description "SLEPc is a software library for the solution of large sparse eigenproblems on parallel computers. It can be used for the solution of -- cgit 1.4.1 From 0b2f43076c32a43b1fbe49f425749b4b4467ebce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:02:25 +0100 Subject: gnu: teckit: Use HTTPS home page URI. * gnu/packages/fontutils.scm (teckit)[home-page]: Use HTTPS URI. --- 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 886de92d28..a4c92f5bea 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Roel Janssen -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -457,7 +457,7 @@ primary means by which end users perform conversions, and they have not been designed, tested, and debugged to the extent that general-purpose applications should be.") (license license:lgpl2.1+) - (home-page "http://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) + (home-page "https://scripts.sil.org/cms/scripts/page.php?cat_id=teckit"))) (define-public graphite2 (package -- cgit 1.4.1 From 5c5a9cd6ff659aaa29522712616cd676ecf48d96 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:02:53 +0100 Subject: gnu: twolame: Use HTTPS home page URI. * gnu/packages/audio.scm (twolame)[home-page]: Use HTTPS URI. --- 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 cc5189abea..05c038c226 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3425,7 +3425,7 @@ conversion. It may be used, for example, to resample PCM-encoded audio.") (native-inputs `(("perl" ,perl) ("which" ,which))) ;used in tests/test.pl - (home-page "http://www.twolame.org/") + (home-page "https://www.twolame.org/") (synopsis "MPEG Audio Layer 2 (MP2) encoder") (description "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on -- cgit 1.4.1 From fed1367894e4baef2c51c6b0d0fa6c44542e51cc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:03:15 +0100 Subject: gnu: unicorn: Use HTTPS home page URI. * gnu/packages/emulators.scm (unicorn)[home-page]: Use HTTPS URI. --- 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 dcbffa0a28..057d78ace9 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2084,7 +2084,7 @@ performance, features, and ease of use.") `(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu")))) ("cmocka" ,cmocka) ("hexdump-for-tests" ,util-linux))) - (home-page "http://www.unicorn-engine.org") + (home-page "https://www.unicorn-engine.org") (synopsis "Unicorn CPU emulator framework") (description "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator -- cgit 1.4.1 From 597579afc3f3f36a330c4ed2af6d5f2c14dfa88c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:03:42 +0100 Subject: gnu: unknown-horizons: Use HTTPS home page URI. * gnu/packages/games.scm (unknown-horizons)[home-page]: Use HTTPS URI. --- 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 8c38f3aa98..14b6868a0e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4014,7 +4014,7 @@ also available.") ("python-polib" ,python-polib) ("python-pytest" ,python-pytest) ("python-pytest-mock" ,python-pytest-mock))) - (home-page "http://unknown-horizons.org/") + (home-page "https://unknown-horizons.org/") (synopsis "Isometric realtime strategy, economy and city building simulation") (description "Unknown Horizons is a 2D realtime strategy simulation with an emphasis -- cgit 1.4.1 From 372b15f8625e7f20cafdba2677d4bf3f5eccc127 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Feb 2021 12:04:10 +0100 Subject: gnu: wavpack: Use HTTPS home page URI. * gnu/packages/audio.scm (wavpack)[home-page]: Use HTTPS URI. --- 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 05c038c226..cd51d0ef1c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3242,7 +3242,7 @@ stretching and pitch scaling of audio. This package contains the library.") `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) - (home-page "http://www.wavpack.com/") + (home-page "https://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description "WavPack is an audio compression format with lossless, lossy and hybrid -- cgit 1.4.1 From 8e7ebd35cc6656b0ba659591a718e4e1883b5285 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 28 Feb 2021 12:38:50 -0500 Subject: gnu: privoxy: Update to 3.0.32 [security fixes]. Fixes OVE-20210203-0001, OVE-20210206-0001, OVE-20210207-0001, OVE-20210205-0001, and OVE-20210222-0001. * gnu/packages/tor.scm (privoxy): Update to 3.0.32. --- 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 c08be1d2f9..2284483ca3 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -162,7 +162,7 @@ rejects UDP traffic from the application you're using.") (define-public privoxy (package (name "privoxy") - (version "3.0.31") + (version "3.0.32") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/ijbswa/Sources/" @@ -170,7 +170,7 @@ rejects UDP traffic from the application you're using.") version "-stable-src.tar.gz")) (sha256 (base32 - "1sq4s0h73r7mynl8s0ynn3a6zl98j06nb2nqx2j254n7maijjxq7")))) + "1mzfxwnvnf1jkvfcrsivm6mjwdzjrc3h89qziz0mwi32ih0f87f6")))) (build-system gnu-build-system) (arguments '(;; The default 'sysconfdir' is $out/etc; change that to -- cgit 1.4.1 From 25d409bfd7c35801805c5ddd74e6c61ea6ad1f70 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 28 Feb 2021 20:30:46 +0200 Subject: gnu: emilua: Use a source file-name. * gnu/packages/lua.scm (emilua)[source]: Add file-name field. --- gnu/packages/lua.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 5f9f859e93..7a9e80fca4 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1121,6 +1121,7 @@ shell command executions.") ;; these are dependencies unlikely to be "unbundled" in future ;; releases. (recursive? #t))) + (file-name (git-file-name name version)) (sha256 (base32 "1d6k5v6x85fbvz2ijq1imnfdwvqmsav4xp021a5v3ah4mgy7yann")))) -- cgit 1.4.1 From 1b5b882120daf7d111aa351a919a90e818324347 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:40:26 -0500 Subject: gnu: linux-libre: Update to 5.11.2. * gnu/packages/linux.scm (linux-libre-version, linux-libre-pristine-source, linux-libre-source, linux-libre): Update to 5.11.2. --- 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 4eb2506407..93de944cbe 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -367,6 +367,9 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.11))) +;; The "longterm" kernels — the older releases with long-term upstream support. +;; Here are the support timelines: +;; (define-public linux-libre-5.10-version "5.10.19") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -380,9 +383,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -;; The "longterm" kernels — the older releases with long-term upstream support. -;; Here are the support timelines: -;; (define-public linux-libre-5.4-version "5.4.101") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -890,17 +890,17 @@ It has been modified to remove all non-free binary blobs.") '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:configuration-file kernel-config)) +(define-public linux-libre-version linux-libre-5.11-version) +(define-public linux-libre-pristine-source linux-libre-5.11-pristine-source) +(define-public linux-libre-source linux-libre-5.11-source) +(define-public linux-libre linux-libre-5.11) + (define-public linux-libre-5.10 (make-linux-libre* linux-libre-5.10-version linux-libre-5.10-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:configuration-file kernel-config)) -(define-public linux-libre-version linux-libre-5.10-version) -(define-public linux-libre-pristine-source linux-libre-5.10-pristine-source) -(define-public linux-libre-source linux-libre-5.10-source) -(define-public linux-libre linux-libre-5.10) - (define-public linux-libre-5.4 (make-linux-libre* linux-libre-5.4-version linux-libre-5.4-source -- cgit 1.4.1 From 7c15b9cfd23031a53ca60b5710254ad1ad762b8d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Feb 2021 14:42:46 -0500 Subject: gnu: linux-libre-with-bpf: Update to 5.11.2. * gnu/packages/linux.scm (linux-libre-with-bpf): Update to 5.11.2. --- 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 93de944cbe..4441ebb672 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1066,8 +1066,8 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-with-bpf (let ((base-linux-libre (make-linux-libre* - linux-libre-5.10-version - linux-libre-5.10-source + linux-libre-5.11-version + linux-libre-5.11-source '("x86_64-linux" "i686-linux" "armhf-linux" "aarch64-linux" "riscv64-linux") #:extra-version "bpf" -- cgit 1.4.1 From 39efda1e1e3fad351f6d6ee43be9942882f932f0 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 28 Feb 2021 20:55:11 +0000 Subject: gnu: guix-build-coordinator: Update to 0-20.1f79fc3. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-20.1f79fc3. --- 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 9c0f649934..776867eab7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1046,8 +1046,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "f9a257ed61531eafc9727faebe50be1a1cb1648a") - (revision "19")) + (let ((commit "1f79fc38a17ceda30f378efd4e7f80f252c99b4d") + (revision "20")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1058,7 +1058,7 @@ environments.") (commit commit))) (sha256 (base32 - "1n9c5yn0crcqrrxng4xw1m2kvb9lin2fpym8ja75q6z3s7lpnjvg")) + "0d5zr5mv07pi195vva2fhclfgyzrgbk9vlnwrmy7z1jcw2p1d2zp")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 7556130c2f940c8c92ea79af633cb08c82f50cb4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 28 Feb 2021 21:11:58 +0000 Subject: services: guix-build-coordinator: Rework authentication config. A new authentication approach has been added to the coordinator, so to better represent the options, this commit changes the configuration to accept different records, each for different authentication approaches. * gnu/services/guix.scm (guix-build-coordinator-agent-configuration-uuid, guix-build-coordinator-agent-configuration-password, guix-build-coordinator-agent-configuration-password-file): Removed procedures. (guix-build-coordinator-agent-password-auth, guix-build-coordinator-agent-password-auth?, guix-build-coordinator-agent-password-auth-uuid, guix-build-coordinator-agent-password-auth-password, guix-build-coordinator-agent-password-file-auth, guix-build-coordinator-agent-password-file-auth?, guix-build-coordinator-agent-password-file-auth-uuid, guix-build-coordinator-agent-password-file-auth-password-file): New procedures. (guix-build-coordinator-agent-shepherd-services): Adjust to handle the authentication field and it's possible record values. * doc/guix.texi (Guix Build Coordinator): Update documentation. --- doc/guix.texi | 48 +++++++++++++++++++++++++++++++++------------ gnu/services/guix.scm | 54 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 74 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 27083f1ae6..b75fce4dbc 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30962,18 +30962,9 @@ The system user to run the service as. @item @code{coordinator} (default: @code{"http://localhost:8745"}) The URI to use when connecting to the coordinator. -@item @code{uuid} -The UUID of the agent. This should be generated by the coordinator -process, stored in the coordinator database, and used by the intended -agent. - -@item @code{password} (default: @code{#f}) -The password to use when connecting to the coordinator. A file to read -the password from can also be specified, and this is more secure. - -@item @code{password-file} (default: @code{#f}) -A file containing the password to use when connecting to the -coordinator. +@item @code{authentication} +Record describing how this agent should authenticate with the +coordinator. Possible record types are described below. @item @code{systems} (default: @code{#f}) The systems for which this agent should fetch builds. The agent process @@ -30993,6 +30984,39 @@ input store items aren't already available. @end table @end deftp +@deftp {Data Type} guix-build-coordinator-agent-password-auth +Data type representing an agent authenticating with a coordinator via a +UUID and password. + +@table @asis +@item @code{uuid} +The UUID of the agent. This should be generated by the coordinator +process, stored in the coordinator database, and used by the intended +agent. + +@item @code{password} +The password to use when connecting to the coordinator. + +@end table +@end deftp + +@deftp {Data Type} guix-build-coordinator-agent-password-file-auth +Data type representing an agent authenticating with a coordinator via a +UUID and password read from a file. + +@table @asis +@item @code{uuid} +The UUID of the agent. This should be generated by the coordinator +process, stored in the coordinator database, and used by the intended +agent. + +@item @code{password-file} +A file containing the password to use when connecting to the +coordinator. + +@end table +@end deftp + The Guix Build Coordinator package contains a script to query an instance of the Guix Data Service for derivations to build, and then submit builds for those derivations to the coordinator. The service diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index 88d23f746a..b86e20360b 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -55,14 +55,22 @@ guix-build-coordinator-agent-configuration-package guix-build-coordinator-agent-configuration-user guix-build-coordinator-agent-configuration-coordinator - guix-build-coordinator-agent-configuration-uuid - guix-build-coordinator-agent-configuration-password - guix-build-coordinator-agent-configuration-password-file + guix-build-coordinator-agent-configuration-authentication guix-build-coordinator-agent-configuration-systems guix-build-coordinator-agent-configuration-max-parallel-builds guix-build-coordinator-agent-configuration-derivation-substitute-urls guix-build-coordinator-agent-configuration-non-derivation-substitute-urls + guix-build-coordinator-agent-password-auth + guix-build-coordinator-agent-password-auth? + guix-build-coordinator-agent-password-auth-uuid + guix-build-coordinator-agent-password-auth-password + + guix-build-coordinator-agent-password-file-auth + guix-build-coordinator-agent-password-file-auth? + guix-build-coordinator-agent-password-file-auth-uuid + guix-build-coordinator-agent-password-file-auth-password-file + guix-build-coordinator-agent-service-type guix-build-coordinator-queue-builds-configuration @@ -132,11 +140,7 @@ (default "guix-build-coordinator-agent")) (coordinator guix-build-coordinator-agent-configuration-coordinator (default "http://localhost:8745")) - (uuid guix-build-coordinator-agent-configuration-uuid) - (password guix-build-coordinator-agent-configuration-password - (default #f)) - (password-file guix-build-coordinator-agent-configuration-password-file - (default #f)) + (authentication guix-build-coordinator-agent-configuration-authentication) (systems guix-build-coordinator-agent-configuration-systems (default #f)) (max-parallel-builds @@ -149,6 +153,21 @@ guix-build-coordinator-agent-configuration-non-derivation-substitute-urls (default #f))) +(define-record-type* + guix-build-coordinator-agent-password-auth + make-guix-build-coordinator-agent-password-auth + guix-build-coordinator-agent-password-auth? + (uuid guix-build-coordinator-agent-password-auth-uuid) + (password guix-build-coordinator-agent-password-auth-password)) + +(define-record-type* + guix-build-coordinator-agent-password-file-auth + make-guix-build-coordinator-agent-password-file-auth + guix-build-coordinator-agent-password-file-auth? + (uuid guix-build-coordinator-agent-password-file-auth-uuid) + (password-file + guix-build-coordinator-agent-password-file-auth-password-file)) + (define-record-type* guix-build-coordinator-queue-builds-configuration make-guix-build-coordinator-queue-builds-configuration @@ -326,7 +345,7 @@ (define (guix-build-coordinator-agent-shepherd-services config) (match-record config - (package user coordinator uuid password password-file max-parallel-builds + (package user coordinator authentication max-parallel-builds derivation-substitute-urls non-derivation-substitute-urls systems) (list @@ -337,13 +356,16 @@ (start #~(make-forkexec-constructor (list #$(file-append package "/bin/guix-build-coordinator-agent") #$(string-append "--coordinator=" coordinator) - #$(string-append "--uuid=" uuid) - #$@(if password - #~(#$(string-append "--password=" password)) - #~()) - #$@(if password-file - #~(#$(string-append "--password-file=" password-file)) - #~()) + #$@(match authentication + (($ + uuid password) + #~(#$(string-append "--uuid=" uuid) + #$(string-append "--password=" password))) + (($ + uuid password-file) + #~(#$(string-append "--uuid=" uuid) + #$(string-append "--password-file=" + password-file)))) #$(simple-format #f "--max-parallel-builds=~A" max-parallel-builds) #$@(if derivation-substitute-urls -- cgit 1.4.1 From 8a7b4ce0936f456ebd57ea13ec64336d7cd51678 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 28 Feb 2021 21:35:36 +0000 Subject: services: guix-build-coordinator: Add dynamic auth record. * gnu/services/guix.scm (guix-build-coordinator-agent-dynamic-auth, guix-build-coordinator-agent-dynamic-auth?, guix-build-coordinator-agent-dynamic-auth-agent-name, guix-build-coordinator-agent-dynamic-auth-token): New procedures. (guix-build-coordinator-agent-shepherd-services): Handle new dynamic auth record. * doc/guix.texi (Guix Build Coordinator): Document the new dynamic auth record. --- doc/guix.texi | 17 +++++++++++++++++ gnu/services/guix.scm | 18 +++++++++++++++++- 2 files changed, 34 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index b75fce4dbc..e8fb346d73 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31017,6 +31017,23 @@ coordinator. @end table @end deftp +@deftp {Data Type} guix-build-coordinator-agent-dynamic-auth +Data type representing an agent authenticating with a coordinator via a +dyanmic auth token and agent name. + +@table @asis +@item @code{agent-name} +Name of an agent, this is used to match up to an existing entry in the +database if there is one. When no existing entry is found, a new entry +is automatically added. + +@item @code{token} +Dynamic auth token, this is created and stored in the coordinator +database, and is used by the agent to authenticate. + +@end table +@end deftp + The Guix Build Coordinator package contains a script to query an instance of the Guix Data Service for derivations to build, and then submit builds for those derivations to the coordinator. The service diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index b86e20360b..b0d2c05bcf 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -71,6 +71,11 @@ guix-build-coordinator-agent-password-file-auth-uuid guix-build-coordinator-agent-password-file-auth-password-file + guix-build-coordinator-agent-dynamic-auth + guix-build-coordinator-agent-dynamic-auth? + guix-build-coordinator-agent-dynamic-auth-agent-name + guix-build-coordinator-agent-dynamic-auth-token + guix-build-coordinator-agent-service-type guix-build-coordinator-queue-builds-configuration @@ -168,6 +173,13 @@ (password-file guix-build-coordinator-agent-password-file-auth-password-file)) +(define-record-type* + guix-build-coordinator-agent-dynamic-auth + make-guix-build-coordinator-agent-dynamic-auth + guix-build-coordinator-agent-dynamic-auth? + (agent-name guix-build-coordinator-agent-dynamic-auth-agent-name) + (token guix-build-coordinator-agent-dynamic-auth-token)) + (define-record-type* guix-build-coordinator-queue-builds-configuration make-guix-build-coordinator-queue-builds-configuration @@ -365,7 +377,11 @@ uuid password-file) #~(#$(string-append "--uuid=" uuid) #$(string-append "--password-file=" - password-file)))) + password-file))) + (($ + agent-name token) + #~(#$(string-append "--name=" agent-name) + #$(string-append "--dynamic-auth-token=" token)))) #$(simple-format #f "--max-parallel-builds=~A" max-parallel-builds) #$@(if derivation-substitute-urls -- cgit 1.4.1 From d4baac70b85ec5f9690328c5e0b0adee84b6b420 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 4 Jan 2021 02:00:12 +0100 Subject: gnu: Add ruby-jekyll-feed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-jekyll-feed): New variable. Signed-off-by: Björn Höfling --- 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 8d3646847a..01f78fdb43 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12283,3 +12283,28 @@ exceptions with predefined messages.") giving detailed reports on the time taken for each task.") (home-page "https://github.com/ruby/benchmark") (license license:bsd-2))) + +(define-public ruby-jekyll-feed + (package + (name "ruby-jekyll-feed") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-feed" version)) + (sha256 + (base32 + "1zxqkrnix0xiw98531h5ga6h69jhzlx2jh9qhvcl67p8nq3sgza9")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #false)) ;there are none + (propagated-inputs + `(("jekyll" ,jekyll))) + (synopsis + "Jekyll plugin to generate an Atom feed of your Jekyll posts") + (description + "This package provides a Jekyll plugin to generate an Atom feed +of your Jekyll posts.") + (home-page + "https://github.com/jekyll/jekyll-feed") + (license license:expat))) -- cgit 1.4.1 From f815e88ed0f1cc0c5dd391fbc450710008483b53 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 4 Jan 2021 02:00:13 +0100 Subject: gnu: Add ruby-jekyll-sitemap. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-jekyll-sitemap): New variable. Signed-off-by: Björn Höfling --- 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 01f78fdb43..fc946a705e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12308,3 +12308,28 @@ of your Jekyll posts.") (home-page "https://github.com/jekyll/jekyll-feed") (license license:expat))) + +(define-public ruby-jekyll-sitemap + (package + (name "ruby-jekyll-sitemap") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-sitemap" version)) + (sha256 + (base32 + "0622rwsn5i0m5xcyzdn86l68wgydqwji03lqixdfm1f1xdfqrq0d")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #false)) ;there are none + (propagated-inputs + `(("jekyll" ,jekyll))) + (synopsis + "Automatically generate a sitemap.xml for your Jekyll site") + (description + "This package provides a Jekyll plugin to silently generate +a sitemaps.org compliant sitemap for your Jekyll site.") + (home-page + "https://github.com/jekyll/jekyll-sitemap") + (license license:expat))) -- cgit 1.4.1 From 3d5c5cf611cc09c03e9d641094d86e3afc96d6c6 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 4 Jan 2021 02:00:14 +0100 Subject: gnu: Add ruby-jekyll-seo-tag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ruby.scm (ruby-jekyll-seo-tag): New variable. Signed-off-by: Björn Höfling --- 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 fc946a705e..231402d9f5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -12333,3 +12333,28 @@ a sitemaps.org compliant sitemap for your Jekyll site.") (home-page "https://github.com/jekyll/jekyll-sitemap") (license license:expat))) + +(define-public ruby-jekyll-seo-tag + (package + (name "ruby-jekyll-seo-tag") + (version "2.7.1") + (source + (origin + (method url-fetch) + (uri (rubygems-uri "jekyll-seo-tag" version)) + (sha256 + (base32 + "0fsi75hymk2wswy216fs224p5ycrzjw1kshw1bsl5czhv42wr2w3")))) + (build-system ruby-build-system) + (arguments + `(#:tests? #false)) + (propagated-inputs + `(("jekyll" ,jekyll))) + (synopsis + "Jekyll plugin to add metadata tags for search engines and social networks") + (description + "This package provides a Jekyll plugin to add metadata tags for search engines +and social networks to better index and display your site's content.") + (home-page + "https://github.com/jekyll/jekyll-seo-tag") + (license license:expat))) -- cgit 1.4.1 From 3505d86502c80fa390d2c6db103697307d596b0e Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 02:56:51 +0100 Subject: gnu: openscad: Update to 2021.01 [maybe fixes TALOS-2020-1222, TALOS-2020-1223]. TALOS-2020-1222 has yet to be disclosed and has no known CVE number. TALOS-2020-1223 has CVE-2020-28599 assigned. * gnu/packages/engineering.scm (openscad): Update to 2021.01. [patches]: Remove. Boost 1.72 is supported now upstream. [arguments]: In replacement 'check phase, disable some tests requiring experimental "lazy-union" feature. Also disable PDF-related tests requiring ghostscript and failing either way. * gnu/local.mk (dist_patch_DATA): Remove patch. * gnu/packages/patches/openscad-parser-boost-1.72.patch: Ditto. --- gnu/local.mk | 1 - gnu/packages/engineering.scm | 18 ++++++++++----- .../patches/openscad-parser-boost-1.72.patch | 26 ---------------------- 3 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 gnu/packages/patches/openscad-parser-boost-1.72.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 83753e6b4e..0954158d4c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1429,7 +1429,6 @@ dist_patch_DATA = \ %D%/packages/patches/openssh-fix-ssh-copy-id.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ - %D%/packages/patches/openscad-parser-boost-1.72.patch \ %D%/packages/patches/opensles-add-license-file.patch \ %D%/packages/patches/openssl-runpath.patch \ %D%/packages/patches/openssl-1.1-c-rehash-in.patch \ diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fb6895f911..8517d2abde 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2476,7 +2476,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") (define-public openscad (package (name "openscad") - (version "2019.05") + (version "2021.01") (source (origin (method url-fetch) @@ -2484,9 +2484,7 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") ".src.tar.gz")) (sha256 (base32 - "0nbgk5q5pgnw53la0kccdcpz2f4xf6d6076rkn0q08z57hkc85ha")) - (patches (search-patches - "openscad-parser-boost-1.72.patch")))) + "0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) @@ -2529,7 +2527,17 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") (with-directory-excursion "tests" (invoke "cmake" ".") (invoke "make") - (invoke "ctest")) + (invoke "ctest" "--exclude-regex" + (string-join + (list + "astdumptest_allexpressions" + "echotest_function-literal-compare" + "echotest_function-literal-tests" + "echotest_allexpressions" + "lazyunion-*" + "pdfexporttest_centered" + "pdfexporttest_simple-pdf") + "|"))) ;; strip python test files since lib dir ends up in out/share (for-each delete-file (find-files "libraries/MCAD" ".*\\.py")) diff --git a/gnu/packages/patches/openscad-parser-boost-1.72.patch b/gnu/packages/patches/openscad-parser-boost-1.72.patch deleted file mode 100644 index 35311e6173..0000000000 --- a/gnu/packages/patches/openscad-parser-boost-1.72.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/openscad/openscad/commit/b6c170cc5d.patch - -From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Fri, 25 Oct 2019 15:10:26 +0000 -Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 - -src/parser.y:76:6: error: no template named 'stack' in namespace 'std' -std::stack scope_stack; -~~~~~^ ---- - src/parser.y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/parser.y b/src/parser.y -index 7f4fd56ca7..4c77c989ea 100644 ---- a/src/parser.y -+++ b/src/parser.y -@@ -46,6 +46,7 @@ - #include "printutils.h" - #include "memory.h" - #include -+#include - #include - #include "boost-utils.h" - #include "feature.h" -- cgit 1.4.1 From 8e5061e6d6ef7ba00cdd2f02c15667dd03ca9002 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 04:34:31 +0100 Subject: gnu: Add quiterss. * gnu/packages/syndication.scm (quiterss): New variable. --- gnu/packages/syndication.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 3e848b9f9c..3ebc9182fa 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -24,6 +24,7 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system cargo) + #:use-module (guix build-system qt) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system python) @@ -39,12 +40,14 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-xyz) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages ruby) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) @@ -357,3 +360,57 @@ a simple interface that makes it easy to organize and browse feeds.") \"river of news\" or a public \"planet\" page. It supports all common feed formats, including all versions of RSS and Atom.") (license license:gpl2+))) + +(define-public quiterss + (package + (name "quiterss") + (version "0.19.4") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/QuiteRSS/quiterss/archive/" + version ".tar.gz")) + (sha256 + (base32 + "1g1kfa15fr8xskpsc15fbw22z8fljkyq6wfq02zygi4fb8hgmpyr")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "." "\\.cpp$") + ;; Disable Google Analytics spyware by default, + ;; removing completely is not trivial. + (("settings\\.value\\(\"Settings/statisticsEnabled2\", true\\)") + "settings.value(\"Settings/statisticsEnabled2\", false)") + ;; Disable update check spyware by default, otherwise runs + ;; at every startup, nasty. Not needed on GNU Guix as a + ;; feature either way. + (("settings\\.value\\(\"Settings/updateCheckEnabled\", true\\)") + "settings.value(\"Settings/updateCheckEnabled\", false)")) + #t)))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ;; no test suite + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (invoke "qmake" "CONFIG+=release" + (string-append "PREFIX=" + (assoc-ref outputs "out")) + (string-append "QMAKE_LRELEASE=" + (assoc-ref inputs "qttools") + "/bin/lrelease"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("qtwebkit" ,qtwebkit) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("phonon" ,phonon) + ("sqlite" ,sqlite))) + (home-page "https://quiterss.org/") + (synopsis "RSS/Atom news feeds reader written on Qt/C++") + (description "QuiteRSS is an RSS/Atom news feeds reader written on Qt/C++ +that aims to be quite fast and comfortable to it's user.") + (license license:gpl3+))) -- cgit 1.4.1 From 143472afa49562a11220475409ac0dfc8644a6a4 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 04:42:12 +0100 Subject: gnu: quiterss: Fix lint warnings. * gnu/packages/syndication.scm (quiterss): [source]: Use git-fetch instead of autogenerated GitHub tarball. Remove trailing whitespace. --- gnu/packages/syndication.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 3ebc9182fa..89ef69f6b8 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -366,13 +366,14 @@ formats, including all versions of RSS and Atom.") (name "quiterss") (version "0.19.4") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/QuiteRSS/quiterss/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/QuiteRSS/quiterss") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1g1kfa15fr8xskpsc15fbw22z8fljkyq6wfq02zygi4fb8hgmpyr")) + "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6")) (modules '((guix build utils))) (snippet '(begin @@ -383,7 +384,7 @@ formats, including all versions of RSS and Atom.") "settings.value(\"Settings/statisticsEnabled2\", false)") ;; Disable update check spyware by default, otherwise runs ;; at every startup, nasty. Not needed on GNU Guix as a - ;; feature either way. + ;; feature either way. (("settings\\.value\\(\"Settings/updateCheckEnabled\", true\\)") "settings.value(\"Settings/updateCheckEnabled\", false)")) #t)))) -- cgit 1.4.1 From 0f4030c4c6860806ef487c2b6d90fd9c599b64e7 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 05:09:44 +0100 Subject: gnu: python-pysaml2: Update to 6.5.1 [fixes CVE-2021-21238, CVE-2021-21239]. * gnu/packages/python-xyz.scm (python-pysaml2): Update to 6.5.1. --- gnu/packages/python-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38dd0654d9..a170c95cd2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -22556,23 +22556,26 @@ networking engine for Python.") (define-public python-pysaml2 (package (name "python-pysaml2") - (version "5.0.0") + (version "6.5.1") (source (origin (method url-fetch) (uri (pypi-uri "pysaml2" version)) (sha256 (base32 - "1h8cmxh9cvxhrdfmkh92wg6zpxmhi2fixq1cy4hxismmaar7bsny")))) + "1xk2x0slz1f8cqv7vn77qx99xfd1mshhswiwrljk9m72w2m9iivd")))) (build-system python-build-system) (propagated-inputs `(("python-cryptography" ,python-cryptography) ("python-dateutil" ,python-dateutil) ("python-defusedxml" ,python-defusedxml) + ("python-importlib-resources" + ,python-importlib-resources) ("python-pyopenssl" ,python-pyopenssl) ("python-pytz" ,python-pytz) ("python-requests" ,python-requests) - ("python-six" ,python-six))) + ("python-six" ,python-six) + ("python-xmlschema" ,python-xmlschema))) (home-page "https://idpy.org") (synopsis "Python implementation of SAML Version 2 Standard") (description -- cgit 1.4.1 From d85edd7a9528fc9f3f0b6d4d4ce5c9e144ebbedf Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 05:30:55 +0100 Subject: gnu: stunnel: Update to 5.58 [security fixes]. * gnu/packages/web.scm (stunnel): Update to 5.58. --- gnu/packages/web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e9a17f3b78..68fd9c4d11 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5813,14 +5813,14 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.57") + (version "5.58") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "1q8gc05fiz7w55ws0whwzb94ffjnhzfppf1mhz1hf671vmrvjnmg")))) + (base32 "0y9vjzjqi340vy6h321r1cskb7l6a4prr9d2ysixqzjpjv04rhfl")))) (build-system gnu-build-system) (native-inputs ;; For tests. @@ -5847,6 +5847,8 @@ tools like SSH (Secure Shell) to reach the outside world.") (substitute* "tests/make_test" (("/bin/sh ") (string-append (which "sh") " "))) + ;; test requires networking + (delete-file "tests/recipes/055_socket_closed") #t))))) (home-page "https://www.stunnel.org") (synopsis "TLS proxy for clients or servers") -- cgit 1.4.1 From ea13b3a14cb079e33b59cf60cdabf500ecc51cf1 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 05:43:28 +0100 Subject: gnu: mumble: Update to 1.3.4 [security fixes]. * gnu/packages/telephony.scm (mumble): Update to 1.3.4. [source]: Use GitHub releases as tarballs stopped being distributed through 'mumble.info'. --- gnu/packages/telephony.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index df6df83dd2..dbf17a4fb0 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -515,14 +515,16 @@ address of one of the participants.") (define-public mumble (package (name "mumble") - (version "1.3.3") + (version "1.3.4") (source (origin (method url-fetch) - (uri (string-append "https://mumble.info/snapshot/stable/" - name "-" version ".tar.gz")) + (uri + (string-append + "https://github.com/mumble-voip/mumble/releases/download/" + version "/" name "-" version ".tar.gz")) (sha256 (base32 - "101gw1334zmqsbjrba5dq1v4p2nxcs37g2yrzvkcra6s9ri4fw3j")) + "14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From 9be83f28c0fefc1befcafd9ccba66c527bbf5440 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 05:51:28 +0100 Subject: gnu: ansible: Update to 2.9.18 [security fixes]. * gnu/packages/admin.scm (ansible): Update to 2.9.18. --- 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 2ca99774b8..5b864d172e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2292,13 +2292,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.16") + (version "2.9.18") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "0j1icfqff25zm9sq6j41ipl6gcj3i67mb5bqbjf2f2q1yx6rm8sk")))) + (base32 "0g6rsnh02zq5nizamgakl2wvgz7hk1lpnjn9akldrcpa55vygzjm")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit 1.4.1 From d0a0215cda916d1dbff8fcc50aa4277f4f7e1871 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 06:02:28 +0100 Subject: gnu: node: Update to 10.24.0 [security fixes]. * gnu/packages/node.scm (node): Update to 10.24.0. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 051c4c3b41..dec6cc2b7c 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -50,14 +50,14 @@ (define-public node (package (name "node") - (version "10.23.3") + (version "10.24.0") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "13za06bz17k71gcxyrx41l2j8al1kr3j627b8m7kqrf3l7rdfnsi")) + "1k1srdis23782hnd1ymgczs78x9gqhv77v0am7yb54gqcspp70hm")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From 85da3f52cb40be33ab045120d2e101002896a143 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 06:10:57 +0100 Subject: gnu: radare2: Update to 5.1.1. * gnu/packages/engineering.scm (radare2): Update to 5.1.1. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8517d2abde..99c9f216ef 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1553,7 +1553,7 @@ bootloader in Espressif ESP8266 & ESP32 series chips.") (define-public radare2 (package (name "radare2") - (version "5.0.0") + (version "5.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -1561,7 +1561,7 @@ bootloader in Espressif ESP8266 & ESP32 series chips.") (commit version))) (sha256 (base32 - "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420")) + "0hv9x31iabasj12g8f04incr1rbcdkxi3xnqn3ggp8gl4h6pf2f3")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From ac17ff0669521f0efec11696ad99f589bebf0f10 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Mar 2021 11:43:06 +0200 Subject: gnu: gama: Update to 2.14. * gnu/packages/gps.scm (gama): Update to 2.14. --- 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 ca53ac3b73..633cdbd5d9 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -149,7 +149,7 @@ between two other data points.") (define-public gama (package (name "gama") - (version "2.13") + (version "2.14") (source (origin (method url-fetch) @@ -157,7 +157,7 @@ between two other data points.") version ".tar.gz")) (sha256 (base32 - "041cprbj4lfs42i7sd1c2zlx3r16g6c5shz3qls79gxb7kqflkgb")) + "04mhbgpqbynnmm8ww4k2yk1w2j66c276dns9xwn8cvrq58kjimln")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 7ca43b0a1e2215abe0df0708f31decace8e68911 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 1 Mar 2021 11:44:31 +0200 Subject: gnu: gama: Delete bundled pdfs. * gnu/packages/gps.scm (gama)[source]: Adjust snippet to also remove generated PDFs. --- gnu/packages/gps.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 633cdbd5d9..d2f0becec0 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -162,6 +162,7 @@ between two other data points.") (snippet '(begin (delete-file-recursively "lib/expat") + (for-each delete-file (find-files "doc/fig" "\\.pdf$")) #t)))) (build-system gnu-build-system) (arguments '(#:parallel-tests? #f)) ; race condition -- cgit 1.4.1 From ff9f2463f9c604c402ccbebdeba41dd22a915e6c Mon Sep 17 00:00:00 2001 From: pukkamustard Date: Mon, 1 Mar 2021 12:24:58 +0100 Subject: gnu: Add guile-cbor. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile-cbor): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c75fc4b4ac..45b3a82d00 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2020 Jesse Gibbons ;;; Copyright © 2020 Mike Rosset ;;; Copyright © 2020 Leo Prikler -;;; Copyright © 2020 pukkamustard +;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; ;;; This file is part of GNU Guix. @@ -4560,3 +4560,32 @@ ffi-helper from nyacc.") for C++ code using a simple embedded DSL. Think of it as @code{Boost.Python} or @code{LuaBind} but for Scheme.") (license license:boost1.0)))) + +(define-public guile-cbor + (package + (name "guile-cbor") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://inqlab.net/git/guile-cbor.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "0bdqg3ifayf7m2j09lqrgdfprbdaa67azf09bcq9b4k71inxfnxl")))) + (build-system gnu-build-system) + (arguments `()) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs `(("guile" ,guile-3.0))) + (synopsis "Guile implementation of CBOR") + (description + "The Concise Binary Object Representation (CBOR), as specified by RFC 8949, is +a binary data serialization format. CBOR is similar to JSON but serializes to +binary which is smaller and faster to generate and parse. This package provides +a Guile implementation of CBOR.") + (home-page "https://inqlab.net/git/guile-cbor.git") + (license license:gpl3+))) -- cgit 1.4.1 From e56186df593ea6d474aa3ea7faf0efcd31f75857 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 1 Mar 2021 19:06:42 +0100 Subject: gnu: cutter: Fix build by depending on older radare2. * gnu/packages/engineering.scm (radare2-for-cutter): New variable. Version 5.0.0. (cutter)[inputs]: Move from radare2 to radare2-for-cutter. --- gnu/packages/engineering.scm | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 99c9f216ef..59c424c9da 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2393,6 +2393,21 @@ analysis and AC analysis. The engine is designed to do true mixed-mode simulation.") (license license:gpl3+))) +(define-public radare2-for-cutter + (package + (inherit radare2) + (name "radare2") + (version "5.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/radareorg/radare2") + (commit version))) + (sha256 + (base32 + "0aa7c27kd0l55fy5qfvxqmakp4pz6240v3hn84095qmqkzcbs420")) + (file-name (git-file-name name version)))))) + (define-public cutter (package (name "cutter") @@ -2428,7 +2443,9 @@ simulation.") `(("qtbase" ,qtbase) ("qtsvg" ,qtsvg) ("openssl" ,openssl) - ("radare2" ,radare2))) + ;; Depends on radare2 4.5.1 officially, builds and works fine with + ;; radare2 5.0.0 but fails to build with radare2 5.1.1. + ("radare2" ,radare2-for-cutter))) (home-page "https://github.com/radareorg/cutter") (synopsis "GUI for radare2 reverse engineering framework") (description "Cutter is a GUI for radare2 reverse engineering framework. -- cgit 1.4.1 From 747f68bfb28ba0a4c68c44e1a990fa3e2522c9e1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 1 Mar 2021 15:13:30 -0500 Subject: gnu: Audacity: Build with Python 3. * gnu/packages/audio.scm (audacity)[native-inputs]: Replace python-2 with python. --- 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 cd51d0ef1c..052360d2e9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -741,7 +741,7 @@ engineers, musicians, soundtrack editors and composers.") ("gettext" ,gettext-minimal) ;for msgfmt ("libtool" ,libtool) ("pkg-config" ,pkg-config) - ("python" ,python-2) + ("python" ,python) ("which" ,which))) (arguments `(#:configure-flags -- cgit 1.4.1 From baec2a0846496c15f972f91cbdad085130c25940 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 1 Mar 2021 22:23:32 +0100 Subject: gnu: glslang: Use 11.0.0 as git-fetch tag. * gnu/packages/vulkan.scm (glslang)[source]: Use tag 11.0.0. From the README.md: "The versioning scheme is being improved, and you might notice some differences. This is currently WIP, but will be coming soon." In this curse, they moved the tag 10-11.0.0 to just 11.0.0. See also . --- gnu/packages/vulkan.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index 1a0d0d7d63..ac91f8451c 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -156,7 +156,9 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.") (method git-fetch) (uri (git-reference (url "https://github.com/KhronosGroup/glslang") - (commit version))) + ;; Tag "10-11.0.0" was moved to "11.0.0". + ;; FIXME: Use (commit version) on next update. + (commit "11.0.0"))) (sha256 (base32 "14mn2awswl022ls75mfpsnpsl0ai0jgfbqj3sxcsqawyj5f432py")) -- cgit 1.4.1 From d5ac66a2eee8ed33a9d9d79e15ec578eafd566d5 Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Mon, 1 Mar 2021 22:58:06 +0100 Subject: gnu: i3-wm: Use asciidoc-py3. * gnu/packages/wm.scm (i3-wm)[inputs]: Remove asciidoc. [native-inputs]: Add asciidoc-py3. --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 93189fc90b..a837e6d20b 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -320,7 +320,6 @@ commands would.") ("libxkbcommon" ,libxkbcommon) ("libev" ,libev) ("libyajl" ,libyajl) - ("asciidoc" ,asciidoc) ("xmlto" ,xmlto) ("perl-pod-simple" ,perl-pod-simple) ("libx11" ,libx11) @@ -332,6 +331,7 @@ commands would.") `(("which" ,which) ("perl" ,perl) ("pkg-config" ,pkg-config) + ("asciidoc-py3" ,asciidoc-py3) ;; For building the documentation. ("libxml2" ,libxml2) ("docbook-xsl" ,docbook-xsl))) -- cgit 1.4.1 From 4bc9a1f4e3bd39302b4ceaab8589a2e6ef82c4bd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 2 Mar 2021 02:17:35 +0100 Subject: gnu: java-tomcat: Update to 8.5.63 [security fixes]. * gnu/packages/web.scm (java-tomcat): Update to 8.5.63. --- 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 68fd9c4d11..9892dde0b9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6585,14 +6585,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.53") + (version "8.5.63") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "15lwq3clf21hzk7mma70sffpxjqn8ww5mjq6zhmwcp4m17m22z26")) + "1wr6mpgbk2gs18vp8mdggiq6vifj68a875dd1fkdf7cs31q54rns")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet -- cgit 1.4.1 From 0eb64c2c85c2046c54dcb425f2bd8578376fa522 Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Tue, 2 Mar 2021 12:43:28 +0800 Subject: gnu: dwl: Update to 0.2. * gnu/packages/wm.scm (dwl): Update to 0.2. [arguments]: Remove the install phase. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a837e6d20b..e0c4d1db84 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1264,7 +1264,7 @@ project derived from the original Calm Window Manager.") (define-public dwl (package (name "dwl") - (version "0.1") + (version "0.2") (source (origin (method git-fetch) (uri (git-reference @@ -1273,7 +1273,7 @@ project derived from the original Calm Window Manager.") (file-name (git-file-name name version)) (sha256 (base32 - "18g2sx8cv54zl5iw5m9lzngrp6ra2pyp7c68qps2ava3brw9m0j2")))) + "0r5hsxpckkrq1y7bjfq58rlc5xy45z499rg628q3nh289978ail1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1283,12 +1283,7 @@ project derived from the original Calm Window Manager.") (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure - (replace 'install ; no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "dwl" bin))))))) + (delete 'configure)))) ; no configure (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 683cccc3e7342393f41eb425f3432bc295b42d02 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 09:33:58 +0100 Subject: gnu: emacs-dash: Update to 2.18.1. * gnu/packages/emacs-xyz.scm (emacs-dash): Update to 2.18.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 783f7790e9..14a0a62b68 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2909,7 +2909,7 @@ and stored in memory.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.18.0") + (version "2.18.1") (source (origin (method git-fetch) (uri (git-reference @@ -2918,7 +2918,7 @@ and stored in memory.") (file-name (git-file-name name version)) (sha256 (base32 - "190v264wj5cdm109ippzx2vc64hvfzmh5nbx4f2w09hn0hwfqipm")))) + "1cvfd36vv0wqb16bnqqxh99hy2yks0j2i4l8qjkg3bxjgk7ldmva")))) (build-system emacs-build-system) (arguments `(#:tests? #t)) (home-page "https://github.com/magnars/dash.el") -- cgit 1.4.1 From 3fdb8fc0c4d897b17f487f18c5fc62cd40c337ed Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 09:35:13 +0100 Subject: gnu: python-pikepdf: Update to 2.8.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.8.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a170c95cd2..01f1e66258 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5806,13 +5806,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0xjr9qnv6z94ka1xj57am4a64vppdrplgmm359y1za1mqnfyabyk")))) + (base32 "1dfc8a7gp6ib6a2gdx6fz2zvvk4yx8vr2m7b6044rk91vpyrdzvl")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 412892a280ba9387de2bb50041df3a77831723b8 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 20:41:27 +0100 Subject: gnu: xfce4-cpugraph-plugin: Update to 1.2.3. * gnu/packages/xfce.scm (xfce4-cpugraph-plugin): Update to 1.2.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index f575926eb4..83b6a404ad 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1357,7 +1357,7 @@ A plugin for the Xfce panel is also available.") (define-public xfce4-cpugraph-plugin (package (name "xfce4-cpugraph-plugin") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1366,7 +1366,7 @@ A plugin for the Xfce panel is also available.") "/xfce4-cpugraph-plugin-" version ".tar.bz2")) (sha256 (base32 - "0pnm2lqcc9snzpcd25c2yvzcnikk5chc5bn1jh14r6726vx14z1l")))) + "13302psv0fzg2dsgadr8j6mb06k1bsa4zw6hxmb644vqlvcwq37v")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 1196f3f95a8afd2044f2f0514991be76582f862e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 20:57:34 +0100 Subject: gnu: mousepad: Update to 0.5.3. * gnu/packages/xfce.scm (mousepad): Update to 0.5.3. Signed-off-by: Nicolas Goaziou --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 83b6a404ad..efb31c6263 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1206,7 +1206,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1214,7 +1214,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "13pvisqhq5rjrkfdw635z600167920fxqzg1ngvismaf39iwbb9h")))) + "1a6a3x4h6aisjm59i0afx1w50035s76zjr4a6p9ja5bax6wqn877")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than -- cgit 1.4.1 From 9d03eb8095033b0613f695a56b41fd5478832830 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 21:06:33 +0100 Subject: gnu: xfce4-time-out-plugin: Update to 1.1.2. * gnu/packages/xfce.scm (xfce4-time-out-plugin): Update to 1.1.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index efb31c6263..d8acbba0c9 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1944,7 +1944,7 @@ swap space and the system uptime in the Xfce4 panel.") (define-public xfce4-time-out-plugin (package (name "xfce4-time-out-plugin") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1953,7 +1953,7 @@ swap space and the system uptime in the Xfce4 panel.") "/xfce4-time-out-plugin-" version ".tar.bz2")) (sha256 (base32 - "07d3vddzrl6p6kg3qs4rd8qk57ghf33sk9sh73gsx2hxfnwbwk8r")))) + "1m42kmi0x3xb0lzj2nd7q2r5y5r2viqcvxfpbg1aafzzjjkfpn1x")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 29bcfcd8134bf2868117f88106333164a2c7640b Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 21:26:53 +0100 Subject: gnu: xfce4-panel: Update to 4.16.2. * gnu/packages/xfce.scm (xfce4-panel): Update to 4.16.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index d8acbba0c9..dc65567835 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -413,7 +413,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.16.1") + (version "4.16.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -421,7 +421,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "14arjxpvnxdl0a0ajifrmy2py3hv5qy4fykl52wdp4k5pv39n2gs")) + "1kxm905z6m0mvnki7qxwz638kfa93lvy5xv3qfp8sc8ldxp1cd46")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From c19544bc4855da7dd6b9b63db275e4e8a88bcd2a Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 23:23:15 +0100 Subject: gnu: chessx: Update to 1.5.6. * gnu/packages/games.scm (chessx): Update to 1.5.6. [arguments]: Remove now unneeded build fix. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 14b6868a0e..74d04ad502 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2020 Vitaliy Shatrov ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux @@ -11794,14 +11794,14 @@ and chess engines.") (define-public chessx (package (name "chessx") - (version "1.5.4") + (version "1.5.6") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/chessx/chessx/" version "/chessx-" version ".tgz")) (sha256 - (base32 "1a3541vl5hp6jllgx998w9kjh9kp3wrl80yfwkxmq1bc5bzsrnz2")))) + (base32 "01fjchil2h6ry2ywr0dwjw2g7zd29580cr4c74d5z74h999lp6nh")))) (build-system qt-build-system) (native-inputs `(("qttools" ,qttools))) @@ -11819,12 +11819,7 @@ and chess engines.") (lambda* (#:key inputs #:allow-other-keys) (substitute* "chessx.pro" (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") - (string-append (assoc-ref inputs "qttools") "/bin/lrelease")) - ;; Fix missing translations. - (("TRANSLATIONS = i18n/chessx_de.ts") - "TRANSLATIONS = i18n/chessx_de.ts i18n/chessx_da.ts \\ -i18n/chessx_fr.ts i18n/chessx_it.ts i18n/chessx_cz.ts i18n/chessx_ru.ts \\ -i18n/chessx_es.ts")) + (string-append (assoc-ref inputs "qttools") "/bin/lrelease"))) #t)) (add-after 'fix-paths 'make-qt-deterministic (lambda _ -- cgit 1.4.1 From 94dddc8b80d28d11fcc82595d54105111832c2aa Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 23:44:46 +0100 Subject: gnu: go-ipfs: Update to 0.8.0. * gnu/packages/ipfs.scm (go-ipfs): Update to 0.8.0. Signed-off-by: Nicolas Goaziou --- gnu/packages/ipfs.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 417956a394..57701991e3 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Martin Becze -;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020, 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -214,7 +214,7 @@ written in Go.") (define-public go-ipfs (package (name "go-ipfs") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch/tarbomb) @@ -222,7 +222,7 @@ written in Go.") "https://dist.ipfs.io/go-ipfs/v" version "/go-ipfs-source.tar.gz")) (sha256 - (base32 "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3")) + (base32 "0k2qzlfz8ks9c70rxsy7jvk6d2s6yll1b8v9k2kcw07r989gxbdq")) (file-name (string-append name "-" version "-source")))) (build-system go-build-system) (arguments -- cgit 1.4.1 From cd7bd1cc8f1caf63902b2281d7926862e6c31827 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Mar 2021 10:44:37 +0200 Subject: gnu: libredwg: Update to 0.12.3. * gnu/packages/engineering.scm (libredwg): Update to 0.12.3. --- gnu/packages/engineering.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 59c424c9da..66331d7c09 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2016, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis @@ -1217,14 +1217,14 @@ use on a given system.") (define-public libredwg (package (name "libredwg") - (version "0.12.1") + (version "0.12.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libredwg/libredwg-" version ".tar.xz")) (sha256 - (base32 "0a1ih91nn5rh7v8li2ljppm8iacrnv8nkdpzshbdggl5f0mm1pyy")))) + (base32 "1vhm3r3zr8hh0jbvv6qdykh1x14r4c1arl1qj48i4cx2dd3366mk")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-bindings"))) -- cgit 1.4.1 From 70487e3ee9e2d6d6833a0559115a034e50aba129 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Mar 2021 10:44:49 +0200 Subject: gnu: font-gnu-unifont: Update to 13.0.06. * gnu/packages/fonts.scm (font-gnu-unifont): Update to 13.0.06. --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index c47940ba85..bb0270466a 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Jookia <166291@gmail.com> ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2016 Dmitry Nikolaev -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016 Toni Reina ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice @@ -731,7 +731,7 @@ for use at smaller text sizes"))) (define-public font-gnu-unifont (package (name "font-gnu-unifont") - (version "13.0.05") + (version "13.0.06") (source (origin (method url-fetch) @@ -741,7 +741,7 @@ for use at smaller text sizes"))) (string-append "mirror://gnu/unifont/unifont-" version "/unifont-" version ".tar.gz"))) (sha256 - (base32 "0kkgagnyhl92pwgnvf1vjrc1ql8lk5khb125sz18ck8vnxk4i3pr")))) + (base32 "09g91g0gv76sadslp70m5xwfk3jf8kh7rpk2pz3l2hpldnjggpk8")))) (build-system gnu-build-system) (outputs '("out" ; TrueType version "pcf" ; PCF (bitmap) version -- cgit 1.4.1 From 0f8a646e03c947fec6cdc3966fab2dd8c8f9f98e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Mar 2021 10:45:30 +0200 Subject: gnu: octave: Update to 6.2.0. * gnu/packages/maths.scm (octave): Update to 6.2.0. [source]: Download tar.xz tarball. [native-inputs]: Remove lzip. --- gnu/packages/maths.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 083c20dad3..6856737bdf 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1928,15 +1928,15 @@ can solve two kinds of problems: (define-public octave-cli (package (name "octave-cli") - (version "6.1.0") + (version "6.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/octave/octave-" - version ".tar.lz")) + version ".tar.xz")) (sha256 (base32 - "0355s0pi8603ccs2j08zym3nalgalslxn83s37zq8nkrrkwxrjfk")))) + "06id09zspya24gshcwgp039cp35c06150mdlxysawgnbrhj16wkv")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) @@ -1971,8 +1971,7 @@ can solve two kinds of problems: ("texinfo" ,texinfo) ("zlib" ,zlib))) (native-inputs - `(("lzip" ,lzip) - ("gfortran" ,gfortran) + `(("gfortran" ,gfortran) ("pkg-config" ,pkg-config) ("perl" ,perl) ;; The following inputs are not actually used in the build process. -- cgit 1.4.1 From af931e654a51fa3ea11f64f45bfec92739fed7b8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Mar 2021 10:46:17 +0200 Subject: gnu: parallel: Update to 20210222. * gnu/packages/parallel.scm (parallel): Update to 20210222. --- 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 cc602b3fca..ab4450c24e 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -55,14 +55,14 @@ (define-public parallel (package (name "parallel") - (version "20210122") + (version "20210222") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "1wxkqz6ld1bp0ilvc04vhq99qjay1nl6pbk3qzvp3sjavv9vdwdl")))) + (base32 "0az73cpl04k3j9hwyxgych5cr95ls8qrsmy6zni4xxv2xc5b0saf")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From c7e4a6dbb411c324791f1e9cce47b6dd319dbe17 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 10:03:35 +0100 Subject: gnu: emacs-consult: Update to 0.6. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 0.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 14a0a62b68..114fc7b4e4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7259,7 +7259,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.5") + (version "0.6") (source (origin (method git-fetch) @@ -7267,7 +7267,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "0840hm6nk6yzz8yp8xqzdrycf7wwklxaxp10q0d30wpxwcrsw5c2")) + (base32 "09n3q3dyi83s4fk4z7csnjicbxd69ws4zp4371c1lbxcvvq2fdnd")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs -- cgit 1.4.1 From 14b32f62ac5171aaef206a6b8eb621ae96dc2856 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Mar 2021 10:08:46 +0100 Subject: gnu: Add file-attributes. * gnu/packages/lisp-xyz.scm (cl-file-attributes, ecl-file-attributes, sbcl-file-attributes): New variables. --- gnu/packages/lisp-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b7c5da97b8..4a1bec3d62 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14645,3 +14645,29 @@ on UNIX like platforms.") (define-public cl-daemon (sbcl-package->cl-source-package sbcl-daemon)) + +(define-public sbcl-file-attributes + (let ((commit "2c6fdb08f136d5f9a8d12626ed5b64edc2ae1bb8")) + (package + (name "sbcl-file-attributes") + (version (git-version "1.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/file-attributes/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vi1h6pd04g41ay3hr76ac89isyz4x864g87r8v9xcl4gizkzwlq")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("documentation-utils" ,sbcl-documentation-utils) + ("trivial-features" ,sbcl-trivial-features))) + (home-page "https://shinmera.github.io/file-attributes/") + (synopsis "Access to common file attributes in Common Lisp") + (description + "This is a small OS portability library to retrieve and set file +attributes not supported by the Common Lisp standard functions.") + (license license:zlib)))) -- cgit 1.4.1 From b35dea1d5231efc7b546fba17ee927cccbb0fc23 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Mar 2021 10:12:06 +0100 Subject: gnu: Add ecl-file-attributes, cl-file-attributes. * gnu/packages/lisp-xyz.scm (cl-file-attributes, ecl-file-attributes): New variables. There were mistakenly left out from the previous commit. --- gnu/packages/lisp-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4a1bec3d62..84fa01f311 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14671,3 +14671,9 @@ on UNIX like platforms.") "This is a small OS portability library to retrieve and set file attributes not supported by the Common Lisp standard functions.") (license license:zlib)))) + +(define-public ecl-file-attributes + (sbcl-package->ecl-package sbcl-file-attributes)) + +(define-public cl-file-attributes + (sbcl-package->cl-source-package sbcl-file-attributes)) -- cgit 1.4.1 From ac11ef2f50932caf759aa2d3635690ec7fb9c2a9 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 28 Feb 2021 02:48:39 +0000 Subject: gnu: Add bmake. * gnu/packages/build-tools.scm (bmake): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/build-tools.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 63417e5b81..1b4a2effd5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Yuval Kogman ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +38,8 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages adns) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -147,6 +150,53 @@ 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 bmake + (package + (name "bmake") + (version "20210206") + (source + (origin + (method url-fetch) + (uri (string-append + "http://www.crufty.net/ftp/pub/sjg/bmake-" version ".tar.gz")) + (sha256 + (base32 "07n9avzdg6gifrzyddnyzada5s5rzklvbqfpv5drljpxcgpqpvwg")))) + (build-system gnu-build-system) + (inputs + `(("bash" ,bash-minimal))) + (native-inputs + `(("coreutils" ,coreutils))) + (arguments + `(#:tests? #f ; test during build + #:phases + (modify-phases %standard-phases + (add-after 'configure 'fix-test ; fix from nixpkgs + (lambda _ + (substitute* "unit-tests/unexport-env.mk" + (("PATH=\t/bin:/usr/bin:/sbin:/usr/sbin") + "PATH := ${PATH}")))) + (add-after 'configure 'remove-fail-tests + (lambda _ + (substitute* "unit-tests/Makefile" + (("cmd-interrupt") "") + (("varmod-localtime") "")) + #t))) + #:configure-flags + (list + (string-append + "--with-defshell=" (assoc-ref %build-inputs "bash") "/bin/bash") + (string-append + "--with-default-sys-path=" (assoc-ref %outputs "out") "/share/mk")) + #:make-flags + (list "INSTALL=install"))) ;; use coreutils install + (home-page "http://www.crufty.net/help/sjg/bmake.htm") + (synopsis "BSD's make") + (description + "bmake is a program designed to simplify the maintenance of other +programs. Its input is a list of specifications as to the files upon which +programs and other files depend.") + (license license:bsd-3))) + (define-public gn (let ((commit "e327ffdc503815916db2543ec000226a8df45163") (revision "1819")) ;as returned by `git describe`, used below -- cgit 1.4.1 From 4a9cb7a46f693f5e1c0e1b88b3b4c2f716dd63b2 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Mar 2021 13:29:12 +0100 Subject: gnu: sbcl-hu.dwim.asdf: Update to 20200724. * gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.asdf): Update to 20200724. [source]: Use new GitHub repository. --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 84fa01f311..b4b65b9c45 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1256,23 +1256,26 @@ consistent across multiple Common Lisp implementations.") (sbcl-package->ecl-package sbcl-trivial-features)) (define-public sbcl-hu.dwim.asdf - (package - (name "sbcl-hu.dwim.asdf") - (version "20190521") - (source - (origin - (method url-fetch) - (uri (string-append "http://beta.quicklisp.org/archive/hu.dwim.asdf/" - "2019-05-21/hu.dwim.asdf-" version "-darcs.tgz")) - (sha256 - (base32 - "0rsbv71vyszy8w35yjwb5h6zcmknjq223hkzir79y72qdsc6sabn")))) - (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 + (let ((commit "67cdf84390e530af4303cc4bc815fdf2a5e48f59")) + (package + (name "sbcl-hu.dwim.asdf") + (version "20200724") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hu-dwim/hu.dwim.asdf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0p81jalilkaqw832a12s35q0z6rrarxjasm1jy6h4fvyj9pf0zkx")))) + (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))) + (license license:public-domain)))) (define-public cl-hu.dwim.asdf (sbcl-package->cl-source-package sbcl-hu.dwim.asdf)) -- cgit 1.4.1 From 8664eede1af88b810139800d75892dba0f4f576a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Mar 2021 13:32:03 +0100 Subject: gnu: sbcl-hu.dwim.common-lisp: Update to 2021-01-27. * gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.common-lisp): Update to 2021-01-27. [source]: Use new GitHub repository. [home-page]: Use full address. --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b4b65b9c45..2de0461a9b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11977,27 +11977,27 @@ overview article about COP which also contains some ContextL examples: (sbcl-package->ecl-package sbcl-contextl)) (define-public sbcl-hu.dwim.common-lisp - (package - (name "sbcl-hu.dwim.common-lisp") - (version "2015-07-09") - (source - (origin - (method url-fetch) - (uri (string-append - "http://beta.quicklisp.org/archive/hu.dwim.common-lisp/" - version "/hu.dwim.common-lisp-" - (string-replace-substring version "-" "") - "-darcs.tgz")) - (sha256 - (base32 "13cxrvh55rw080mvfir7s7k735l9rcfh3khxp97qfwd5rz0gadb9")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("hu.dwim.asdf" ,sbcl-hu.dwim.asdf))) - (home-page "http://dwim.hu/") - (synopsis "Redefine some standard Common Lisp names") - (description "This library is a redefinition of the standard Common Lisp + (let ((commit "90558195773383142a57a16687d5e7f4adea6418")) + (package + (name "sbcl-hu.dwim.common-lisp") + (version "2021-01-27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hu-dwim/hu.dwim.common-lisp/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06zkdw3scnaw0d4nmsgkv7pi7sw00dikdgfgsqmbqfbz2yrsdabk")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("hu.dwim.asdf" ,sbcl-hu.dwim.asdf))) + (home-page "http://dwim.hu/project/hu.dwim.common-lisp") + (synopsis "Redefine some standard Common Lisp names") + (description "This library is a redefinition of the standard Common Lisp package that includes a number of renames and shadows. ") - (license license:public-domain))) + (license license:public-domain)))) (define-public cl-hu.dwim.common-lisp (sbcl-package->cl-source-package sbcl-hu.dwim.common-lisp)) -- cgit 1.4.1 From f72caafc6b50d4b19672dbe3fdcbb839f55951c8 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 2 Mar 2021 13:36:40 +0100 Subject: gnu: sbcl-hu.dwim.stefil: Update to 20180609. * gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.stefil): Update to 20180609. --- gnu/packages/lisp-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2de0461a9b..12852f7eb7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1284,26 +1284,26 @@ documentation system, explicit development support, etc.") (sbcl-package->ecl-package sbcl-hu.dwim.asdf)) (define-public sbcl-hu.dwim.stefil - (let ((commit "ab6d1aa8995878a1b66d745dfd0ba021090bbcf9")) + (let ((commit "414902c6f575818c39a8a156b8b61b1adfa73dad")) (package (name "sbcl-hu.dwim.stefil") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.0.0" "2" commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.common-lisp.net/xcvb/hu.dwim.stefil.git") + (url "https://github.com/hu-dwim/hu.dwim.stefil") (commit commit))) (sha256 - (base32 "1d8yccw65zj3zh46cbi3x6nmn1dwdb76s9d0av035077mvyirqqp")) + (base32 "14izmjjim590rh74swrssavdmdznj2z8vhqixy780sjhpcr5pmkc")) (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") + (home-page "http://dwim.hu/project/hu.dwim.stefil") (synopsis "Simple test framework") (description "Stefil is a simple test framework for Common Lisp, with a focus on interactive development.") -- cgit 1.4.1 From fee4afd84b772ce111629dd3ff7ff89636539859 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:02:58 +0100 Subject: gnu: Add gimagereader. * gnu/packages/ocr.scm (gimagereader): New variable. --- gnu/packages/ocr.scm | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocr.scm b/gnu/packages/ocr.scm index c4e965941a..15e1811d6b 100644 --- a/gnu/packages/ocr.scm +++ b/gnu/packages/ocr.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2021 Andy Tai +;;; Copyright © 2021 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,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 build-system python) #:use-module (gnu packages) @@ -33,12 +35,19 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages djvu) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages enchant) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages scanner) #:use-module (gnu packages xml) #:use-module (gnu packages image)) @@ -130,6 +139,67 @@ supported through the Leptonica library. It can also detect whether text is monospaced or proportional.") (license license:asl2.0)))) +(define-public gimagereader + (package + (name "gimagereader") + (version "3.3.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://github.com/manisandro/gImageReader/releases" + "/download/v" version "/" + "gimagereader-" version ".tar.xz")) + (sha256 + (base32 "1pghffb55k3wq33nbn9fi0lmjbldpmvqs2msnvss8bxz1k1ck23n")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ;no test + #:configure-flags (list "-DENABLE_VERSIONCHECK=0") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build + ;; XXX: Prevent compilation error: "incomplete type ‘QUrl’ used in + ;; nested name specifier". Fixed upstream as + ;; 6209e25dab20b233e399ff36fabe4252db0f9e44. It can be removed in + ;; release 3.3.2+. + (lambda _ + (with-directory-excursion "qt/src/hocr" + (substitute* '("HOCROdtExporter.cc" "HOCRTextExporter.cc") + (("#include \n" all) + (string-append all "#include \n")))) + #t))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config))) + (inputs + `(("enchant" ,enchant) + ("djvulibre" ,djvulibre) + ("leptonica" ,leptonica) + ("podofo" ,podofo) + ("poppler-qt5" ,poppler-qt5) + ("sane-backends" ,sane-backends) + ("qtbase" ,qtbase) + ("qtspell" ,qtspell) + ("quazip" ,quazip) + ("tesseract" ,tesseract-ocr))) + (home-page "https://github.com/manisandro/gImageReader") + (synopsis "Qt front-end to tesseract-ocr") + (description + "gImageReader is a Qt front-end to Tesseract optical character +recognition (OCR) software. + +gImageReader supports automatic page layout detection but the user can +also manually define and adjust the recognition regions. It is +possible to import images from disk, scanning devices, clipboard and +screenshots. gImageReader also supports multipage PDF documents. +Recognized text is displayed directly next to the image and basic text +editing including search/replace and removing of line breaks is +possible. Spellchecking for the output text is also supported if the +corresponding dictionaries are installed.") + (license license:gpl3+))) + (define-public zinnia (let* ((commit "581faa8f6f15e4a7b21964be3a5ec36265c80e5b") (revision "1") -- cgit 1.4.1 From 1a004fc29b3a07b913c1ae35625c2750d128db56 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:06:40 +0100 Subject: gnu: emacs-posframe: Update to 0.8.6. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.8.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 114fc7b4e4..93a6c3b3a7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12356,14 +12356,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.5") + (version "0.8.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "0rls0rsj9clx4wd0gbdi5jzwyslparlf7phib649637gq6gs90ds")))) + (base32 "1f2f2kh888l0sr9jawib731gpsmg0kj3kkasic5zad75lj3wagpi")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From 2892e1a2a8bbe7d43854f40dc759ad3e0faecfbc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:09:32 +0100 Subject: gnu: bzflag: Update to 2.4.22. * gnu/packages/games.scm (bzflag): Update to 2.4.22. --- 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 74d04ad502..20a22ee574 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -767,14 +767,14 @@ Quizes: arithmetic, and quiz.") (define-public bzflag (package (name "bzflag") - (version "2.4.20") + (version "2.4.22") (source (origin (method url-fetch) (uri (string-append "https://download.bzflag.org/bzflag/source/" version "/bzflag-" version ".tar.bz2")) (sha256 - (base32 "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2")))) + (base32 "0kba0011nswc2csqlzkd7bas307zm5813zlnby5vsmxn08rnar4y")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 673ab1cdb4702ae2b79434ee1f5b3095eebf8eb3 Mon Sep 17 00:00:00 2001 From: Simon South Date: Tue, 2 Mar 2021 08:53:27 -0500 Subject: gnu: knot-resolver: Update to 5.3.0. * gnu/packages/dns.scm (knot-resolver): Update to 5.3.0. Signed-off-by: Tobias Geerinckx-Rice --- 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 2c4008559f..abc0df5345 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -942,14 +942,14 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.2.1") + (version "5.3.0") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "09jqy23q1pgj76y2qd1xfk72wwmypnyawm3span3gx00qi2bfdxa")))) + "0gp3ivv3zccz4b6s1wxbsvvlrc837lw2g089l3cbvzsg7z0b4v7v")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From 7bcbf35efa328456ece1b54426789501aed11b77 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Tue, 2 Mar 2021 15:38:21 +0100 Subject: gnu: feh: Update to 3.6.3. * gnu/packages/image-viewers.scm (feh): Update to 3.6.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/image-viewers.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index fda9e4cb7b..bddf86568c 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021 Rovanion Luckey +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,7 +77,7 @@ (define-public feh (package (name "feh") - (version "3.6.2") + (version "3.6.3") (home-page "https://feh.finalrewind.org/") (source (origin (method url-fetch) @@ -84,7 +85,7 @@ name "-" version ".tar.bz2")) (sha256 (base32 - "0d66qz9h37pk8h10bc918hbv3j364vyni934rlw2j951s5wznj8n")))) + "1d13x8hmvpdc5f5rj4l29ha7iz7wvqxjlvh6il04wq8igzrj0x23")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit 1.4.1 From 05dc279bbeac62811ca4c84dba3fe70574d09652 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Tue, 2 Mar 2021 15:22:08 +0100 Subject: gnu: xwallpaper: Update to 0.6.6. * gnu/packages/xdisorg.scm (xwallpaper): Update to 0.6.6. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/xdisorg.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f0ebc49230..87ea37323d 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Nicolas Goaziou +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -2323,7 +2324,7 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") (define-public xwallpaper (package (name "xwallpaper") - (version "0.6.5") + (version "0.6.6") (source (origin (method git-fetch) @@ -2332,7 +2333,7 @@ can optionally use some appearance settings from XSettings, tint2 and GTK.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "121ai4dc0v65qk12gn9w62ixly8hc8a5qrygkbb82vy8ck4jqxj7")))) + (base32 "10klm81rs3k3l2i7whpvcsg95x51ja11l86fmwbrvg3kq705p2sr")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From 467f7919e2720b3214eb118958c95626b66ea562 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 24 Feb 2021 21:22:08 +0100 Subject: gnu: liburcu: Update to 0.12.2. * gnu/packages/datastructures.scm (liburcu): Update to 0.12.2. --- gnu/packages/datastructures.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm index f4f51fc6a4..f10a54d376 100644 --- a/gnu/packages/datastructures.scm +++ b/gnu/packages/datastructures.scm @@ -140,14 +140,14 @@ in between these sequences may be different in both content and length.") (define-public liburcu (package (name "liburcu") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (string-append "https://www.lttng.org/files/urcu/" "userspace-rcu-" version ".tar.bz2")) (sha256 (base32 - "03nd1gy2c3fdb6xwdrd5lr1jcjxbzffqh3z91mzbjhjn6k8fmymv")))) + "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ; for tests -- cgit 1.4.1 From cc39e9dbdcfb2c57f3f7aa7e9d2fb92dbc2ad742 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Mar 2021 17:05:29 +0100 Subject: gnu: kallisto: Use older htslib. * gnu/packages/bioinformatics.scm (kallisto)[inputs]: Use htslib-1.9 instead of the latest. --- 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 42476a4b2f..d6dd6f8987 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11624,7 +11624,7 @@ using nucleotide or amino-acid sequence data.") #t))))) (inputs `(("hdf5" ,hdf5) - ("htslib" ,htslib) + ("htslib" ,htslib-1.9) ("zlib" ,zlib))) (home-page "https://pachterlab.github.io/kallisto/") (synopsis "Near-optimal RNA-Seq quantification") -- cgit 1.4.1 From f21c711a0f7f008bf9e271e2f74ad78fcdf5f24c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 2 Mar 2021 17:06:18 +0100 Subject: gnu: kallisto: Update to 0.46.2. * gnu/packages/bioinformatics.scm (kallisto): Update to 0.46.2. [source]: Remove bundled htslib sources. --- gnu/packages/bioinformatics.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d6dd6f8987..156beafc64 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11592,7 +11592,7 @@ using nucleotide or amino-acid sequence data.") (define-public kallisto (package (name "kallisto") - (version "0.44.0") + (version "0.46.2") (source (origin (method git-fetch) (uri (git-reference @@ -11601,7 +11601,10 @@ using nucleotide or amino-acid sequence data.") (file-name (git-file-name name version)) (sha256 (base32 - "0nj382jiywqnpgvyhichajpkkh5r0bapn43f4dx40zdaq5v4m40m")))) + "0ij5n7v3m90jdfi7sn8nvglfyf58abp1f5xq42r4k73l0lfds6xi")) + (modules '((guix build utils))) + (snippet + '(delete-file-recursively "ext/htslib/")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit 1.4.1 From 3af5497c6e27643dcfb08f8ff023487fb8889fc1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:11:36 +0100 Subject: gnu: rust-predicates-1: Update to 1.0.7. * gnu/packages/crates-io.scm (rust-predicates-1): Update to 1.0.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac38d1180d..242861a2a3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28681,14 +28681,14 @@ dependency to expose a precomputed hash.") (define-public rust-predicates-1 (package (name "rust-predicates") - (version "1.0.5") + (version "1.0.7") (source (origin (method url-fetch) (uri (crate-uri "predicates" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nkkn3h3b9vigyy4adlnhi2zrxm5j0nbnqid6snwxp4h5v8ymgwn")))) + (base32 "1ai5qdqym11x1x55via1gq2w86ac1gj3rsjdan9wqmqsdi2k7d7f")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From b9ac9757e59066df88a0c3e6d5bac69518bbe16c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:12:07 +0100 Subject: gnu: rust-bstr-0.2: Update to 0.2.15. * gnu/packages/crates-io.scm (rust-bstr-0.2): Update to 0.2.15. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 242861a2a3..9361d57bf0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5326,7 +5326,7 @@ alphabet.") (define-public rust-bstr-0.2 (package (name "rust-bstr") - (version "0.2.12") + (version "0.2.15") (source (origin (method url-fetch) @@ -5335,7 +5335,7 @@ alphabet.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hazfback6i2k3vhhwyj8h46id3y58zxqh22pz46hj9r1zayd298")))) + "0gca4v6448clsssll3y787jgw542c9mw9phqdi7419g1jfnlf2x4")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 4176544adbfffab2b9eb37000a678e137b15b19b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:13:03 +0100 Subject: gnu: rust-assert-cmd-1: Update to 1.0.3. * gnu/packages/crates-io.scm (rust-assert-cmd-1): Update to 1.0.3. [arguments]: Add rust-bstr Cargo input. --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9361d57bf0..cb7ceb444d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2290,7 +2290,7 @@ standard library.") (define-public rust-assert-cmd-1 (package (name "rust-assert-cmd") - (version "1.0.1") + (version "1.0.3") (source (origin (method url-fetch) @@ -2299,11 +2299,12 @@ standard library.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1nhqr0zimizcnqfggccfznyrmvklgqwhklsh0f1yq5lwdyi9r2y8")))) + "15h3wfxn1q7sfcrin4z35x9hgf539f2dhkwz2mq4zswlrmc5nizj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3) + (("rust-bstr" ,rust-bstr-0.2) + ("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-predicates" ,rust-predicates-1) ("rust-predicates-core" ,rust-predicates-core-1) ("rust-predicates-tree" ,rust-predicates-tree-1) -- cgit 1.4.1 From aac12366d0a1fbd24360737adbc6f7a5217b17b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:14:27 +0100 Subject: gnu: rust-syntect-4: Update to 4.5.0. * gnu/packages/crates-io.scm (rust-syntect-4): Update to 4.5.0. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb7ceb444d..bca763a48c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40018,7 +40018,7 @@ a syntax tree of Rust source code.") (define-public rust-syntect-4 (package (name "rust-syntect") - (version "4.4.0") + (version "4.5.0") (source (origin (method url-fetch) @@ -40026,7 +40026,7 @@ a syntax tree of Rust source code.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "121y6rswylvbhaz8krjb9aa7h16f6ly2sdbbka1hr1dm0pgphfaf")))) + (base32 "1r9ij3qmq4cs83jwpk1043sai1dwdghb8lwkm34rs12d7frc5yib")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;missing files -- cgit 1.4.1 From e809925bc39b96912bdff389a6192c19705587ba Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:17:27 +0100 Subject: gnu: Add rust-clircle-0.3. * gnu/packages/crates-io.scm (rust-clircle-0.3): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bca763a48c..0c444a8c21 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7001,6 +7001,34 @@ colorization.") pitfalls in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-clircle-0.3 + (package + (name "rust-clircle") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clircle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15p36klnsgjimfswi0mjc7wsh4b662v7gbfinh56ipk3bacbv2z6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/niklasmohrin/clircle") + (synopsis "Detect IO circles in your CLI apps arguments.") + (description + "Clircle provides a cross-platform API to detect read or write cycles +from your user-supplied arguments. You can get the important identifiers of +a file (from a path) and for all three stdio streams, if they are piped from +or to a file as well.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cloudabi-0.1 (package (name "rust-cloudabi") -- cgit 1.4.1 From 0b300616663a77484a6b8c5e7912e9df7ddfc709 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:19:56 +0100 Subject: gnu: Add rust-sys-info-0.7. * gnu/packages/crates-io.scm (rust-sys-info-0.7): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c444a8c21..27b4815192 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40218,6 +40218,29 @@ syntax extension expansion.") (description "This package provides a backport of libsyntax.") (license (list license:expat license:asl2.0)))) +(define-public rust-sys-info-0.7 + (package + (name "rust-sys-info") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sys-info" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0facyh6hswp1i7airri8ly5kl6sv5bvkkd21vs51k2b3z22bvkz5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/FillZpp/sys-info-rs") + (synopsis "Get system information in Rust") + (description + "This Rust crate gathers system information.") + (license license:expat))) + (define-public rust-sysctl-0.4 (package (name "rust-sysctl") -- cgit 1.4.1 From 3c0e6923228e94751d82681f67b908eff755889e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:21:43 +0100 Subject: gnu: Add rust-unicode-categories-0.1. * gnu/packages/crates-io.scm (rust-unicode-categories-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 27b4815192..209b939cf3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45368,6 +45368,27 @@ Unicode and Internationalization Crates (UNIC) project.") "Implementation of the Unicode Bidirectional Algorithm.") (license (list license:asl2.0 license:expat)))) +(define-public rust-unicode-categories-0.1 + (package + (name "rust-unicode-categories") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode_categories" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kp1d7fryxxm7hqywbk88yb9d1avsam9sg76xh36k5qx2arj9v1r")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/swgillespie/unicode-categories") + (synopsis "Query Unicode category membership for chars") + (description + "unicode-categories is a simple crate that adds many extensions to the +char type that allow for the querying if whether or not a character is +a member of a certain category of Unicode characters.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-normalization-0.1 (package (name "rust-unicode-normalization") -- cgit 1.4.1 From a94fc2bdfc268fa8183eaebb8fefe207079e8e19 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:25:09 +0100 Subject: gnu: Add rust-snailquote-0.3. * gnu/packages/crates-io.scm (rust-snailquote-0.3): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 209b939cf3..3c14b8f614 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38226,6 +38226,39 @@ control on the fields.") (description "This package provides a small and fast async runtime.") (license (list license:asl2.0 license:expat)))) +(define-public rust-snailquote-0.3 + (package + (name "rust-snailquote") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "snailquote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04687yzvgk3ja0ch7k96w3v36fzvqd9ci2l5k12ijligh2fp4jzk")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-categories" ,rust-unicode-categories-0.1)))) + (home-page "https://github.com/euank/snailquote") + (synopsis "Escape and unescape strings with shell-inspired quoting") + (description + "This library provides functions to escape and unescape strings. + +It escapes them in a roughly ``sh'' compatible way (e.g. double quotes +supporting backslash escapes, single quotes supporting no escapes). + +In addition, it provides support for common C-like ASCII escapes (like +@samp{\\n} for newline, @samp{\\v} for vertical tab, etc.) and Rust +string-like Unicode (via @samp{\\u@{12ff@}} style escapes). + +More importantly, this library also provides the ability to un-escape a given +escaped text to recover the original string.") + (license license:gpl3))) + (define-public rust-socket2-0.3 (package (name "rust-socket2") -- cgit 1.4.1 From 83fdec306e01f7de2ab2448a5c75bdc5ae2be8d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:26:22 +0100 Subject: gnu: Add rust-bugreport-0.3. * gnu/packages/crates-io.scm (rust-bugreport-0.3): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3c14b8f614..cb1ab77bbc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5426,6 +5426,31 @@ system calls. Second, exposing the internal buffer allows the user to work with data in place, which avoids another copy.") (license license:gpl3))) +(define-public rust-bugreport-0.3 + (package + (name "rust-bugreport") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bugreport" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n5f1nkqbc5yf9bckjap49pwnqnvdczm6x9y23caaghpgw0n4rqi")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-snailquote" ,rust-snailquote-0.3) + ("rust-sys-info" ,rust-sys-info-0.7)))) + (home-page "https://github.com/sharkdp/bugreport") + (synopsis "Collect system and environment information for bug reports") + (description + "bugreport is a Rust library that helps application developers to +automatically collect information about the system and the environment that +users can send along with a bug report.") + (license (list license:expat license:asl2.0)))) + (define-public rust-build-const-0.2 (package (name "rust-build-const") -- cgit 1.4.1 From e321ddd9b37909a97de7b8ece13c435c59303adc Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 17:40:06 +0100 Subject: gnu: Add rust-bat-0.17. * gnu/packages/crates-io.scm (rust-bat-0.17): New variable. * gnu/packages/shells.scm (rust-nu-plugin-textview-0.27)[arguments]: Use rust-bat-0.17 instead of bat as Cargo input. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/shells.scm | 4 ++-- 2 files changed, 47 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cb1ab77bbc..dc427ba764 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16855,6 +16855,51 @@ of gzip files based on the gzip header implementation in the @code{flate2} crate IEEE 754-2008 binary16 type.") (license (list license:expat license:asl2.0)))) +(define-public rust-bat-0.17 + (package + (name "rust-bat") + (version "0.17.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bat" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ia12774prjnm3msiaja6qdpxkpyknxswqpgkmwzj0wn9nhkc7nz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ansi-colours" ,rust-ansi-colours-1) + ("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-atty" ,rust-atty-0.2) + ("rust-clap" ,rust-clap-2) + ("rust-clap" ,rust-clap-2) + ("rust-console" ,rust-console-0.13) + ("rust-content-inspector" ,rust-content-inspector-0.2) + ("rust-dirs" ,rust-dirs-3) + ("rust-encoding" ,rust-encoding-0.2) + ("rust-error-chain" ,rust-error-chain-0.12) + ("rust-git2" ,rust-git2-0.13) + ("rust-globset" ,rust-globset-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-path-abs" ,rust-path-abs-0.5) + ("rust-semver" ,rust-semver-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-shell-words" ,rust-shell-words-1) + ("rust-syntect" ,rust-syntect-4) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-wild" ,rust-wild-2)))) + (home-page "https://github.com/sharkdp/bat") + (synopsis "@command{cat} clone with syntax highlighting and git integration") + (description + "@command{bat} is a drop-in @command{cat} replacement featuring syntax +highlighting for a large number of languages, git integration, and automatic +paging.") + (license (list license:expat license:asl2.0)))) + (define-public rust-handlebars-2 (package (name "rust-handlebars") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index a6db301149..c605a7566b 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -1860,8 +1860,8 @@ Nushell.") (arguments `(#:skip-build? #t #:cargo-inputs - (("bat" ,bat) - ("rust-ansi-term" ,rust-ansi-term-0.12) + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-bat" ,rust-bat-0.17) ("rust-nu-data" ,rust-nu-data-0.27) ("rust-nu-errors" ,rust-nu-errors-0.27) ("rust-nu-plugin" ,rust-nu-plugin-0.27) -- cgit 1.4.1 From 3ce7c1f3c3ef11b698ef1ab6eddc8caf1de4f4d7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 2 Mar 2021 14:34:11 +0100 Subject: gnu: bat: Update to 0.18.0. * gnu/packages/rust-apps.scm (bat): Update to 0.18.0. --- gnu/packages/rust-apps.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d5567b8873..7aa44a35ae 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -83,24 +83,26 @@ low-end hardware and serving many concurrent requests.") (define-public bat (package (name "bat") - (version "0.17.1") + (version "0.18.0") (source (origin (method url-fetch) (uri (crate-uri "bat" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ia12774prjnm3msiaja6qdpxkpyknxswqpgkmwzj0wn9nhkc7nz")))) + (base32 "1hr6vzkw8mdy9v0sg1pg9gibamabhip05s7zdkwzwlv69qnhgs1z")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ansi-colours" ,rust-ansi-colours-1) ("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-atty" ,rust-atty-0.2) + ("rust-bugreport" ,rust-bugreport-0.3) ("rust-clap" ,rust-clap-2) - ("rust-console" ,rust-console-0.13) + ("rust-clircle" ,rust-clircle-0.3) + ("rust-console" ,rust-console-0.14) ("rust-content-inspector" ,rust-content-inspector-0.2) - ("rust-dirs" ,rust-dirs-3) + ("rust-dirs-next" ,rust-dirs-next-2) ("rust-encoding" ,rust-encoding-0.2) ("rust-error-chain" ,rust-error-chain-0.12) ("rust-git2" ,rust-git2-0.13) @@ -116,8 +118,11 @@ low-end hardware and serving many concurrent requests.") ("rust-wild" ,rust-wild-2)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-1) + ("rust-nix" ,rust-nix-0.19) ("rust-predicates" ,rust-predicates-1) - ("rust-tempdir" ,rust-tempdir-0.3)))) + ("rust-serial-test" ,rust-serial-test-0.5) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-wait-timeout" ,rust-wait-timeout-0.2)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From e98c67b87312cee5bfc971b063b82e02ed941329 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Mar 2021 17:52:47 +0100 Subject: gnu: pitivi: Build from git source. * gnu/packages/video.scm (pitivi)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/video.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f083df1d65..d27ead3c8d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4120,14 +4120,15 @@ tools for styling them, including a built-in real-time video preview.") (package (name "pitivi") (version (string-append latest-semver "-" %version)) - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor %version) "/" - name "-" %version ".tar.xz")) - (sha256 - (base32 - "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/pitivi.git") + (commit %version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13x5acs29za5y5n058z86qqrzdx53w05zkw91zkqx0m2hn94dy3p")))) (build-system meson-build-system) (inputs `(("glib" ,glib) -- cgit 1.4.1 From 8c5cafab4978514214aa899ff222597634d58074 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Mar 2021 17:54:51 +0100 Subject: gnu: pitivi: Update to 2021.01.0. * gnu/packages/video.scm (pitivi): Update to 2021.01.0. --- 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 d27ead3c8d..08ceebb674 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4116,7 +4116,7 @@ tools for styling them, including a built-in real-time video preview.") (define-public pitivi ;; Pitivi switched to a non-semantic versioning scheme close before 1.0 (let ((latest-semver "0.999.0") - (%version "2020.09.2")) + (%version "2021.01.0")) (package (name "pitivi") (version (string-append latest-semver "-" %version)) @@ -4128,7 +4128,7 @@ tools for styling them, including a built-in real-time video preview.") (commit %version))) (file-name (git-file-name name version)) (sha256 - (base32 "13x5acs29za5y5n058z86qqrzdx53w05zkw91zkqx0m2hn94dy3p")))) + (base32 "1jics10l16ismi5br6wxi4jxz3dd4p0c0xv8l0l3nvksvda4aafi")))) (build-system meson-build-system) (inputs `(("glib" ,glib) -- cgit 1.4.1 From c48c69194fee468d2ac16ccc25f012312083bf89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 2 Mar 2021 18:08:27 +0100 Subject: gnu: python-matplotlib: Fix running under Wayland with GTK3. * gnu/packages/python-xyz.scm (python-matplotlib)[source]: Add patch. * gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../python-matplotlib-run-under-wayland-gtk3.patch | 31 ++++++++++++++++++++++ gnu/packages/python-xyz.scm | 5 ++-- 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0954158d4c..81ca759503 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1539,6 +1539,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch \ %D%/packages/patches/python-mediafile-wavpack.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch b/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch new file mode 100644 index 0000000000..6f067763b5 --- /dev/null +++ b/gnu/packages/patches/python-matplotlib-run-under-wayland-gtk3.patch @@ -0,0 +1,31 @@ +From: Tobias Geerinckx-Rice +Date: Tue, 02 Mar 2021 18:04:33 +0100 +Subject: [PATCH] gnu: python-matplotlib: Run under Wayland with GTK3. + +Adopted from upstream's fix[0] for +. + +[0]: https://github.com/liuyun88/matplotlib/commit/3d5000463bd23cb046681220f5511f07743f7d82 + +--- +diff -Naur a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py +--- a/lib/matplotlib/backends/backend_gtk3.py 2019-11-21 23:47:05.000000000 +0100 ++++ b/lib/matplotlib/backends/backend_gtk3.py 2021-03-02 18:00:57.479929766 +0100 +@@ -42,11 +42,12 @@ + + try: ++ _display = Gdk.Display.get_default() + cursord = { +- cursors.MOVE : Gdk.Cursor.new(Gdk.CursorType.FLEUR), +- cursors.HAND : Gdk.Cursor.new(Gdk.CursorType.HAND2), +- cursors.POINTER : Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR), +- cursors.SELECT_REGION : Gdk.Cursor.new(Gdk.CursorType.TCROSS), +- cursors.WAIT : Gdk.Cursor.new(Gdk.CursorType.WATCH), ++ cursors.MOVE : Gdk.Cursor.new_from_name(_display, "move"), ++ cursors.HAND : Gdk.Cursor.new_from_name(_display, "pointer"), ++ cursors.POINTER : Gdk.Cursor.new_from_name(_display, "default"), ++ cursors.SELECT_REGION : Gdk.Cursor.new_from_name(_display, "crosshair"), ++ cursors.WAIT : Gdk.Cursor.new_from_name(_display, "wait"), + } + except TypeError as exc: + # Happens when running headless. Convert to ImportError to cooperate with diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 01f1e66258..456cfea5c6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5131,8 +5131,9 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (method url-fetch) (uri (pypi-uri "matplotlib" version)) (sha256 - (base32 - "1nmshfqh7wyg15i16hx1yiylcvzkws29ivn66n3i0wyqwcpjr3lf")))) + (base32 "1nmshfqh7wyg15i16hx1yiylcvzkws29ivn66n3i0wyqwcpjr3lf")) + (patches + (search-patches "python-matplotlib-run-under-wayland-gtk3.patch")))) (build-system python-build-system) (propagated-inputs ; the following packages are all needed at run time `(("python-cycler" ,python-cycler) -- cgit 1.4.1 From 3905580180d8f8ed1eec07baa307b4bff0d726d6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 1 Mar 2021 13:35:19 -0500 Subject: gnu: Python 2: Fix CVE-2021-3177. * gnu/packages/patches/python-2.7-CVE-2021-3177.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python.scm (python-2.7)[replacement]: New field. (python-2.7/fixed): New variable. --- gnu/local.mk | 1 + .../patches/python-2.7-CVE-2021-3177.patch | 157 +++++++++++++++++++++ gnu/packages/python.scm | 9 ++ 3 files changed, 167 insertions(+) create mode 100644 gnu/packages/patches/python-2.7-CVE-2021-3177.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 81ca759503..47294d6e23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1518,6 +1518,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-2.7-search-paths.patch \ %D%/packages/patches/python-2.7-site-prefixes.patch \ %D%/packages/patches/python-2.7-source-date-epoch.patch \ + %D%/packages/patches/python-2.7-CVE-2021-3177.patch \ %D%/packages/patches/python-3-arm-alignment.patch \ %D%/packages/patches/python-3-deterministic-build-info.patch \ %D%/packages/patches/python-3-search-paths.patch \ diff --git a/gnu/packages/patches/python-2.7-CVE-2021-3177.patch b/gnu/packages/patches/python-2.7-CVE-2021-3177.patch new file mode 100644 index 0000000000..9f2032ad4a --- /dev/null +++ b/gnu/packages/patches/python-2.7-CVE-2021-3177.patch @@ -0,0 +1,157 @@ +Fix CVE-2021-3177 for Python 2.7: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3177 + +Patch copied from Debian: + +https://salsa.debian.org/cpython-team/python2/-/blob/e54f3303884f1362f3311ec36f070b40603dd76e/debian/patches/CVE-2021-3177.diff + +bpo-42938: Replace snprintf with Python unicode formatting in ctypes param reprs. +--- a/Lib/ctypes/test/test_parameters.py ++++ b/Lib/ctypes/test/test_parameters.py +@@ -206,6 +206,49 @@ class SimpleTypesTestCase(unittest.TestC + with self.assertRaises(ZeroDivisionError): + WorseStruct().__setstate__({}, b'foo') + ++ def test_parameter_repr(self): ++ from ctypes import ( ++ c_bool, ++ c_char, ++ c_wchar, ++ c_byte, ++ c_ubyte, ++ c_short, ++ c_ushort, ++ c_int, ++ c_uint, ++ c_long, ++ c_ulong, ++ c_longlong, ++ c_ulonglong, ++ c_float, ++ c_double, ++ c_longdouble, ++ c_char_p, ++ c_wchar_p, ++ c_void_p, ++ ) ++ self.assertRegexpMatches(repr(c_bool.from_param(True)), r"^$") ++ self.assertEqual(repr(c_char.from_param('a')), "") ++ self.assertRegexpMatches(repr(c_wchar.from_param('a')), r"^$") ++ self.assertEqual(repr(c_byte.from_param(98)), "") ++ self.assertEqual(repr(c_ubyte.from_param(98)), "") ++ self.assertEqual(repr(c_short.from_param(511)), "") ++ self.assertEqual(repr(c_ushort.from_param(511)), "") ++ self.assertRegexpMatches(repr(c_int.from_param(20000)), r"^$") ++ self.assertRegexpMatches(repr(c_uint.from_param(20000)), r"^$") ++ self.assertRegexpMatches(repr(c_long.from_param(20000)), r"^$") ++ self.assertRegexpMatches(repr(c_ulong.from_param(20000)), r"^$") ++ self.assertRegexpMatches(repr(c_longlong.from_param(20000)), r"^$") ++ self.assertRegexpMatches(repr(c_ulonglong.from_param(20000)), r"^$") ++ self.assertEqual(repr(c_float.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1.5)), "") ++ self.assertEqual(repr(c_double.from_param(1e300)), "") ++ self.assertRegexpMatches(repr(c_longdouble.from_param(1.5)), r"^$") ++ self.assertRegexpMatches(repr(c_char_p.from_param(b'hihi')), "^$") ++ self.assertRegexpMatches(repr(c_wchar_p.from_param('hihi')), "^$") ++ self.assertRegexpMatches(repr(c_void_p.from_param(0x12)), r"^$") ++ + ################################################################ + + if __name__ == '__main__': +--- a/Modules/_ctypes/callproc.c ++++ b/Modules/_ctypes/callproc.c +@@ -460,50 +460,53 @@ PyCArg_dealloc(PyCArgObject *self) + static PyObject * + PyCArg_repr(PyCArgObject *self) + { +- char buffer[256]; + switch(self->tag) { + case 'b': + case 'B': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.b); +- break; + case 'h': + case 'H': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.h); +- break; + case 'i': + case 'I': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.i); +- break; + case 'l': + case 'L': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.l); +- break; + + #ifdef HAVE_LONG_LONG + case 'q': + case 'Q': +- sprintf(buffer, +- "", ++ return PyString_FromFormat("", + self->tag, self->value.q); +- break; + #endif + case 'd': +- sprintf(buffer, "", +- self->tag, self->value.d); +- break; +- case 'f': +- sprintf(buffer, "", +- self->tag, self->value.f); +- break; ++ case 'f': { ++ PyObject *f = PyFloat_FromDouble((self->tag == 'f') ? self->value.f : self->value.d); ++ if (f == NULL) { ++ return NULL; ++ } ++ PyObject *r = PyObject_Repr(f); ++ Py_DECREF(f); ++ if (r == NULL) { ++ return NULL; ++ } ++ char *value = PyString_AsString(r); ++ if (value == NULL) { ++ return NULL; ++ } ++ PyObject *result = PyString_FromFormat("", self->tag, value); ++ Py_DECREF(r); ++ return result; ++ } + + case 'c': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.c); +- break; + + /* Hm, are these 'z' and 'Z' codes useful at all? + Shouldn't they be replaced by the functionality of c_string +@@ -512,16 +515,13 @@ PyCArg_repr(PyCArgObject *self) + case 'z': + case 'Z': + case 'P': +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self->value.p); +- break; + + default: +- sprintf(buffer, "", ++ return PyString_FromFormat("", + self->tag, self); +- break; + } +- return PyString_FromString(buffer); + } + + static PyMemberDef PyCArgType_members[] = { diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 9d97050c66..e05c91b3d0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -107,6 +107,7 @@ (define-public python-2.7 (package (name "python2") + (replacement python-2.7/fixed) (version "2.7.17") (source (origin @@ -350,6 +351,14 @@ data types.") (properties '((cpe-name . "python"))) (license license:psfl))) +(define python-2.7/fixed + (package + (inherit python-2.7) + (source (origin + (inherit (package-source python-2.7)) + (patches (append (search-patches "python-2.7-CVE-2021-3177.patch") + (origin-patches (package-source python-2.7)))))))) + ;; Current 2.x version. (define-public python-2 python-2.7) -- cgit 1.4.1 From 5ca1c7d1ce86a8d4737996d3a0f7288db7f60852 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 23 Feb 2021 14:06:51 +0100 Subject: gnu: Add readstat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/statistics.scm (readstat): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/statistics.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index dfc0011309..c5cb7c0961 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5904,3 +5904,31 @@ Java package that provides routines for various statistical distributions.") is designed to support editing of scripts and interaction with various statistical analysis programs such as R, Julia, and JAGS.") (license license:gpl3+)))) + +(define-public readstat + (package + (name "readstat") + (version "1.1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WizardMac/ReadStat") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00sdmaq0qzp6kyv53fpfi6jf3iv4pd0ap0gmw3mbfip52bbnl55w")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gnu-gettext) + ("libtool" ,libtool))) + (inputs + `(("zlib" ,zlib))) ; libz + (synopsis "Convert SAS, Stata, and SPSS files") + (description "Command-line tool and C library for reading files from +popular stats packages like SAS, Stata and SPSS.") + (home-page "https://github.com/WizardMac/ReadStat") + (license license:expat))) + -- cgit 1.4.1 From 2075b83b2dbd9896e2e69070e3363f3d43fbe133 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 23 Feb 2021 14:07:14 +0100 Subject: gnu: r-haven: Unvendor readstat. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cran.scm (r-haven) [snippet]: Remove bundled readstat. [arguments]: Patch Makevars to use system readstat. [inputs]: Replace zlib with readstat. Signed-off-by: Ludovic Courtès --- gnu/packages/cran.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index baf8e08f86..1d574b9768 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2309,10 +2309,25 @@ including functions for geolocation and routing.") (uri (cran-uri "haven" version)) (sha256 (base32 - "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")))) + "03cypgqhdkrfbfpl1yx2wb7flczrbak1w654wkicmd5ajwr9zvkf")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor readstat + (delete-file-recursively "src/readstat") + #t)))) (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'unbundle-readstat + (lambda _ + ;; Not required, since we’re not building readstat. + (substitute* "src/Makevars" + (("-lz") "-lreadstat")) + #t))))) (inputs - `(("zlib" ,zlib))) + `(("readstat" ,readstat))) (native-inputs `(("r-knitr" ,r-knitr))) (propagated-inputs -- cgit 1.4.1 From be22c87d2df59dffdee7cad8c725a9f3bd3aa9ef Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 23 Feb 2021 14:11:06 +0000 Subject: gnu: Add pcg-cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (pcg-cpp): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 659eb1cdeb..eeb45950af 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -980,3 +980,32 @@ programming environment using the actor model for concurrent, distributed computation.") (home-page "https://www.actor-framework.org/") (license license:bsd-3))) + +(define-public pcg-cpp + (let ((commit "5b5cac8d61339e810c5dbb4692d868a1d7ca1b2d") + (revision "1")) + (package + (name "pcg-cpp") + (version (git-version "0.98.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/imneme/pcg-cpp") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s9dcd4iydlc1xj9m6f7c52nlyx99klk043sk7arqy6kp7gdaa33")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure)) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + (synopsis "C++11 header only library for random number generation") + (description "The Permuted Congruential Generator (PCG) extends the +Linear Congruential Generator (LCG) with a permutation function to increase +output randomness while retaining speed, simplicity, and conciseness.") + (home-page "https://www.pcg-random.org") + (license (list license:expat license:asl2.0))))) ; dual licensed -- cgit 1.4.1 From 3043974c36a6d9f54c3c95a0034266ee6228337a Mon Sep 17 00:00:00 2001 From: Ellis Kenyő Date: Wed, 17 Feb 2021 19:45:36 +0000 Subject: gnu: Add python-jinja2-cli. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-jinja2-cli): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 456cfea5c6..e318329577 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -97,6 +97,7 @@ ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Ellis Kenyő ;;; ;;; This file is part of GNU Guix. ;;; @@ -23988,3 +23989,28 @@ and frame grabber interface.") (description "A screencast tool to display your keys inspired by Screenflick.") (license license:gpl3+))) + +(define-public python-jinja2-cli + (package + (name "python-jinja2-cli") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "jinja2-cli" version)) + (sha256 + (base32 + "0vikx7v6fbvww6kfrv0k5a24jyv3ak7nindg60906pdd1m9qvkcw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-jinja2" ,python-jinja2))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-jinja2" ,python-jinja2) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/mattrobenolt/jinja2-cli") + (synopsis "Command-line interface to Jinja2") + (description + "This package provides a command-line interface (CLI) to the Jinja2 +template engine.") + (license license:bsd-3))) -- cgit 1.4.1 From 22475a65d852c72f0609fa29ec66921c29f02b3c Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Tue, 16 Feb 2021 22:28:23 +0100 Subject: gnu: stgit: Update to 1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (stgit): Update to 1.0. Signed-off-by: Ludovic Courtès --- 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 3afb06ca79..8292a5df15 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1237,7 +1237,7 @@ lot easier.") (define-public stgit (package (name "stgit") - (version "0.23") + (version "1.0") (source (origin (method git-fetch) @@ -1246,7 +1246,7 @@ lot easier.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bgxgsd6nj6gkk74c56vrjsyr7j19jrj6cx2ma6f7b20wriznhd5")))) + (base32 "0dixgvjlsk3xisj8blzdhh0nphm5zqkjbj081wgsba52z4zq1y0q")))) (build-system python-build-system) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 97f8b22f6d1ac3367dd806f7b01d3c09bf2a74e5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Mar 2021 21:52:03 +0100 Subject: gnu: ocaml-llvm: Move to (gnu packages llvm). Commit 8f710cc598fb675d267f49a82cffc197f03ad52c introduced a circular dependency between ocaml.scm and llvm.scm by referring to 'llvm' from the top level of ocaml.scm. This fixes it. * gnu/packages/ocaml.scm (make-ocaml-llvm, ocaml-llvm) (ocaml-llvm-9, ocaml-llvm-10, ocaml-llvm-11): Move to... * gnu/packages/llvm.scm: ... here. --- gnu/packages/llvm.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/ocaml.scm | 45 --------------------------------------------- 2 files changed, 47 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index 114654c628..fb45668735 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix memoization) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) @@ -54,6 +56,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ocaml) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -1182,3 +1185,47 @@ C/C++/Obj-C code according to a set of style options, see (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}."))) + +(define make-ocaml-llvm + ;; Make it a memoizing procedure so its callers below don't end up defining + ;; two equal-but-not-eq "ocaml-llvm" packages for the default LLVM. + (mlambdaq (llvm) + (package + (inherit llvm) + (name "ocaml-llvm") + (outputs '("out")) + (arguments + `(#:configure-flags + (list + (string-append "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=" + (assoc-ref %build-inputs "llvm") "/lib") + "-DBUILD_SHARED_LIBS=TRUE" + "-DLLVM_OCAML_OUT_OF_TREE=TRUE" + (string-append "-DLLVM_OCAML_INSTALL_PATH=" + (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "make" "ocaml_all"))) + (replace 'install + (lambda _ + (invoke "cmake" "-P" "bindings/ocaml/cmake_install.cmake")))))) + (inputs + `(("llvm" ,llvm))) + (native-inputs + `(("ocaml" ,ocaml) + ("ocaml-findlib" ,ocaml-findlib) + ("ocaml-ounit" ,ocaml-ounit) + ("python" ,python))) + (propagated-inputs + `(("ocaml-integers" ,ocaml-integers) + ("ocaml-ctypes" ,ocaml-ctypes))) + (synopsis "OCaml bindings to LLVM") + (description "This package contains the OCaml bindings distributed with +LLVM.")))) + +(define-public ocaml-llvm (make-ocaml-llvm llvm)) +(define-public ocaml-llvm-9 (make-ocaml-llvm llvm-9)) +(define-public ocaml-llvm-10 (make-ocaml-llvm llvm-10)) +(define-public ocaml-llvm-11 (make-ocaml-llvm llvm-11)) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3d75240ad3..b561f11d34 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -87,7 +87,6 @@ #:use-module (guix packages) #:use-module (guix svn-download) #:use-module (guix utils) - #:use-module (guix memoization) #:use-module ((srfi srfi-1) #:hide (zip))) ;; A shortcut for files from ocaml forge. Downloaded files are computed from @@ -6198,47 +6197,3 @@ provides support to program with time varying values: declarative events and signals. React doesn't define any primitive event or signal, it lets the client chooses the concrete timeline.") (license license:lgpl2.1+))) - -(define make-ocaml-llvm - ;; Make it a memoizing procedure so its callers below don't end up defining - ;; two equal-but-not-eq "ocaml-llvm" packages for the default LLVM. - (mlambdaq (llvm) - (package - (inherit llvm) - (name "ocaml-llvm") - (outputs '("out")) - (arguments - `(#:configure-flags - (list - (string-append "-DLLVM_OCAML_EXTERNAL_LLVM_LIBDIR=" - (assoc-ref %build-inputs "llvm") "/lib") - "-DBUILD_SHARED_LIBS=TRUE" - "-DLLVM_OCAML_OUT_OF_TREE=TRUE" - (string-append "-DLLVM_OCAML_INSTALL_PATH=" - (assoc-ref %outputs "out") "/lib/ocaml/site-lib")) - #:phases - (modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke "make" "ocaml_all"))) - (replace 'install - (lambda _ - (invoke "cmake" "-P" "bindings/ocaml/cmake_install.cmake")))))) - (inputs - `(("llvm" ,llvm))) - (native-inputs - `(("ocaml" ,ocaml) - ("ocaml-findlib" ,ocaml-findlib) - ("ocaml-ounit" ,ocaml-ounit) - ("python" ,python))) - (propagated-inputs - `(("ocaml-integers" ,ocaml-integers) - ("ocaml-ctypes" ,ocaml-ctypes))) - (synopsis "OCaml bindings to LLVM") - (description "This package contains the OCaml bindings distributed with -LLVM.")))) - -(define-public ocaml-llvm (make-ocaml-llvm llvm)) -(define-public ocaml-llvm-9 (make-ocaml-llvm llvm-9)) -(define-public ocaml-llvm-10 (make-ocaml-llvm llvm-10)) -(define-public ocaml-llvm-11 (make-ocaml-llvm llvm-11)) -- cgit 1.4.1 From 061256da09f54861812ee5d99838e1ef60930c5b Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Tue, 16 Feb 2021 23:15:22 +0100 Subject: gnu: Add usync. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sync.scm (usync): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/sync.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 76b822ecbc..d3caf4f13b 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ (define-module (gnu packages sync) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) @@ -46,6 +48,7 @@ #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) #:use-module (gnu packages lua) + #:use-module (gnu packages ocaml) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -53,6 +56,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) + #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) @@ -315,6 +319,37 @@ comparatively easy to install not requiring new file systems or block devices and does not hamper local file system performance.") (license license:gpl2+))) +(define-public usync + (let ((revision "1") + (commit "09a8059a1adc22666d3ecf7872e22e6846c3ac9e")) + (package + (name "usync") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ebzzry/usync") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j")))) + (build-system copy-build-system) + (propagated-inputs + `(("scsh" ,scsh) + ("rsync" ,rsync) + ("unison" ,unison))) + (arguments + `(#:install-plan + '(("usync" "bin/usync")))) + (home-page "https://github.com/ebzzry/usync") + (synopsis "Command line site-to-site synchronization tool") + (description + "@command{usync} is a simple site-to-site synchronization program +written in @command{scsh}. It makes use of @command{unison} and +@command{rsync} for bi- and uni-directional synchronizations.") + (license license:expat)))) + (define-public casync (package (name "casync") -- cgit 1.4.1 From 8784b52a9adbdce4fe4699222a0618077ad66609 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 2 Mar 2021 22:16:42 +0100 Subject: gnu: usync: Patch shebang. * gnu/packages/sync.scm (usync)[propagated-inputs]: Move SCSH to... [inputs]: ... here. New field. [arguments]: Add #:phases. --- gnu/packages/sync.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d3caf4f13b..d7c9009f3b 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2018, 2021 Ludovic Courtès ;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2020 Jakub Kądziołka @@ -335,13 +335,19 @@ and does not hamper local file system performance.") (sha256 (base32 "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j")))) (build-system copy-build-system) + (inputs + `(("scsh" ,scsh))) (propagated-inputs - `(("scsh" ,scsh) - ("rsync" ,rsync) + `(("rsync" ,rsync) ("unison" ,unison))) (arguments - `(#:install-plan - '(("usync" "bin/usync")))) + `(#:install-plan '(("usync" "bin/usync")) + #:phases (modify-phases %standard-phases + (add-before 'install 'patch-usync-shebang + (lambda _ + (substitute* "usync" + (("/usr/bin/env scsh") + (which "scsh")))))))) (home-page "https://github.com/ebzzry/usync") (synopsis "Command line site-to-site synchronization tool") (description -- cgit 1.4.1 From 4bb9bb78c2482627b1afa2cffda68a4427a3b21d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 00:06:33 +0100 Subject: gnu: osip: Update to 5.2.0. * gnu/packages/telephony.scm (osip): Update to 5.2.0. --- gnu/packages/telephony.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index dbf17a4fb0..53cc127e48 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -323,14 +323,14 @@ GNU ccRTP stack and serves as library for other RTP stacks (define-public osip (package (name "osip") - (version "5.1.2") + (version "5.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/osip/libosip2-" version ".tar.gz")) (patches (search-patches "osip-CVE-2017-7853.patch")) (sha256 (base32 - "148j1i0zkwf09qdpk3nc5sssj1dvppw7p0n9rgrg8k56447l1h1b")))) + "0xdk3cszkzb8nb757gl47slrr13mf6xz43ab4k343fv8llp8pd2g")))) (build-system gnu-build-system) (synopsis "Library implementing SIP (RFC-3261)") -- cgit 1.4.1 From 759a526f5fdd49b9136a639269afd77e2599dcb6 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 06:39:37 +0100 Subject: gnu: openssh: Update to 8.5p1. * gnu/packages/patches/openssh-fix-ssh-copy-id.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Also unregister it. * gnu/packages/ssh.scm (openssh): Update to 8.5p1. --- gnu/local.mk | 1 - gnu/packages/patches/openssh-fix-ssh-copy-id.patch | 38 ---------------------- gnu/packages/ssh.scm | 7 ++-- 3 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/openssh-fix-ssh-copy-id.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 47294d6e23..3557d9f429 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1426,7 +1426,6 @@ dist_patch_DATA = \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ - %D%/packages/patches/openssh-fix-ssh-copy-id.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/opensles-add-license-file.patch \ diff --git a/gnu/packages/patches/openssh-fix-ssh-copy-id.patch b/gnu/packages/patches/openssh-fix-ssh-copy-id.patch deleted file mode 100644 index 6adba639a3..0000000000 --- a/gnu/packages/patches/openssh-fix-ssh-copy-id.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix a bug where ssh-copy-id would fail with "EOF: command not found": - -https://github.com/openssh/openssh-portable/pull/206 - -Patch copied from upstream source repository: - -https://github.com/openssh/openssh-portable/commit/d9e727dcc04a52caaac87543ea1d230e9e6b5604 - -From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001 -From: Oleg -Date: Thu, 1 Oct 2020 12:09:08 +0300 -Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id - ---- - contrib/ssh-copy-id | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id -index 392f64f94..a76907717 100644 ---- a/contrib/ssh-copy-id -+++ b/contrib/ssh-copy-id -@@ -247,7 +247,7 @@ installkeys_sh() { - # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing - # the cat adds the keys we're getting via STDIN - # and if available restorecon is used to restore the SELinux context -- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF) -+ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF - cd; - umask 077; - mkdir -p $(dirname "${AUTH_KEY_FILE}") && -@@ -258,6 +258,7 @@ installkeys_sh() { - restorecon -F .ssh ${AUTH_KEY_FILE}; - fi - EOF -+ ) - - # to defend against quirky remote shells: use 'exec sh -c' to get POSIX; - printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index c94631036b..b73e9633ea 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -186,16 +186,15 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "8.4p1") + (version "8.5p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) - (patches (search-patches "openssh-hurd.patch" - "openssh-fix-ssh-copy-id.patch")) + (patches (search-patches "openssh-hurd.patch")) (sha256 (base32 - "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as")))) + "09gc8rv7728chxraab85dzkdikaw4aph1wlcwcc9kai9si0kybzm")))) (build-system gnu-build-system) (native-inputs `(("groff" ,groff) ("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 62418f3da71f08e2fd5730620261829186a1c3ce Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 3 Mar 2021 08:41:14 +0100 Subject: gnu: sbcl-file-attributes: Update to 20210302. * gnu/packages/lisp-xyz.scm (sbcl-file-attributes): Update to 20210302. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 12852f7eb7..920cafe2dd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14650,10 +14650,10 @@ on UNIX like platforms.") (sbcl-package->cl-source-package sbcl-daemon)) (define-public sbcl-file-attributes - (let ((commit "2c6fdb08f136d5f9a8d12626ed5b64edc2ae1bb8")) + (let ((commit "bbde396438f37d676de9775239115410bec4da2d")) (package (name "sbcl-file-attributes") - (version (git-version "1.0.0" "1" commit)) + (version (git-version "1.0.0" "2" commit)) (source (origin (method git-fetch) @@ -14662,7 +14662,7 @@ on UNIX like platforms.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1vi1h6pd04g41ay3hr76ac89isyz4x864g87r8v9xcl4gizkzwlq")))) + (base32 "0n8q818ry2shggjfhp8gjby8v5mla9pg97c5g19pcglpnwim7a74")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From 073ae1b9c4f592cedc32fcbe851065d7b6a2cc40 Mon Sep 17 00:00:00 2001 From: André Alexandre Gomes Date: Wed, 3 Mar 2021 08:44:36 +0100 Subject: gnu: Add cl-difflib. * gnu/packages/lisp-xyz.scm (cl-difflib, ecl-cl-difflib, sbcl-cl-difflib): New variables. Signed-off-by: Pierre Neidhardt --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 920cafe2dd..e08d9ab1a4 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2020, 2021 Sharlatan Hellseher ;;; Copyright © 2021 Aurora ;;; Copyright © 2021 Matthew Kraai +;;; Copyright © 2021 André A. Gomes ;;; ;;; This file is part of GNU Guix. ;;; @@ -14680,3 +14681,38 @@ attributes not supported by the Common Lisp standard functions.") (define-public cl-file-attributes (sbcl-package->cl-source-package sbcl-file-attributes)) + +(define-public sbcl-cl-difflib + (let ((commit "98eb335c693f1881584b83ca7be4a0fe05355c4e") + (revision "0")) + (package + (name "sbcl-cl-difflib") + (version (git-version "0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wiseman/cl-difflib") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "08if0abhqg191xcz9s7xv8faqq51nswzp8hw423fkqjzr24pmq48")))) + (build-system asdf-build-system/sbcl) + ;; Due to the age of this library tests use some deprecated + ;; functionality and keep failing. + (arguments + '(#:tests? #f + #:asd-files '("cl-difflib.asd"))) + (home-page "https://github.com/wiseman/cl-difflib") + (synopsis "Compute differences between pairs of sequences") + (description + "A Common Lisp library for computing differences between +sequences based on the Python difflib module.") + (license license:expat)))) + +(define-public ecl-cl-difflib + (sbcl-package->ecl-package sbcl-cl-difflib)) + +(define-public cl-difflib + (sbcl-package->cl-source-package sbcl-cl-difflib)) -- cgit 1.4.1 From db22d9364efb9baae534386f5b80928a83249ff2 Mon Sep 17 00:00:00 2001 From: André Alexandre Gomes Date: Wed, 3 Mar 2021 08:48:54 +0100 Subject: gnu: Add cl-html-diff. * gnu/packages/lisp-xyz.scm (cl-html-diff, ecl-cl-html-diff, sbcl-cl-html-diff): New variables. Signed-off-by: Pierre Neidhardt --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e08d9ab1a4..5aabbbd831 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14716,3 +14716,35 @@ sequences based on the Python difflib module.") (define-public cl-difflib (sbcl-package->cl-source-package sbcl-cl-difflib)) + +(define-public sbcl-cl-html-diff + (let ((commit "5a0b39d1c524278d6f60851d7786bb2585614310") + (revision "0")) + (package + (name "sbcl-cl-html-diff") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wiseman/cl-html-diff") + (commit commit))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1varnijivzd4jpimn1cz8p5ks713zzha5cgl4vmb0xr8ahravwzb")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-difflib" ,sbcl-cl-difflib))) + (home-page "https://github.com/wiseman/cl-html-diff") + (synopsis "Generate a human-readable diff of two HTML documents") + (description + "A Common Lisp library for generating a human-readable diff of two +HTML documents.") + (license license:expat)))) + +(define-public ecl-cl-html-diff + (sbcl-package->ecl-package sbcl-cl-html-diff)) + +(define-public cl-html-diff + (sbcl-package->cl-source-package sbcl-cl-html-diff)) -- cgit 1.4.1 From 5ca7bae767b493c2b907753f9ebbf74bbad49ad7 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 1 Mar 2021 22:17:04 +0100 Subject: gnu: bpytop: Update to 1.0.63. * gnu/packages/admin.scm (bpytop): Update to 1.0.63. Signed-off-by: Efraim Flashner --- 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 5b864d172e..9757d62a06 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -619,14 +619,14 @@ memory, disks, network and processes.") (define-public bpytop (package (name "bpytop") - (version "1.0.62") + (version "1.0.63") (source (origin (method url-fetch) (uri (pypi-uri "bpytop" version)) (sha256 (base32 - "02d9gdnnx45lnhx0bgg4wz9bdrkg40mm6pi1443f5i3mcpz8yh4s")))) + "0ql72s842g56rnzdqja6m53lw5y68c4gb540ihp1bjg7x9ycim11")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil))) -- cgit 1.4.1 From 9f4ffc249f1f9aca03ffc5414dec9b2b8ecc03c1 Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Mon, 1 Mar 2021 21:44:40 -0800 Subject: gnu: hmmer: Update to 3.3.2. * gnu/packages/bioinformatics.scm (hmmer): Update to 3.3.2. Signed-off-by: Efraim Flashner --- 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 156beafc64..32bd4bef86 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Bonface Munyoki Kilyungi +;;; Copyright © 2021 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -3874,7 +3875,7 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") (define-public hmmer (package (name "hmmer") - (version "3.2.1") + (version "3.3.2") (source (origin (method url-fetch) @@ -3882,9 +3883,10 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") "http://eddylab.org/software/hmmer/hmmer-" version ".tar.gz")) (sha256 (base32 - "171bivy6xhgjsz5nv53n81pc3frnwz29ylblawk2bv46szwjjqd5")))) + "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj")))) (build-system gnu-build-system) - (native-inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + ("python" ,python))) ; for tests (home-page "http://hmmer.org/") (synopsis "Biosequence analysis using profile hidden Markov models") (description -- cgit 1.4.1 From dcee10506c1fd7bcf35fa3631da288df724cde72 Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Mon, 1 Mar 2021 21:46:30 -0800 Subject: gnu: infernal: Update to 1.1.4. * gnu/packages/bioinformatics.scm (infernal): Update to 1.1.4. Signed-off-by: Efraim Flashner --- 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 32bd4bef86..d617736e57 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7156,14 +7156,14 @@ data in the form of VCF files.") (define-public infernal (package (name "infernal") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "http://eddylab.org/software/infernal/" "infernal-" version ".tar.gz")) (sha256 (base32 - "0pm8bm3s6nfa0av4x6m6h27lsg12b3lz3jm0fyh1mc77l2isd61v")))) + "1z4mgwqg1j4n5ika08ai8mg9yjyjhf4821jp83v2bgwzxrykqjgr")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) -- cgit 1.4.1 From 9e76de0460a02c4129bec9a9e44b4a9c93e090a1 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 09:44:13 +0100 Subject: gnu: Add cl-tooter. * gnu/packages/lisp-xyz.scm (cl-tooter, ecl-tooter, sbcl-tooter): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5aabbbd831..d75b996eb0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2021 Aurora ;;; Copyright © 2021 Matthew Kraai ;;; Copyright © 2021 André A. Gomes +;;; Copyright © 2021 Cage ;;; ;;; This file is part of GNU Guix. ;;; @@ -14748,3 +14749,37 @@ HTML documents.") (define-public cl-html-diff (sbcl-package->cl-source-package sbcl-cl-html-diff)) + +(define-public sbcl-tooter + (let ((commit "b8d4b245b1d946bc9da6f51a3d8c2dc43e4d3868") + (revision "1")) + (package + (name "sbcl-tooter") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/tooter") + (commit commit))) + (file-name (git-file-name "tooter" version)) + (sha256 + (base32 "0g40dlis4dbw4p3zxz3scx27b9zm8zlzihywapf5zqrdqfx5hpq9")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("sbcl-cl-ppcre" ,sbcl-cl-ppcre) + ("sbcl-documentation-utils" ,sbcl-documentation-utils) + ("sbcl-drakma" ,sbcl-drakma) + ("sbcl-yason" ,sbcl-yason))) + (synopsis "Common Lisp client library for Mastodon instances") + (description + "This is a Common Lisp library implementing the full v1 REST API +protocol for Mastodon.") + (home-page "https://shinmera.github.io/tooter/") + (license license:zlib)))) + +(define-public ecl-tooter + (sbcl-package->ecl-package sbcl-tooter)) + +(define-public cl-tooter + (sbcl-package->cl-source-package sbcl-tooter)) -- cgit 1.4.1 From 5e4c332617b495539519ed20a4268aac63285ec1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 3 Mar 2021 10:04:25 +0100 Subject: gnu: emacs-sly: Update to 20210224. * gnu/packages/emacs-xyz.scm (emacs-sly): Update to 20210224. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 93a6c3b3a7..514476c7f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9864,12 +9864,12 @@ CIDER).") (define-public emacs-sly ;; Update together with sbcl-slynk. - (let ((commit "0f46f91a9542599d62c0c332b39636b2941ea372")) + (let ((commit "fb84318c08f59bc786e047006fc81e2ace568309")) ;; Versions are not always tagged. Besides, latest master contains ;; important fixes. (package (name "emacs-sly") - (version (git-version "1.0.43" "3" commit)) + (version (git-version "1.0.43" "4" commit)) (source (origin (method git-fetch) @@ -9879,7 +9879,7 @@ CIDER).") (file-name (git-file-name name version)) (sha256 (base32 - "0p3j0zylacy6vms8ngis2hx2351xnwfzsw3zy043q6vmqd14wrf1")))) + "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj")))) (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo))) -- cgit 1.4.1 From d9f1752c55a458d80c48192150f68ef37738a91f Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 3 Mar 2021 10:04:41 +0100 Subject: gnu: sbcl-slynk: Update to 20210224. * gnu/packages/lisp-xyz.scm (sbcl-slynk): Update to 20210224. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d75b996eb0..90ab8c5cd0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -943,10 +943,10 @@ antialiased TrueType font rendering using CLX and XRender extension.") (sbcl-package->ecl-package sbcl-clx-truetype)) (define-public sbcl-slynk - (let ((commit "0f46f91a9542599d62c0c332b39636b2941ea372")) + (let ((commit "fb84318c08f59bc786e047006fc81e2ace568309")) (package (name "sbcl-slynk") - (version (git-version "1.0.43" "3" commit)) + (version (git-version "1.0.43" "4" commit)) (source (origin (method git-fetch) @@ -955,7 +955,7 @@ antialiased TrueType font rendering using CLX and XRender extension.") (url "https://github.com/joaotavora/sly") (commit commit))) (sha256 - (base32 "0p3j0zylacy6vms8ngis2hx2351xnwfzsw3zy043q6vmqd14wrf1")) + (base32 "0z123k9ak7yjb9bxb5qx48f33ma8066rhkqh8xc14z7shk75jybj")) (file-name (git-file-name "slynk" version)))) (build-system asdf-build-system/sbcl) (outputs '("out" "image")) -- cgit 1.4.1 From 63bee8f0addc95c81426199c9fbf1d0bcf7f1450 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 18 Feb 2021 13:30:22 +0300 Subject: services: shepherd: Make 'assert-valid-graph' public. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/shepherd.scm (assert-valid-graph): Make public. Signed-off-by: Ludovic Courtès --- gnu/services/shepherd.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 19a052c89b..7277273686 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm @@ -73,7 +73,9 @@ shepherd-service-back-edges shepherd-service-upgrade - user-processes-service-type)) + user-processes-service-type + + assert-valid-graph)) ;;; Commentary: ;;; -- cgit 1.4.1 From 7309aab0d4703cf08d41cfb0276e7382fd15d88b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 3 Mar 2021 14:37:41 +0100 Subject: gnu: emacs-posframe: Update to 0.8.7. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.8.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 514476c7f1..93dc4f86e9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12356,14 +12356,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.6") + (version "0.8.7") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "1f2f2kh888l0sr9jawib731gpsmg0kj3kkasic5zad75lj3wagpi")))) + (base32 "0n6r06fz51jwh2k67xdwwbxij7igwfihhmkp6r3a758bck9hhwxi")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From 63df962225a92a4a51dbc31b6e41bc15fe0962b9 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Feb 2021 00:07:20 +0100 Subject: gnu: Add camlboot. * gnu/packages/ocaml.scm (camlboot): New variable. --- gnu/packages/ocaml.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b561f11d34..604812261d 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages llvm) @@ -104,6 +105,71 @@ ".tar.gz")) (sha256 (base32 hash)))) +(define-public camlboot + (let ((commit "506280c6e0813e0e794988151a8e46be55373ebc") + (revision "0")) + (package + (name "camlboot") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ekdohibs/camlboot") + (commit commit) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vimxl4karw9ih3npyc5rhxg85cjh6fqjbq3dzj7j2iymlhwfbkv")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bootstrap binaries and pre-generated source files, + ;; to ensure we actually bootstrap properly. + (for-each delete-file (find-files "ocaml-src" "^.depend$")) + (delete-file "ocaml-src/boot/ocamlc") + (delete-file "ocaml-src/boot/ocamllex") + ;; Ensure writable + (for-each + (lambda (file) + (chmod file (logior (stat:mode (stat file)) #o200))) + (find-files "." ".")))))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list "_boot/ocamlc") ; build target + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'no-autocompile + (lambda _ + ;; prevent a guile warning + (setenv "GUILE_AUTO_COMPILE" "0"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (install-file "_boot/ocamlc" bin) + (rename-file "miniml/interp/lex.byte" "ocamllex") + (install-file "ocamllex" bin))))))) + (native-inputs + `(("guile" ,guile-3.0))) + (home-page "https://github.com/Ekdohibs/camlboot") + (synopsis "OCaml souce bootstrap") + (description "OCaml is written in OCaml. Its sources contain a pre-compiled +bytecode version of @command{ocamlc} and @command{ocamllex} that are used to +build the next version of the compiler. Camlboot implements a bootstrap for +the OCaml compiler and provides a bootstrapped equivalent to these files. + +It contains a compiler for a small subset of OCaml written in Guile Scheme, +an interpreter for OCaml written in that subset and a manually-written lexer +for OCaml. These elements eliminate the need for the binary bootstrap in +OCaml and can effectively bootstrap OCaml 4.07. + +This package produces a native @command{ocamlc} and a bytecode @command{ocamllex}.") + (license license:expat)))) + (define-public ocaml-4.11 (package (name "ocaml") -- cgit 1.4.1 From 0bd58ae7ff0d5c3935b0d660819aca4a0493ef8a Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 27 Feb 2021 00:07:30 +0100 Subject: gnu: ocaml-4.07: Bootstrap. * gnu/packages/ocaml.scm (ocaml-4.07): Implement bootstrap via camlboot. --- gnu/packages/ocaml.scm | 153 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 150 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 604812261d..3eb14c77f6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -254,7 +254,11 @@ functional, imperative and object-oriented styles of programming.") (base32 "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj")))))) -(define-public ocaml-4.07 +;; This package is a bootstrap package for ocaml-4.07. It builds from camlboot, +;; using the upstream sources for ocaml 4.07. It installs a bytecode ocamllex +;; and ocamlc, the bytecode interpreter ocamlrun, and generated .depend files +;; that we otherwise remove for bootstrap purposes. +(define ocaml-4.07-boot (package (inherit ocaml-4.09) (version "4.07.1") @@ -266,11 +270,150 @@ functional, imperative and object-oriented styles of programming.") "/ocaml-" version ".tar.xz")) (sha256 (base32 - "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z")))) + "1f07hgj5k45cylj1q3k5mk8yi02cwzx849b1fwnwia8xlcfqpr6z")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bootstrap binaries and pre-generated source files, + ;; to ensure we actually bootstrap properly. + (for-each delete-file (find-files "." "^.depend$")) + (delete-file "boot/ocamlc") + (delete-file "boot/ocamllex"))))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'copy-bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (let ((camlboot (assoc-ref inputs "camlboot"))) + (copy-file (string-append camlboot "/bin/ocamllex") "boot/ocamllex") + (copy-file (string-append camlboot "/bin/ocamlc") "boot/ocamlc") + (chmod "boot/ocamllex" #o755) + (chmod "boot/ocamlc" #o755)))) + (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)))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (define* (make . args) + (apply invoke "make" + (append (if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + args))) + ;; create empty .depend files because they are included by various + ;; Makefiles, and they have no rule to generate them. + (invoke "touch" ".depend" "stdlib/.depend" "byterun/.depend" + "tools/.depend" "lex/.depend" "asmrun/.depend" + "debugger/.depend" "ocamltest/.depend" "ocamldoc/.depend" + "ocamldoc/stdlib_non_prefixed/.depend" + "otherlibs/bigarray/.depend" "otherlibs/graph/.depend" + "otherlibs/raw_spacetime_lib/.depend" "otherlibs/str/.depend" + "otherlibs/systhreads/.depend" "otherlibs/threads/.depend" + "otherlibs/unix/.depend" "otherlibs/win32unix/.depend") + ;; We cannot build ocamldep until we have created all the .depend + ;; files, so replace it with ocamlc -depend. + (substitute* "tools/Makefile" + (("\\$\\(CAMLRUN\\) ./ocamldep") "../boot/ocamlc -depend")) + (substitute* '("otherlibs/graph/Makefile" + "otherlibs/systhreads/Makefile" + "otherlibs/threads/Makefile" + "otherlibs/unix/Makefile") + (("\\$\\(CAMLRUN\\) ../../tools/ocamldep") + "../../boot/ocamlc -depend")) + (substitute* '("otherlibs/bigarray/Makefile" + "otherlibs/raw_spacetime_lib/Makefile" + "otherlibs/str/Makefile" + "otherlibs/win32unix/Makefile") + (("\\$\\(CAMLRUN\\) \\$\\(ROOTDIR\\)/tools/ocamldep") + "../../boot/ocamlc -depend")) + ;; Ensure we copy needed file, so we can generate a proper .depend + (substitute* "ocamldoc/Makefile" + (("include Makefile.unprefix") + "include Makefile.unprefix +depend: $(STDLIB_MLIS) $(STDLIB_DEPS)")) + ;; Generate required tools for `alldepend' + (make "-C" "byterun" "depend") + (make "-C" "byterun" "all") + (copy-file "byterun/ocamlrun" "boot/ocamlrun") + (make "ocamlyacc") + (copy-file "yacc/ocamlyacc" "boot/ocamlyacc") + (make "-C" "stdlib" "sys.ml") + (make "-C" "stdlib" "CAMLDEP=../boot/ocamlc -depend" "depend") + ;; Build and copy files later used by `tools' + (make "-C" "stdlib" "COMPILER=" + "CAMLC=../boot/ocamlc -use-prims ../byterun/primitives" + "all") + (for-each + (lambda (file) + (copy-file file (string-append "boot/" (basename file)))) + (cons* "stdlib/stdlib.cma" "stdlib/std_exit.cmo" "stdlib/camlheader" + (find-files "stdlib" ".*.cmi$"))) + (symlink "../byterun/libcamlrun.a" "boot/libcamlrun.a") + ;; required for ocamldoc/stdlib_non_prefixed + (make "parsing/parser.mli") + ;; required for dependencies + (make "-C" "tools" + "CAMLC=../boot/ocamlc -nostdlib -I ../boot -use-prims ../byterun/primitives -I .." + "make_opcodes" "cvt_emit") + ;; generate all remaining .depend files + (make "alldepend" + (string-append "ocamllex=" (getcwd) "/boot/ocamlrun " + (getcwd) "/boot/ocamllex") + (string-append "CAMLDEP=" (getcwd) "/boot/ocamlc -depend") + (string-append "OCAMLDEP=" (getcwd) "/boot/ocamlc -depend") + (string-append "ocamldep=" (getcwd) "/boot/ocamlc -depend")) + ;; Build ocamllex + (make "CAMLC=boot/ocamlc -nostdlib -I boot -use-prims byterun/primitives" + "ocamlc") + ;; Build ocamlc + (make "-C" "lex" + "CAMLC=../boot/ocamlc -strict-sequence -nostdlib -I ../boot -use-prims ../byterun/primitives" + "all"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (depends (string-append out "/share/depends"))) + (mkdir-p bin) + (mkdir-p depends) + (install-file "ocamlc" bin) + (install-file "lex/ocamllex" bin) + (for-each + (lambda (file) + (let ((dir (string-append depends "/" (dirname file)))) + (mkdir-p dir) + (install-file file dir))) + (find-files "." "^\\.depend$")))))))) + (native-inputs + `(("camlboot" ,camlboot) + ("perl" ,perl) + ("pkg-config" ,pkg-config))))) + +(define-public ocaml-4.07 + (package + (inherit ocaml-4.07-boot) (arguments (substitute-keyword-arguments (package-arguments ocaml-4.09) ((#:phases phases) `(modify-phases ,phases + (add-before 'configure 'copy-bootstrap + (lambda* (#:key inputs #:allow-other-keys) + (let ((ocaml (assoc-ref inputs "ocaml"))) + (copy-file (string-append ocaml "/bin/ocamllex") "boot/ocamllex") + (copy-file (string-append ocaml "/bin/ocamlc") "boot/ocamlc") + (chmod "boot/ocamllex" #o755) + (chmod "boot/ocamlc" #o755) + (let ((rootdir (getcwd))) + (with-directory-excursion (string-append ocaml "/share/depends") + (for-each + (lambda (file) + (copy-file file (string-append rootdir "/" file))) + (find-files "." "."))))))) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -279,7 +422,11 @@ functional, imperative and object-oriented styles of programming.") ;; --prefix= syntax (with equals sign). (invoke "./configure" "--prefix" out - "--mandir" mandir)))))))))) + "--mandir" mandir)))))))) + (native-inputs + `(("ocaml" ,ocaml-4.07-boot) + ("perl" ,perl) + ("pkg-config" ,pkg-config))))) (define-public ocaml ocaml-4.11) -- cgit 1.4.1 From 1e1549a7a78e135bb16fed6fcc8bb0891f71ba7c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Mar 2021 11:20:18 -0500 Subject: gnu: certbot, python-acme: Update to 1.12.0. * gnu/packages/tls.scm (python-acme): Update to 1.12.0. (certbot): Update to 1.12.0. [arguments]: Replace the 'build-documentation' phase. --- gnu/packages/tls.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 775e915534..c6228f7fd2 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -557,13 +557,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.10.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1n1g29f3qzy77xn06dss9nc92wndgm8phgjrvx740sy9xnd5bfzw")))) + "1wn2jvkg18z31nd060hfcp2yqvxjxykim2ybgaidv7qfsms38dma")))) (build-system python-build-system) (arguments `(#:phases @@ -579,7 +579,6 @@ netcat implementation that supports TLS.") (install-file "docs/_build/texinfo/acme-python.info" info) (install-file "docs/_build/man/acme-python.1" man) #t)))))) - ;; TODO: Add optional inputs for testing. (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) @@ -614,12 +613,20 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "1dww9m1a2p3a9vpxs5j29f8cdkqywqb4j70z3cnkpl7017yf77hd")))) + "0nfzk6fzyfqy8lgs5lmxfndrdh5c2ljdvzj39rwvgg3r6ivkirsy")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) ((#:phases phases) `(modify-phases ,phases + (replace 'build-documentation + (lambda _ + ;; Fix building the manual page in 1.12.0: + ;; https://github.com/certbot/certbot/issues/8633 + ;; TODO Remove the substitution in later releases. + (substitute* "docs/conf.py" + (("'man',") "")) + (invoke "make" "-C" "docs" "man" "info"))) (replace 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -630,7 +637,6 @@ netcat implementation that supports TLS.") (install-file "docs/_build/man/certbot.1" man1) (install-file "docs/_build/man/certbot.7" man7) #t)))))))) - ;; TODO: Add optional inputs for testing. (native-inputs `(("python-mock" ,python-mock) ("python-pytest" ,python-pytest) -- cgit 1.4.1 From 3aacc9f1dae2f68d623dae540fa050f1a87d2519 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 21:01:29 +0100 Subject: gnu: python-pillow: Update to 8.1.1 [security fixes]. * gnu/packages/python-xyz.scm (python-pillow): Update to 8.1.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e318329577..d9de9bc01c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5839,14 +5839,14 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pillow (package (name "python-pillow") - (version "8.0.1") + (version "8.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Pillow" version)) (sha256 (base32 - "17pv0flaqqfld9m4lz8ayxyqb11gbbmr7w04mw4ar79cn3lwdi8i")))) + "086g7nhv52wclrwnzbzs2x3nvyzs2hfq1bvgivsrp5f7r7wiiz7n")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) -- cgit 1.4.1 From 427d6069017238d9d810f57ea62c987a6d309563 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 21:23:40 +0100 Subject: gnu: jasper: Update to 2.0.25 [fixes CVE-2021-26926]. * gnu/packages/image.scm (jasper): Update to 2.0.25. --- 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 2d83313d9e..a48b1e1afb 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1392,7 +1392,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.23") + (version "2.0.25") (source (origin (method git-fetch) (uri (git-reference @@ -1401,7 +1401,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1fccpss5ii9rnsd2pkg6k7mkckwpfi8dgp64qzqv3zp1vs2nffw6")))) + "06s6z7qrcnbi9mbj2d0a6k7lxbjdh3ppjpx8bcdv73lxhm4z7pzr")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo))) -- cgit 1.4.1 From 73c541d0658a9e4388eddd14afe40c523a82b129 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 21:36:31 +0100 Subject: gnu: libebml: Update to 1.4.2 [fixes CVE-2021-3405]. * gnu/packages/xml.scm (libebml): Update to 1.4.2. --- 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 472dfedbb8..f10a982294 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -142,14 +142,14 @@ things the parser might find in the XML document (like start tags).") (define-public libebml (package (name "libebml") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 "0ckhf7wcfwik1c8ilwipdr9p7b58pvqvj8x54l6slqah81lwd53f")))) + (base32 "1wmri5c94b02q2z32bqlpfs4vbw0n0c602321wigna2qw1y27is1")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From fcb4c112e1390e8bb5182a45234e6040d77ddede Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 3 Mar 2021 21:37:14 +0100 Subject: gnu: libmatroska: Update to 1.6.3. * gnu/packages/video.scm (libmatroska): Update to 1.6.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 08ceebb674..564c465dab 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1305,14 +1305,14 @@ SMPTE 314M.") (define-public libmatroska (package (name "libmatroska") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 "140r3q6n4a0n11zaf76lvyxd9gp435dgm8gn7mj0gar2hjm7ji5w")))) + (base32 "06h81sxyz2riic0gpzik6ffcnq32wrqphi8c6k55glcdymiimyfs")))) (build-system cmake-build-system) (inputs `(("libebml" ,libebml))) -- cgit 1.4.1 From 409e5c10afe94db79aa0c13504171bfc99c409d1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Mar 2021 16:43:34 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.223. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.223. (linux-libre-4.14-pristine-source): 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 4441ebb672..0fba288403 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -410,7 +410,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.222") +(define-public linux-libre-4.14-version "4.14.223") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -418,7 +418,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"))) + (hash (base32 "04zn74k1b7hfnfdi9fgifrn4jz0j00d4ymp8vhgbrdj75jrmynhs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 2e58fb2979125053e34d16684da9c392defe18af Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Mar 2021 16:44:18 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.259. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.259. (linux-libre-4.9-pristine-source): 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 0fba288403..8d4c354b85 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -423,7 +423,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.258") +(define-public linux-libre-4.9-version "4.9.259") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -431,7 +431,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"))) + (hash (base32 "1r71vgbw17srsjdmsdr1jra7v412mhiysi4kpa77y29r2h3zk5r3"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 35aedd0cbb7dc092ec8b067c35b8aaf0836f4fc4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 3 Mar 2021 16:44:27 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.259. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.259. (linux-libre-4.4-pristine-source): 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 8d4c354b85..e77de3db6f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -436,7 +436,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.258") +(define-public linux-libre-4.4-version "4.4.259") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -444,7 +444,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"))) + (hash (base32 "18mw4xgza2szgz9x7lq3nzbf48cfkg2g4rli5p5ix4w3ni34h0sr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 14c3c3eec2cdd9359964a0bd5e77654ec10bcc98 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 3 Mar 2021 10:01:24 -0800 Subject: gnu: diffoscope: Update to 168. * gnu/packages/diffoscope.scm (diffoscope): Update to 168. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index c6af50e444..a2490330e0 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "167") + (version "168") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0v0l299igvjsxz7xbsfl7kfqw958v56khzda1ixdsax6qrnqcf6m")))) + "18rs4jfx50d7vkaqcc46r7pccgizp0is56267sq13vbfvz758dhh")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 48dd1ac030061c25c1d3e7710ebdf297509ed412 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 4 Mar 2021 00:21:27 +0100 Subject: gnu: libpcap: Update to 1.10.0. * gnu/packages/admin.scm (libpcap): Update to 1.10.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 9757d62a06..e6248ebb3e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1198,14 +1198,14 @@ tools: server, client, and relay agent.") (define-public libpcap (package (name "libpcap") - (version "1.9.1") + (version "1.10.0") (source (origin (method url-fetch) (uri (string-append "https://www.tcpdump.org/release/libpcap-" version ".tar.gz")) (sha256 (base32 - "153h1378diqyc27jjgz6gg5nxmb4ddk006d9xg69nqavgiikflk3")))) + "07ibr6zzfh1wk5gqcbnlyh6v0dfmhpfd0fqj5y3yxvzf4ckb84ld")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) -- cgit 1.4.1 From 63ed56c3475e0932efea79b98b4160538d943011 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 4 Mar 2021 00:21:35 +0100 Subject: gnu: tcpdump: Update to 4.99.0 [security fixes]. * gnu/packages/admin.scm (tcpdump): Update to 4.99.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 e6248ebb3e..c24e8d1fa7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1226,14 +1226,14 @@ network statistics collection, security monitoring, network debugging, etc.") (define-public tcpdump (package (name "tcpdump") - (version "4.9.3") + (version "4.99.0") (source (origin (method url-fetch) (uri (string-append "https://www.tcpdump.org/release/tcpdump-" version ".tar.gz")) (sha256 (base32 - "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c")))) + "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc")))) (build-system gnu-build-system) (inputs `(("libpcap" ,libpcap) ("openssl" ,openssl))) -- cgit 1.4.1 From 66fac8ad0f2a4c3773c374dc462c6d2364e82e6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 18:31:21 +0100 Subject: gnu: nano: Update to 5.6.1. * gnu/packages/nano.scm (nano): Update to 5.6.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 c2879eb530..7aa81b7533 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "5.6") + (version "5.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "0ckscf3klm2k1zjvcv8mkza1yp80g7ss56n73790fk83lzj87qgw")))) + (base32 "02cbxqizbdlfwnz8dpq4fbzmdi4yk6fv0cragvpa0748w1cp03bn")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From a5b24c35ca68059f06fb1ff8a656d84d1a1e86ed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 18:50:07 +0100 Subject: gnu: yadifa: Update to 2.4.2. * gnu/packages/dns.scm (yadifa): Update to 2.4.2. --- gnu/packages/dns.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index abc0df5345..ab338e85ac 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -765,16 +765,16 @@ served by AS112. Stub and forward zones are supported.") (define-public yadifa (package (name "yadifa") - (version "2.4.1") + (version "2.4.2") (source - (let ((build "9916")) + (let ((build "9997")) (origin (method url-fetch) (uri (string-append "https://www.yadifa.eu/sites/default/files/releases/" "yadifa-" version "-" build ".tar.gz")) (sha256 - (base32 "1m1j7q1f0682xig8qign5ms52igix8pd45fds7p5j285dvrfa4xd"))))) + (base32 "0f1by2c7l39qpsar5nh98f3xypmn2ikv7wr557wmva6m0lwbl3q0"))))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) -- cgit 1.4.1 From ce62ca5b1ea02e043f33019f302a2dfb8d20f839 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:01:49 +0100 Subject: gnu: ipset: Update to 7.11. * gnu/packages/linux.scm (ipset): Update to 7.11. --- gnu/packages/linux.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e77de3db6f..5fbf525e40 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7811,13 +7811,14 @@ receiving. It is dedicated to the PL011 UART of the Raspberry Pi.") (define-public ipset (package (name "ipset") - (version "7.10") - (source (origin - (method url-fetch) - (uri (string-append "https://ipset.netfilter.org/ipset-" version ".tar.bz2")) - (sha256 - (base32 - "1xlwgsy06jx0bckc5r2wvyys8jfpc5klfqqqshmk5zp28fx0cjdj")))) + (version "7.11") + (source + (origin + (method url-fetch) + (uri (string-append "https://ipset.netfilter.org/" + "ipset-" version ".tar.bz2")) + (sha256 + (base32 "0zdzp9fhpp6hmirzxy7w27fb9xx9lxd2ykxbn8by7ngi62nvll9i")))) (build-system gnu-build-system) (inputs `(("libmnl" ,libmnl))) -- cgit 1.4.1 From a5528684c486226aa3ec00bcf1044dcd596b0dde Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:03:36 +0100 Subject: gnu: compsize: Update to 1.5. * gnu/packages/linux.scm (compsize): Update to 1.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 5fbf525e40..0ae57db373 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5079,7 +5079,7 @@ blocks and random block placement.") (define-public compsize (package (name "compsize") - (version "1.3") + (version "1.5") (home-page "https://github.com/kilobyte/compsize") (source (origin (method git-fetch) @@ -5087,7 +5087,7 @@ blocks and random block placement.") (url home-page) (commit (string-append "v" version)))) (sha256 - (base32 "1c69whla844nwis30jxbj00zkpiw3ccndhkmzjii8av5358mjn43")) + (base32 "0vqnrwgpv6pc1yjl0g4gl71xyl6v0xl3pyqjanjpwps73c53azir")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From e430433bb99b948cb6ef079a967fca8ce9a794bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:07:16 +0100 Subject: gnu: compsize: Prepare for cross-compilation. * gnu/packages/linux.scm (compsize)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/linux.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0ae57db373..96cd150a63 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5094,7 +5094,8 @@ blocks and random block placement.") `(("btrfs-progs" ,btrfs-progs))) (arguments `(#:tests? #f ; No tests. - #:make-flags (list "CC=gcc") + #:make-flags + (list (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit 1.4.1 From 6a3d7e2540cc95937cedf296f32d11330f22cb3f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:30:32 +0100 Subject: gnu: libodfgen: Update to 0.1.8. * gnu/packages/libreoffice.scm (libodfgen): Update to 0.1.8. [inputs]: Add libxml2. --- gnu/packages/libreoffice.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 99382c991b..bae28a4483 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Alex Griffin ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Andy Wingo ;;; Copyright © 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2017, 2018, 2019 Marius Bakke @@ -682,14 +682,14 @@ Microsoft Visio documents of all versions.") (define-public libodfgen (package (name "libodfgen") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/libwpd/libodfgen/" "libodfgen-" version "/libodfgen-" version ".tar.xz")) (sha256 (base32 - "0cdq48wlpp8m0qmndybv64r0m4vh0qsqx69cn6ms533cjlgljgij")))) + "0986c5gw4vdfz7bcmpdfz07inba5wxsx4f6xvndknqj6zlkh082m")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) @@ -698,9 +698,10 @@ Microsoft Visio documents of all versions.") `(("librevenge" ,librevenge))) (inputs `(("boost" ,boost) + ("libxml2" ,libxml2) ("zlib" ,zlib))) (arguments - ;; avoid triggering configure errors by simple inclusion of boost headers + ;; Avoid triggering configure errors by simple inclusion of Boost headers. `(#:configure-flags '("--disable-werror"))) (home-page "https://sourceforge.net/p/libwpd/wiki/libodfgen/") (synopsis "ODF (Open Document Format) library") -- cgit 1.4.1 From f3326638f58f5f1137a3ca15c5ad4eae639e0666 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:30:40 +0100 Subject: gnu: libnumbertext: Update to 1.0.7. * gnu/packages/libreoffice.scm (libnumbertext): Update to 1.0.7. --- 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 bae28a4483..a8c2ac5c4b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -600,7 +600,7 @@ Microsoft Publisher documents of all versions.") (define-public libnumbertext (package (name "libnumbertext") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) @@ -608,7 +608,7 @@ Microsoft Publisher documents of all versions.") "releases/download/" version "/libnumbertext-" version ".tar.xz")) (sha256 - (base32 "0mxf22gpbr818ib4av17zmyx6i6nf4br5qlxq0qvfz5z6h5j57vk")))) + (base32 "1z31idnmd9iv6ra5dcsn7q70wv32clk2sqc5bbhimqcsp2f29f0p")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From 877e309e1c97fe9ad119c1ba39e476b7587e9b61 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 19:47:27 +0100 Subject: gnu: pipewire: Update to 0.3.22. * gnu/packages/linux.scm (pipewire): Update to 0.3.22. --- 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 96cd150a63..e20cb56545 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7464,7 +7464,7 @@ of Linux application development.") (package (inherit pipewire) (name "pipewire") - (version "0.3.18") + (version "0.3.22") (source (origin (method git-fetch) (uri (git-reference @@ -7473,7 +7473,7 @@ of Linux application development.") (file-name (git-file-name name version)) (sha256 (base32 - "1yghhgs18yqrnd0b2r75l5n8yng962r1wszbsi01v6i9zib3jc9g")))) + "1ywna5f5v8s79ivrqfwwc8vy6sn3a2zvfwqyalf1fypj5d90w8g9")))) (arguments '(#:configure-flags (list (string-append "-Dudevrulesdir=" (assoc-ref %outputs "out") -- cgit 1.4.1 From 8a69ae0cafc67ec94a030c4430c63faeb6070fac Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 20:00:36 +0100 Subject: gnu: sysstat: Update to 12.4.3. * gnu/packages/linux.scm (sysstat): Update to 12.4.3. --- 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 e20cb56545..f8928232e6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6169,14 +6169,14 @@ running boot option, and more.") (define-public sysstat (package (name "sysstat") - (version "12.4.2") + (version "12.4.3") (source (origin (method url-fetch) (uri (string-append "http://pagesperso-orange.fr/sebastien.godard/" "sysstat-" version ".tar.xz")) (sha256 - (base32 "13q1zb7ip389b35rcgy2ngf1z9zhdmdwx5bv9lwfnl1xi30v409p")))) + (base32 "1z8bdyj92q0capbrdscwzb51bqh54ng15gpvmjmvrb2syhqj8hxf")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite. -- cgit 1.4.1 From 242db527299f66474b97e301b31f7b70370577b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 20:16:57 +0100 Subject: gnu: libfm: Update to 1.3.2. * gnu/packages/lxde.scm (libfm): Update to 1.3.2. --- gnu/packages/lxde.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index c5097076b1..440138c3b8 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017 Nikita ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Brendan Tildesley -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 ison ;;; Copyright © 2018, 2019 Ludovic Courtès ;;; Copyright © 2018 Ricardo Wurmus @@ -66,7 +66,7 @@ (define-public libfm (package (name "libfm") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcmanfm/" @@ -74,7 +74,7 @@ "%29/LibFM/" name "-" version ".tar.xz")) (sha256 (base32 - "1r6gl49xrykldwz8y4h2s7gjarxigg3bbkrj0gphxjj1vr5j9ccn")))) + "1rfira3lx8v6scz1aq69925j4vslpp36bmgrrzcfby2c60q2c155")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) ("gtk+" ,gtk+-2))) -- cgit 1.4.1 From ebbe8565164894bcdb5732bab1b151fd0b0b3a8d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 20:20:58 +0100 Subject: gnu: pcmanfm: Update to 1.3.2. * gnu/packages/lxde.scm (pcmanfm): Update to 1.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 440138c3b8..8eed3f54e9 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -235,7 +235,7 @@ speed up the access to freedesktop.org defined application menus.") (define-public pcmanfm (package (name "pcmanfm") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcmanfm/" @@ -243,7 +243,7 @@ speed up the access to freedesktop.org defined application menus.") "%29/PCManFM/pcmanfm-" version ".tar.xz")) (sha256 (base32 - "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138")))) + "1xqc2k2jh165mm81xg0ghxx0ml1s3rhh4ndvbzkcri4kfhj7pjql")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("gvfs" ,gvfs) ; for trash and mount support -- cgit 1.4.1 From bee5bbb5c7f33763e3f4388cd6aa3abeae37f8c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 21:27:44 +0100 Subject: gnu: libfm-extra: Fix typo in description. * gnu/packages/lxde.scm (libfm-extra)[description]: Add missing article. --- gnu/packages/lxde.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm index 8eed3f54e9..f81d7af3c4 100644 --- a/gnu/packages/lxde.scm +++ b/gnu/packages/lxde.scm @@ -99,7 +99,7 @@ Glib/GIO giving a higher-level API.") ("libtool" ,libtool) ("pkg-config" ,pkg-config))) (synopsis "File management support (extra library)") - (description "This package contains standalone library which extends the + (description "This package contains a stand-alone library which extends the libFM file management library."))) (define-public lxappearance -- cgit 1.4.1 From 4f4c1ec8093fbf3bea8a9245a0efb13090161685 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 21:27:52 +0100 Subject: gnu: fennel: Update to 0.8.1. * gnu/packages/lua.scm (fennel): Update to 0.8.1. --- gnu/packages/lua.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 7a9e80fca4..16996572d7 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016, 2017, 2019 Clément Lassieur ;;; Copyright © 2016 José Miguel Sánchez García -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Simon South @@ -1162,7 +1162,7 @@ enabled.") (define-public fennel (package (name "fennel") - (version "0.8.0") + (version "0.8.1") (source (origin (method git-fetch) (uri (git-reference @@ -1171,7 +1171,7 @@ enabled.") (file-name (git-file-name name version)) (sha256 (base32 - "1jng33vmnk6mi37l3x2z0plng940jpj7kz1s493ki80z3mkaxjfg")) + "0n0xkgzlrwpppm5vbvn84mq418xhmyakk9hakdmjv1lk2dfdq2g7")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 87609036facf698cfcf28bf0ceaeeee601d56162 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 21:40:25 +0100 Subject: gnu: powerstat: Update to 0.02.25. * gnu/packages/linux.scm (powerstat): Update to 0.02.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 f8928232e6..b959532634 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1458,14 +1458,14 @@ at login. Local and dynamic reconfiguration are its key features.") (define-public powerstat (package (name "powerstat") - (version "0.02.22") + (version "0.02.25") (source (origin (method url-fetch) (uri (string-append "https://kernel.ubuntu.com/~cking/tarballs/" "powerstat/powerstat-" version ".tar.gz")) (sha256 - (base32 "0r355b9syqa2nhfy8ksvxyy5d58v0isf983842js091s6liy0x7g")))) + (base32 "0dmixbxm4qd08ds26i0wvxwyy8nrjzfjj2q9ylx35564g4wh58qb")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 2ca33b3a5ed2a647b9cd6637eaf0b6e62111b607 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 21:43:41 +0100 Subject: gnu: glfw: Update to 3.3.3. * gnu/packages/gl.scm (glfw): Update to 3.3.3. --- 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 e378474147..5b4f5ec0fa 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -770,7 +770,7 @@ OpenGL.") (define-public glfw (package (name "glfw") - (version "3.3.2") + (version "3.3.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/glfw/glfw" @@ -778,7 +778,7 @@ OpenGL.") "/glfw-" version ".zip")) (sha256 (base32 - "1izgc4r0ypxwwklfzj98ab4xqsjpb1wbsfdbivvxpmr95x8km8q8")))) + "0xrrahhbs4sn7sgvdk9sgz5zla4sw3ajq6kxpqrx635l8nnqfc3j")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no test target -- cgit 1.4.1 From 2b8779cbe50089114d30916eab805d3a46f1f6c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 22:22:41 +0100 Subject: gnu: fetchmail: Update to 6.4.16. * gnu/packages/mail.scm (fetchmail): Update to 6.4.16. --- 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 bd2e48d533..721f1b8af7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -410,7 +410,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.14") + (version "6.4.16") (source (origin (method url-fetch) @@ -418,7 +418,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1jxxb3qyrh7118fwqa3bhirjh97j2w8r71s8vcb6vp3w1wwhfis2")))) + (base32 "1fagi10fv8pdil6gss6a3ca3jbp3wbiyz7cp8ivsxyrsq059ljq4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit 1.4.1 From ba9e29f1410c05f6e6cf1e10626296d6a81ebc63 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 22:24:03 +0100 Subject: gnu: isync: Update to 1.4.1. * gnu/packages/mail.scm (isync): Update to 1.4.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 721f1b8af7..5bcd214d27 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1986,14 +1986,14 @@ hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (define-public isync (package (name "isync") - (version "1.3.5") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/isync/isync/" version "/isync-" version ".tar.gz")) (sha256 (base32 - "0mbnrwac0p9na307r7qigzcaga69xcih74ixhwmv0d6lvkjk5xb8")))) + "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 402964eec4a33d93826093545b657794c2b863df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 22:24:12 +0100 Subject: gnu: unbound: Update to 1.13.1. * gnu/packages/dns.scm (unbound): Update to 1.13.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 ab338e85ac..bb19175b1a 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -608,14 +608,14 @@ to result in system-wide compromise.") (define-public unbound (package (name "unbound") - (version "1.13.0") + (version "1.13.1") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "18dj7migq6379hps59793457l81s3z7dll3y0fj6qcmhjlx08m59")))) + (base32 "1f2hky62f4xxnjr0lncrzz4gipg01rp12pf98mrqkgf5ixxxj145")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs -- cgit 1.4.1 From 30e76966b13f97ae93dd74920190cc870dbfa5e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 22:42:27 +0100 Subject: gnu: mpd: Update to 0.22.6. * gnu/packages/mpd.scm (mpd): Update to 0.22.6. --- gnu/packages/mpd.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index cbd1de8840..a8959b2f66 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2016, 2018, 2019, 2020 Leo Famulari -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Evan Straw ;;; Copyright © 2020 Ricardo Wurmus ;;; Copyright © 2020 Lars-Dominik Braun @@ -105,7 +105,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.22.4") + (version "0.22.6") (source (origin (method url-fetch) (uri @@ -114,7 +114,7 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1l4x2jrv04hp4q9gyfg79g78bk68lrd6wd3hysl6y91rln9sj7l9")))) + "0pjdd8qwia1dsfkzyxcasfhxiqwk6lcz333z8w9vcg2wi6j4kq9b")))) (build-system meson-build-system) (arguments `(#:configure-flags '("-Ddocumentation=enabled"))) -- cgit 1.4.1 From 34ff94c40735f07bac77c2199de94012d7a2764d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:12:11 +0100 Subject: gnu: whois: Update to 5.5.8. * gnu/packages/networking.scm (whois): Update to 5.5.8. --- 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 5e66ddc01e..360f3ca732 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1312,7 +1312,7 @@ and up to 1 Mbit/s downstream.") (define-public whois (package (name "whois") - (version "5.5.7") + (version "5.5.8") (source (origin (method git-fetch) @@ -1321,7 +1321,7 @@ and up to 1 Mbit/s downstream.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1w3d0ffl0ng1m4i10k968kk4xicviq24w5vwl6d8dhja61d7yd2r")))) + (base32 "12lhl2q1pa1qkbv0l1cpy8hn4wh5i99bqc68rlm4f7jyqlj2l82r")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no test suite -- cgit 1.4.1 From 0d03ca6e94fd27207b6cba5b8c195a3e52687be0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:12:41 +0100 Subject: gnu: zabbix-agentd: Update to 5.2.5. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.2.5. --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 0a98544ae9..46e1903704 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -160,7 +160,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.2.3") + (version "5.2.5") (source (origin (method url-fetch) @@ -168,7 +168,7 @@ etc. via a Web interface. Features include: "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "0wlv3jala7xinl03fr6n0y3hmq9yi0wwn27k6snqhz4yyfdwhdnf")))) + (base32 "1iaby7rablakx91hajnkmjcc4zkvrq7xsvlhss3lw5drm12rf3ff")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From cd7c9f520b647ff72684fd9ab313fd8f14144acd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:13:01 +0100 Subject: gnu: liquidsfz: Update to 0.2.3. * gnu/packages/music.scm (liquidsfz): Update to 0.2.3. --- 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 5673c111c2..762f4ddde9 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4574,14 +4574,14 @@ audio samples and various soft sythesizers. It can receive input from a MIDI ke (define-public liquidsfz (package (name "liquidsfz") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (string-append "https://space.twc.de/~stefan/liquidsfz/" "liquidsfz-" version ".tar.bz2")) (sha256 (base32 - "011m839vjb8gmiv1vzc0d7xz2q2jiwk4v0j9paqyx3lm61czvy93")))) + "1hb4hc3gkvjfbx0ls6wxzavhv2hf9ix11cz8yvndyb6q9lwkimwl")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-shared"))) -- cgit 1.4.1 From 5c709614028c53a94f60b8d24bd465f1bbbd228a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:17:20 +0100 Subject: gnu: synthv1: Update to 0.9.20. * gnu/packages/music.scm (synthv1): Update to 0.9.20. --- 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 762f4ddde9..58bdb566ce 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1927,7 +1927,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.19") + (version "0.9.20") (source (origin (method url-fetch) (uri @@ -1935,7 +1935,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "17sizhav01mn07gi812n8wqdcr85290zqg609s18cww2b95dy6mn")))) + "1g2i79gkl1j7i49djz6igkbvdmfwxhcg6kx97n63bcqcvvy03rqz")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From fbb40c1b212869c20c7ca2d696832214d5b39a0f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:17:29 +0100 Subject: gnu: drumkv1: Update to 0.9.20. * gnu/packages/music.scm (drumkv1): Update to 0.9.20. --- 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 58bdb566ce..d952b7d773 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1959,7 +1959,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.19") + (version "0.9.20") (source (origin (method url-fetch) (uri @@ -1967,7 +1967,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0w9frc634yg2m0yc84szdf6x7l4f19pcviqpg065a1kdixf98qrf")))) + "0y6njh1n0yai4g9dhg24hwc9khba44l4n5xizqcs6i4q7lyr9z48")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From 595a5f345f07a56eea40ccd678246f460d6b75b2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:17:35 +0100 Subject: gnu: samplv1: Update to 0.9.20. * gnu/packages/music.scm (samplv1): Update to 0.9.20. --- 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 d952b7d773..fd9c4abc99 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1992,7 +1992,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.19") + (version "0.9.20") (source (origin (method url-fetch) (uri @@ -2000,7 +2000,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "1fwvk83sfvp1k6qyqv1a7a1l8sbm6azcldaiiqa3ls1vhl4m5wv4")))) + "06nni00dgn8fvbyam1v44aq4yfns1vf7hw1mwmwzv2vxapdbpngn")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From 5e00d147912c17f3abcef9af137fea462c250a78 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:17:40 +0100 Subject: gnu: padthv1: Update to 0.9.20. * gnu/packages/music.scm (padthv1): Update to 0.9.20. --- 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 fd9c4abc99..415005c941 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2025,7 +2025,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.19") + (version "0.9.20") (source (origin (method url-fetch) (uri @@ -2033,7 +2033,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "06fkrc4xxzr3sa3c76lnkcm4q9k0xl5993bn60la0ja4sz2kp6r7")))) + "1x3qjkby29xd7y0dg22ms19c8h8drqf55m9nxz6jlc58sfha2ss0")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From 93872098eb4c66c01ee56ba5f0e568e029def326 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:43:19 +0100 Subject: gnu: meld: Update to 3.20.3. * gnu/packages/patchutils.scm (meld): Update to 3.20.3. --- gnu/packages/patchutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 0896efeb82..f190fec1a2 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2015, 2018 Leo Famulari -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines ;;; ;;; This file is part of GNU Guix. @@ -246,7 +246,7 @@ GiB).") (define-public meld (package (name "meld") - (version "3.20.2") + (version "3.20.3") (source (origin (method url-fetch) @@ -254,7 +254,7 @@ GiB).") (version-major+minor version) "/meld-" version ".tar.xz")) (sha256 - (base32 "0a0x156zr3w2yg0rnhwy39giy3xnfm6sqcfa4xcw4i6ahvwqa2dc")))) + (base32 "06h52vaghvj5n507mj0hhk9yrca16pyl4l16c00b3bmkplljpqzh")))) (build-system python-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 560e6058198c15ebdd338eac09c21f27d6758758 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:43:44 +0100 Subject: gnu: czmq: Update to 4.2.1. * gnu/packages/networking.scm (czmq): Update to 4.2.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 360f3ca732..74eabd8267 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -945,7 +945,7 @@ more.") (define-public czmq (package (name "czmq") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (string-append @@ -954,7 +954,7 @@ more.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1szciz62sk3fm4ga9qjpxz0n0lazvphm32km95bq92ncng12kayg")))) + "0fdclvd7fcwixp0k57ccv7d159v3slasyhvndxfn8n1a9hh0lwjx")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-drafts") -- cgit 1.4.1 From d6e11acc21facb93aafd5a3e040ca85b5bcbd987 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Mar 2021 23:44:03 +0100 Subject: gnu: zyre: Update to 2.0.1. * gnu/packages/networking.scm (zyre): Update to 2.0.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 74eabd8267..4dd34179f0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2903,7 +2903,7 @@ remotely.") (define-public zyre (package (name "zyre") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri @@ -2911,7 +2911,7 @@ remotely.") version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0qz2730bng1gs9xbqxhkw88qbsmszgmmrl2g9k6xrg6r3bqvsdc7")))) + "13596507ma1474cjqzxym5jlvcshvw7sjhw80rdz788gyz6kz90b")))) (build-system gnu-build-system) (inputs `(("zeromq" ,zeromq) ("czmq" ,czmq) -- cgit 1.4.1 From 43a5b88358333218933070332c572d5ceb524790 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:03:13 +0100 Subject: gnu: socat: Update to 1.7.4.1. * gnu/packages/networking.scm (socat): Update to 1.7.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 4dd34179f0..2f64a9c262 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -813,7 +813,7 @@ useful for making transparent firewalls.") (define-public socat (package (name "socat") - (version "1.7.3.4") + (version "1.7.4.1") (source (origin (method url-fetch) (uri (string-append @@ -821,7 +821,7 @@ useful for making transparent firewalls.") version ".tar.bz2")) (sha256 (base32 - "1z7xgnwiqpcv1j6aghhj9nqbx7cg3gpc4n9j7vi9hm7nhv5788wp")))) + "1sbmqqvni3ss9wyay6ik5v81kxffkra80mh4ypgj74g82iba5b1z")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no test suite (inputs `(("openssl" ,openssl))) -- cgit 1.4.1 From 04a18e936ca3d36656aaba1c23fe347120bc8576 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:07:52 +0100 Subject: gnu: wofi: Update to 1.2.4. * gnu/packages/xdisorg.scm (wofi): Update to 1.2.4. --- 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 87ea37323d..e3c5ea7f80 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2662,7 +2662,7 @@ using @command{dmenu}.") (define-public wofi (package (name "wofi") - (version "1.2.3") + (version "1.2.4") (source (origin (method hg-fetch) (uri (hg-reference @@ -2671,7 +2671,7 @@ using @command{dmenu}.") (file-name (git-file-name name version)) (sha256 (base32 - "0glpb2gf5n78s01z3rn614ak8ibxhfr824gy6xlljbxclgds264i")))) + "1bnf078fg1kwslzwm1mjxwcqqq3bhk1dzymwfw9gk3brqbxrl75c")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) -- cgit 1.4.1 From 439df62672bd22a4a1a8de0d94c2242635fa4c33 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:10:01 +0100 Subject: gnu: highlight: Update to 3.62. * gnu/packages/pretty-print.scm (highlight): Update to 3.62. --- 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 4ab1da5ca9..88dff5c7b4 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -270,14 +270,14 @@ seen in a terminal.") (define-public highlight (package (name "highlight") - (version "3.60") + (version "3.62") (source (origin (method url-fetch) (uri (string-append "http://www.andre-simon.de/zip/highlight-" version ".tar.bz2")) (sha256 - (base32 "098xwzj70f2kp9zbfknlqca41lgdjv71clfx1m84151xdszv8p56")))) + (base32 "088di7qxd6b2r22qljllhnly0r9a0lfnwnfqswjn23s09awjbl6p")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From fed2879c18aa415dd13b0f6eaa22f0078e1f93cd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:10:14 +0100 Subject: gnu: squid: Update to 4.14. * gnu/packages/networking.scm (squid): Update to 4.14. --- 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 2f64a9c262..0e99cd1cc0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1630,14 +1630,14 @@ TCP connection, TLS handshake and so on) in the terminal.") (define-public squid (package (name "squid") - (version "4.13") + (version "4.14") (source (origin (method url-fetch) (uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" version ".tar.xz")) (sha256 - (base32 "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8")))) + (base32 "1z4zf98q24ps19fq840n0hwh6z1la65rf061kcapr29lcjm7s2gi")))) (build-system gnu-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From f781e2a7e93d6696c99b0378c49361b40249c489 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:12:31 +0100 Subject: gnu: xonsh: Update to 0.9.26. * gnu/packages/shells.scm (xonsh): Update to 0.9.26. --- 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 c605a7566b..bb49833912 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -524,13 +524,13 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.9.25") + (version "0.9.26") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 - (base32 "0q1xy0k5mvz4031p4d3y0j7ljpx32rmpk21jy148l6xcss039br0")) + (base32 "00cfhl17hvycqv4vly8cdfj82949hn7572d910z7qkkqy6yy9957")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From 4b317975ab18ac89b7eaa06dfff79eb4150096ef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 00:13:13 +0100 Subject: gnu: screen-message: Update to 0.26. * gnu/packages/xdisorg.scm (screen-message): Update to 0.26. --- 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 e3c5ea7f80..9d139db68c 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1978,7 +1978,7 @@ a user-configurable period of time.") (define-public screen-message (package (name "screen-message") - (version "0.25") + (version "0.26") (source (origin (method url-fetch) (uri (string-append @@ -1986,7 +1986,7 @@ a user-configurable period of time.") "/screen-message-" version ".tar.gz")) (sha256 (base32 - "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0")))) + "0dwgm4z3dfk6xz41w8xiv0hmnwr74gf3ykb91b090hc4ffwsf4mw")))) (build-system gnu-build-system) (inputs `(("gtk3" ,gtk+) ("gdk" ,gdk-pixbuf) -- cgit 1.4.1 From 22ef895d2481964bf72b04bb5b4195c8cfb94754 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 4 Mar 2021 01:39:07 +0100 Subject: gnu: 389-ds-base: Update to 1.4.0.31 [security fixes]. * gnu/packages/openldap.scm (389-ds-base): Update to 1.4.0.31. --- 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 c23a9f6c25..400f10600f 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -237,14 +237,14 @@ servers from Python programs.") (define-public 389-ds-base (package (name "389-ds-base") - (version "1.4.0.21") + (version "1.4.0.31") (source (origin (method url-fetch) (uri (string-append "https://releases.pagure.org/389-ds-base/" "389-ds-base-" version ".tar.bz2")) (sha256 (base32 - "1qd1ap5d5nxyiq0d19czfwc3h7iwl9lmr5sy7d7xmpr2by59aysr")))) + "1rs218iqxyclccsdqb529favdsmz88zw785lsxd9ln43ja3x3l65")))) (build-system gnu-build-system) (arguments `(#:modules ((srfi srfi-1) -- cgit 1.4.1 From 8768df2ec03fc67e2acbc33b61fabc412fd75e0b Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:21:25 +0100 Subject: gnu: Add cl-croatoan. * gnu/packages/lisp-xyz.scm (cl-croatoan, ecl-croatoan, sbcl-croatoan): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 90ab8c5cd0..7f655ff187 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) + #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -14783,3 +14784,46 @@ protocol for Mastodon.") (define-public cl-tooter (sbcl-package->cl-source-package sbcl-tooter)) + +(define-public sbcl-croatoan + (let ((commit "89ecd147cf1548f569f23353b3ab656cfb74de1f") + (revision "1")) + (package + (name "sbcl-croatoan") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/McParen/croatoan") + (commit commit))) + (file-name (git-file-name "croatoan" version)) + (sha256 + (base32 "0pk4mym88531jx0f1zmm6gmvrmdjzj2zcl2cdywdsxvjygr53zyx")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ncurses/ncurses.lisp" + (("libncursesw" all) + (string-append (assoc-ref inputs "ncurses") + "/lib/" + all)))))))) + (inputs + `(("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cffi" ,sbcl-cffi) + ("ncurses" ,ncurses) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (synopsis "Common Lisp bindings for the ncurses terminal library") + (description "Croatoan provides high-level Common Lisp CLOS bindings for +the ncurses terminal library.") + (home-page "https://github.com/McParen/croatoan") + (license license:expat)))) + +(define-public ecl-croatoan + (sbcl-package->ecl-package sbcl-croatoan)) + +(define-public cl-croatoan + (sbcl-package->cl-source-package sbcl-croatoan)) -- cgit 1.4.1 From c1b8219d3858408cb487a5ce37f448c9b5aface5 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:21:46 +0100 Subject: gnu: Add cl-spark. * gnu/packages/lisp-xyz.scm (cl-spark, ecl-cl-spark, sbcl-cl-spark): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7f655ff187..eed4914002 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14827,3 +14827,33 @@ the ncurses terminal library.") (define-public cl-croatoan (sbcl-package->cl-source-package sbcl-croatoan)) + +(define-public sbcl-cl-spark + (let ((commit "4e34bcebdcf8e45265986eb43ad4ad03bb41a581") + (revision "1")) + (package + (name "sbcl-cl-spark") + (version (git-version "0.1.13" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tkych/cl-spark") + (commit commit))) + (file-name (git-file-name "cl-spark" version)) + (sha256 + (base32 "0my1fsgi2rjaqkpk934f2bjy63pmnj7faza3fzvnk6k3l66y19nk")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (synopsis "Common Lisp library to make histograms") + (description "This is a Common Lisp library to make histograms using +UTF-8 block characters.") + (home-page "https://github.com/tkych/cl-spark") + (license license:expat)))) + +(define-public ecl-cl-spark + (sbcl-package->ecl-package sbcl-cl-spark)) + +(define-public cl-spark + (sbcl-package->cl-source-package sbcl-cl-spark)) -- cgit 1.4.1 From c88de9648760797453e2d1f89479cdffffc18322 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:22:13 +0100 Subject: gnu: Add cl-access. * gnu/packages/lisp-xyz.scm (cl-access, ecl-access, sbcl-access): New variables. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index eed4914002..6cdf9a61f0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14857,3 +14857,41 @@ UTF-8 block characters.") (define-public cl-spark (sbcl-package->cl-source-package sbcl-cl-spark)) + +(define-public sbcl-access + (let ((commit "1b26db3760018cdc4624f880f0a1e0155d8f6c50") + (revision "1")) + (package + (name "sbcl-access") + (version (git-version "1.5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/access") + (commit commit))) + (file-name (git-file-name "access" version)) + (sha256 + (base32 "1knd3n4mpzkc97i1znbas32pscd30416isvmx2pjmgvar6k93pl5")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("lisp-unit2" ,sbcl-lisp-unit2))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("anaphora" ,sbcl-anaphora) + ("closer-mop" ,sbcl-closer-mop) + ("interpol" ,sbcl-cl-interpol) + ("iterate" ,sbcl-iterate))) + (synopsis + "Common lisp library to unify access to dictionary-like structures") + (description + "This is a Common lisp library to unify access to the most common +dictionary-like data structures.") + (home-page "https://github.com/sharplispers/access") + (license license:bsd-3)))) + +(define-public ecl-access + (sbcl-package->ecl-package sbcl-access)) + +(define-public cl-access + (sbcl-package->cl-source-package sbcl-access)) -- cgit 1.4.1 From 3c1cc4992b575ec0cccbce5ea824fe5f6375ea9e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Mar 2021 10:01:28 +0100 Subject: gnu: Add cl-sxql-composer. * gnu/packages/lisp-xyz.scm (cl-sxql-composer, ecl-sxql-composer, sbcl-sxql-composer): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6cdf9a61f0..d338488427 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14895,3 +14895,34 @@ dictionary-like data structures.") (define-public cl-access (sbcl-package->cl-source-package sbcl-access)) + +(define-public sbcl-sxql-composer + (let ((commit "2b2230cb01ae1b68e28921d99e4814046867fb75") + (revision "1")) + (package + (name "sbcl-sxql-composer") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mmontone/sxql-composer") + (commit commit))) + (file-name (git-file-name "sxql-composer" version)) + (sha256 + (base32 "1agkrj3ymskzc3c7pxbrj123d1kygjqcls145m0ap3i07q96hh1r")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("sxql" ,sbcl-sxql))) + (synopsis "Build and compose SXQL queries dynamically") + (description + "This is a Common Lisp library to build and compose SXQL queries +dynamically.") + (home-page "https://github.com/mmontone/sxql-composer") + (license license:expat)))) + +(define-public ecl-sxql-composer + (sbcl-package->ecl-package sbcl-sxql-composer)) + +(define-public cl-sxql-composer + (sbcl-package->cl-source-package sbcl-sxql-composer)) -- cgit 1.4.1 From 88d822c5f1750edcd362632184cc2bcb331e01e2 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:22:58 +0100 Subject: gnu: Add cl-i18n. * gnu/packages/lisp-xyz.scm (cl-i18n, ecl-cl-i18n, sbcl-cl-i18n): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d338488427..a36254a718 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14926,3 +14926,36 @@ dynamically.") (define-public cl-sxql-composer (sbcl-package->cl-source-package sbcl-sxql-composer)) + +(define-public sbcl-cl-i18n + (let ((commit "fa0aa5bef8dfbdf2d72f7cc9f49e848ccbb567aa") + (revision "1")) + (package + (name "sbcl-cl-i18n") + (version (git-version "0.5.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/cage/cl-i18n") + (commit commit))) + (file-name (git-file-name "cl-i18n" version)) + (sha256 + (base32 "1hpsdbb3hd79bzbrnbqgk2j3f0ispxvk91snp08fm2z3f1sds5as")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode))) + (synopsis "Internationalisation framework for Common Lisp") + (description + "This is a Gettext-style internationalisation framework for Common +Lisp.") + (home-page "https://notabug.org/cage/cl-i18n") + (license license:llgpl)))) + +(define-public ecl-cl-i18n + (sbcl-package->ecl-package sbcl-cl-i18n)) + +(define-public cl-i18n + (sbcl-package->cl-source-package sbcl-cl-i18n)) -- cgit 1.4.1 From 9e9c9a3a02110fbe3551cf000b6ceb67c9888c34 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:23:46 +0100 Subject: gnu: Add cl-crypto-shortcuts. * gnu/packages/lisp-xyz.scm (cl-crypto-shortcuts, ecl-crypto-shortcuts, sbcl-crypto-shortcuts): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a36254a718..386abab55e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14959,3 +14959,36 @@ Lisp.") (define-public cl-i18n (sbcl-package->cl-source-package sbcl-cl-i18n)) + +(define-public sbcl-crypto-shortcuts + (let ((commit "7efd22d80e867cd8c9f8f363d4fe7b51ee2dadc0") + (revision "1")) + (package + (name "sbcl-crypto-shortcuts") + (version (git-version "2.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shinmera/crypto-shortcuts") + (commit commit))) + (file-name (git-file-name "crypto-shortcuts" version)) + (sha256 + (base32 "0c0m0ar04jn7qf2v8c4sivamlzki03r13rnxy8b3n27rh9r6hgin")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-base64" ,sbcl-cl-base64) + ("flexi-stream" ,sbcl-flexi-streams) + ("ironclad" ,sbcl-ironclad))) + (synopsis "Collection of common cryptography functions") + (description + "This is a collection of common cryptography functions for Common +Lisp.") + (home-page "https://shinmera.github.io/crypto-shortcuts/") + (license license:zlib)))) + +(define-public ecl-crypto-shortcuts + (sbcl-package->ecl-package sbcl-crypto-shortcuts)) + +(define-public cl-crypto-shortcuts + (sbcl-package->cl-source-package sbcl-crypto-shortcuts)) -- cgit 1.4.1 From f934892cbb8be1d0d0c688368ac3388dd51b1881 Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:24:10 +0100 Subject: gnu: Add cl-html5-parser. * gnu/packages/lisp-xyz.scm (cl-html5-parser, ecl-cl-html5-parser, sbcl-cl-html5-parser): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 386abab55e..2f084c7760 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14992,3 +14992,37 @@ Lisp.") (define-public cl-crypto-shortcuts (sbcl-package->cl-source-package sbcl-crypto-shortcuts)) + +(define-public sbcl-cl-html5-parser + (let ((commit "74a92eb3a183a0afd089ea33350e816e6b9aeefa") + (revision "1")) + (package + (name "sbcl-cl-html5-parser") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rotatef/cl-html5-parser") + (commit commit))) + (file-name (git-file-name "cl-html5-parser" version)) + (sha256 + (base32 "04if61wigylsmn996rbfl8ylsd0d9hzdmg7p2wiglncibjzcl5k9")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:tests? #f + #:asd-systems '("cl-html5-parser"))) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("flexi-stream" ,sbcl-flexi-streams) + ("string-case" ,sbcl-string-case))) + (synopsis "HTML5 parser for Common Lisp") + (description "This a Common Lisp library to parse HTML5 documents.") + (home-page "https://github.com/rotatef/cl-html5-parser") + (license license:lgpl3+)))) + +(define-public ecl-cl-html5-parser + (sbcl-package->ecl-package sbcl-cl-html5-parser)) + +(define-public cl-html5-parser + (sbcl-package->cl-source-package sbcl-cl-html5-parser)) -- cgit 1.4.1 From 09f60f9e3e57072ff09522713963c74e097b9a4f Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:24:34 +0100 Subject: gnu: Add cl-percent-encoding. * gnu/packages/lisp-xyz.scm (cl-percent-encoding, ecl-percent-encoding, sbcl-percent-encoding): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2f084c7760..1fa6a56935 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15026,3 +15026,36 @@ Lisp.") (define-public cl-html5-parser (sbcl-package->cl-source-package sbcl-cl-html5-parser)) + +(define-public sbcl-percent-encoding + (let ((commit "c1224e22bc8048fbd3ebbc9329715a0c1b673170") + (revision "1")) + (package + (name "sbcl-percent-encoding") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/llibra/percent-encoding") + (commit commit))) + (file-name (git-file-name "percent-encoding" version)) + (sha256 + (base32 "0q1lh3sa6mkjr5gcdkgimkpc29rgf9cjhv90f61h8ridj28grq0h")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (inputs + `(("anaphora" ,sbcl-anaphora) + ("babel" ,sbcl-babel))) + (synopsis "RFC 3986 percent-encoding library") + (description + "This is a Common Lisp library providing RFC 3986 percent-encoding.") + (home-page "https://github.com/llibra/percent-encoding") + (license license:expat)))) + +(define-public ecl-percent-encoding + (sbcl-package->ecl-package sbcl-percent-encoding)) + +(define-public cl-percent-encoding + (sbcl-package->cl-source-package sbcl-percent-encoding)) -- cgit 1.4.1 From 85eaafafbba134d47b35fa42eb8a190224d0562f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Mar 2021 10:50:11 +0100 Subject: gnu: sbcl-esrap: Update to 0.18-1.da6b24f. * gnu/packages/lisp-xyz.scm (sbcl-esrap): Update to 0.18-1.da6b24f. [source, home-page]: Update to new maintainer's URL. [native-inputs]: Remove eos, add fiveam. [description]: Add new features. --- gnu/packages/lisp-xyz.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1fa6a56935..161a15c44f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1675,28 +1675,28 @@ that of Eos has not. Thus, Eos is now deprecated in favor of FiveAM.") (sbcl-package->ecl-package sbcl-eos)) (define-public sbcl-esrap - (let ((commit "133be8b05c2aae48696fe5b739eea2fa573fa48d")) + (let ((commit "da6b24fb18bdb8e7e177bcf2820cdaf0b560deb6") + (revision "1")) (package (name "sbcl-esrap") - (version (git-version "0.0.0" "1" commit)) + (version (git-version "0.18" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/nikodemus/esrap") + (url "https://github.com/scymtym/esrap") (commit commit))) (sha256 - (base32 - "02d5clihsdryhf7pix8c5di2571fdsffh75d40fkzhws90r5mksl")) + (base32 "12vf3bxwzf8icnf6rw1xalvm7493cfbb46r2vlhc09s59djkf39q")) (file-name (git-file-name "esrap" version)))) (build-system asdf-build-system/sbcl) (native-inputs - `(("eos" ,sbcl-eos))) ;For testing only. + `(("fiveam" ,sbcl-fiveam))) (inputs `(("alexandria" ,sbcl-alexandria))) (synopsis "Common Lisp packrat parser") (description - "A packrat parser for Common Lisp. + "This is a packrat parser for Common Lisp. In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports: @itemize @@ -1704,8 +1704,11 @@ In addition to regular Packrat / Parsing Grammar / TDPL features ESRAP supports: @item inline grammars @item semantic predicates @item introspective facilities (describing grammars, tracing, setting breaks) +@item left-recursive grammars +@item functions as terminals +@item accurate, customizable parse error reports @end itemize\n") - (home-page "https://nikodemus.github.io/esrap/") + (home-page "https://scymtym.github.io/esrap/") (license license:expat)))) (define-public cl-esrap -- cgit 1.4.1 From 865728dd52600c7aa29a87bf18cb02ddf453cdfc Mon Sep 17 00:00:00 2001 From: cage Date: Wed, 3 Mar 2021 16:54:23 +0100 Subject: gnu: Add tinmop. * gnu/packages/web-browsers.scm (tinmop): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/web-browsers.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 58da0de922..5a83a4ef95 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2021 Cage ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,12 +47,14 @@ #:use-module (gnu packages) #:use-module (gnu packages backup) #:use-module (gnu packages compression) + #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) #:use-module (gnu packages fonts) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnome-xyz) @@ -66,6 +69,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -817,3 +821,77 @@ command selection. The following protocols are supported as first-class citizens: gopher, gemini, finger, and local. There is also support for telnet, http, and https via third-party applications.") (license license:gpl3+))) + +(define-public tinmop + (package + (name "tinmop") + (version "0.5.9") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/cage/tinmop") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zdra4q4mkrldv7dpag9p1bsma2k9pvp9pp9k7qsbm0alj7xwqpr")))) + (build-system gnu-build-system) + (native-inputs + `(("curl" ,curl) + ("gettext" ,gnu-gettext) + ("gnupg" ,gnupg) + ("sbcl" ,sbcl))) + (inputs + `(("access" ,sbcl-access) + ("alexandria" ,sbcl-alexandria) + ("babel" ,sbcl-babel) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-base64" ,sbcl-cl-base64) + ("cl-colors2" ,sbcl-cl-colors2) + ("cl-html5-parser" ,sbcl-cl-html5-parser) + ("cl-i18n" ,sbcl-cl-i18n) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("cl-spark" ,sbcl-cl-spark) + ("cl-sqlite" ,sbcl-cl-sqlite) + ("cl+ssl" ,sbcl-cl+ssl) + ("clunit2" ,sbcl-clunit2) + ("croatoan" ,sbcl-croatoan) + ("crypto-shortcuts" ,sbcl-crypto-shortcuts) + ("drakma" ,sbcl-drakma) + ("esrap" ,sbcl-esrap) + ("ieee-floats" ,sbcl-ieee-floats) + ("local-time" ,sbcl-local-time) + ("log4cl" ,sbcl-log4cl) + ("marshal" ,sbcl-marshal) + ("nano" ,nano) + ("openssl" ,openssl) + ("osicat" ,sbcl-osicat) + ("parse-number" ,sbcl-parse-number) + ("percent-encoding" ,sbcl-percent-encoding) + ("sxql" ,sbcl-sxql) + ("sxql-composer" ,sbcl-sxql-composer) + ("tooter" ,sbcl-tooter) + ("unix-opts" ,sbcl-unix-opts) + ("usocket" ,sbcl-usocket) + ("xdg-utils" ,xdg-utils))) + (arguments + `(#:tests? #f + #:strip-binaries? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-home + (lambda _ + (setenv "HOME" "/tmp") + #t)) + (add-after 'configure 'fix-asdf + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Makefile.in" + (("LISP_COMPILER) ") + "LISP_COMPILER) --eval \"(require 'asdf)\" --eval \"(push \\\"$$(pwd)/\\\" asdf:*central-registry*)\" ")) + #t))))) + (synopsis "Gemini and pleroma client with a terminal interface") + (description + "This package provides a Gemini and pleroma client with a terminal +interface.") + (home-page "https://www.autistici.org/interzona/tinmop.html") + (license license:gpl3+))) -- cgit 1.4.1 From 3e5d811387d8cd6a3eca0f50b55d728c5f6382f5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 14:43:01 +0200 Subject: gnu: python-plotly: Update to 4.14.3. * gnu/packages/graph.scm (python-plotly): Update to 4.14.3. [propagated-inputs]: Remove python-decorator. Add python-ipython, python-pillow. Move python-ipywidgets, python-xarray ... [native-inputs]: ... to here. --- gnu/packages/graph.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 86c4b98bf1..6110c7a91b 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2021 Efraim Flashner ;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2020 Alexander Krotov ;;; Copyright © 2020 Pierre Langlois @@ -151,7 +151,7 @@ lines.") (define-public python-plotly (package (name "python-plotly") - (version "4.8.1") + (version "4.14.3") (source (origin (method git-fetch) (uri (git-reference @@ -160,7 +160,7 @@ lines.") (file-name (git-file-name name version)) (sha256 (base32 - "08ab677gr85m10zhixr6dnmlfws8q6sra7nhyb8nf3r8dx1ffqhz")))) + "02wlgy7gf3v5ckiq9ab3prm53cckxkavlghqgkk9xw2sfmmrn61q")))) (build-system python-build-system) (arguments `(#:phases @@ -183,16 +183,17 @@ lines.") (find-files out "\\.gz")) #t)))))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-ipywidgets" ,python-ipywidgets) + ("python-pytest" ,python-pytest) + ("python-xarray" ,python-xarray))) (propagated-inputs - `(("python-decorator" ,python-decorator) - ("python-ipywidgets" ,python-ipywidgets) + `(("python-ipython" ,python-ipython) ("python-pandas" ,python-pandas) + ("python-pillow" ,python-pillow) ("python-requests" ,python-requests) ("python-retrying" ,python-retrying) ("python-six" ,python-six) - ("python-statsmodels" ,python-statsmodels) - ("python-xarray" ,python-xarray))) + ("python-statsmodels" ,python-statsmodels))) (home-page "https://plotly.com/python/") (synopsis "Interactive plotting library for Python") (description "Plotly's Python graphing library makes interactive, -- cgit 1.4.1 From e9096ef105c8f3d4667e55b4d94a1b1493659e2d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 14:47:42 +0200 Subject: gnu: python-plotly: Allow test phase to be skipped. * gnu/packages/graph.scm (python-plotly)[arguments]: Wrap custom 'check phase tests with test with tests? keyword. --- gnu/packages/graph.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index 6110c7a91b..d2e4c875a1 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -170,12 +170,14 @@ lines.") (chdir "packages/python/plotly") #t)) (replace 'check - (lambda _ - (invoke "pytest" "-x" "plotly/tests/test_core") - (invoke "pytest" "-x" "plotly/tests/test_io") - ;; FIXME: Add optional dependencies and enable their tests. - ;; (invoke "pytest" "-x" "plotly/tests/test_optional") - (invoke "pytest" "_plotly_utils/tests"))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-x" "plotly/tests/test_core") + (invoke "pytest" "-x" "plotly/tests/test_io") + ;; FIXME: Add optional dependencies and enable their tests. + ;; (invoke "pytest" "-x" "plotly/tests/test_optional") + (invoke "pytest" "_plotly_utils/tests")) + #t)) (add-before 'reset-gzip-timestamps 'make-files-writable (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit 1.4.1 From 1c8a3283316837995ec93d586859f53f43635716 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 14:10:13 +0100 Subject: gnu: dovecot: Update to 2.3.14. * gnu/packages/mail.scm (dovecot): Update to 2.3.14. --- 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 5bcd214d27..539eac5b77 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1754,7 +1754,7 @@ facilities for checking incoming mail.") (package (name "dovecot") ;; Also update dovecot-pigeonhole when updating to a new minor version. - (version "2.3.13") + (version "2.3.14") (source (origin (method url-fetch) @@ -1762,7 +1762,7 @@ facilities for checking incoming mail.") (version-major+minor version) "/" "dovecot-" version ".tar.gz")) (sha256 - (base32 "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53")))) + (base32 "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From b12974ec52de76d1420dd61aa5fcd075add5754d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 14:10:22 +0100 Subject: gnu: dovecot-pigeonhole: Update to 0.5.14. * gnu/packages/mail.scm (dovecot-pigeonhole): Update to 0.5.14. --- 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 539eac5b77..0e0934a245 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1823,7 +1823,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") (let ((dovecot-version (version-major+minor (package-version dovecot)))) (package (name "dovecot-pigeonhole") - (version "0.5.13") + (version "0.5.14") (source (origin (method url-fetch) @@ -1831,7 +1831,7 @@ It supports mbox/Maildir and its own dbox/mdbox formats.") "https://pigeonhole.dovecot.org/releases/" dovecot-version "/" "dovecot-" dovecot-version "-pigeonhole-" version ".tar.gz")) (sha256 - (base32 "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi")) + (base32 "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From ab10e1086cf1e36330a55d05ee438b097c9fd626 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 16:19:19 +0200 Subject: gnu: python-jedi: Allow test phase to be skipped. * gnu/packages/python-xyz.scm (python-jedi)[arguments]: Wrap custom 'check phase tests with check for tests? keyword. --- gnu/packages/python-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d9de9bc01c..fbc9ad688d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13945,9 +13945,11 @@ characters, mouse support, and auto suggestions.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ - (setenv "HOME" "/tmp") - (invoke "python" "-m" "pytest" "-vv")))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (invoke "python" "-m" "pytest" "-vv")) + #t))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-docopt" ,python-docopt))) -- cgit 1.4.1 From 93aaaecb29c76badf41d1bc810ae140c1e523857 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 15:11:45 +0100 Subject: gnu: libisofs: Update to 1.5.4. * gnu/packages/cdrom.scm (libisofs): Update to 1.5.4. --- 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 6d544b8fcf..905103efd4 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -884,14 +884,14 @@ DVD-RW, DVD-R, DVD-R/DL, BD-R, and BD-RE.") (define-public libisofs (package (name "libisofs") - (version "1.5.2") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libisofs-" version ".tar.gz")) (sha256 (base32 - "002mcyqwg625a8hqvsrmgm26mhhfwj0j7rahfhsqirmk02b16npg")))) + "13m82l13cb5d7ca53dv3akma1jr9gw0hnnshdwqpj6ahly0fv85a")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) -- cgit 1.4.1 From cb93d420cd000a9e5ce1a6201bffff6c5babc168 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 15:11:58 +0100 Subject: gnu: oath-toolkit: Update to 2.6.6. * gnu/packages/authentication.scm (oath-toolkit): Update to 2.6.6. --- gnu/packages/authentication.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/authentication.scm b/gnu/packages/authentication.scm index bd40a6eb5c..9a4878c8a6 100644 --- a/gnu/packages/authentication.scm +++ b/gnu/packages/authentication.scm @@ -33,14 +33,14 @@ (define-public oath-toolkit (package (name "oath-toolkit") - (version "2.6.5") + (version "2.6.6") (source (origin (method url-fetch) (uri (string-append "https://download.savannah.nongnu.org/releases/" name "/" name "-" version ".tar.gz")) (sha256 - (base32 "06f21smb412xads4lygvyb47fcpvhdns0k6h880m9pbzgq6141yj")))) + (base32 "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x")))) (build-system gnu-build-system) (arguments ;; TODO ‘--enable-pskc’ causes xmlsec-related test suite failures. -- cgit 1.4.1 From b94d4e6a1d8bd5bbae5656429f0f62d7ee4c24f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:22:57 +0100 Subject: gnu: indi: Update to 1.8.9. * gnu/packages/astronomy.scm (indi): Update to 1.8.9. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index feb22eb592..f623274136 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -793,7 +793,7 @@ provide you with detailed information about each pass.") (define-public indi (package (name "indi") - (version "1.8.8") + (version "1.8.9") (source (origin (method git-fetch) @@ -802,7 +802,7 @@ provide you with detailed information about each pass.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "19gm7rbnm3295g2i8mdzfslpz0vrcgfmbl59311qpszvlxbmyd2r")))) + (base32 "0nw4b2cdsg244slcm3yf1v11jlxbbjrpvi6ax90svs7rlandz8jv")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 779243832c11fea2ac018c6916eabe2fd3e2e4d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:23:09 +0100 Subject: gnu: libolm: Update to 3.2.2. * gnu/packages/crypto.scm (libolm): Update to 3.2.2. --- 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 b03cefa59d..e0fa74409b 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1237,7 +1237,7 @@ Trusted comments are signed, thus verified, before being displayed.") (define-public libolm (package (name "libolm") - (version "3.2.1") + (version "3.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -1245,7 +1245,7 @@ Trusted comments are signed, thus verified, before being displayed.") (commit version))) (sha256 (base32 - "14b5cplcnbf2baq0lvz4f97m6swxpb13rvxdajxyw3s4mbvasia4")) + "0qji25wiwmkxyfpraxj96c54hyayqmjkvwh0gsy5gb5pz5bp4mcy")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From 9aa8f57f40e485e692d7e8924c04bbcc82c48a45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:23:32 +0100 Subject: gnu: fasm: Update to 1.73.27. * gnu/packages/assembly.scm (fasm): Update to 1.73.27. --- gnu/packages/assembly.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 55a1be8d54..38d157bd5d 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2015 Ludovic Courtès ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016, 2020, 2021 Efraim Flashner -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2019 Andy Tai ;;; Copyright © 2020 Jakub Kądziołka @@ -184,14 +184,14 @@ speed on x86, NEON on ARM, etc.).") (define-public fasm (package (name "fasm") - (version "1.73.25") + (version "1.73.27") (source (origin (method url-fetch) (uri (string-append "https://flatassembler.net/fasm-" version ".tgz")) (sha256 - (base32 "0k3h61mfwslyb34kf4dnapfwl8jxlmrp4dv666wc057hkj047knn")))) + (base32 "1cghiks49ql77b9l4mwrnlk76kai0fm0z22j71kbdlxngwvlh0b8")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests exist -- cgit 1.4.1 From 2e142b1c624e33747800b45826741daeb0ad782f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:23:43 +0100 Subject: gnu: simde: Update to 0.7.2. * gnu/packages/assembly.scm (simde): Update to 0.7.2. --- gnu/packages/assembly.scm | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 38d157bd5d..9db1834d27 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -152,23 +152,16 @@ to the clients.") (define-public simde (package (name "simde") - (version "0.7.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/simd-everywhere/simde") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1xf5xfzkk9rj47cichgz5ni8xs9hbpz5p6fmxr4ij721ffd002k3")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix the version string - (substitute* "meson.build" - (("0.7.0-rc2") "0.7.0")) - #t)))) + (version "0.7.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simd-everywhere/simde") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xkf21gbkgz6zlxabkmgwvy7py6cdnfqx9aplj90gz25gzrr1mkb")))) (build-system meson-build-system) ;; We really want this for the headers, and the tests require a bundled library. (arguments '(#:configure-flags '("-Dtests=false"))) -- cgit 1.4.1 From afeb2e27bbb6b1d98e0d6abceddd8342bc6966d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:23:59 +0100 Subject: gnu: clzip: Update to 1.12. * gnu/packages/compression.scm (clzip): Update to 1.12. --- 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 1db8b093a3..2429429987 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1835,14 +1835,14 @@ Lunzip is intended to be fully compatible with the regular lzip package.") (define-public clzip (package (name "clzip") - (version "1.11") + (version "1.12") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/lzip/clzip/" "clzip-" version ".tar.gz")) (sha256 - (base32 "1h14dmc9fi10gcdpdpbgq1bwvcxvivppilj64pf720x8mw915mfr")))) + (base32 "1s7yidqvmxi61hh569h5aci816l6qkffjgx0zx57qyyq0qq2pjgw")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 69f75ce198aeb7452d4d9fbf9941debc1cb3736e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:24:21 +0100 Subject: gnu: pigz: Update to 2.6. * gnu/packages/compression.scm (pigz): Update to 2.6. --- 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 2429429987..3561dc6bbe 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -891,14 +891,14 @@ extract such file systems.") (define-public pigz (package (name "pigz") - (version "2.4") + (version "2.6") (source (origin (method url-fetch) (uri (string-append "http://zlib.net/pigz/" name "-" version ".tar.gz")) (sha256 (base32 - "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54")))) + "0z9avc4mifwcpj3qdsf9m2rjw9jx03b2r9pj0c4xgla9fh6ppv9f")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 51059be36658246f24d85a485e33091ac92e8a74 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:41:06 +0100 Subject: gnu: mariadb-connector-c: Update to 3.1.12. * gnu/packages/databases.scm (mariadb-connector-c): Update to 3.1.12. --- 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 5c6ba05aaf..cca5995a65 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1170,7 +1170,7 @@ as a drop-in replacement of MySQL.") (define-public mariadb-connector-c (package (name "mariadb-connector-c") - (version "3.1.11") + (version "3.1.12") (source (origin (method url-fetch) @@ -1179,7 +1179,7 @@ as a drop-in replacement of MySQL.") "/mariadb-connector-c-" version "-src.tar.gz" "/from/https%3A//mirrors.ukfast.co.uk/sites/mariadb/?serve")) (sha256 - (base32 "03svzahdf7czjlm695c11r4bfd04qdqgx8r1vkpr1zlkjhwnqvry")))) + (base32 "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig")))) (inputs `(("openssl" ,openssl))) (build-system cmake-build-system) -- cgit 1.4.1 From f6a94e7e33c50070b8341676d850970a81276684 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 16:57:03 +0100 Subject: gnu: mariadb-connector-c: Fix source tarball file name. * gnu/packages/databases.scm (mariadb-connector-c)[source]: Add a FILE-NAME. --- gnu/packages/databases.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index cca5995a65..261d2391b1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1178,6 +1178,7 @@ as a drop-in replacement of MySQL.") "https://downloads.mariadb.org/f/connector-c-" version "/mariadb-connector-c-" version "-src.tar.gz" "/from/https%3A//mirrors.ukfast.co.uk/sites/mariadb/?serve")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig")))) (inputs -- cgit 1.4.1 From f4521346b0e1805caacf826134040ce47d90c7be Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Mar 2021 17:14:17 +0100 Subject: gnu: ripgrep: Fix build. * gnu/packages/rust-apps.scm (ripgrep)[arguments]: Disable tests for now. Some are failing due to recent rust-bstr upgrade. --- gnu/packages/rust-apps.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7aa44a35ae..dc9526b267 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -386,7 +386,11 @@ characters, ASCII whitespace characters, other ASCII characters and non-ASCII.") "1grfi0j9zczzipipc21lkdbqmd2lvy2wlqy65fy4sckqvix5amdr")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + ;; XXX: Upgrading rust-bstr-0.2 from 0.2.12 to 0.2.15 introduced 11 test + ;; failures. Skip tests for now. Check again at next bstr or ripgrep + ;; upgrade. + `(#:tests? #false + #:cargo-inputs (("rust-bstr" ,rust-bstr-0.2) ("rust-clap" ,rust-clap-2) ("rust-grep" ,rust-grep-0.2) -- cgit 1.4.1 From e8fe0304bc62008c75f635157e6fdf0a5df9b3cc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 17:28:44 +0200 Subject: gnu: ruby-builder: Update to 3.2.4. * gnu/packages/ruby.scm (ruby-builder): Update to 3.2.4. --- 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 231402d9f5..94ca522da3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -958,13 +958,13 @@ specified in a \"Gemfile\", as well as their dependencies.") (define-public ruby-builder (package (name "ruby-builder") - (version "3.2.3") + (version "3.2.4") (source (origin (method url-fetch) (uri (rubygems-uri "builder" version)) (sha256 (base32 - "0qibi5s67lpdv1wgcj66wcymcr04q6j4mzws6a479n0mlrmh5wr1")))) + "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit 1.4.1 From bc10203475ede3f88416a7614b7e9343fca8de75 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 4 Mar 2021 18:06:55 +0200 Subject: gnu: ruby-minitest: Update to 5.12.2. * gnu/packages/ruby.scm (ruby-minitest): Update to 5.12.2. --- 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 94ca522da3..39e1792471 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -4418,13 +4418,13 @@ client protocol.") (define-public ruby-minitest (package (name "ruby-minitest") - (version "5.11.3") + (version "5.12.2") (source (origin (method url-fetch) (uri (rubygems-uri "minitest" version)) (sha256 (base32 - "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq")))) + "0zjm24aiz42i9n37mcw8lydd7n0y7wfk27by06jx77ypcld3qvkw")))) (build-system ruby-build-system) (native-inputs `(("ruby-hoe" ,ruby-hoe))) -- cgit 1.4.1 From b12696075d41761a01013b1b24dbe44ad4df9c7b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Mar 2021 13:46:10 -0500 Subject: gnu: linux-libre: Update to 5.11.3. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.3. (linux-libre-5.11-pristine-source, deblob-scripts-5.11): Update hashes. --- 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 b959532634..b7b6def652 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,15 +354,15 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.2") +(define-public linux-libre-5.11-version "5.11.3") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version (base32 "1kcvwbbzlii4smx6m4hj97va5bf3drbglb24jkky93a1g37a9ksj") - (base32 "0y76962qnnjxc5jgaw9vwrydzwjvj3q4xf7skp3ks2dab7vkhj33"))) + (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"))) + (hash (base32 "1znbn7n2jzm2rd7gsfj897lgrvaw48ljqfyza3166mw0nc5wfn1m"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 1a6f3c806996a7194309ccd591fab8c46126fe19 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Mar 2021 13:46:50 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.20. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.20. (linux-libre-5.10-pristine-source): 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 b7b6def652..21b7c8fa5d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.19") +(define-public linux-libre-5.10-version "5.10.20") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1mml5a30ky0khzj3r6ahybycbbszk86agq62qclwq2kzvsqbprr7"))) + (hash (base32 "18rh56aqc7ysr309prfml6sr0a81v6kh1ybw2c2vwhmszr373qwv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From e703977e65124ba8d55e23d38be0653d6ce11311 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Mar 2021 13:47:29 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.102. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.102. (linux-libre-5.4-pristine-source): 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 21b7c8fa5d..2d82cf4f85 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.101") +(define-public linux-libre-5.4-version "5.4.102") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "179lv5vfxwbr40s505b69vahks7pb32yqcpzxbfhjcmy5l3qq4af"))) + (hash (base32 "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From d5a8e530d794beb0e162a124ea3068887b920556 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Mar 2021 13:48:42 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.178. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.178. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2d82cf4f85..9e35e533de 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.177") +(define-public linux-libre-4.19-version "4.19.178") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,8 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 - "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"))) + (hash (base32 "1vln86ksignzw3d2xk5qgc5a2vghngczfsk949dn3r5dxygvlx8b"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 6891f95739c733df217ceaf5d0787cbed380ec1c Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Thu, 4 Mar 2021 19:43:17 -0500 Subject: gnu: mupdf: Fix CVE-2021-3407. * gnu/packages/pdf.scm (mupdf)[source]: Add patch. * gnu/packages/patches/mupdf-CVE-2021-3407.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/patches/mupdf-CVE-2021-3407.patch | 51 ++++++++++++++++++++++++++ gnu/packages/pdf.scm | 3 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mupdf-CVE-2021-3407.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3557d9f429..25afb99618 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1382,6 +1382,7 @@ dist_patch_DATA = \ %D%/packages/patches/mumps-shared-mumps.patch \ %D%/packages/patches/mumps-shared-pord.patch \ %D%/packages/patches/mupdf-fix-linkage.patch \ + %D%/packages/patches/mupdf-CVE-2021-3407.patch \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/musl-cross-locale.patch \ diff --git a/gnu/packages/patches/mupdf-CVE-2021-3407.patch b/gnu/packages/patches/mupdf-CVE-2021-3407.patch new file mode 100644 index 0000000000..9f901517c5 --- /dev/null +++ b/gnu/packages/patches/mupdf-CVE-2021-3407.patch @@ -0,0 +1,51 @@ +This patch came from https://git.ghostscript.com/?p=mupdf.git;a=patch;h=cee7cefc610d42fd383b3c80c12cbc675443176a +and fixes CVE-2021-3407. + +From cee7cefc610d42fd383b3c80c12cbc675443176a Mon Sep 17 00:00:00 2001 +From: Robin Watts +Date: Fri, 22 Jan 2021 17:05:15 +0000 +Subject: [PATCH] Bug 703366: Fix double free of object during linearization. + +This appears to happen because we parse an illegal object from +a broken file and assign it to object 0, which is defined to +be free. + +Here, we fix the parsing code so this can't happen. +--- + source/pdf/pdf-parse.c | 6 ++++++ + source/pdf/pdf-xref.c | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/source/pdf/pdf-parse.c b/source/pdf/pdf-parse.c +index 7abc8c3d4..5761c3351 100644 +--- a/source/pdf/pdf-parse.c ++++ b/source/pdf/pdf-parse.c +@@ -749,6 +749,12 @@ pdf_parse_ind_obj(fz_context *ctx, pdf_document *doc, + fz_throw(ctx, FZ_ERROR_SYNTAX, "expected generation number (%d ? obj)", num); + } + gen = buf->i; ++ if (gen < 0 || gen >= 65536) ++ { ++ if (try_repair) ++ *try_repair = 1; ++ fz_throw(ctx, FZ_ERROR_SYNTAX, "invalid generation number (%d)", gen); ++ } + + tok = pdf_lex(ctx, file, buf); + if (tok != PDF_TOK_OBJ) +diff --git a/source/pdf/pdf-xref.c b/source/pdf/pdf-xref.c +index 1b2bdcd59..30197b4b8 100644 +--- a/source/pdf/pdf-xref.c ++++ b/source/pdf/pdf-xref.c +@@ -1190,6 +1190,8 @@ pdf_read_new_xref(fz_context *ctx, pdf_document *doc, pdf_lexbuf *buf) + { + ofs = fz_tell(ctx, doc->file); + trailer = pdf_parse_ind_obj(ctx, doc, doc->file, buf, &num, &gen, &stm_ofs, NULL); ++ if (num == 0) ++ fz_throw(ctx, FZ_ERROR_GENERIC, "Trailer object number cannot be 0\n"); + } + fz_catch(ctx) + { +-- +2.17.1 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index daea7ee8ad..e81c3caf87 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -724,7 +724,8 @@ extracting content or merging files.") "mupdf-" version "-source.tar.xz")) (sha256 (base32 "16m5sksil22sshxy70xkslsb2qhvcqb1d95i9savnhds1xn4ybar")) - (patches (search-patches "mupdf-fix-linkage.patch")) + (patches (search-patches "mupdf-fix-linkage.patch" + "mupdf-CVE-2021-3407.patch")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From c6c48494e318defbe28bcc6d37f28d59c30dbf32 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 5 Mar 2021 09:29:58 +0000 Subject: services: guix-build-coordinator: Add dynamic auth with file record. * gnu/services/guix.scm (guix-build-coordinator-agent-dynamic-auth-with-file, guix-build-coordinator-agent-dynamic-auth-with-filen?, guix-build-coordinator-agent-dynamic-auth-with-file-agent-name, guix-build-coordinator-agent-dynamic-auth-with-file-token-file): New procedures. (guix-build-coordinator-agent-shepherd-services): Handle new dynamic auth with file record. * doc/guix.texi (Guix Build Coordinator): Document the new dynamic auth with file record. --- doc/guix.texi | 17 +++++++++++++++++ gnu/services/guix.scm | 20 +++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index e8fb346d73..763603b41b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31034,6 +31034,23 @@ database, and is used by the agent to authenticate. @end table @end deftp +@deftp {Data Type} guix-build-coordinator-agent-dynamic-auth-with-file +Data type representing an agent authenticating with a coordinator via a +dyanmic auth token read from a file and agent name. + +@table @asis +@item @code{agent-name} +Name of an agent, this is used to match up to an existing entry in the +database if there is one. When no existing entry is found, a new entry +is automatically added. + +@item @code{token-file} +File containing the dynamic auth token, this is created and stored in +the coordinator database, and is used by the agent to authenticate. + +@end table +@end deftp + The Guix Build Coordinator package contains a script to query an instance of the Guix Data Service for derivations to build, and then submit builds for those derivations to the coordinator. The service diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index b0d2c05bcf..d1d31febdc 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -76,6 +76,11 @@ guix-build-coordinator-agent-dynamic-auth-agent-name guix-build-coordinator-agent-dynamic-auth-token + guix-build-coordinator-agent-dynamic-auth-with-file + guix-build-coordinator-agent-dynamic-auth-with-file? + guix-build-coordinator-agent-dynamic-auth-with-file-agent-name + guix-build-coordinator-agent-dynamic-auth-with-file-token-file + guix-build-coordinator-agent-service-type guix-build-coordinator-queue-builds-configuration @@ -180,6 +185,13 @@ (agent-name guix-build-coordinator-agent-dynamic-auth-agent-name) (token guix-build-coordinator-agent-dynamic-auth-token)) +(define-record-type* + guix-build-coordinator-agent-dynamic-auth-with-file + make-guix-build-coordinator-agent-dynamic-auth-with-file + guix-build-coordinator-agent-dynamic-auth-with-file? + (agent-name guix-build-coordinator-agent-dynamic-auth-with-file-agent-name) + (token-file guix-build-coordinator-agent-dynamic-auth-with-file-token-file)) + (define-record-type* guix-build-coordinator-queue-builds-configuration make-guix-build-coordinator-queue-builds-configuration @@ -381,7 +393,13 @@ (($ agent-name token) #~(#$(string-append "--name=" agent-name) - #$(string-append "--dynamic-auth-token=" token)))) + #$(string-append "--dynamic-auth-token=" token))) + (($ + + agent-name token-file) + #~(#$(string-append "--name=" agent-name) + #$(string-append "--dynamic-auth-token-file=" + token-file)))) #$(simple-format #f "--max-parallel-builds=~A" max-parallel-builds) #$@(if derivation-substitute-urls -- cgit 1.4.1 From c9d42d611c43e485fe39ef0adc2b032a4aec8fae Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 5 Mar 2021 10:40:18 +0100 Subject: gnu: hamlib: Update to 4.1. * gnu/packages/radio.scm (hamlib): Update to 4.1. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index af6d852a98..6a48e8746f 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -773,7 +773,7 @@ you must extend 'udev-service-type' with this package. E.g.: (define-public hamlib (package (name "hamlib") - (version "3.3") + (version "4.1") (source (origin (method url-fetch) @@ -781,7 +781,7 @@ you must extend 'udev-service-type' with this package. E.g.: "https://github.com/Hamlib/Hamlib/releases/download/" version "/hamlib-" version ".tar.gz")) (sha256 - (base32 "10788mgrhbc57zpzakcxv5aqnr2819pcshml6fbh8zvnkja562y9")))) + (base32 "0hi3nc1k55mxff05amdv5iwryaz6r3205l24q0bg7l84f53bkm5l")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit 1.4.1 From d2278beb103871ea469dcc55deafe7d687c75149 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Mon, 1 Mar 2021 19:43:18 -0500 Subject: gnu: racket: Update to 8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/scheme.scm (racket): Update to 8.0. [arguments]: Add #:configure-flags. Add 'patch-chez-configure' phase. [inputs]: Add "zlib", "zlib:static", "lz4", and "lz4:static". [synopsis, description]: Tweak. (racket-minimal): Update to 8.0. Signed-off-by: Ludovic Courtès --- gnu/packages/scheme.scm | 98 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 71 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 6c30ed8bf6..10be0aa28a 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -398,22 +398,26 @@ implementation techniques and as an expository tool.") (define-public racket (package (name "racket") - (version "7.9") ; note: remember to also update racket-minimal! + (version "8.0") ; note: remember to also update racket-minimal! (source (origin (method url-fetch) - (uri (list (string-append "http://mirror.racket-lang.org/installers/" - version "/racket-" version "-src.tgz") + (uri (list (string-append "https://mirror.racket-lang.org/installers/" + version "/racket-src.tgz") + ;; this mirror seems to have broken HTTPS: (string-append "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" - version "/racket-" version "-src.tgz"))) + version "/racket-src.tgz"))) (sha256 (base32 - "0gmp2ahmfd97nn9bwpfx9lznjmjkd042slnrrbdmyh59cqh98y2m")) + "047wpjblfzmf1msz7snrp2c2h0zxyzlmbsqr9bwsyvz3frcg0888")) (patches (search-patches "racket-store-checksum-override.patch")))) (build-system gnu-build-system) (arguments - '(#:phases + '(#:configure-flags + '("--enable-libz" + "--enable-liblz4") + #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure-minimal (lambda* (#:key inputs #:allow-other-keys) @@ -493,13 +497,45 @@ implementation techniques and as an expository tool.") (lambda _ (substitute* "collects/racket/system.rkt" (("/bin/sh") (which "sh"))) - #t))) + #t)) + (add-after 'patch-/bin/sh 'patch-chez-configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "src/cs/c/Makefile.in" + (("/bin/sh") (which "sh"))) + ;; TODO: Racket CS uses a fork of Chez Scheme. + ;; Most of this is copy-pasted from the "chez.scm", + ;; but maybe there's a way to reuse more directly. + (with-directory-excursion "src/ChezScheme" + (substitute* (find-files "mats" "Mf-.*") + (("^[[:space:]]+(cc ) *") "\tgcc ")) + (substitute* + (find-files "." (string-append + "(" + "Mf-[a-zA-Z0-9.]+" + "|Makefile[a-zA-Z0-9.]*" + "|checkin" + "|stex\\.stex" + "|newrelease" + "|workarea" + "|unix\\.ms" + "|^6\\.ms" + ;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read + ")")) + (("/bin/rm") (which "rm")) + (("/bin/ln") (which "ln")) + (("/bin/cp") (which "cp")) + (("/bin/echo") (which "echo"))) + (substitute* "makefiles/installsh" + (("/bin/true") (which "true"))))))) ;; XXX: how to run them? #:tests? #f)) (inputs - `(("libffi" ,libffi) - ;; Hardcode dynamically loaded libraries for better functionality. + `(;; Hardcode dynamically loaded libraries for better functionality. ;; sqlite and libraries for `racket/draw' are needed to build the doc. + ("zlib" ,zlib) + ("zlib:static" ,zlib "static") + ("lz4" ,lz4) + ("lz4:static" ,lz4 "static") ("cairo" ,cairo) ("fontconfig" ,fontconfig) ("glib" ,glib) @@ -519,10 +555,14 @@ implementation techniques and as an expository tool.") (home-page "https://racket-lang.org") (synopsis "Implementation of Scheme and related languages") (description - "Racket is an implementation of the Scheme programming language (R5RS and -R6RS) and related languages, such as Typed Racket. It features a compiler and -a virtual machine with just-in-time native compilation, as well as a large set -of libraries.") + "Racket is a general-purpose programming language in the Scheme family, +with a large set of libraries and a compiler based on Chez Scheme. Racket is +also a platform for language-oriented programming, from small domain-specific +languages to complete language implementations. + +The main Racket distribution comes with many bundled packages, including +the DrRacket IDE, libraries for GUI and web programming, and implementations +of languages such as Typed Racket, R5RS and R6RS Scheme, and Datalog.") ;; https://download.racket-lang.org/license.html (license (list lgpl3+ asl2.0 expat)))) @@ -533,14 +573,15 @@ of libraries.") (version (package-version racket)) (source (origin (method url-fetch) - (uri (list (string-append "http://mirror.racket-lang.org/installers/" - version "/racket-minimal-" version "-src.tgz") + (uri (list (string-append "https://mirror.racket-lang.org/installers/" + version "/racket-minimal-src.tgz") + ;; this mirror seems to have broken HTTPS: (string-append "http://mirror.informatik.uni-tuebingen.de/mirror/racket/" - version "/racket-minimal-" version "-src.tgz"))) + version "/racket-minimal-src.tgz"))) (sha256 (base32 - "0yc5zkpq1bavj64h67pllw6mfjhmdp65fgdpyqcaan3syy6b5cia")) + "0mwyffw4gcci8wmzxa3j28h03h0gsz55aard8qrk3lri8r2xyg21")) (patches (search-patches "racket-store-checksum-override.patch")))) (synopsis "Racket without bundled packages such as Dr. Racket") @@ -551,18 +592,21 @@ of libraries.") ;; Delete fix that applies to files not included in the minimal package. (delete 'pre-configure))))) (inputs - `(("libffi" ,libffi) - ("openssl" ,openssl) - ("sqlite" ,sqlite))) + `(("openssl" ,openssl) + ("sqlite" ,sqlite) + ("zlib" ,zlib) + ("zlib:static" ,zlib "static") + ("lz4" ,lz4) + ("lz4:static" ,lz4 "static"))) (description - "Racket is an implementation of the Scheme programming language (R5RS and -R6RS) and related languages, such as Typed Racket. It features a compiler and -a virtual machine with just-in-time native compilation, as well as a large set -of libraries. + "Racket is a general-purpose programming language in the Scheme family, +with a large set of libraries and a compiler based on Chez Scheme. Racket is +also a platform for language-oriented programming, from small domain-specific +languages to complete language implementations. -In this minimal package, the essential package racket-libs is included, as -well as libraries that live in collections. In particular, @command{raco} and -the @code{pkg} library are still bundled."))) +The ``minimal Racket'' distribution includes just enough of Racket for you to +use @command{raco pkg} to install more. Bundled packages, such as the +Dr. Racket IDE, are not included."))) (define-public gambit-c (package -- cgit 1.4.1 From b2a94e59b8fba2f43fbefc45c2f1c4caeabdedb1 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Fri, 5 Mar 2021 10:23:11 +0100 Subject: gnu: virtualpg: Update to 2.0.1. * gnu/packages/geo.scm (virtualpg): Update to 2.0.1. Signed-off-by: Guillaume Le Vaillant --- 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 bd8dd6b9f7..ae37c8f151 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1756,14 +1756,14 @@ tools supporting SpatiaLite.") (define-public virtualpg (package (name "virtualpg") - (version "1.0.2") + (version "2.0.1") (source (origin (method url-fetch) (uri (string-append "https://www.gaia-gis.it/gaia-sins/" "virtualpg-" version ".tar.gz")) (sha256 - (base32 "0kjipcd08vvn188xmwbs7sw41xcs06x47n2hbqshpjcr51mxbarp")))) + (base32 "12z0l7368r4116ljzg7nljy5hf425r11vxc540w79wlzikmynamy")))) (build-system gnu-build-system) (inputs `(("postgresql" ,postgresql) -- cgit 1.4.1 From c0c3f7466c733ba8abcde9cc3bd436f435faaf33 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Mar 2021 15:02:18 +0100 Subject: gnu: Add r-gg-gap. * gnu/packages/cran.scm (r-gg-gap): 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 1d574b9768..60d5d116b2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1954,6 +1954,29 @@ in R and Shiny via the D3 visualization library.") from Wes Anderson movies.") (license license:expat))) +(define-public r-gg-gap + (package + (name "r-gg-gap") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "gg.gap" version)) + (sha256 + (base32 + "0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h")))) + (properties `((upstream-name . "gg.gap"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cowplot" ,r-cowplot) + ("r-ggplot2" ,r-ggplot2))) + (home-page "https://github.com/ChrisLou-bioinfo/gg.gap") + (synopsis "Define segments on the y-axis for ggplot2") + (description + "The @code{gg.gap} function enables you to define segments for the y-axis +in a ggplot2 plot.") + (license license:gpl3))) + (define-public r-tablerdash (package (name "r-tablerdash") -- cgit 1.4.1 From f5c3e8e2ec9ab9e105c0b53afa0c2f5d5fa11065 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 5 Mar 2021 15:02:31 +0100 Subject: gnu: Add r-cellchat. * gnu/packages/bioinformatics.scm (r-cellchat): New variable. --- gnu/packages/bioinformatics.scm | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d617736e57..6d21e14360 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10859,6 +10859,72 @@ explore and perform basic analysis of single cell sequencing data coming from droplet sequencing. It has been particularly tailored for Drop-seq.") (license license:gpl3)))) +(define-public r-cellchat + (let ((commit + "21edd226ca408e4c413408f98562d71ee0b54e5d") + (revision "1")) + (package + (name "r-cellchat") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sqjin/CellChat") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0cvzl9mi8jjznpql2gv67swnk1dndn3a2h22z5l84h7lwpwjmh53")) + (snippet + '(for-each delete-file '("src/CellChat.so" + "src/CellChat_Rcpp.o" + "src/RcppExports.o"))))) + (properties `((upstream-name . "CellChat"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-circlize" ,r-circlize) + ("r-colorspace" ,r-colorspace) + ("r-complexheatmap" ,r-complexheatmap) + ("r-cowplot" ,r-cowplot) + ("r-dplyr" ,r-dplyr) + ("r-expm" ,r-expm) + ("r-fnn" ,r-fnn) + ("r-forcats" ,r-forcats) + ("r-future" ,r-future) + ("r-future-apply" ,r-future-apply) + ("r-gg-gap" ,r-gg-gap) + ("r-ggalluvial" ,r-ggalluvial) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-igraph" ,r-igraph) + ("r-irlba" ,r-irlba) + ("r-magrittr" ,r-magrittr) + ("r-matrix" ,r-matrix) + ("r-nmf" ,r-nmf) + ("r-patchwork" ,r-patchwork) + ("r-pbapply" ,r-pbapply) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-rcppeigen" ,r-rcppeigen) + ("r-reshape2" ,r-reshape2) + ("r-reticulate" ,r-reticulate) + ("r-rspectra" ,r-rspectra) + ("r-rtsne" ,r-rtsne) + ("r-scales" ,r-scales) + ("r-shape" ,r-shape) + ("r-sna" ,r-sna) + ("r-stringr" ,r-stringr) + ("r-svglite" ,r-svglite))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/sqjin/CellChat") + (synopsis "Analysis of cell-cell communication from single-cell transcriptomics data") + (description + "This package infers, visualizes and analyzes the cell-cell +communication networks from scRNA-seq data.") + (license license:gpl3)))) + (define-public sambamba (package (name "sambamba") -- cgit 1.4.1 From 58277e68d4427e110c07fca7bce931be31e6a266 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 5 Mar 2021 15:51:52 +0100 Subject: gnu: camlboot: Raise max-silent-time timeout value to 4 hours. * gnu/packages/ocaml.scm (camlboot)[properties]: Add a 'max-silent-time' property, with a value of 4 hours. --- gnu/packages/ocaml.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3eb14c77f6..eb09747127 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -155,6 +155,8 @@ (install-file "ocamllex" bin))))))) (native-inputs `(("guile" ,guile-3.0))) + (properties + `(max-silent-time . 14400)) ; 4 hours, expected even on x86_64 (home-page "https://github.com/Ekdohibs/camlboot") (synopsis "OCaml souce bootstrap") (description "OCaml is written in OCaml. Its sources contain a pre-compiled -- cgit 1.4.1 From dfbbc736708851d7156ee86428eea40e56e356c0 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Fri, 5 Mar 2021 02:20:37 +0100 Subject: gnu: Add r-rcppthread. * gnu/packages/cran.scm (r-rcppthread): New variable. --- gnu/packages/cran.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 60d5d116b2..0943a8972b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Sandeep Subramanian ;;; Copyright © 2018 Charlie Ritter ;;; Copyright © 2018 Konrad Hinsen -;;; Copyright © 2018, 2020 Mădălin Ionel Patrașcu +;;; Copyright © 2018, 2020, 2021 Mădălin Ionel Patrașcu ;;; Copyright © 2018 Laura Lazzati ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Marius Bakke @@ -2691,6 +2691,27 @@ and Francois (2011, JSS), and the book by Eddelbuettel (2013, Springer); see @code{citation(\"Rcpp\")} for details on these last two.") (license license:gpl2+))) +(define-public r-rcppthread + (package + (name "r-rcppthread") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "RcppThread" version)) + (sha256 + (base32 + "1xfcxrny779kgknlvnc4j02ifprnakndnkhx8bhy50d39vp4hjjl")))) + (properties `((upstream-name . "RcppThread"))) + (build-system r-build-system) + (home-page + "https://github.com/tnagler/RcppThread") + (synopsis "R threading in C++") + (description + "This package provides a C++11-style thread class and thread pool that can +safely be interrupted from R.") + (license license:expat))) + (define-public r-bindr (package (name "r-bindr") -- cgit 1.4.1 From 1353e536054c3f7375d784885014add9b9ea990b Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Fri, 5 Mar 2021 02:20:38 +0100 Subject: gnu: Add r-universalmotif. * gnu/packages/bioconductor.scm (r-universalmotif): New variable. --- gnu/packages/bioconductor.scm | 52 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a4d97fad65..9e426df99e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020 Simon Tournier ;;; Copyright © 2020 Peter Lo -;;; Copyright © 2020 Mădălin Ionel Patrașcu +;;; Copyright © 2020, 2021 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. @@ -7435,6 +7435,56 @@ data. This modified test allows for testing differential expression in qPCR data.") (license license:gpl2+))) +(define-public r-universalmotif + (package + (name "r-universalmotif") + (version "1.8.3") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "universalmotif" version)) + (sha256 + (base32 + "1ys2kbayc1rzv8nzi60208yfslm4kzynndfg7vw2n0c30dvzycrc")))) + (properties + `((upstream-name . "universalmotif"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-reference-to-strip + (lambda _ + (substitute* "src/Makevars" + (("/usr/bin/strip") (which "strip")))))))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biostrings" ,r-biostrings) + ("r-ggplot2" ,r-ggplot2) + ("r-ggseqlogo" ,r-ggseqlogo) + ("r-iranges" ,r-iranges) + ("r-mass" ,r-mass) + ("r-rcpp" ,r-rcpp) + ("r-rcppthread" ,r-rcppthread) + ("r-rdpack" ,r-rdpack) + ("r-rlang" ,r-rlang) + ("r-s4vectors" ,r-s4vectors) + ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page + "https://bioconductor.org/packages/universalmotif/") + (synopsis + "Specific structures importer, modifier, and exporter for R") + (description + "This package allows importing most common @dfn{specific structure} +(motif) types into R for use by functions provided by other Bioconductor +motif-related packages. Motifs can be exported into most major motif formats +from various classes as defined by other Bioconductor packages. A suite of +motif and sequence manipulation and analysis functions are included, including +enrichment, comparison, P-value calculation, shuffling, trimming, higher-order +motifs, and others.") + (license license:gpl3))) + ;; This is a CRAN package, but it depends on Bioconductor packages, so we put ;; it here. (define-public r-activedriverwgs -- cgit 1.4.1 From 297531ef58ea91d167dac0474d02a538e8e6bc74 Mon Sep 17 00:00:00 2001 From: Mădălin Ionel Patrașcu Date: Fri, 5 Mar 2021 02:20:39 +0100 Subject: gnu: Add r-circrnaprofiler. * gnu/packages/bioconductor.scm (r-circrnaprofiler): New variable. --- gnu/packages/bioconductor.scm | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9e426df99e..89b191585b 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6810,6 +6810,59 @@ accessibility data.") ,@(alist-delete "r-monocle" (package-propagated-inputs r-cicero))))))) +(define-public r-circrnaprofiler + (package + (name "r-circrnaprofiler") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "circRNAprofiler" version)) + (sha256 + (base32 + "1rwpl9a5p5242aiapik0vf4ywqh7m6phzl8z8qmzcy0imbx7mpbn")))) + (properties + `((upstream-name . "circRNAprofiler"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationhub" ,r-annotationhub) + ("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) + ("r-bsgenome-hsapiens-ucsc-hg19" ,r-bsgenome-hsapiens-ucsc-hg19) + ("r-deseq2" ,r-deseq2) + ("r-dplyr" ,r-dplyr) + ("r-edger" ,r-edger) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-gwascat" ,r-gwascat) + ("r-iranges" ,r-iranges) + ("r-magrittr" ,r-magrittr) + ("r-r-utils" ,r-r-utils) + ("r-readr" ,r-readr) + ("r-reshape2" ,r-reshape2) + ("r-rlang" ,r-rlang) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-seqinr" ,r-seqinr) + ("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr) + ("r-universalmotif" ,r-universalmotif))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/Aufiero/circRNAprofiler") + (synopsis + "Computational framework for the downstream analysis of circular RNA's") + (description + "@code{r-circrnaprofiler} is a computational framework for a comprehensive +in silico analysis of @dfn{circular RNA} (circRNAs). This computational +framework allows to combine and analyze circRNAs previously detected by +multiple publicly available annotation-based circRNA detection tools. It +covers different aspects of circRNAs analysis from differential expression +analysis, evolutionary conservation, biogenesis to functional analysis.") + (license license:gpl3))) + (define-public r-cistopic (let ((commit "29abd8df9afb60ff27ac3f0a590930debe926950") (revision "0")) -- cgit 1.4.1 From 81aa2fa4ae8fda14dd900ca07559f809ab3354b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 4 Mar 2021 21:31:50 +0100 Subject: gnu: php: Update to 7.4.16 [security fixes]. * gnu/packages/php.scm (php): Update to 7.4.16. [arguments]: Patch failing new test. --- gnu/packages/php.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 46062facee..e93d1122be 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016-2020 Julien Lepiller ;;; Copyright © 2016 Marius Bakke -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Oleg Pykhalov ;;; Copyright © 2020 Maxim Cournoyer @@ -60,7 +60,7 @@ (define-public php (package (name "php") - (version "7.4.15") + (version "7.4.16") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1f1wsi2frdbr9a3hvhmk3mmd7cwzf6mwya2akpzkwyygy1jrr1cv")) + "12xr7w2mk8ab3igvbpi94ks2xfw2nqga9a6nxs94rvcdz3xcw5hw")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -327,6 +327,14 @@ ;; Expects an empty Array; gets one with " " in it. "ext/pcre/tests/bug80118.phpt")) + ;; Accomodate two extra openssl errors flanking the expected one: + ;; random number generator:RAND_{load,write}_file:Cannot open file + ;; This is due to an invalid $HOME, but changing it in the test + ;; still prints the first one & changing it globally is overkill. + (substitute* "ext/openssl/tests/bug80747.phpt" + ((".*error:%s:key size too small.*" match) + (string-append "%s\n" match "%s\n"))) + ;; Skip tests requiring network access. (setenv "SKIP_ONLINE_TESTS" "1") ;; Without this variable, 'make test' passes regardless of failures. -- cgit 1.4.1 From ad0c8f7eaa5217fa51a6c02790d094fe16bb880d Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 3 Mar 2021 10:40:39 -0800 Subject: gnu: Add emacs-eldoc. * gnu/packages/emacs-xyz.scm (emacs-eldoc): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 93dc4f86e9..2bd37b90f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12887,6 +12887,30 @@ for the current file, using the major mode as a hint. It prompts you to enter one if it fails.") (license license:gpl3+))) +(define-public emacs-eldoc + (package + (name "emacs-eldoc") + (version "1.11.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/eldoc-" version ".el")) + (sha256 + (base32 "1py9l1vl7s90y5kfpglhy11jswam2gcrqap09h6wb5ldnyb8cgq2")))) + (build-system emacs-build-system) + (home-page "http://elpa.gnu.org/packages/eldoc.html") + (synopsis "Show function arglist or variable docstring in echo area") + (description + "This program was inspired by the behavior of the ``mouse documentation +window'' on many Lisp Machine systems; as you type a function's symbol name as +part of a sexp, it will print the argument list for that function. Behavior +is not identical; for example, you need not actually type the function name, +you need only move point around in a sexp that calls it. Also, if point is +over a documented variable, it will print the one-line documentation for that +variable instead, to remind you of that variable's meaning.") + (license license:gpl3+))) + ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run (define-public emacs-ert-runner -- cgit 1.4.1 From 92894e64a00cf4b907a1045905032c53d52c8202 Mon Sep 17 00:00:00 2001 From: John Soo Date: Wed, 3 Mar 2021 10:42:13 -0800 Subject: gnu: emacs-eglot: Add missing dependency. * gnu/packages/emacs-xyz.scm (emacs-eglot):[arguments] Add dependency. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2bd37b90f1..6b1edaea1d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12876,7 +12876,8 @@ Emacs.") (base32 "1zvs144hxq2mmq1h0ynx9hy7yyccb46f3pjg9mgq8v9cw5y678vk")))) (build-system emacs-build-system) (propagated-inputs - `(("emacs-jsonrpc" ,emacs-jsonrpc) + `(("emacs-eldoc" ,emacs-eldoc) + ("emacs-jsonrpc" ,emacs-jsonrpc) ("emacs-project" ,emacs-project))) (home-page "https://github.com/joaotavora/eglot") (synopsis "Client for Language Server Protocol (LSP) servers") -- cgit 1.4.1 From 1fe75f8397670afb409922ed44fb4152eda3c8f3 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Thu, 4 Mar 2021 20:57:42 +0100 Subject: gnu: Add emacs-multifiles. * gnu/packages/emacs-xyz.scm (emacs-multifiles): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6b1edaea1d..3af56ef1fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5781,6 +5781,33 @@ interactive searches to move multiple fake cursors.") simultaneous cursors.") (license license:gpl3+))) +(define-public emacs-multifiles + ;; There is no tag and no "Version:" keyword. Using the latest release + ;; instead. + (let ((commit "dddfe64b8e1c1cd1f9ccc1f03405477fc0d53897") + (revision "1")) + (package + (name "emacs-multifiles") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/magnars/multifiles.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash))) + (home-page "https://github.com/magnars/multifiles.el") + (synopsis "Edit multiple files in a single Emacs buffer") + (description + "This package allows one to view and edit parts of multiple files in +one Emacs buffer.") + (license license:gpl3+)))) + (define-public emacs-mc-extras (let ((commit "053abc52181b8718559d7361a587bbb795faf164") (revision "1")) -- cgit 1.4.1 From 697a4c464d4911ba5f32352db863aba1a64d562b Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Thu, 4 Mar 2021 21:15:33 +0100 Subject: gnu: Add emacs-springboard. * gnu/packages/emacs-xyz.scm (emacs-springboard): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3af56ef1fe..c312b7c9fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22484,6 +22484,36 @@ functions for Fish shell scripts.") parent directory using @code{Eshell}.") (license license:gpl3+)))) +(define-public emacs-springboard + ;; Upstream provides no tag. Using the latest commit. Version is extracted + ;; from "Version:" keyword. + (let ((commit "687d1e5898a880878995dc9bffe93b4598366203") + (version "1.0") + (revision "1")) + (package + (name "emacs-springboard") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jwiegley/springboard") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fn8c4hqblfjvcpg68kj2dmdjqsdnxddqbzgvakl43zckjg8pi01")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-ivy" ,emacs-ivy))) + (home-page "https://github.com/jwiegley/springboard") + (synopsis "Change the Emacs default directory quickly") + (description + "This Emacs package provides a quick way to change the default +directory for only the next invoked command. The directory selection can be +done using Helm, Ido or Ivy.") + (license license:gpl2+)))) + (define-public emacs-tco-el (let ((commit "482db5313f090b17ed22ccd856f0e141dc75afe6") (revision "1")) -- cgit 1.4.1 From e693927a747e36a8c7bef042f7be92f15304cc8b Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Thu, 4 Mar 2021 21:58:28 +0100 Subject: gnu: Add lr. * gnu/packages/admin.scm (lr): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/admin.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c24e8d1fa7..b0fee13907 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2130,6 +2130,33 @@ environment variable is set and output is to tty.") (home-page "http://mama.indstate.edu/users/ice/tree/") (license license:gpl2+))) +(define-public lr + (package + (name "lr") + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.vuxu.org/lr/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Tool to generate customized file listings") + (description + "lr is a tool for generating file listings, which includes the best +features of ls(1), find(1), stat(1) and du(1).") + (home-page "https://git.vuxu.org/lr/about") + (license license:expat))) + (define-public direvent (package (name "direvent") -- cgit 1.4.1 From be2b2e884b1061c0509e962e80bb477e31bd2acb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 5 Mar 2021 13:33:10 +0100 Subject: gnu: Add emacs-envrc. * gnu/packages/emacs-xyz.scm (emacs-envrc): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c312b7c9fb..cfd1fdeb86 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -93,6 +93,7 @@ ;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2021 Yurii Kholodkov ;;; Copyright © 2021 Alexey Abramov +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -13667,6 +13668,32 @@ query them from the comfort of your editor.") (home-page "https://github.com/hrs/engine-mode") (license license:gpl3+))) +(define-public emacs-envrc + (package + (name "emacs-envrc") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/purcell/envrc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p")))) + (build-system emacs-build-system) + (home-page "https://github.com/purcell/envrc") + (synopsis "Support for Direnv which operates buffer-locally") + (description + "This is library which uses Direnv to set environment variables on +a per-buffer basis. This means that when you work across multiple projects +which have @file{.envrc} files, all processes launched from the buffers ``in'' +those projects will be executed with the environment variables specified in +those files. This allows different versions of linters and other tools to be +used in each project if desired.") + (license license:gpl3+))) + (define-public emacs-prop-menu (package (name "emacs-prop-menu") -- cgit 1.4.1 From 3aa65ce266878ddf558b7553185ef7ffb9eb0bdb Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 5 Mar 2021 05:28:11 -0800 Subject: gnu: youtube-dl: Update to 2021-03-03. gnu/packages/video.scm (youtube-dl): Update to 2021-03-03. Signed-off-by: Nicolas Goaziou --- 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 564c465dab..4cc1f0b441 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2197,14 +2197,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.02.22") + (version "2021.03.03") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "19j4kfqln1yk47dpid9j4z3zvgxy6xar1mpfsadifikfdgbmsq7x")) + "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From e5394493979bc63f65fd64cd36890fcb5f2a84b3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 5 Mar 2021 17:44:07 +0100 Subject: gnu: denemo: Update to 2.5.0. * gnu/packages/music.scm (denemo): Update to 2.5.0. --- gnu/packages/music.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 415005c941..40780ab6f1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -599,14 +599,13 @@ many input formats and provides a customisable Vi-style user interface.") (define-public denemo (package (name "denemo") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) - (uri (string-append "mirror://gnu/denemo/" - "denemo-" version ".tar.gz")) + (uri (string-append "mirror://gnu/denemo/denemo-" version ".tar.gz")) (sha256 - (base32 "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd")))) + (base32 "05kwy8894hsxr6123hc854j2qq2sxyjw721zk4g3vzz8pw29p887")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From b9610b242027b2f7fb7d32f805f637842331ea11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Mar 2021 19:06:48 +0100 Subject: gnu: libburn: Update to 1.5.4. * gnu/packages/cdrom.scm (libburn): Update to 1.5.4. --- 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 905103efd4..d93c673ac2 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -862,14 +862,14 @@ laid out on the image.") (define-public libburn (package (name "libburn") - (version "1.5.2") + (version "1.5.4") (source (origin (method url-fetch) (uri (string-append "http://files.libburnia-project.org/releases/" "libburn-" version ".tar.gz")) (sha256 (base32 - "09sjrvq8xsj1gnl2wwyv4lbmicyzzl6x1ac2rrn53xnp34bxnckv")))) + "0m1vyry6pi115nysfgb0cg313qqhnlxqdg7f920wpiar0z8mjl2j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 41b984ccfceb5fb088d03a6306a8e02becab9ab3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Mar 2021 19:07:05 +0100 Subject: gnu: pencil2d: Update to 0.6.6. * gnu/packages/animation.scm (pencil2d): Update to 0.6.6. --- gnu/packages/animation.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index c92c4ae7e7..3a915c7fda 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2017 Ricardo Wurmus -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Pkill -9 ;;; Copyright © 2020 Vinicius Monego ;;; @@ -392,7 +392,7 @@ waveform until they line up with the proper sounds.") (define-public pencil2d (package (name "pencil2d") - (version "0.6.5") + (version "0.6.6") (source (origin (method git-fetch) (uri (git-reference @@ -401,7 +401,7 @@ waveform until they line up with the proper sounds.") (file-name (git-file-name name version)) (sha256 (base32 - "06l60wawkhb3wrsj79p5f7ka5cgcyly36pbvm95fvwbkmlvmjzf1")))) + "0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit 1.4.1 From fa7f4781ca79ba55ce923bc6b3f57fb806dfe900 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 5 Mar 2021 14:14:30 -0500 Subject: gnu: Audacity: Fix a crash on foreign distros. Without the wrap phase, Audacity crashes like this when trying to use the "Open file" dialog: (audacity:28276): GLib-GIO-ERROR **: 14:14:55.211: Settings schema 'org.gtk.Settings.FileChooser' is not installed * gnu/packages/audio.scm (audacity)[arguments]: Add (guix build glib-or-gtk-build-system) to #:imported-modules. Adjust #:modules accordingly. Add phases 'glib-or-gtk-wrap'. --- gnu/packages/audio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 052360d2e9..2440fed1fd 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -750,6 +750,12 @@ engineers, musicians, soundtrack editors and composers.") "-Daudacity_use_ffmpeg=linked" "-Daudacity_use_lame=system" "-Daudacity_use_portsmf=system") + #:imported-modules ((guix build glib-or-gtk-build-system) + ,@%cmake-build-system-modules) + #:modules + ((guix build utils) + (guix build cmake-build-system) + ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)) #:phases (modify-phases %standard-phases (add-after 'unpack 'comment-out-revision-ident @@ -766,7 +772,9 @@ engineers, musicians, soundtrack editors and composers.") (("../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h") (("../lib-src/portmidi/porttime/porttime.h") "porttime.h")) (substitute* "src/prefs/MidiIOPrefs.cpp" - (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h"))))) + (("../../lib-src/portmidi/pm_common/portmidi.h") "portmidi.h")))) + (add-after 'wrap-program 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))) ;; The test suite is not "well exercised" according to the developers, ;; and fails with various errors. See ;; . -- cgit 1.4.1 From 0055f6a8a3913634f1615ca6f14f1eeb9824a17d Mon Sep 17 00:00:00 2001 From: Sébastien Lerique Date: Fri, 5 Mar 2021 23:26:57 +0900 Subject: gnu: network-manager-applet: Activate support for libappindicator. * gnu/packages/gnome.scm (network-manager-applet): Activate support for libappindicator. [arguments]: Add #:configure-flags. [inputs]: Add "libappindicator". Signed-off-by: Brice Waegeneire --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 32cecb75b5..a8f921de97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020, 2021 Andy Tai +;;; Copyright © 2020, 2021 Sébastien Lerique ;;; ;;; This file is part of GNU Guix. ;;; @@ -7978,7 +7979,9 @@ Cisco's AnyConnect SSL VPN.") "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t)) + '(#:glib-or-gtk? #t + #:configure-flags + '("-Dappindicator=yes"))) (native-inputs `(("intltool" ,intltool) ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. @@ -7994,6 +7997,7 @@ Cisco's AnyConnect SSL VPN.") ("libnma" ,libnma))) (inputs `(("gcr" ,gcr) + ("libappindicator" ,libappindicator) ("libgudev" ,libgudev) ("libnotify" ,libnotify) ("libsecret" ,libsecret) -- cgit 1.4.1 From 23c6be1d3dfb4c6fa6170d7fff348e82f379a0ba Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 5 Mar 2021 21:44:51 +0100 Subject: gnu: network-manager-applet: Update to 1.20.0. * gnu/packages/gnome.scm (network-manager-applet): Update to 1.20.0. --- 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 a8f921de97..1aaffe0b00 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020, 2021 Vinicius Monego -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tim Gesthuizen @@ -7968,7 +7968,7 @@ Cisco's AnyConnect SSL VPN.") (define-public network-manager-applet (package (name "network-manager-applet") - (version "1.16.0") + (version "1.20.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/network-manager-applet/" @@ -7976,7 +7976,7 @@ Cisco's AnyConnect SSL VPN.") "network-manager-applet-" version ".tar.xz")) (sha256 (base32 - "1rf3nm0hjcy9f8ajb4vmvwy503w8yj8d4daxkcb7w7i7b92qmyfn")))) + "0lsjkbv66hn7acl2pg9h6hz4b700zzv4cjwrwjvy7043blw0bcla")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit 1.4.1 From c6ada4914d9ed1a8424c4b3953bd7dcf47fdf73c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Fri, 5 Mar 2021 22:38:19 +0100 Subject: gnu: camlboot: Fix typo in properties. * gnu/packages/ocaml.scm (camlboot)[properties]: Add missing pair of parenthesis. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index eb09747127..086f3b048a 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -156,7 +156,7 @@ (native-inputs `(("guile" ,guile-3.0))) (properties - `(max-silent-time . 14400)) ; 4 hours, expected even on x86_64 + `((max-silent-time . 14400))) ; 4 hours, expected even on x86_64 (home-page "https://github.com/Ekdohibs/camlboot") (synopsis "OCaml souce bootstrap") (description "OCaml is written in OCaml. Its sources contain a pre-compiled -- cgit 1.4.1 From a714af38d5d1046081524d859cde4cd8fd12a923 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 5 Mar 2021 21:54:12 +0000 Subject: gnu: guix: Update to 112692c. * gnu/packages/package-management.scm (guix): Update to 112692c. --- 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 776867eab7..4c12e85a01 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "a53f711422f63d7e32b8639b968cf00bcc69ffea") - (revision 13)) + (commit "112692c0d546d35cd67c5dc70dbd1dc609b18f64") + (revision 14)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "01sky036v6dh8zwvrzl08pj4r6vkz7mjadkqbrwhak4nvds5frq8")) + "081m6zcgscmh3xbz1wrm7bjwj5d1fnwd8w89qbmd8z44a1iknf49")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From fc193b6518ad8df0cc92cb50b88217430dea47e3 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 5 Mar 2021 23:31:15 +0100 Subject: gnu: cgal: Update to 5.2 [security fixes]. * gnu/packages/patches/cgal-security-pr-5371.patch: New patch. Downloaded from , with hunks on files matching pattern "*Convex_decomposition_3*" removed because they don't exist in cgal's released sources. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/graphics.scm (cgal): Update to 5.2. [source]: Apply patch. --- gnu/local.mk | 1 + gnu/packages/graphics.scm | 10 +- gnu/packages/patches/cgal-security-pr-5371.patch | 1611 ++++++++++++++++++++++ 3 files changed, 1618 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/cgal-security-pr-5371.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 25afb99618..4900dabc36 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -879,6 +879,7 @@ dist_patch_DATA = \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ + %D%/packages/patches/cgal-security-pr-5371.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 7e83c7ea4e..db04b93f20 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -718,15 +718,17 @@ more.") (define-public cgal (package (name "cgal") - (version "4.14.2") + (version "5.2") (source (origin (method url-fetch) (uri (string-append - "https://github.com/CGAL/cgal/releases/download/releases/" - "CGAL-" version "/CGAL-" version ".tar.xz")) + "https://github.com/CGAL/cgal/releases/download/v" version + "/CGAL-" version ".tar.xz")) (sha256 (base32 - "08lrp3hfwdypggz4138bnkh6bjxn441zg2y9xnq5mrjfc5ini6w1")))) + "08sr2k2dm4zasfbvisqpvs6djqw3rywzwpzr701an870nvnqck3l")) + (patches (search-patches "cgal-security-pr-5371.patch")) + (patch-flags '("-p2")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target diff --git a/gnu/packages/patches/cgal-security-pr-5371.patch b/gnu/packages/patches/cgal-security-pr-5371.patch new file mode 100644 index 0000000000..dea53dceaf --- /dev/null +++ b/gnu/packages/patches/cgal-security-pr-5371.patch @@ -0,0 +1,1611 @@ +From 618b409b0fbcef7cb536a4134ae3a424ef5aae45 Mon Sep 17 00:00:00 2001 +From: Maxime Gimeno +Date: Mon, 18 Jan 2021 15:40:40 +0100 +Subject: [PATCH 1/8] Fix Nef_2 and Nef_S2 IO + +--- + Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 74 ++++++++++++--- + Nef_2/include/CGAL/Nef_polyhedron_2.h | 2 + + Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 106 ++++++++++++++++------ + 3 files changed, 142 insertions(+), 40 deletions(-) + +diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +index 85295f3d85a..9b84dd37fbe 100644 +--- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h ++++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +@@ -200,6 +200,11 @@ bool PM_io_parser::read_vertex(Vertex_handle v) + !(in >> p) || + !check_sep("}") ) return false; + ++ if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + if (iso) v->set_face(Face_of[f]); + else v->set_halfedge(Halfedge_of[f]); + mark(v) = m; point(v) = p; +@@ -229,10 +234,14 @@ bool PM_io_parser::read_hedge(Halfedge_handle e) + !(in >> f) || !check_sep(",") || + !(in >> m) || !check_sep("}") ) + return false; +- CGAL_assertion_msg +- (eo >= 0 || (std::size_t) eo < en || epr >= 0 || (std::size_t) epr < en || ene >= 0 || (std::size_t) ene < en || +- v >= 0 || (std::size_t) v < vn || f >= 0 || (std::size_t) f < fn , +- "wrong index in read_hedge"); ++ ++ if(!(eo >= 0 && (std::size_t) eo < en && epr >= 0 && (std::size_t) epr < en && ene >= 0 && (std::size_t) ene < en && ++ v >= 0 && (std::size_t) v < vn && f >= 0 && (std::size_t) f < fn )) ++ { ++ in.clear(std::ios_base::badbit); ++ std::cerr<<"wrong index in read_hedge"<opposite()]); +@@ -267,14 +276,32 @@ bool PM_io_parser::read_face(Face_handle f) + int n, ei, vi; Mark m; + if ( !(in >> n) || !check_sep("{") ) return false; + if ( !(in >> ei) || !check_sep(",") ) return false; +- if (ei >= 0) f->set_halfedge(Halfedge_of[ei]); ++ if (ei >= 0 && ei < en) ++ { ++ f->set_halfedge(Halfedge_of[ei]); ++ } ++ else ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + while (in >> ei) { + CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); ++ if (!(ei >= 0 && ei < en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + f->store_fc(Halfedge_of[ei]); + } in.clear(); + if (!check_sep(",")) { return false; } + while (in >> vi) { + CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); ++ if (!(vi >= 0 && vi < vn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + f->store_iv(Vertex_of[vi]); + } in.clear(); + if (!check_sep(",") || !(in >> m) || !check_sep("}") ) +@@ -313,13 +340,26 @@ template + void PM_io_parser::read() + { + if ( !check_sep("Plane_map_2") ) +- CGAL_error_msg("PM_io_parser::read: no embedded_PM header."); ++ { ++ std::cerr<<"PM_io_parser::read: no embedded_PM header."<> vn)) ) +- CGAL_error_msg("PM_io_parser::read: wrong node line."); ++ { ++ std::cerr<<"PM_io_parser::read: wrong node line."<> en) && (en%2==0)) ) +- CGAL_error_msg("PM_io_parser::read: wrong edge line."); ++ { ++ std::cerr<<"PM_io_parser::read: wrong edge line."<> fn)) ) +- CGAL_error_msg("PM_io_parser::read: wrong face line."); ++ { ++ std::cerr<<"PM_io_parser::read: wrong face line."<::read() + + for(i=0; i> + std::cerr << "Nef_polyhedron_2 input corrupted." << std::endl; + NP = Nef_polyhedron_2(); + } ++ if(!is) ++ return is; + typename Nef_polyhedron_2::Topological_explorer D(NP.explorer()); + D.check_integrity_and_topological_planarity(); + return is; +diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h +index 7bddd3036d5..631c63dc5dc 100644 +--- a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h ++++ b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h +@@ -203,8 +203,14 @@ bool SM_io_parser::read_vertex(SVertex_handle v) + !(in >> p) || + !check_sep("}") ) return false; + +- if (iso) set_face(v,SFace_of[f]); +- else set_first_out_edge(v,Edge_of[f]); ++ if(f<0 || (iso && f > fn) || (!iso && f > en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } ++ ++ if (iso) this->set_face(v,SFace_of[f]); ++ else this->set_first_out_edge(v,Edge_of[f]); + v->mark() = m; v->point() = p; + return true; + } +@@ -235,17 +241,21 @@ bool SM_io_parser::read_edge(SHalfedge_handle e) + !(in >> m) || !check_sep(",") || + !(in >> k) || !check_sep("}") ) + return false; +- CGAL_assertion_msg ++ if (! + (eo >= 0 && eo < en && epr >= 0 && epr < en && ene >= 0 && ene < en && +- v >= 0 && v < vn && f >= 0 && f < fn , +- "wrong index in read_edge"); ++ v >= 0 && v < vn && f >= 0 && f < fn )) ++ { ++ std::cerr<<"wrong index in read_edge"<twin()]); +- set_prev(e,Edge_of[epr]); +- set_next(e,Edge_of[ene]); +- set_source(e,SVertex_of[v]); +- set_face(e,SFace_of[f]); ++ this->set_prev(e,Edge_of[epr]); ++ this->set_next(e,Edge_of[ene]); ++ this->set_source(e,SVertex_of[v]); ++ this->set_face(e,SFace_of[f]); + e->mark() = m; + e->circle() = k; + return true; +@@ -274,7 +284,7 @@ bool SM_io_parser::read_loop(SHalfloop_handle l) + CGAL_assertion_msg( + (lo >= 0 && lo < 2 && f >= 0 && f < fn),"wrong index in read_edge"); + +- set_face(l,SFace_of[f]); ++ this->set_face(l,SFace_of[f]); + l->mark() = m; + l->circle() = k; + return true; +@@ -303,21 +313,33 @@ bool SM_io_parser::read_face(SFace_handle f) + int n, ei, vi, li; Mark m; + if ( !(in >> n) || !check_sep("{") ) return false; + while (in >> ei) { +- CGAL_assertion_msg(ei >= 0 && ei < en, +- "wrong index in face cycle list."); +- store_sm_boundary_object(Edge_of[ei],f); ++ if(!(ei >= 0 && ei < en)) ++ { ++ std::cerr<<"wrong index in face cycle list."<store_sm_boundary_object(Edge_of[ei],f); + } in.clear(); + if (!check_sep(",")) { return false; } + while (in >> vi) { +- CGAL_assertion_msg(vi >= 0 && vi < vn, +- "wrong index in iso vertex list."); +- store_sm_boundary_object(SVertex_of[vi],f); ++ if(!(vi >= 0 && vi < vn)) ++ { ++ std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(SVertex_of[vi],f); + } in.clear(); + if (!check_sep(",")) { return false; } + while (in >> li) { +- CGAL_assertion_msg(li >= 0 && li < 2, +- "wrong index in iso vertex list."); +- store_sm_boundary_object(Loop_of[li],f); ++ if(!(li >= 0 && li < 2)) ++ { ++ std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(Loop_of[li],f); + } in.clear(); + if (!check_sep(",") || !(in >> m) || !check_sep("}") ) + return false; +@@ -357,16 +379,36 @@ void SM_io_parser::print() const + template + void SM_io_parser::read() + { ++ if ( !check_sep("Nef_polyhedron_S2") ) ++ { ++ std::cerr<<"Missing line in header"<> vn)) ) +- CGAL_error_msg("SM_io_parser::read: wrong vertex line."); ++ { ++ std::cerr<<"SM_io_parser::read: wrong vertex line."<> en) && (en%2==0)) ) +- CGAL_error_msg("SM_io_parser::read: wrong edge line."); ++ { ++ std::cerr<<"SM_io_parser::read: wrong edge line."<> ln)) ) +- CGAL_error_msg("SM_io_parser::read: wrong loop line."); ++ { ++ std::cerr<<"SM_io_parser::read: wrong loop line."<> fn)) ) +- CGAL_error_msg("SM_io_parser::read: wrong face line."); ++ { ++ std::cerr<<"SM_io_parser::read: wrong face line."<::read() + + for(i=0; i +Date: Tue, 19 Jan 2021 12:24:08 +0100 +Subject: [PATCH 2/8] Fix Nef_3 + +--- + Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 195 ++++++++++++++++++++++- + 1 file changed, 188 insertions(+), 7 deletions(-) + +diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +index 5eee7528ee7..04d9d0ac8e8 100644 +--- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h ++++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +@@ -1444,40 +1444,61 @@ void SNC_io_parser::read_items(int plus01) { + typename std::vector::iterator vi; + for(vi=Vertex_of.begin(); vi!=Vertex_of.end(); ++vi) { + if (!read_vertex(*vi)) +- CGAL_error_msg("SNC_io_parser::read: error in node line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in node line"<::iterator ei; + for(ei=Edge_of.begin(); ei!=Edge_of.end(); ++ei) { + if (!read_edge(*ei)) +- CGAL_error_msg("SNC_io_parser::read: error in edge line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in edge line"<::iterator vhf_iterator; + vhf_iterator fi; + for(fi=Halffacet_of.begin(); fi!=Halffacet_of.end(); ++fi) { + if (!read_facet(*fi)) +- CGAL_error_msg("SNC_io_parser::read: error in facet line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in facet line"<::iterator ci; + for(ci=Volume_of.begin()+plus01; ci!=Volume_of.end(); ++ci) { + if (!read_volume(*ci)) +- CGAL_error_msg("SNC_io_parser::read: error in volume line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in volume line"<::iterator sei; + for(sei=SEdge_of.begin(); sei!=SEdge_of.end(); ++sei) { + if (!read_sedge(*sei)) +- CGAL_error_msg("SNC_io_parser::read: error in sedge line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in sedge line"<::iterator sli; + for(sli=SLoop_of.begin(); sli!=SLoop_of.end(); ++sli) { + if (!read_sloop(*sli)) +- CGAL_error_msg("SNC_io_parser::read: error in sloop line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in sloop line"<::iterator sfi; + for(sfi=SFace_of.begin(); sfi!=SFace_of.end(); ++sfi) { + if (!read_sface(*sfi)) +- CGAL_error_msg("SNC_io_parser::read: error in sface line"); ++ { ++ std::cerr<<"SNC_io_parser::read: error in sface line"<sncp()); +@@ -1535,21 +1556,56 @@ read_vertex(Vertex_handle vh) { + vh->sncp() = this->sncp(); + + in >> index; ++ if(index >= int(en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->svertices_begin() = (index >= 0 ? Edge_of[index] : this->svertices_end()); + in >> index; ++ if(index >= int(en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->svertices_last() = index >= 0 ? Edge_of[index] : this->svertices_end(); + OK = OK && test_string(","); + in >> index; ++ if(index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->shalfedges_begin() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); + in >> index; ++ if(index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->shalfedges_last() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); + OK = OK && test_string(","); + in >> index; ++ if(index >= int(sfn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->sfaces_begin() = index >= 0 ? SFace_of[index] : this->sfaces_end(); + in >> index; ++ if(index >= int(sfn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->sfaces_last() = index >= 0 ? SFace_of[index] : this->sfaces_end(); + OK = OK && test_string(","); + in >> index; ++ if(index >= int(sln)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + vh->shalfloop() = index >= 0 ? SLoop_of[index] : this->shalfloops_end(); + OK = OK && test_string("|"); + #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT +@@ -1604,17 +1660,37 @@ read_edge(Halfedge_handle eh) { + OK = OK && test_string("{"); + + in >> index; ++ if(index < 0 || index >= int(en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + eh->twin() = Edge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(vn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + eh->center_vertex() = Vertex_of[index]; + OK = OK && test_string(","); + in >> index; + if(index == 0) { + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + eh->out_sedge() = SEdge_of[index]; + } else { + in >> index; ++ if(index < 0 || index >= int(sfn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + eh->incident_sface() = SFace_of[index]; + } + OK = OK && test_string("|"); +@@ -1669,6 +1745,11 @@ read_facet(Halffacet_handle fh) { + OK = OK && test_string("{"); + + in >> index; ++ if(index < 0 || index >= int(fn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + fh->twin() = Halffacet_of[index]; + OK = OK && test_string(","); + +@@ -1676,6 +1757,11 @@ read_facet(Halffacet_handle fh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + fh->boundary_entry_objects().push_back(make_object(SEdge_of[index])); + in >> cc; + } +@@ -1684,11 +1770,21 @@ read_facet(Halffacet_handle fh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; ++ if(index < 0 || index >= int(sln)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + fh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); + in >> cc; + } + + in >> index; ++ if(index < 0 || index >= int(vn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + fh->incident_volume() = Volume_of[index+addInfiBox]; + OK = OK && test_string("|"); + #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT +@@ -1731,6 +1827,11 @@ read_volume(Volume_handle ch) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; ++ if(index < 0 || index >= int(sfn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + ch->shell_entry_objects().push_back(make_object(SFace_of[index])); + in >> cc; + } +@@ -1781,27 +1882,67 @@ read_sedge(SHalfedge_handle seh) { + OK = OK && test_string("{"); + + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->twin() = SEdge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->sprev() = SEdge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->snext() = SEdge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(en)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->source() = Edge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(sfn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->incident_sface() = SFace_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->prev() = SEdge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(sen)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->next() = SEdge_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= int(fn)) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + seh->facet() = Halffacet_of[index]; + OK = OK && test_string("|"); + #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT +@@ -1852,12 +1993,27 @@ read_sloop(SHalfloop_handle slh) { + OK = OK && test_string("{"); + + in >> index; ++ if(index < 0 || index >= sln) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + slh->twin() = SLoop_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= sfn) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + slh->incident_sface() = SFace_of[index]; + OK = OK && test_string(","); + in >> index; ++ if(index < 0 || index >= fn) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + slh->facet() = Halffacet_of[index]; + OK = OK && test_string("|"); + #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT +@@ -1904,6 +2060,11 @@ read_sface(SFace_handle sfh) { + OK = OK && test_string("{"); + + in >> index; ++ if(index < 0 || index >= vn) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + sfh->center_vertex() = Vertex_of[index]; + OK = OK && test_string(","); + +@@ -1913,6 +2074,11 @@ read_sface(SFace_handle sfh) { + in >> index; + // sfh->boundary_entry_objects().push_back(SEdge_of[index]); + SM_decorator SD(&*sfh->center_vertex()); ++ if(index < 0 || index >= sen) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + SD.link_as_face_cycle(SEdge_of[index],sfh); + in >> cc; + } +@@ -1921,6 +2087,11 @@ read_sface(SFace_handle sfh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; ++ if(index < 0 || index >= en) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + sfh->boundary_entry_objects().push_back(make_object(Edge_of[index])); + this->sncp()->store_sm_boundary_item(Edge_of[index], --(sfh->sface_cycles_end())); + in >> cc; +@@ -1930,12 +2101,22 @@ read_sface(SFace_handle sfh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; ++ if(index < 0 || index >= sln) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + sfh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); + this->sncp()->store_sm_boundary_item(SLoop_of[index], --(sfh->sface_cycles_end())); + in >> cc; + } + + in >> index; ++ if(index < 0 || index >= vn) ++ { ++ in.clear(std::ios_base::badbit); ++ return false; ++ } + sfh->volume() = Volume_of[index+addInfiBox]; + OK = OK && test_string("}"); + in >> sfh->mark(); + +From 9e291e6bbfe23137fb2dd3a0f8d6461229ca2376 Mon Sep 17 00:00:00 2001 +From: Maxime Gimeno +Date: Tue, 19 Jan 2021 14:04:54 +0100 +Subject: [PATCH 3/8] replace cerr by CGAL_warning_msg + +--- + Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 14 +++--- + Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 53 ++++++++++++++++------- + Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 18 ++++---- + 3 files changed, 54 insertions(+), 31 deletions(-) + +diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +index 9b84dd37fbe..52bc830e115 100644 +--- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h ++++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +@@ -341,23 +341,23 @@ void PM_io_parser::read() + { + if ( !check_sep("Plane_map_2") ) + { +- std::cerr<<"PM_io_parser::read: no embedded_PM header."<> vn)) ) + { +- std::cerr<<"PM_io_parser::read: wrong node line."<> en) && (en%2==0)) ) + { +- std::cerr<<"PM_io_parser::read: wrong edge line."<> fn)) ) + { +- std::cerr<<"PM_io_parser::read: wrong face line."<::read() + for(i=0; i + void SNC_io_parser::read() + { + if ( !check_sep("Selective Nef Complex") ) +- CGAL_error_msg("SNC_io_parser::read: no SNC header."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: no SNC header."); ++ returnl ++ } + std::string kernel_type; + in >> kernel_type; + CGAL_assertion(kernel_type == "standard" || kernel_type == "extended"); + if ( !(check_sep("vertices") && (in >> vn)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong vertex line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong vertex line."); ++ return; ++ } + if ( !(check_sep("halfedges") && (in >> en) && (en%2==0)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong edge line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong edge line."); ++ return; ++ } + if ( !(check_sep("facets") && (in >> fn) && (fn%2==0)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong facet line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong facet line."); ++ } + if ( !(check_sep("volumes") && (in >> cn)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong volume line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong volume line."); ++ return; ++ } + if ( !(check_sep("shalfedges") && (in >> sen)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong sedge line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sedge line."); ++ return; ++ } + if ( !(check_sep("shalfloops") && (in >> sln)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong sloop line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sloop line."); ++ return; ++ } + if ( !(check_sep("sfaces") && (in >> sfn)) ) +- CGAL_error_msg("SNC_io_parser::read: wrong sface line."); ++ { ++ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sface line."); ++ return; ++ } + + addInfiBox = (kernel_type == "standard" && Infi_box::extended_kernel()); + +@@ -1445,7 +1468,7 @@ void SNC_io_parser::read_items(int plus01) { + for(vi=Vertex_of.begin(); vi!=Vertex_of.end(); ++vi) { + if (!read_vertex(*vi)) + { +- std::cerr<<"SNC_io_parser::read: error in node line"<::read_items(int plus01) { + for(ei=Edge_of.begin(); ei!=Edge_of.end(); ++ei) { + if (!read_edge(*ei)) + { +- std::cerr<<"SNC_io_parser::read: error in edge line"<::read_items(int plus01) { + for(fi=Halffacet_of.begin(); fi!=Halffacet_of.end(); ++fi) { + if (!read_facet(*fi)) + { +- std::cerr<<"SNC_io_parser::read: error in facet line"<::read_items(int plus01) { + for(ci=Volume_of.begin()+plus01; ci!=Volume_of.end(); ++ci) { + if (!read_volume(*ci)) + { +- std::cerr<<"SNC_io_parser::read: error in volume line"<::read_items(int plus01) { + for(sei=SEdge_of.begin(); sei!=SEdge_of.end(); ++sei) { + if (!read_sedge(*sei)) + { +- std::cerr<<"SNC_io_parser::read: error in sedge line"<::read_items(int plus01) { + for(sli=SLoop_of.begin(); sli!=SLoop_of.end(); ++sli) { + if (!read_sloop(*sli)) + { +- std::cerr<<"SNC_io_parser::read: error in sloop line"<::read_items(int plus01) { + for(sfi=SFace_of.begin(); sfi!=SFace_of.end(); ++sfi) { + if (!read_sface(*sfi)) + { +- std::cerr<<"SNC_io_parser::read: error in sface line"<::read() + { + if ( !check_sep("Nef_polyhedron_S2") ) + { +- std::cerr<<"Missing line in header"<> vn)) ) + { +- std::cerr<<"SM_io_parser::read: wrong vertex line."<> en) && (en%2==0)) ) + { +- std::cerr<<"SM_io_parser::read: wrong edge line."<> ln)) ) + { +- std::cerr<<"SM_io_parser::read: wrong loop line."<> fn)) ) + { +- std::cerr<<"SM_io_parser::read: wrong face line."<::read() + for(i=0; i::read() + for(i=0; i +Date: Wed, 20 Jan 2021 08:38:33 +0100 +Subject: [PATCH 4/8] Fix typo and use setstate + +--- + Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 10 ++-- + Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 66 +++++++++++------------ + Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 10 ++-- + 3 files changed, 43 insertions(+), 43 deletions(-) + +diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +index 52bc830e115..64a3e94916e 100644 +--- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h ++++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +@@ -202,7 +202,7 @@ bool PM_io_parser::read_vertex(Vertex_handle v) + + if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + if (iso) v->set_face(Face_of[f]); +@@ -238,7 +238,7 @@ bool PM_io_parser::read_hedge(Halfedge_handle e) + if(!(eo >= 0 && (std::size_t) eo < en && epr >= 0 && (std::size_t) epr < en && ene >= 0 && (std::size_t) ene < en && + v >= 0 && (std::size_t) v < vn && f >= 0 && (std::size_t) f < fn )) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + std::cerr<<"wrong index in read_hedge"<::read_face(Face_handle f) + } + else + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + while (in >> ei) { + CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); + if (!(ei >= 0 && ei < en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + f->store_fc(Halfedge_of[ei]); +@@ -299,7 +299,7 @@ bool PM_io_parser::read_face(Face_handle f) + CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); + if (!(vi >= 0 && vi < vn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + f->store_iv(Vertex_of[vi]); +diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +index 21c54dd4133..e5530445153 100644 +--- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h ++++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +@@ -1402,7 +1402,7 @@ void SNC_io_parser::read() + if ( !check_sep("Selective Nef Complex") ) + { + CGAL_warning_msg(false, "SNC_io_parser::read: no SNC header."); +- returnl ++ return; + } + std::string kernel_type; + in >> kernel_type; +@@ -1581,14 +1581,14 @@ read_vertex(Vertex_handle vh) { + in >> index; + if(index >= int(en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->svertices_begin() = (index >= 0 ? Edge_of[index] : this->svertices_end()); + in >> index; + if(index >= int(en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->svertices_last() = index >= 0 ? Edge_of[index] : this->svertices_end(); +@@ -1596,14 +1596,14 @@ read_vertex(Vertex_handle vh) { + in >> index; + if(index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->shalfedges_begin() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); + in >> index; + if(index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->shalfedges_last() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); +@@ -1611,14 +1611,14 @@ read_vertex(Vertex_handle vh) { + in >> index; + if(index >= int(sfn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->sfaces_begin() = index >= 0 ? SFace_of[index] : this->sfaces_end(); + in >> index; + if(index >= int(sfn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->sfaces_last() = index >= 0 ? SFace_of[index] : this->sfaces_end(); +@@ -1626,7 +1626,7 @@ read_vertex(Vertex_handle vh) { + in >> index; + if(index >= int(sln)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + vh->shalfloop() = index >= 0 ? SLoop_of[index] : this->shalfloops_end(); +@@ -1685,7 +1685,7 @@ read_edge(Halfedge_handle eh) { + in >> index; + if(index < 0 || index >= int(en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + eh->twin() = Edge_of[index]; +@@ -1693,7 +1693,7 @@ read_edge(Halfedge_handle eh) { + in >> index; + if(index < 0 || index >= int(vn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + eh->center_vertex() = Vertex_of[index]; +@@ -1703,7 +1703,7 @@ read_edge(Halfedge_handle eh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + eh->out_sedge() = SEdge_of[index]; +@@ -1711,7 +1711,7 @@ read_edge(Halfedge_handle eh) { + in >> index; + if(index < 0 || index >= int(sfn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + eh->incident_sface() = SFace_of[index]; +@@ -1770,7 +1770,7 @@ read_facet(Halffacet_handle fh) { + in >> index; + if(index < 0 || index >= int(fn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + fh->twin() = Halffacet_of[index]; +@@ -1782,7 +1782,7 @@ read_facet(Halffacet_handle fh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + fh->boundary_entry_objects().push_back(make_object(SEdge_of[index])); +@@ -1795,7 +1795,7 @@ read_facet(Halffacet_handle fh) { + in >> index; + if(index < 0 || index >= int(sln)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + fh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); +@@ -1805,7 +1805,7 @@ read_facet(Halffacet_handle fh) { + in >> index; + if(index < 0 || index >= int(vn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + fh->incident_volume() = Volume_of[index+addInfiBox]; +@@ -1852,7 +1852,7 @@ read_volume(Volume_handle ch) { + in >> index; + if(index < 0 || index >= int(sfn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + ch->shell_entry_objects().push_back(make_object(SFace_of[index])); +@@ -1907,7 +1907,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->twin() = SEdge_of[index]; +@@ -1915,7 +1915,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->sprev() = SEdge_of[index]; +@@ -1923,7 +1923,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->snext() = SEdge_of[index]; +@@ -1931,7 +1931,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->source() = Edge_of[index]; +@@ -1939,7 +1939,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sfn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->incident_sface() = SFace_of[index]; +@@ -1947,7 +1947,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->prev() = SEdge_of[index]; +@@ -1955,7 +1955,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(sen)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->next() = SEdge_of[index]; +@@ -1963,7 +1963,7 @@ read_sedge(SHalfedge_handle seh) { + in >> index; + if(index < 0 || index >= int(fn)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + seh->facet() = Halffacet_of[index]; +@@ -2018,7 +2018,7 @@ read_sloop(SHalfloop_handle slh) { + in >> index; + if(index < 0 || index >= sln) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + slh->twin() = SLoop_of[index]; +@@ -2026,7 +2026,7 @@ read_sloop(SHalfloop_handle slh) { + in >> index; + if(index < 0 || index >= sfn) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + slh->incident_sface() = SFace_of[index]; +@@ -2034,7 +2034,7 @@ read_sloop(SHalfloop_handle slh) { + in >> index; + if(index < 0 || index >= fn) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + slh->facet() = Halffacet_of[index]; +@@ -2085,7 +2085,7 @@ read_sface(SFace_handle sfh) { + in >> index; + if(index < 0 || index >= vn) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + sfh->center_vertex() = Vertex_of[index]; +@@ -2099,7 +2099,7 @@ read_sface(SFace_handle sfh) { + SM_decorator SD(&*sfh->center_vertex()); + if(index < 0 || index >= sen) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + SD.link_as_face_cycle(SEdge_of[index],sfh); +@@ -2112,7 +2112,7 @@ read_sface(SFace_handle sfh) { + in >> index; + if(index < 0 || index >= en) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + sfh->boundary_entry_objects().push_back(make_object(Edge_of[index])); +@@ -2126,7 +2126,7 @@ read_sface(SFace_handle sfh) { + in >> index; + if(index < 0 || index >= sln) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + sfh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); +@@ -2137,7 +2137,7 @@ read_sface(SFace_handle sfh) { + in >> index; + if(index < 0 || index >= vn) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + sfh->volume() = Volume_of[index+addInfiBox]; +diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h +index a9377719f93..d58126bac9c 100644 +--- a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h ++++ b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h +@@ -205,7 +205,7 @@ bool SM_io_parser::read_vertex(SVertex_handle v) + + if(f<0 || (iso && f > fn) || (!iso && f > en)) + { +- in.clear(std::ios_base::badbit); ++ in.setstate(std::ios_base::badbit); + return false; + } + +@@ -246,7 +246,7 @@ bool SM_io_parser::read_edge(SHalfedge_handle e) + v >= 0 && v < vn && f >= 0 && f < fn )) + { + std::cerr<<"wrong index in read_edge"<::read_face(SFace_handle f) + if(!(ei >= 0 && ei < en)) + { + std::cerr<<"wrong index in face cycle list."<store_sm_boundary_object(Edge_of[ei],f); +@@ -326,7 +326,7 @@ bool SM_io_parser::read_face(SFace_handle f) + if(!(vi >= 0 && vi < vn)) + { + std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(SVertex_of[vi],f); +@@ -336,7 +336,7 @@ bool SM_io_parser::read_face(SFace_handle f) + if(!(li >= 0 && li < 2)) + { + std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(Loop_of[li],f); + +From ffa019712b0ad3b20e3d02edad4d731fda04a2ef Mon Sep 17 00:00:00 2001 +From: Maxime Gimeno +Date: Mon, 25 Jan 2021 12:59:48 +0100 +Subject: [PATCH 5/8] First face may be -1, don't fail on it, just don't use it + +--- + Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +index 64a3e94916e..d08b08180d6 100644 +--- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h ++++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +@@ -280,11 +280,7 @@ bool PM_io_parser::read_face(Face_handle f) + { + f->set_halfedge(Halfedge_of[ei]); + } +- else +- { +- in.setstate(std::ios_base::badbit); +- return false; +- } ++ + while (in >> ei) { + CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); + if (!(ei >= 0 && ei < en)) + +From d78842712cdfcbb3bdfc5f7cb252d3772fd6a16f Mon Sep 17 00:00:00 2001 +From: Maxime Gimeno +Date: Tue, 26 Jan 2021 09:55:20 +0100 +Subject: [PATCH 6/8] Fix conversion warnigns + +--- + Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 8 ++++---- + Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 18 +++++++++--------- + 2 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +index d08b08180d6..39b99b37d7c 100644 +--- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h ++++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h +@@ -200,7 +200,7 @@ bool PM_io_parser::read_vertex(Vertex_handle v) + !(in >> p) || + !check_sep("}") ) return false; + +- if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) ++ if(!(f >= 0 && ((iso && (std::size_t)f < fn) || (!iso && (std::size_t)f < en)))) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -276,14 +276,14 @@ bool PM_io_parser::read_face(Face_handle f) + int n, ei, vi; Mark m; + if ( !(in >> n) || !check_sep("{") ) return false; + if ( !(in >> ei) || !check_sep(",") ) return false; +- if (ei >= 0 && ei < en) ++ if (ei >= 0 && (std::size_t) ei < en) + { + f->set_halfedge(Halfedge_of[ei]); + } + + while (in >> ei) { + CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); +- if (!(ei >= 0 && ei < en)) ++ if (!(ei >= 0 && (std::size_t)ei < en)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -293,7 +293,7 @@ bool PM_io_parser::read_face(Face_handle f) + if (!check_sep(",")) { return false; } + while (in >> vi) { + CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); +- if (!(vi >= 0 && vi < vn)) ++ if (!(vi >= 0 && (std::size_t)vi < vn)) + { + in.setstate(std::ios_base::badbit); + return false; +diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +index e5530445153..1dde7f8d0b3 100644 +--- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h ++++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +@@ -1579,7 +1579,7 @@ read_vertex(Vertex_handle vh) { + vh->sncp() = this->sncp(); + + in >> index; +- if(index >= int(en)) ++ if(index >= (int)en) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2016,7 +2016,7 @@ read_sloop(SHalfloop_handle slh) { + OK = OK && test_string("{"); + + in >> index; +- if(index < 0 || index >= sln) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2024,7 +2024,7 @@ read_sloop(SHalfloop_handle slh) { + slh->twin() = SLoop_of[index]; + OK = OK && test_string(","); + in >> index; +- if(index < 0 || index >= sfn) ++ if(index < 0 || index >= (int)(sfn)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2032,7 +2032,7 @@ read_sloop(SHalfloop_handle slh) { + slh->incident_sface() = SFace_of[index]; + OK = OK && test_string(","); + in >> index; +- if(index < 0 || index >= fn) ++ if(index < 0 || index >= (int)(fn)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2083,7 +2083,7 @@ read_sface(SFace_handle sfh) { + OK = OK && test_string("{"); + + in >> index; +- if(index < 0 || index >= vn) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2097,7 +2097,7 @@ read_sface(SFace_handle sfh) { + in >> index; + // sfh->boundary_entry_objects().push_back(SEdge_of[index]); + SM_decorator SD(&*sfh->center_vertex()); +- if(index < 0 || index >= sen) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2110,7 +2110,7 @@ read_sface(SFace_handle sfh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; +- if(index < 0 || index >= en) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2124,7 +2124,7 @@ read_sface(SFace_handle sfh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; +- if(index < 0 || index >= sln) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2135,7 +2135,7 @@ read_sface(SFace_handle sfh) { + } + + in >> index; +- if(index < 0 || index >= vn) ++ if(index < 0 || index >= (int)(sln)) + { + in.setstate(std::ios_base::badbit); + return false; + +From 23cc6b0f4a2ac6061b01d86411d58b6da7ff5a34 Mon Sep 17 00:00:00 2001 +From: Maxime Gimeno +Date: Wed, 27 Jan 2021 10:04:45 +0100 +Subject: [PATCH 7/8] Fix read_sface + +--- + .../Convex_decomposition_3/check_decomposition.cpp | 2 ++ + Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 10 +++++----- + 2 files changed, 7 insertions(+), 5 deletions(-) + +diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +index 1dde7f8d0b3..a31a07c5d99 100644 +--- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h ++++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h +@@ -1803,7 +1803,7 @@ read_facet(Halffacet_handle fh) { + } + + in >> index; +- if(index < 0 || index >= int(vn)) ++ if(index < 0 || index >= int(cn)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2083,7 +2083,7 @@ read_sface(SFace_handle sfh) { + OK = OK && test_string("{"); + + in >> index; +- if(index < 0 || index >= (int)(sln)) ++ if(index < 0 || index >= (int)(vn)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2097,7 +2097,7 @@ read_sface(SFace_handle sfh) { + in >> index; + // sfh->boundary_entry_objects().push_back(SEdge_of[index]); + SM_decorator SD(&*sfh->center_vertex()); +- if(index < 0 || index >= (int)(sln)) ++ if(index < 0 || index >= (int)(sen)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2110,7 +2110,7 @@ read_sface(SFace_handle sfh) { + while(isdigit(cc)) { + in.putback(cc); + in >> index; +- if(index < 0 || index >= (int)(sln)) ++ if(index < 0 || index >= (int)(en)) + { + in.setstate(std::ios_base::badbit); + return false; +@@ -2135,7 +2135,7 @@ read_sface(SFace_handle sfh) { + } + + in >> index; +- if(index < 0 || index >= (int)(sln)) ++ if(index < 0 || index >= (int)(cn)) + { + in.setstate(std::ios_base::badbit); + return false; + -- cgit 1.4.1 From 04d780b5c64c0e1aed08b33936f1e3b2789f784d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 5 Mar 2021 23:48:31 +0100 Subject: gnu: openscad: Disable failing tests with cgal@5.2 input. * gnu/packages/engineering.scm (openscad)[arguments]: Add more disable tests in 'check phase. --- gnu/packages/engineering.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 66331d7c09..f560a15aa9 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2553,7 +2553,18 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") "echotest_allexpressions" "lazyunion-*" "pdfexporttest_centered" - "pdfexporttest_simple-pdf") + "pdfexporttest_simple-pdf" + + ;; Broken due since cgal@5.2 + + ;; https://github.com/CGAL/cgal/pull/5371 (security) + ;; FIXME: Investigate or wait for future releases to + ;; fix it. + ;; Unsure if wrong test-suite or wrong security + ;; patch. + "cgalpngtest_nef3_broken" + "opencsgtest_nef3_broken" + "csgpngtest_nef3_broken" + "throwntogethertest_nef3_broken") "|"))) ;; strip python test files since lib dir ends up in out/share (for-each delete-file -- cgit 1.4.1 From ae2231559c8d33c222aa9a3b8cdb6aa5d49c8931 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 5 Mar 2021 23:56:15 +0100 Subject: gnu: hplip: Update to 3.21.2. * gnu/packages/cups.scm (hplip): Update to 3.21.2. * gnu/packages/patches/hplip-remove-imageprocessor.patch: Adapt. --- gnu/packages/cups.scm | 6 ++-- .../patches/hplip-remove-imageprocessor.patch | 41 ++++++++++++++-------- 2 files changed, 30 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 51efee5157..e12c1a0689 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mark H Weaver -;;; Copyright © 2017–2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. @@ -484,14 +484,14 @@ should only be used as part of the Guix cups-pk-helper service.") (define-public hplip (package (name "hplip") - (version "3.20.11") + (version "3.21.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/hplip/hplip/" version "/hplip-" version ".tar.gz")) (sha256 (base32 - "04fvdyjyjbkviy3awgm7g43p3lrvrsmgaqz8bwra22g7v2rpa5hb")) + "0hbwx9d4c8177vi0gavz9pxi7rc97jciacndp90ms8327shj2121")) (modules '((guix build utils))) (patches (search-patches "hplip-remove-imageprocessor.patch")) (snippet diff --git a/gnu/packages/patches/hplip-remove-imageprocessor.patch b/gnu/packages/patches/hplip-remove-imageprocessor.patch index cde3ecba2d..c9d27a4d1d 100644 --- a/gnu/packages/patches/hplip-remove-imageprocessor.patch +++ b/gnu/packages/patches/hplip-remove-imageprocessor.patch @@ -1,4 +1,5 @@ -This patch is based heavily on the Debian patch. +This patch is based heavily on the Debian patch, but was updated to +apply to subsequent upstream changes not yet in Debian. 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 @@ -175,55 +176,67 @@ index 5b282d8..0bacfaf 100644 #include #include -@@ -637,16 +636,10 @@ int HPCupsFilter::processRasterData(cups_raster_t *cups_raster) - +@@ -651,21 +650,8 @@ sprintf(hpPreProcessedRasterFile, "%s/hp_%s_cups_SwapedPagesXXXXXX",CUPS_TMP_DIR, m_JA.user_name); -- image_processor_t* imageProcessor = imageProcessorCreate(); - + +- image_processor_t* imageProcessor=NULL; +- IMAGE_PROCESSOR_ERROR result; +- //added if condition to check if pinter language is "ljzjstream" +- //If so, then bypass imageprocessing functions while running HPCUPS filter. +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){ +- imageProcessor = imageProcessorCreate(); +- } while (cupsRasterReadHeader2(cups_raster, &cups_header)) { - -- IMAGE_PROCESSOR_ERROR result = imageProcessorStartPage(imageProcessor, &cups_header); +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0){ +- 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) +@@ -764,14 +750,6 @@ color_raster = rgbRaster; black_raster = kRaster; +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0) +- { - 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) +@@ -801,14 +779,6 @@ } } // for() loop end +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0) +- { - 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) +@@ -823,11 +793,6 @@ rgbRaster = NULL; } +- +- if(strncmp(m_JA.printer_platform, "ljzjstream",10) == 0) +- { - imageProcessorDestroy(imageProcessor); -- +- } unlink(hpPreProcessedRasterFile); return ret_status; } -- cgit 1.4.1 From db5a70c81dba2545d6114d5c41bfc7192ac27cd5 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 6 Mar 2021 00:00:24 +0100 Subject: gnu: Add python-readability. * gnu/packages/python-xyz.scm (python-readability): New variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fbc9ad688d..4e8a28ee6e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24016,3 +24016,27 @@ and frame grabber interface.") "This package provides a command-line interface (CLI) to the Jinja2 template engine.") (license license:bsd-3))) + +(define-public python-readability + (package + (name "python-readability") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "readability" version)) + (sha256 + (base32 + "1b8gq3g2zwvx0aivvdg56cc0bn7xw6f2v6psmxdx9aiipkw0s0zr")))) + (build-system python-build-system) + (home-page + "https://github.com/andreasvc/readability/") + (synopsis + "Measure the readability of a given text using surface +characteristics") + (description + "This package provides a Python library that is an implementation of +traditional readability measures based on simple surface +characteristics. These measures are basically linear regressions based on the +number of words, syllables, and sentences.") + (license license:asl2.0))) -- cgit 1.4.1 From 3218f02de4a95365e9e6eca83fd4c94dfd0b748c Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 6 Mar 2021 00:02:28 +0100 Subject: gnu: Add python-listparser. * gnu/packages/python-xyz.scm (python-listparser): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4e8a28ee6e..aec5b5e77a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24040,3 +24040,24 @@ traditional readability measures based on simple surface characteristics. These measures are basically linear regressions based on the number of words, syllables, and sentences.") (license license:asl2.0))) + +(define-public python-listparser + (package + (name "python-listparser") + (version "0.18") + (source + (origin + (method url-fetch) + (uri (pypi-uri "listparser" version)) + (sha256 + (base32 + "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b")))) + (build-system python-build-system) + (home-page + "https://github.com/kurtmckee/listparser") + (synopsis + "Parse subscription lists in Python") + (description + "This package provides a Python library that can parse OPML, FOAF, and +iGoogle subscription lists.") + (license license:expat))) -- cgit 1.4.1 From 373e5fc96724fd38bb1263e4af90932ea36f596b Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 6 Mar 2021 00:05:46 +0100 Subject: gnu: Add gfeeds. * gnu/packages/syndication.scm (gfeeds): New variable. --- gnu/packages/syndication.scm | 67 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 89ef69f6b8..79dbb77018 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -24,10 +24,11 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system cargo) - #:use-module (guix build-system qt) #: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 python) + #:use-module (guix build-system qt) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages base) @@ -50,7 +51,9 @@ #:use-module (gnu packages qt) #:use-module (gnu packages ruby) #:use-module (gnu packages sqlite) + #:use-module (gnu packages time) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xml) @@ -415,3 +418,65 @@ formats, including all versions of RSS and Atom.") (description "QuiteRSS is an RSS/Atom news feeds reader written on Qt/C++ that aims to be quite fast and comfortable to it's user.") (license license:gpl3+))) + +(define-public gfeeds + (package + (name "gfeeds") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri + (string-append + "https://gitlab.gnome.org/World/gfeeds/-/archive/" version + "/gfeeds-" version ".tar.bz2")) + (sha256 + (base32 + "05gwwzqfz29m477imd5vh84jfla1wnklwpc2sdxnqli72wg08fli")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-mpv-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gfeeds/confManager.py" + (("mpv") (string-append (assoc-ref inputs "mpv") "/bin/mpv"))) + #t)) + (add-after 'install 'wrap-gfeeds + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (string-append + (assoc-ref outputs "out") "/bin/gfeeds") + `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) + `("XDG_DATA_DIRS" ":" prefix (,(getenv "XDG_DATA_DIRS")))) + #t))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("glib" ,glib) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("hicolor-icon-theme" ,hicolor-icon-theme) + ("libhandy" ,libhandy) + ("mpv" ,mpv) + ("python" ,python) + ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-dateutil" ,python-dateutil) + ("python-feedparser" ,python-feedparser) + ("python-html5lib" ,python-html5lib) + ("python-listparser" ,python-listparser) + ("python-lxml" ,python-lxml) + ("python-pillow" ,python-pillow) + ("python-pygments" ,python-pygments) + ("python-pytz" ,python-pytz) + ("python-readability" ,python-readability) + ("python-requests" ,python-requests) + ("webkitgtk" ,webkitgtk) + ("python-pygobject" ,python-pygobject))) + (home-page "https://gfeeds.gabmus.org/") + (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") + (description "Feeds is an RSS/Atom feed reader made with GTK+ +and it has an easy-to-use graphical user interface.") + (license license:gpl3+))) -- cgit 1.4.1 From 1582f12233b9de6faf7cb811b6736dac0774d867 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 00:47:35 +0100 Subject: gnu: epson-inkjet-printer-escpr: Update to 1.7.9. * gnu/packages/cups.scm (epson-inkjet-printer-escpr): Update to 1.7.9. --- 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 e12c1a0689..2edd5d245c 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -855,7 +855,7 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (define-public epson-inkjet-printer-escpr (package (name "epson-inkjet-printer-escpr") - (version "1.7.8") + (version "1.7.9") ;; 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 @@ -863,11 +863,11 @@ HP@tie{}LaserJet, and possibly other printers. See @file{README} for details.") (source (origin (method url-fetch) - (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/04/32/" - "1a455ef8618def65700ca4e446311c2fb43cd839/" - "epson-inkjet-printer-escpr-1.7.8-1lsb3.2.tar.gz")) + (uri (string-append "https://download3.ebz.epson.net/dsc/f/03/00/12/50/95/" + "322b8d6b915ab85add33d41f04ba5130866aadbe/" + "epson-inkjet-printer-escpr-1.7.9-1lsb3.2.tar.gz")) (sha256 - (base32 "1pygg2bd2gh27dc65h3dzwrpvi6bq5c87wl0ldchqlc2b3blsx6p")))) + (base32 "136hhvhimxfnrdn3ksbiswjxgsifrwlp3zz8h0v63w4k1vkzpgc0")))) (build-system gnu-build-system) (arguments `(#:modules -- cgit 1.4.1 From 170cf035cece04fd2b9460451f5f66ba5c4485ca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 00:47:44 +0100 Subject: gnu: libmd: Update to 1.0.3. * gnu/packages/crypto.scm (libmd): Update to 1.0.3. --- 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 e0fa74409b..5c8e4d6b22 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -114,7 +114,7 @@ communication, encryption, decryption, signatures, etc.") (define-public libmd (package (name "libmd") - (version "1.0.1") + (version "1.0.3") (source (origin (method url-fetch) (uri @@ -125,7 +125,7 @@ communication, encryption, decryption, signatures, etc.") version ".tar.xz"))) (sha256 (base32 - "0waclg2d5qin3r26gy5jvy4584ik60njc8pqbzwk0lzq3j9ynkp1")))) + "0jmga8y94h857ilra3qjaiax3wd5pd6mx1h120zhl9fcjmzhj0js")))) (build-system gnu-build-system) (synopsis "Message Digest functions from BSD systems") (description -- cgit 1.4.1 From c8cbd369eb512b0bc5cc0d5dfc2b5d35da50aa4f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 01:07:24 +0100 Subject: gnu: vim-full: Remove duplicate 'make-flags'. Fixes . Co-authored-by: Tobias Geerinckx-Rice * gnu/packages/vim.scm (vim-full)[arguments]: Remove duplicate 'make-flags'. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/vim.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 372d470e09..d559364d32 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -216,11 +217,14 @@ with the editor vim."))) "--enable-xim" "--disable-selinux" "--enable-gui") - ;; This flag fixes the following error: - ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel' - ;; .../libexpat.so.1: error adding symbols: DSO missing from command line - #:make-flags '("LDFLAGS=-lexpat") ,@(substitute-keyword-arguments (package-arguments vim) + ;; This flag fixes the following error: + ;; .../libpython3.7m.a(pyexpat.o): undefined reference to symbol 'XML_FreeContentModel' + ;; .../libexpat.so.1: error adding symbols: DSO missing from command line + ((#:make-flags flags) + `(append + (list "LDFLAGS=-lexpat") + (delete "CFLAGS=-D_REENTRANT" ,flags))) ((#:phases phases) `(modify-phases ,phases (add-before 'check 'start-xserver -- cgit 1.4.1 From cacab6853df6099fc7a3849fd4ebf93ce00a0bbb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 01:16:08 +0100 Subject: gnu: qtmips: Update to 0.7.5. * gnu/packages/emulators.scm (qtmips): Update to 0.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 057d78ace9..532ca60602 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -285,7 +285,7 @@ older games.") (define-public qtmips (package (name "qtmips") - (version "0.7.3") + (version "0.7.5") (source (origin (method git-fetch) (uri (git-reference @@ -294,7 +294,7 @@ older games.") (file-name (git-file-name name version)) (sha256 (base32 - "1khvwgqz4h6q6mhbbq0yx43ajz8gx9wmwzs8784vmfrglndbxgax")))) + "1fal7a8y5g0rqqjrk795jh1l50ihz01ppjnrfjrk9vkjbd59szbp")))) (build-system cmake-build-system) (arguments '(#:phases -- cgit 1.4.1 From faaf7ef335f6ff49fcb4cc3bb86d2c047ca30f2b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 01:17:34 +0100 Subject: gnu: fsarchiver: Update to 0.8.6. * gnu/packages/file-systems.scm (fsarchiver): Update to 0.8.6. --- 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 866e9e5392..32f0db91d8 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -264,7 +264,7 @@ always possible.") (define-public fsarchiver (package (name "fsarchiver") - (version "0.8.5") + (version "0.8.6") (source (origin (method git-fetch) @@ -274,7 +274,7 @@ always possible.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rvwq5v3rl14bqxjm1ibfapyicf0sa44nw7451v10kx39lp56ylp")))) + (base32 "1ry2sdkfbg4bwcldk42g1i3wa3z4pr9yh9dil6ilhwcvhqiw41zc")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From 1462a11dbb3d2256c8693e56a583cfd100e27609 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 01:21:04 +0100 Subject: gnu: verilator: Update to 4.110. * gnu/packages/fpga.scm (verilator): Update to 4.110. --- gnu/packages/fpga.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index bee87d9311..8c2325842f 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -502,7 +502,7 @@ using different abstraction levels.") (define-public verilator (package (name "verilator") - (version "4.108") + (version "4.110") (source (origin (method git-fetch) @@ -511,7 +511,7 @@ using different abstraction levels.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kcs0p8i2hiw348xqqh49pmllqspbzh2ljwmia03b42md5h4x5vf")))) + (base32 "1lm2nyn7wzxj5y0ffwazhb4ygnmqf4d61sl937vmnmrpvdihsrrq")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From 6f873731a030dd7ecbd8a5e756b38b26306f6966 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 6 Mar 2021 02:42:34 +0100 Subject: gnu: zstd: Update to 1.4.9 [security fixes]. Fixes CVE-2021-24031 and CVE-2021-24032. * gnu/packages/compression.scm (zstd-1.4.9): New variable. * gnu/packages/compression.scm (zstd): Update to 1.4.9. [replacement]: Graft with 'zstd-1.4.9'. --- gnu/packages/compression.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 3561dc6bbe..ee7f607dcb 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1442,6 +1442,7 @@ or junctions, and always follows hard links.") "v" version "/zstd-" version ".tar.gz")) (sha256 (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) + (replacement zstd-1.4.9) (build-system gnu-build-system) (outputs '("out" ;1.2MiB executables and documentation "lib" ;1.2MiB shared library and headers @@ -1501,6 +1502,19 @@ speed.") license:public-domain ; zlibWrapper/examples/fitblk* license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} +(define-public zstd-1.4.9 + (package + (inherit zstd) + (name "zstd") + (version "1.4.9") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/facebook/zstd/releases/download/" + "v" version "/zstd-" version ".tar.gz")) + (sha256 + (base32 "14yj7309gsvg39rki4xqnd6w5idmqi0655v1fc0mk1m2kvhp9b19")))))) + (define-public pzstd (package (name "pzstd") -- cgit 1.4.1 From 090456dacb76160280a630d53f4f47b421281c66 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 6 Mar 2021 04:47:10 +0100 Subject: gnu: ytnef: Fix CVE-2021-3403 and CVE-2021-3404. * gnu/packages/patches/ytnef-CVE-2021-3403.patch, gnu/packages/patches/ytnef-CVE-2021-3404.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/mail.scm (ytnef): Apply them. --- gnu/local.mk | 2 ++ gnu/packages/mail.scm | 4 +++- gnu/packages/patches/ytnef-CVE-2021-3403.patch | 32 ++++++++++++++++++++++++++ gnu/packages/patches/ytnef-CVE-2021-3404.patch | 30 ++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/ytnef-CVE-2021-3403.patch create mode 100644 gnu/packages/patches/ytnef-CVE-2021-3404.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4900dabc36..fb3b395852 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1755,6 +1755,8 @@ dist_patch_DATA = \ %D%/packages/patches/xsane-support-ipv6.patch \ %D%/packages/patches/xsane-tighten-default-umask.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ + %D%/packages/patches/ytnef-CVE-2021-3403.patch \ + %D%/packages/patches/ytnef-CVE-2021-3404.patch \ %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 0e0934a245..d90bfead72 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3909,7 +3909,9 @@ It is a replacement for the @command{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l")))) + "07h48s5qf08503pp9kafqbwipdqghiif22ghki7z8j67gyp04l6l")) + (patches (search-patches "ytnef-CVE-2021-3403.patch" + "ytnef-CVE-2021-3404.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) diff --git a/gnu/packages/patches/ytnef-CVE-2021-3403.patch b/gnu/packages/patches/ytnef-CVE-2021-3403.patch new file mode 100644 index 0000000000..4b1c9d659f --- /dev/null +++ b/gnu/packages/patches/ytnef-CVE-2021-3403.patch @@ -0,0 +1,32 @@ +From f2380a53fb84d370eaf6e6c3473062c54c57fac7 Mon Sep 17 00:00:00 2001 +From: Oliver Giles +Date: Mon, 1 Feb 2021 10:12:16 +1300 +Subject: [PATCH] Prevent potential double-free in TNEFSubjectHandler + +If TNEFSubjectHandler is called multiple times, but the last time +failed due to the PREALLOCCHECK, the subject.data member will be +a freed, but invalid pointer. To prevent a double-free next time +TNEFSubjectHandler is entered, set it to zero after freeing. + +Resolves: #85 +Reported-by: jasperla +--- + lib/ytnef.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/lib/ytnef.c b/lib/ytnef.c +index b148719..b06c807 100644 +--- a/lib/ytnef.c ++++ b/lib/ytnef.c +@@ -301,8 +301,10 @@ int TNEFFromHandler STD_ARGLIST { + } + // ----------------------------------------------------------------------------- + int TNEFSubjectHandler STD_ARGLIST { +- if (TNEF->subject.data) ++ if (TNEF->subject.data) { + free(TNEF->subject.data); ++ TNEF->subject.data = NULL; ++ } + + PREALLOCCHECK(size, 100); + TNEF->subject.data = calloc(size+1, sizeof(BYTE)); diff --git a/gnu/packages/patches/ytnef-CVE-2021-3404.patch b/gnu/packages/patches/ytnef-CVE-2021-3404.patch new file mode 100644 index 0000000000..e991d6aff1 --- /dev/null +++ b/gnu/packages/patches/ytnef-CVE-2021-3404.patch @@ -0,0 +1,30 @@ +From f9ff4a203b8c155d51a208cadadb62f224fba715 Mon Sep 17 00:00:00 2001 +From: Oliver Giles +Date: Mon, 1 Feb 2021 10:18:17 +1300 +Subject: [PATCH] Ensure the size of the version field is 4 bytes + +A corrupted version field size can cause TNEFVersion to access outside +of allocated memory. Check the version is the expected size and raise +an error if not. + +Resolves: #86 +Reported-by: jasperla +--- + lib/ytnef.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/ytnef.c b/lib/ytnef.c +index b148719..ffede44 100644 +--- a/lib/ytnef.c ++++ b/lib/ytnef.c +@@ -335,6 +335,10 @@ int TNEFRendData STD_ARGLIST { + int TNEFVersion STD_ARGLIST { + WORD major; + WORD minor; ++ if (size != 2 * sizeof(WORD)) { ++ printf("Incorrect size of version field, suspected corruption\n"); ++ return -1; ++ } + minor = SwapWord((BYTE*)data, size); + major = SwapWord((BYTE*)data + 2, size - 2); + -- cgit 1.4.1 From eab6776ecd85a38fc7ff116a497dca0808d4a194 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 11:21:40 +0100 Subject: gnu: emacs-modus-themes: Update to 1.2.3. * gnu/packages/emacs-xyz.scm (emacs-modus-themes): Update to 1.2.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cfd1fdeb86..ad4a3e254b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24350,7 +24350,7 @@ Emacs that integrate with major modes like Org-mode.") (define-public emacs-modus-themes (package (name "emacs-modus-themes") - (version "1.1.1") + (version "1.2.3") (source (origin (method git-fetch) @@ -24359,7 +24359,7 @@ Emacs that integrate with major modes like Org-mode.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1n716nasa1pccz7983kicagc9sqnxlyfmflvifqk4kza2ks0rh9m")))) + (base32 "1l392hz6zs6wg06x2zxnk7s0h5cpmvbkcynh68gjmqjj84l7mqrk")))) (build-system emacs-build-system) (home-page "https://protesilaos.com/modus-themes/") (synopsis "Accessible themes (WCAG AAA)") -- cgit 1.4.1 From ae6d19e7d6fca883b465e85d5b0cb4264b6bd9d9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 11:36:51 +0100 Subject: gnu: texmacs: Update to 1.99.19. * gnu/packages/text-editors.scm (texmacs): Update to 1.99.19. --- 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 0cce85a223..89fe797f36 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -806,14 +806,14 @@ editors.") (define-public texmacs (package (name "texmacs") - (version "1.99.18") + (version "1.99.19") (source (origin (method url-fetch) (uri (string-append "https://www.texmacs.org/Download/ftp/tmftp/" "source/TeXmacs-" version "-src.tar.gz")) (sha256 - (base32 "0il3fwgw20421aj90wg8kyhkwk6lbgb3bb2g5qamh5lk90yj725i")))) + (base32 "1izwqb0z4gqiglv57mjswk6sjivny73kd2sxrf3nmj7wr12pn5m8")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 634dacd27a6084ea42cb207010c358106aa41fe4 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 21 Feb 2021 10:14:45 +0000 Subject: gnu: Add fluida-lv2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (fluida-lv2): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/music.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 40780ab6f1..6f94b7572a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1035,6 +1035,45 @@ are helpful when working in problem spaces where timing is important (such as audio and video).") (license license:bsd-2))) +(define-public fluida-lv2 + (package + (name "fluida-lv2") + (version "0.6") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/brummer10/Fluida.lv2") + (commit (string-append "v" version)) + (recursive? #t))) ; references specific commit of libxputty + (file-name (git-file-name name version)) + (sha256 + (base32 + "1v0bh4wcx79y832qigc3my8ixq0r4ica6z5fg2rg946pkh20x1a2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "INSTALL_DIR=" + (assoc-ref %outputs "out") "/lib/lv2") + "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("cairo" ,cairo) + ("libx11" ,libx11) + ("lv2" ,lv2) + ("fluidsynth" ,fluidsynth))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/brummer10/Fluida.lv2") + (synopsis "Fluidsynth as an LV2 audio plugin") + (description "Fluida is an audio plugin in the LV2 format that acts as +a frontend for fluidsynth.") + (license license:gpl2+))) + (define-public surge-synth (package (name "surge-synth") -- cgit 1.4.1 From cdc688c5ee106b7ee2547e4abd74ab81d7702d3d Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Thu, 25 Feb 2021 23:59:19 +0000 Subject: gnu: Add mamba. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (mamba): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/music.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6f94b7572a..9c809154f1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2019 Jakob L. Kreuze ;;; Copyright © 2019 raingloom ;;; Copyright © 2019 David Wilson -;;; Copyright © 2019, 2020 Alexandros Theodotou +;;; Copyright © 2019, 2020, 2021 Alexandros Theodotou ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Giacomo Leidi @@ -5864,6 +5864,51 @@ It can also play and mix samples.") (home-page "https://gitlab.com/iurie-sw/geonkick") (license license:gpl3+))) +(define-public mamba + (package + (name "mamba") + (version "2.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/brummer10/Mamba") + (commit (string-append "v" version)) + (recursive? #t))) ; references specific commit of libxputty + (file-name (git-file-name name version)) + (sha256 + (base32 + "1bq6sqsij3cdwcsj3wpsnivi4c7jl4l5gwfywhqnib70v60smdja")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags + (list (string-append "PREFIX=" + (assoc-ref %outputs "out")) + "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cairo" ,cairo) + ("fluidsynth" ,fluidsynth) + ("jack" ,jack-1) + ("liblo" ,liblo) + ("libsigc++" ,libsigc++) + ("libsmf" ,libsmf) + ("libx11" ,libx11))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/brummer10/Mamba") + (synopsis "Virtual MIDI keyboard and MIDI file player/recorder for JACK") + (description "Mamba is a virtual MIDI keyboard and MIDI file +player/recorder for the JACK Audio Connection Kit. It comes with predefined +keymaps for QWERTZ, QWERTY and AZERTY keyboards and also allows custom +ones.") + (license license:bsd-0))) + (define-public dpf-plugins (package (name "dpf-plugins") -- cgit 1.4.1 From 5dc130c465c9e0f8c000ded874c9220a97f9bcc4 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 5 Mar 2021 01:50:55 -0300 Subject: gnu: gmic: Update to 2.9.6. * gnu/packages/image-processing.scm (gmic): Update to 2.9.6. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-processing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index c3ea8491d9..0b5c792b56 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018 Lprndn ;;; Copyright © 2019, 2021 Efraim Flashner ;;; Copyright © 2020 Vincent Legoll -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021 Oleh Malyi @@ -603,14 +603,14 @@ due to its architecture which automatically parallelises the image workflows.") (define-public gmic (package (name "gmic") - (version "2.9.2") + (version "2.9.6") (source (origin (method url-fetch) (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q")))) + (base32 "06n1dcskky7aqg3a0cp7biwz8agc4xqvr8091l2wsvgib98yhbyj")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;there are no tests -- cgit 1.4.1 From 75862a9ea7b8902aebe739c784dcbcc82ee4fbf1 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 5 Mar 2021 01:53:36 -0300 Subject: gnu: gmic: Disable static libraries and enable LTO. * gnu/packages/image-processing.scm (gmic)[arguments]: Pass "-DBUILD_LIB_STATIC=OFF", "-DENABLE_DYNAMIC_LINKING=ON" and "-DENABLE_LTO=ON" to #:configure-flags. Add phase to set LDFLAGS. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-processing.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 0b5c792b56..81b90d87ec 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -613,7 +613,18 @@ due to its architecture which automatically parallelises the image workflows.") (base32 "06n1dcskky7aqg3a0cp7biwz8agc4xqvr8091l2wsvgib98yhbyj")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ;there are no tests + `(#:tests? #f ;there are no tests + #:configure-flags '("-DBUILD_LIB_STATIC=OFF" + "-DENABLE_DYNAMIC_LINKING=ON" + "-DENABLE_LTO=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'set-LDFLAGS + (lambda* (#:key inputs outputs #:allow-other-keys) + (setenv "LDFLAGS" + (string-append + "-Wl,-rpath=" + (assoc-ref outputs "out") "/lib"))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From f23ba5d9af8a4aacfa721491df2ce100d4a39889 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 5 Mar 2021 02:14:16 -0300 Subject: gnu: Add gmic-qt. * gnu/packages/image-processing.scm (gmic-qt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-processing.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 81b90d87ec..034918f52f 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -648,6 +648,30 @@ including 2D color images.") ;; Dual-licensed, either license applies. (license (list license:cecill license:cecill-c)))) +(define-public gmic-qt + (package + (inherit gmic) + (name "gmic-qt") + (arguments + (substitute-keyword-arguments (package-arguments gmic) + ((#:configure-flags _) + `(list "-DGMIC_QT_HOST=none" "-DENABLE_DYNAMIC_LINKING=ON" + (string-append "-DGMIC_LIB_PATH=" + (assoc-ref %build-inputs "gmic") "/lib"))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'qt-chdir + (lambda _ (chdir "gmic-qt") #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) + (inputs + `(("gmic" ,gmic) + ("qtbase" ,qtbase) + ,@(package-inputs gmic))) + (synopsis "Qt frontend for the G'MIC image processing framework") + (license license:gpl3+))) + (define-public nip2 (package (name "nip2") -- cgit 1.4.1 From 78e99ae6ce1e60f3e65c05334df26e3fe7e5006f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 5 Mar 2021 02:43:33 -0300 Subject: gnu: Add gmic-qt-krita. * gnu/packages/image-processing.scm (gmic-qt-krita): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-processing.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 034918f52f..5dfd18d1bd 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -672,6 +672,18 @@ including 2D color images.") (synopsis "Qt frontend for the G'MIC image processing framework") (license license:gpl3+))) +(define-public gmic-qt-krita + (package + (inherit gmic-qt) + (name "gmic-qt-krita") + (arguments + (substitute-keyword-arguments (package-arguments gmic-qt) + ((#:configure-flags flags) + '(list "-DGMIC_QT_HOST=krita" "-DENABLE_DYNAMIC_LINKING=ON" + (string-append "-DGMIC_LIB_PATH=" + (assoc-ref %build-inputs "gmic") "/lib"))))) + (synopsis "Krita plugin for the G'MIC image processing framework"))) + (define-public nip2 (package (name "nip2") -- cgit 1.4.1 From 1463e9504b116ea0874a0643a6dd23c957f3e506 Mon Sep 17 00:00:00 2001 From: Benoit Joly Date: Sat, 6 Mar 2021 14:25:24 +0100 Subject: gnu: qutebrowser: Update to 2.0.2. * gnu/packages/web-browsers.scm (qutebrowser): Update to 2.0.2. [inputs]: Add python-importlib-resources. Signed-off-by: Nicolas Goaziou --- gnu/packages/web-browsers.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 5a83a4ef95..4e78c7555d 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2021 Cage +;;; Copyright © 2021 Benoit Joly ;;; ;;; This file is part of GNU Guix. ;;; @@ -477,7 +478,7 @@ interface.") (define-public qutebrowser (package (name "qutebrowser") - (version "1.14.1") + (version "2.0.2") (source (origin (method url-fetch) @@ -485,13 +486,14 @@ interface.") "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "15l7jphy1qjsh6y6kd5mgkxsl6ymm9564g1yypa946jbyrgi8k2m")))) + (base32 "0fxkazz4ykmkiww27l92yr96hq00qn5vvjmknxcy4cl97d2pxa28")))) (build-system python-build-system) (native-inputs `(("python-attrs" ,python-attrs))) ; for tests (inputs `(("python-colorama" ,python-colorama) ("python-cssutils" ,python-cssutils) + ("python-importlib-resources" ,python-importlib-resources) ("python-jinja2" ,python-jinja2) ("python-markupsafe" ,python-markupsafe) ("python-pygments" ,python-pygments) -- cgit 1.4.1 From 0e36ea23374d432f7b74607ae39f717b1f4b2aa9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 13 Feb 2021 21:18:18 +0000 Subject: gnu: Add itcl * gnu/pacages/tcl.scm (itcl): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/tcl.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index f17e138bdb..709b3dd603 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -95,6 +95,56 @@ (description "The Tcl (Tool Command Language) scripting language.") (license license:tcl/tk))) +(define-public itcl + (package + (name "itcl") + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/incrtcl/%5Bincr%20Tcl_Tk%5D-4-source/itcl%20" + version "/itcl" version ".tar.gz")) + (file-name (string-append "incrtcl-" version ".tar.gz")) + (sha256 + (base32 "0w28v0zaraxcq1s9pa6cihqqwqvvwfgz275lks7w4gl7hxjxmasw")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + (string-append + "--exec-prefix=" (assoc-ref %outputs "out")) + (string-append + "--with-tclinclude=" (assoc-ref %build-inputs "tcl") "/include") + (string-append + "--with-tcl=" (assoc-ref %build-inputs "tcl") "/lib")) + #:test-target "test" + #:phases + (modify-phases %standard-phases + (add-after 'install 'cleanup-bin-and-lib + (lambda* (#:key outputs #:allow-other-keys) + ;; NOTE: (Sharlatan-20210213T204336+0000): libraries appearer in + ;; "out/lib/itcl{{version}}" and there are no binaries, some extra + ;; rename and remove spells are to be applied. + (let ((out (assoc-ref outputs "out"))) + (rmdir + (string-append out "/bin")) + (rename-file + (string-append out "/lib/itcl" ,version) (string-append out "/libtmp")) + (rename-file + (string-append out "/libtmp") (string-append out "/lib"))) + #t))))) + (native-inputs + `(("tcl" ,tcl))) + (inputs + `(("tcllib" ,tcllib))) + (home-page "http://incrtcl.sourceforge.net/") + (synopsis "Object Oriented programming (OOP) extension for Tcl") + (description + "[incr Tcl] is a widely used object-oriented system for Tcl. The name is +a play on C++, and [incr Tcl] provides a similar object model, including +multiple inheritence and public and private classes and variables.") + (license license:public-domain))) (define-public expect (package -- cgit 1.4.1 From e0625728125a21b410368eaae68c6fdf2710e11c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:01:24 +0100 Subject: gnu: seqan: Use HTTPS home page URI. * gnu/packages/bioinformatics.scm (seqan)[home-page]: Use HTTPS URI. --- 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 6d21e14360..9fc5cf8ecc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6608,7 +6608,7 @@ writing files into the .sra format.") `(("source" ,source) ("tar" ,tar) ("xz" ,xz))) - (home-page "http://www.seqan.de") + (home-page "https://www.seqan.de") (synopsis "Library for nucleotide sequence analysis") (description "SeqAn is a C++ library of efficient algorithms and data structures for -- cgit 1.4.1 From ea8e89292c2d8ad91de5adbc319d3d66545fb59c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:05:44 +0100 Subject: gnu: seqan-1: Use HTTPS source URI. * gnu/packages/bioinformatics.scm (seqan-1)[source]: Use HTTPS URI. --- 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 9fc5cf8ecc..be07bd18a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6624,7 +6624,7 @@ bioinformatics file formats, sequence alignment, and more.") (version "1.4.2") (source (origin (method url-fetch) - (uri (string-append "http://packages.seqan.de/seqan-library/" + (uri (string-append "https://packages.seqan.de/seqan-library/" "seqan-library-" version ".tar.bz2")) (sha256 (base32 -- cgit 1.4.1 From d12d52cef8a0395603084534bd762189e0dc4f54 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:07:30 +0100 Subject: gnu: ne: Use HTTPS home page URI. * gnu/packages/text-editors.scm (ne)[home-page]: Use HTTPS URI. --- 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 89fe797f36..59286ce033 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1047,7 +1047,7 @@ card. It offers: (substitute* "src/makefile" (("-lcurses") "-lncurses")) #t))))) - (home-page "http://ne.di.unimi.it/") + (home-page "https://ne.di.unimi.it/") (synopsis "Text editor with menu bar") (description "This package provides a modeless text editor with menu bar. It supports syntax highlighting, regular expressions, configurable menus, -- cgit 1.4.1 From 40f262a5a40bf831179cb06ef7f08b842a4b121a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:08:46 +0100 Subject: gnu: rust-servo-freetype-sys-4: Use HTTPS home page URI. * gnu/packages/crates-io.scm (rust-servo-freetype-sys-4)[home-page]: Use HTTPS URI. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index dc427ba764..1b478ec600 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -36866,7 +36866,7 @@ functionality and without weak references.") `(("pkg-config" ,pkg-config))) (inputs `(("freetype" ,freetype))) - (home-page "http://www.freetype.org/") + (home-page "https://www.freetype.org/") (synopsis "Rust wrapper around freetype") (description "This package provides a Rust wrapper around the FreeType library.") -- cgit 1.4.1 From a9a9c632afec38d7ea8921cf60d3598b88b21f2b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:12:15 +0100 Subject: gnu: r-xml: Fix home-page URI. * gnu/packages/statistics.scm (r-xml)[home-page]: Fix URI. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index c5cb7c0961..daea57e290 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2930,7 +2930,7 @@ ldap, and also supports cookies, redirects, authentication, etc.") ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://www.omegahat.org/RSXML") + (home-page "http://www.omegahat.net/RSXML") (synopsis "Tools for parsing and generating XML within R") (description "Many approaches for both reading and creating XML (and HTML) -- cgit 1.4.1 From df45894df3df575ecee7ea93d467acb3e242f876 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 6 Mar 2021 16:13:28 +0100 Subject: gnu: r-rcurl: Fix home page URI. * gnu/packages/statistics.scm (r-rcurl)[home-page]: Fix URI. --- gnu/packages/statistics.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index daea57e290..ac8b4e959e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2899,7 +2899,7 @@ if (certs != \"\") { .opts = merge.list(.opts, list(cainfo=certs)) } `(("libcurl" ,curl))) (propagated-inputs `(("r-bitops" ,r-bitops))) - (home-page "http://www.omegahat.org/RCurl") + (home-page "http://www.omegahat.net/RCurl") (synopsis "General network client interface for R") (description "The package allows one to compose general HTTP requests and provides -- cgit 1.4.1 From ade77dd0d3fec4950e89bbb59c69a5f1fe668c38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 12:37:04 +0100 Subject: gnu: Fix input typoes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/crates-io.scm (rust-nettle-sys-2)[inputs]: Move ‘,’ to its operand. * gnu/packages/docbook.scm (docbook-dsssl)[native-inputs]: Likewise. (docbook-dsssl-doc)[native-inputs]: Likewise. * gnu/packages/emacs-xyz.scm (emacs-helm-slack)[propagated-inputs]: Likewise. * gnu/packages/kde-multimedia.scm (audiocd-kio)[inputs]: Likewise. * gnu/packages/kde-pim.scm (akonadi-mime, kalarmcal, kcalendarsupport) (keventviews, kmailtransport, kpimtextedit)[inputs]: Likewise. * gnu/packages/mpd.scm (cantata)[inputs]: Likewise. * gnu/packages/raspberry-pi.scm (bcm2835): Likewise. * gnu/packages/samba.scm (samba)[native-inputs]: Likewise. * gnu/packages/xdisorg.scm (dex)[inputs]: Likewise. --- gnu/packages/crates-io.scm | 2 +- gnu/packages/docbook.scm | 4 ++-- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/kde-multimedia.scm | 2 +- gnu/packages/kde-pim.scm | 12 ++++++------ gnu/packages/mpd.scm | 2 +- gnu/packages/raspberry-pi.scm | 2 +- gnu/packages/samba.scm | 4 ++-- gnu/packages/xdisorg.scm | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1b478ec600..abe4a937e5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24294,7 +24294,7 @@ cryptographic library.") `(("clang" ,clang) ("pkg-config" ,pkg-config))) (inputs - `(("nettle", nettle))) + `(("nettle" ,nettle))) (arguments `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.51) diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 889bb96010..012e86f6a5 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -249,7 +249,7 @@ by no means limited to these applications.) This package provides XML DTDs.") (inputs `(("docbook-dsssl-doc" ,docbook-dsssl-doc))) (native-inputs - `(("bzip2", bzip2) + `(("bzip2" ,bzip2) ("tar" ,tar))) (home-page "https://docbook.org/") (synopsis "DSSSL style sheets for DocBook") @@ -287,7 +287,7 @@ by no means limited to these applications.) This package provides XML DTDs.") "--no-same-owner" "-C" docdir (string-append "docbook-dsssl-" ,version "/doc")))))) (native-inputs - `(("bzip2", bzip2) + `(("bzip2" ,bzip2) ("tar" ,tar))) (home-page "https://docbook.org/") (synopsis "DocBook DSSSL style sheets documentation") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad4a3e254b..e1726731b3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14120,7 +14120,7 @@ messaging service.") ;; HOME needs to exist for source compilation. (add-before 'build 'set-HOME (lambda _ (setenv "HOME" "/tmp") #t))))) - (propagated-inputs `(("emacs-slack", emacs-slack))) + (propagated-inputs `(("emacs-slack" ,emacs-slack))) (home-page "https://github.com/yuya373/helm-slack") (synopsis "Helm extension for emacs-slack") (description "This package provides an helm extension for emacs-slack diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index cb8cc74d33..35058363d3 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -68,7 +68,7 @@ ("ki18n" ,ki18n) ("kio" ,kio) ("libkcddb" ,libkcddb) - ("libkcompactdisc", libkcompactdisc) + ("libkcompactdisc" ,libkcompactdisc) ("libvorbis" ,libvorbis) ("phonon" ,phonon) ("qtbase" ,qtbase))) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index e055f9a9fd..d790e94c87 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -229,7 +229,7 @@ to list and filter contacts.") ("shared-mime-info" ,shared-mime-info))) (inputs `(("akonadi" ,akonadi) - ("boost", boost) + ("boost" ,boost) ("kcodecs" ,kcodecs) ("kconfig" ,kconfig) ("kconfigwidgets" ,kconfigwidgets) @@ -469,7 +469,7 @@ CalDAV server.") (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs - `(("akonadi", akonadi) + `(("akonadi" ,akonadi) ("boost" ,boost) ("kcalendarcore" ,kcalendarcore) ("kcalutils" ,kcalutils) @@ -551,7 +551,7 @@ one of the APIs mentioned above.") ("akonadi-mime" ,akonadi-mime) ("boost" ,boost) ("kcalendarcore" ,kcalendarcore) - ("kcalutils", kcalutils) + ("kcalutils" ,kcalutils) ("kcompletion" ,kcompletion) ("kdbusaddons" ,kdbusaddons) ("kdepim-apps-libs" ,kdepim-apps-libs) @@ -796,7 +796,7 @@ package.") ("kcalendarcore" ,kcalendarcore) ("kcalendarsupport" ,kcalendarsupport) ("kcalutils" ,kcalutils) - ("kcodecs", kcodecs) + ("kcodecs" ,kcodecs) ("kcompletion" ,kcompletion) ("kconfigwidgets" ,kconfigwidgets) ("kcontacts" ,kcontacts) @@ -1252,7 +1252,7 @@ e-mail client programs into KMail and KDE PIM.") ("kdbusaddons" ,kdbusaddons) ("kconfigwidgets" ,kconfigwidgets) ("ki18n" ,ki18n) - ("kitemmodels", kitemmodels) + ("kitemmodels" ,kitemmodels) ("kio" ,kio) ("kmime" ,kmime) ("ksmtp" ,ksmtp) @@ -1737,7 +1737,7 @@ Virtual Contact File}) files to the KPeople contact management library.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase) - ("qtspeech", qtspeech) + ("qtspeech" ,qtspeech) ("sonnet" ,sonnet))) (arguments `(#:tests? #f)) ;; TODO - test suite hangs diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index a8959b2f66..2f32364ad8 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -444,7 +444,7 @@ support") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("eudev", eudev) + `(("eudev" ,eudev) ("ffmpeg" ,ffmpeg) ("libcdio-paranoia" ,libcdio-paranoia) ("libebur128" ,libebur128) diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index cdea392fc7..bb38b8b218 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -59,7 +59,7 @@ `(#:tests? #f)) ; Would need to be root ;; doc/html docs would not be installed anyway. ;(native-inputs - ; `(("doxygen", doxygen))) + ; `(("doxygen" ,doxygen))) (synopsis "C library for Broadcom BCM 2835 as used in Raspberry Pi") (description "This package provides a C library for Broadcom BCM 2835 as used in the Raspberry Pi") diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index f0b74c8d40..5f14768b87 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -236,7 +236,7 @@ external dependencies.") ("cmocka" ,cmocka) ("cups" ,cups) ("gamin" ,gamin) - ("dbus", dbus) + ("dbus" ,dbus) ("gpgme" ,gpgme) ("gnutls" ,gnutls) ("heimdal" ,heimdal) @@ -265,7 +265,7 @@ external dependencies.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("xsltproc" ,libxslt) - ("libxml2", libxml2))) ;for XML_CATALOG_FILES + ("libxml2" ,libxml2))) ;for XML_CATALOG_FILES (home-page "https://www.samba.org/") (synopsis "The standard Windows interoperability suite of programs for GNU and Unix") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9d139db68c..2e09be525f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2708,7 +2708,7 @@ such as sway, similar to @command{rofi}.") (delete 'configure)) #:tests? #f)) (inputs - `(("python", python))) + `(("python" ,python))) (native-inputs `(("python-sphinx" ,python-sphinx))) (home-page "https://github.com/jceb/dex") -- cgit 1.4.1 From 39546742451d98e22471794e2d938857584173e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 12:51:18 +0100 Subject: gnu: chroma: Update to 1.18. * gnu/packages/games.scm (chroma): Update to 1.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 20a22ee574..2f48a9fb75 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6313,14 +6313,14 @@ with the mouse isn’t always trivial.") (define-public chroma (package (name "chroma") - (version "1.17") + (version "1.18") (source (origin (method url-fetch) (uri (string-append "http://level7.org.uk/chroma/download/chroma-" version ".tar.bz2")) (sha256 (base32 - "047sf00x71xbmi8bqrhfbmr9bk89l2gbykkqsfpw4wz6yfjscs6y")))) + "12bjisf5nlqinw8n4r223vld52p0p2mw3fca92vi175c46bycbzn")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests included -- cgit 1.4.1 From cfcf9dea39fe745bebeee070b59e1a4d4b6b4f57 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 16:00:04 +0100 Subject: Use ‘license:’ #:prefix in (gnu packages language). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/language.scm: Import (guix licenses) with a ‘license:’ #:prefix. Adjust all references. --- gnu/packages/language.scm | 104 ++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 55 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 651b2305c9..576a1c14ab 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -61,9 +61,7 @@ #:use-module (guix build-system perl) #:use-module (guix build-system python) #:use-module (guix build-system qt) - #:use-module ((guix licenses) - #:select - (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+ perl-license zpl2.1 fdl1.2+)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils)) @@ -198,7 +196,7 @@ framework. This package provides a fork of the original nimf project, that focusses especially on Korean input (Hangul, Hanja, ...).") (home-page "https://github.com/hamonikr/nimf/") - (license lgpl3+))) + (license license:lgpl3+))) (define-public hime (package @@ -262,12 +260,8 @@ is lightweight, stable, powerful and supports many commonly used input methods, including Cangjie, Zhuyin, Dayi, Ranked, Shrimp, Greek, Anthy, Korean, Latin, Random Cage Fighting Birds, Cool Music etc.") (home-page "http://hime-ime.github.io/") - (license - (list - gpl2+ - lgpl2.1+ - ;; Documentation - fdl1.2+)))) + (license (list license:gpl2+ license:lgpl2.1+ + license:fdl1.2+)))) ; documentation (define-public libchewing (package @@ -328,7 +322,7 @@ Random Cage Fighting Birds, Cool Music etc.") (description "Chewing is an intelligent phonetic (Zhuyin/Bopomofo) input method, one of the most popular choices for Traditional Chinese users.") (home-page "http://chewing.im/") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public liblouis (package @@ -380,8 +374,8 @@ support a rule- or dictionary based approach. Tools for testing and debugging tables are also included. Liblouis also supports math braille, Nemeth and Marburg.") (home-page "http://liblouis.org/") - (license (list lgpl2.1+ ; library - gpl3+)))) ; tools + (license (list license:lgpl2.1+ ; library + license:gpl3+)))) ; tools (define-public liblouisutdml (package @@ -421,8 +415,8 @@ transcription services for xml, html and text documents. It translates into appropriate braille codes and formats according to its style sheet and the specifications in the document.") (home-page "http://liblouis.org/") - (license (list lgpl3+ ; library - gpl3+)))) ; tools + (license (list license:lgpl3+ ; library + license:gpl3+)))) ; tools (define-public libstemmer (package @@ -459,7 +453,7 @@ specifications in the document.") (description "LibStemmer provides stemming library, supporting several languages.") (home-page "https://snowballstem.org/") - (license bsd-3))) + (license license:bsd-3))) (define-public perl-lingua-en-findnumber (package @@ -481,7 +475,7 @@ languages.") (description "This module provides a regular expression for finding numbers in English text. It also provides functions for extracting and manipulating such numbers.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-en-inflect (package @@ -504,7 +498,7 @@ manipulating such numbers.") words. Plural forms of all nouns, most verbs, and some adjectives are provided. Where appropriate, \"classical\" variants (for example: \"brother\" -> \"brethren\", \"dogma\" -> \"dogmata\", etc.) are also provided.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-en-inflect-number (package @@ -526,7 +520,7 @@ provided. Where appropriate, \"classical\" variants (for example: \"brother\" (description "This module extends the functionality of Lingua::EN::Inflect with three new functions for determining plurality of a word and forcefully converting a word to singular or plural.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-en-inflect-phrase (package @@ -553,7 +547,7 @@ converting a word to singular or plural.") (synopsis "Inflect short English phrases") (description "This module attempts to pluralize or singularize short English phrases.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-en-number-isordinal (package @@ -577,7 +571,7 @@ English phrases.") (synopsis "Detect if English number is ordinal or cardinal") (description "This module will tell you if a number, either in words or as digits, is a cardinal or ordinal number.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-en-tagger (package @@ -607,7 +601,7 @@ appropriate tag for the current word. Unknown words are classified according to word morphology or can be set to be treated as nouns or other parts of speech. The tagger also extracts as many nouns and noun phrases as it can, using a set of regular expressions.") - (license gpl3))) + (license license:gpl3))) (define-public perl-lingua-en-words2nums (package @@ -626,7 +620,7 @@ using a set of regular expressions.") (synopsis "Convert English text to numbers") (description "This module converts English text into numbers. It supports both ordinal and cardinal numbers, negative numbers, and very large numbers.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-pt-stemmer (package @@ -646,7 +640,7 @@ both ordinal and cardinal numbers, negative numbers, and very large numbers.") (description "This module implements a Portuguese stemming algorithm proposed in the paper A Stemming Algorithm for the Portuguese Language by Moreira, V. and Huyck, C.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-stem (package @@ -676,7 +670,7 @@ Moreira, V. and Huyck, C.") (synopsis "Stemming of words in various languages") (description "This routine applies stemming algorithms to its parameters, returning the stemmed words as appropriate to the selected locale.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-stem-fr (package @@ -695,7 +689,7 @@ returning the stemmed words as appropriate to the selected locale.") (synopsis "Porter's stemming algorithm for French") (description "This module uses a modified version of the Porter Stemming Algorithm to return a stemmed French word.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-stem-it (package @@ -714,7 +708,7 @@ Algorithm to return a stemmed French word.") (synopsis "Porter's stemming algorithm for Italian") (description "This module applies the Porter Stemming Algorithm to its parameters, returning the stemmed Italian word.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-stem-ru (package @@ -733,7 +727,7 @@ parameters, returning the stemmed Italian word.") (synopsis "Porter's stemming algorithm for Russian") (description "This module applies the Porter Stemming Algorithm to its parameters, returning the stemmed Russian (KOI8-R only) word.") - (license perl-license))) + (license license:perl-license))) (define-public perl-lingua-stem-snowball-da (package @@ -753,7 +747,7 @@ parameters, returning the stemmed Russian (KOI8-R only) word.") (description "Lingua::Stem::Snowball::Da is a perl port of the danish stemmer at http://snowball.sourceforge.net, it was originally altered from the Lingua::Stem::Snowball::Se.") - (license gpl2))) + (license license:gpl2))) (define-public perl-snowball-norwegian (package @@ -773,7 +767,7 @@ Lingua::Stem::Snowball::Se.") (synopsis "Porters stemming algorithm for Norwegian") (description "Lingua::Stem::Snowball::No is a perl port of the norwegian stemmer at http://snowball.tartarus.org.") - (license perl-license))) + (license license:perl-license))) (define-public perl-snowball-swedish (package @@ -793,7 +787,7 @@ stemmer at http://snowball.tartarus.org.") (synopsis "Porters stemming algorithm for Swedish") (description "Lingua::Stem::Snowball::Se is a perl port of the swedish stemmer at http://snowball.sourceforge.net.") - (license perl-license))) + (license license:perl-license))) (define-public perl-string-toidentifier-en (package @@ -819,7 +813,7 @@ converting an arbitrary string into a readable representation using the ASCII subset of \"\\w\" for use as an identifier in a computer program. The intent is to make unique identifier names from which the content of the original string can be easily inferred by a human just by reading the identifier.") - (license perl-license))) + (license license:perl-license))) (define-public perl-text-german (package @@ -838,7 +832,7 @@ string can be easily inferred by a human just by reading the identifier.") (synopsis "German grundform reduction") (description "This module is a rather incomplete implementation of work done by Gudrun Putze-Meier.") - (license perl-license))) + (license license:perl-license))) (define* (tegaki-release-uri proj version #:optional (ext "tar.gz")) @@ -905,7 +899,7 @@ extensions in EXTS." modern implementation of handwriting recognition software, specifically designed for Chinese (simplified and traditional) and Japanese, and that is suitable for both the desktop and mobile devices.") - (license gpl2+))) ; all files + (license license:gpl2+))) ; all files (define-public python2-tegaki-python (package @@ -950,9 +944,9 @@ suitable for both the desktop and mobile devices.") ("python2-zinnia" ,python2-zinnia))) (synopsis "Chinese and Japanese Handwriting Recognition (Base python library)") - (license (list gpl2+ ; all files except... - bsd-3 ; dictutils.py - zpl2.1)))) ; minjson.py + (license (list license:gpl2+ ; all files except... + license:bsd-3 ; dictutils.py + license:zpl2.1)))) ; minjson.py (define-public python2-tegaki-pygtk (package @@ -988,7 +982,7 @@ suitable for both the desktop and mobile devices.") `(("python2-pygtk" ,python2-pygtk) ("python2-tegaki-python" ,python2-tegaki-python))) (synopsis "Chinese and Japanese Handwriting Recognition (Base UI library)") - (license gpl2+))) ; all files + (license license:gpl2+))) (define-public python2-tegaki-tools (package @@ -1015,7 +1009,7 @@ suitable for both the desktop and mobile devices.") (synopsis "Chinese and Japanese Handwriting Recognition (Advanced tools)") ;; Files in gifenc/ are licensed under gpl3+ while other files are licensed ;; under gpl2+. Therefore, the combined work is licensed under gpl3+. - (license gpl3+))) + (license license:gpl3+))) (define-public python2-tegaki-recognize (let ((commit "eceec69fe651d0733c8c8752dae569d2283d0f3c") @@ -1067,7 +1061,7 @@ suitable for both the desktop and mobile devices.") "--root=/") #t)))))) (synopsis "Chinese and Japanese Handwriting Recognition (Main program)") - (license gpl2+)))) ; all files + (license license:gpl2+)))) (define-public tegaki-zinnia-japanese (package @@ -1104,7 +1098,7 @@ suitable for both the desktop and mobile devices.") (variable "TEGAKI_MODEL_PATH") (files '("share/tegaki/models"))))) (synopsis "Chinese and Japanese Handwriting Recognition (Model)") - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-japanese-light (package @@ -1120,7 +1114,7 @@ suitable for both the desktop and mobile devices.") "0x0fs29ylqzxd6xvg51h7rigpbisd7q8v11df425ib2j792yfyf8")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-japanese-kyoiku (package @@ -1136,7 +1130,7 @@ suitable for both the desktop and mobile devices.") "0am94bcpmbzplxdnwn9gk15sgaizvcfhmv13mk14jjvx3419cvvx")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-japanese-joyo (package @@ -1152,7 +1146,7 @@ suitable for both the desktop and mobile devices.") "1v0j40lzdyiz01ayws0b8r7fsdy2mr32658382kz4wyk883wzx2z")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-simplified-chinese (package @@ -1168,7 +1162,7 @@ suitable for both the desktop and mobile devices.") "18wq0jccv7lpnrfnzspyc110d6pj2v1i21xcx4fmgzz1lnln3fs5")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-simplified-chinese-light (package @@ -1184,7 +1178,7 @@ suitable for both the desktop and mobile devices.") "0v24yf0w0p03lb7fyx128a75mwzad166bigvlbrzqnad789qg1sr")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-traditional-chinese (package @@ -1200,7 +1194,7 @@ suitable for both the desktop and mobile devices.") "140nlp6hynrai2svs5670jjfw1za6ayflhyj2dl0bzsfgbk3447l")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-zinnia-traditional-chinese-light (package @@ -1216,7 +1210,7 @@ suitable for both the desktop and mobile devices.") "1m6yk6a57vs9wg5y50qciwi1ahhmklp2mgsjysbj4mnyzv6yhcr2")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-wagomu-japanese (package @@ -1232,7 +1226,7 @@ suitable for both the desktop and mobile devices.") "0flj5id8xwsn7csrrzqz9prdikswnwm2wms0as2vzdpxzph1az4k")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-wagomu-japanese-kyoiku (package @@ -1248,7 +1242,7 @@ suitable for both the desktop and mobile devices.") "0v8crfh8rdf6ndp16g52s5jlrrlwh73xp38zjn5i9dlacx8kfqg1")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-wagomu-japanese-joyo (package @@ -1264,7 +1258,7 @@ suitable for both the desktop and mobile devices.") "0wk8shpr963zp328g991qs6abpnacq4242003m687z2d6yp7nph2")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public tegaki-wagomu-simplified-chinese (package @@ -1280,7 +1274,7 @@ suitable for both the desktop and mobile devices.") "0wqprynigqxqxv128i1smh81gxvmjj056d9qpznxa3n9f5ymlbj6")) (modules remove-pre-compiled-files-modules) (snippet (remove-pre-compiled-files "model")))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) ;;; Upstream does not provide the source for tegaki-wagomu-traditional-chinese. ;;; Therefore, we use the source for tegaki-zinnia-traditional-chinese and @@ -1301,7 +1295,7 @@ suitable for both the desktop and mobile devices.") (substitute* "Makefile" (("zinnia") "wagomu")) #t)))))) - (license lgpl2.1))) ; all files + (license license:lgpl2.1))) (define-public link-grammar (package @@ -1325,7 +1319,7 @@ system assigns to it a syntactic structure, which consists of a set of labelled links connecting pairs of words. The parser also produces a \"constituent\" (HPSG style phrase tree) representation of a sentence (showing noun phrases, verb phrases, etc.).") - (license bsd-3))) + (license license:bsd-3))) (define-public praat (package @@ -1368,4 +1362,4 @@ noun phrases, verb phrases, etc.).") (description "Praat is a tool to perform phonetics tasks. It can do speech analysis (pitch, formant, intensity, ...), speech synthesis, labelling, segmenting and manipulation.") - (license gpl2+))) + (license license:gpl2+))) -- cgit 1.4.1 From 3208bdfd53ec67434684389a19e151eeb194f184 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 16:42:34 +0100 Subject: gnu: font-liberation: Update to 2.1.3. * gnu/packages/fonts.scm (font-liberation): Update to 2.1.3. --- gnu/packages/fonts.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index bb0270466a..1b00f28aa9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -334,14 +334,15 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (define-public font-liberation (package (name "font-liberation") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) - (uri (string-append "https://github.com/liberationfonts/liberation-fonts/" - "files/5722233/liberation-fonts-ttf-" version ".tar.gz")) + (uri (string-append + "https://github.com/liberationfonts/liberation-fonts/" + "files/6060976/liberation-fonts-ttf-" version ".tar.gz")) (sha256 - (base32 "1q7qx9bpn1gqjh1zbb8n9fkzwz8skn41hyy61186g4c3y8q4js8l")))) + (base32 "0bv8i47iq2irxkkjlqwdli4zz01sb1qg2n6vbdqjrqqhx912zji2")))) (build-system font-build-system) (home-page "https://github.com/liberationfonts") (synopsis "Fonts compatible with Arial, Times New Roman, and Courier New") -- cgit 1.4.1 From 98ec11c472ea401c86ddf40ce5e8e99b63203e91 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 16:43:39 +0100 Subject: gnu: font-liberation: Remove sponsorship information from description. * gnu/packages/fonts.scm (font-liberation)[description]: Remove sponsorship information. --- gnu/packages/fonts.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1b00f28aa9..a1c30b8fa7 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -358,9 +358,7 @@ Bitstream Vera Sans); Bitstream Vera Serif); @item Mono (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and Bitstream Vera Sans Mono). -@end enumerate - -The Liberation Fonts are sponsored by Red Hat.") +@end enumerate\n") (license license:silofl1.1))) (define-public font-linuxlibertine -- cgit 1.4.1 From 3b2d7ada40db66439ce3d285960208687d79b421 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Sat, 6 Mar 2021 01:16:32 +0000 Subject: gnu: mumble: Modify snippet. * gnu/packages/telephony.scm (mumble) [snippet]: List kept directories instead of deleted ones. Co-authored-by: Raghav Gururajan Co-authored-by: jgart Signed-off-by: Leo Prikler --- gnu/packages/telephony.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 53cc127e48..5c8d247e68 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 LibreMiami ;;; ;;; This file is part of GNU Guix. ;;; @@ -525,26 +526,27 @@ address of one of the participants.") (sha256 (base32 "14v0rgy1a5alxmz7ly95y38bdj0hx79yysgkcd8r8p9qqfzlwpv1")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) (snippet `(begin - ;; Remove bundled software. Keep arc4random, celt-0.7.0, - ;; celt-0.11.0, qqbonjour, rnnoise, smallft. - (for-each - delete-file-recursively - '("3rdparty/GL" ; in mesa - "3rdparty/mach-override-build" ; for macx - "3rdparty/mach-override-src" - "3rdparty/minhook-build" ; for win32 - "3rdparty/minhook-src" - "3rdparty/opus-build" ; in opus - "3rdparty/opus-src" - "3rdparty/speex-build" ; in speex - "3rdparty/speex-src" - "3rdparty/speexdsp-src" ; in speexdsp - "3rdparty/xinputcheck-build" ; for win32 - "3rdparty/xinputcheck-src")) - #t)))) + (let ((keep + '("arc4random-src" + "celt-0.7.0-build" + "celt-0.7.0-src" + "celt-0.11.0-build" + "celt-0.11.0-src" + "qqbonjour-src" + "rnnoise-build" + "rnnoise-src" + "smallft-src"))) + (with-directory-excursion "3rdparty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep)))) + #t))))) (build-system qt-build-system) (arguments `(#:tests? #f ; no "check" target -- cgit 1.4.1 From a3084e1e06c30179bd75af2a0badd8a7ac0485f7 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 15 Feb 2021 16:02:43 +0100 Subject: gnu: ppsspp: Update to 1.11.2. * gnu/packages/emulators.scm (ppsspp): Update to 1.11.2. [snippet]: Adapt to changes in source code. Unbundle miniupnp and MoltenVK. [arguments]<#:phases>: Add fix-unittest-build. Comment failing tests. * gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch: Adapt to source. --- gnu/packages/emulators.scm | 50 +++++---- .../patches/ppsspp-disable-upgrade-and-gold.patch | 113 +++++++++++---------- 2 files changed, 93 insertions(+), 70 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 532ca60602..a2e7b9970a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2094,7 +2094,7 @@ framework based on QEMU.") (define-public ppsspp (package (name "ppsspp") - (version "1.10.3") + (version "1.11.2") (source (origin (method git-fetch) @@ -2102,7 +2102,7 @@ framework based on QEMU.") (url "https://github.com/hrydgard/ppsspp") (commit (string-append "v" version)))) (sha256 - (base32 "0znxlbj6cfw7gn0naay0mzhc0k5saw8nrwpspcn7gap1023p06w2")) + (base32 "03nxarx0l1ndi9fffl1wjfwsg3pk2bwf72cwcfaski1sg3dxsv7h")) (file-name (git-file-name name version)) (patches (search-patches "ppsspp-disable-upgrade-and-gold.patch")) @@ -2113,16 +2113,16 @@ framework based on QEMU.") ;; There are still a number of external sources, that we don't ;; remove here. Some may be packaged, others are not. ;; First, we patch existing sources to include the right headers. - (substitute* (append (list "ext/native/thin3d/vulkan_utils.cpp" - "ext/native/thin3d/thin3d_vulkan.cpp") - (find-files "Common" ".*\\.(h|cpp)") + (substitute* (append (find-files "Common" ".*\\.(h|cpp)") (find-files "Core" ".*\\.(h|cpp)") (find-files "GPU" ".*\\.(h|cpp)") (find-files "SDL" ".*\\.(h|cpp)") (find-files "UI" ".*\\.(h|cpp)")) ;; These headers are all hard-coded in the original source. (("ext/cityhash/") "") - (("ext/glslang/") "") + (("ext/glslang/glslang/") "glslang/") + (("ext/glslang/") "glslang/") + (("ext/miniupnp/") "") (("ext/SPIRV-Cross/") "spirv_cross/") (("ext/vulkan/") "vulkan/") (("ext/xxhash.h") "xxhash.h") @@ -2145,7 +2145,12 @@ framework based on QEMU.") ;; Don't search for cityhash/xxhash, we already have them. (("add_library\\((city|xx)hash STATIC") "if()\nendif(") (("ext/xxhash\\.[ch]") "") - (("ext/native/ext/cityhash/.*\\.(cpp|h)") "") + (("ext/cityhash/.*\\.(cpp|h)") "") + (("if\\(USE_MINIUPNPC\\)" all) + (string-append all " +find_package(miniupnpc) +target_link_libraries(${CoreLibName} miniupnpc ${LDLIBS}) +elseif(FALSE)")) ;; Link all of spirv-cross. (("spirv-cross-glsl" all) (string-append all @@ -2158,12 +2163,12 @@ framework based on QEMU.") (("add_subdirectory\\(SPIRV-Cross-build\\)") "")) ;; Finally, we can delete the bundled sources. (for-each delete-file-recursively - '("ext/cmake" + '("MoltenVK" + "ext/cmake" "ext/glew" "ext/glslang" "ext/glslang-build" - "ext/native/ext/cityhash" - "ext/native/ext/libpng17" - "ext/native/ext/libzip" + "ext/miniupnp" "ext/miniupnp-build" + "ext/native" "ext/snappy" "ext/SPIRV-Cross" "ext/SPIRV-Cross-build" "ext/vulkan" @@ -2186,6 +2191,7 @@ framework based on QEMU.") ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) + ("miniupnpc" ,miniupnpc) ("sdl2" ,sdl2) ("snappy" ,snappy) ("spirv-cross" ,spirv-cross) @@ -2196,24 +2202,24 @@ framework based on QEMU.") ;; TODO: unbundle armips. ("armips-source" ,(package-source armips)) ("lang" - ,(let ((commit "1c64b8fbd3cb6bd87935eb53f302f7de6f86e209")) + ,(let ((commit "6bd5b4bc983917ea8402f73c726b46e36f3de0b4")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/hrydgard/ppsspp-lang") (commit commit))) (sha256 - (base32 "0rprn3yd8xfrvi0fm62sgpqa8n73jk7zmlscp8cp0h2fawqpiamd")) + (base32 "08npr3a4xskf85gnlxidl4ksc3rhc7m5rgnj7vsbjvhvw5ap02qx")) (file-name (git-file-name "ppsspp-lang" commit))))) ("tests" - ,(let ((commit "328b839c7243e7f733f9eae88d059485e3d808e7")) + ,(let ((commit "1047400eaec6bcbdb2a64d326375ef6a6617c4ac")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/hrydgard/pspautotests") (commit commit))) (sha256 - (base32 "1gj1kr5ijxrqwvz7c41phskjr70ndp8iz0gr8c3xxsd8p9z5gdvm")) + (base32 "0nxv1lskcr8zbg6nrfai21mxsw0n5vaqhbsa41c3cxfyx5c4w2pg")) (file-name (git-file-name "pspautotests" commit))))))) (arguments `(#:out-of-source? #f @@ -2236,13 +2242,23 @@ framework based on QEMU.") (copy-recursively (assoc-ref inputs "lang") "assets/lang") #t)) + (add-after 'unpack 'fix-unittest-build + (lambda _ + (substitute* "CMakeLists.txt" + (("unittest/TestVertexJit.cpp" all) + (string-append all " unittest/TestShaderGenerators.cpp"))) + (substitute* "unittest/TestVertexJit.cpp" + (("#include \"unittest/UnitTest.h\"" all) + (string-append all "\n#include "))) + #t)) (replace 'check (lambda _ (for-each (lambda (t) (invoke "./unitTest" t)) '("Arm64Emitter" "ArmEmitter" "X64Emitter" "VertexJit" "Asin" - "SinCos" "VFPUSinCos" "MathUtil" "Parsers" "Jit" - "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" "MemMap")) + "SinCos" #|"VFPUSinCos" SIGSEGV|# "MathUtil" "Parsers" "Jit" + "MatrixTranspose" "ParseLBN" "QuickTexHash" "CLZ" + #|"ShaderGenerators"|#)) (invoke "python3" "test.py" "-g") #t)) (replace 'install diff --git a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch index 9503ab6f31..760ab97568 100644 --- a/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch +++ b/gnu/packages/patches/ppsspp-disable-upgrade-and-gold.patch @@ -1,28 +1,28 @@ -From 951f2269f67d618d376656db831796c119f4f6b3 Mon Sep 17 00:00:00 2001 +From 0c57874ebb5982154da127ae338f9190b1581804 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 26 Jun 2020 18:20:04 +0200 Subject: [PATCH] ppsspp: disable upgrade and gold --- - Core/Config.cpp | 11 ------- + Core/Config.cpp | 11 ------ Core/Config.h | 2 -- Qt/QtMain.cpp | 6 ---- SDL/SDLMain.cpp | 6 ---- UI/DevScreens.cpp | 3 -- UI/GameSettingsScreen.cpp | 1 - - UI/MainScreen.cpp | 63 +------------------------------------ - UI/MiscScreens.cpp | 31 ++---------------- + UI/MainScreen.cpp | 70 +------------------------------------ + UI/MiscScreens.cpp | 31 ++-------------- UWP/PPSSPP_UWPMain.cpp | 6 ---- Windows/MainWindowMenu.cpp | 2 +- Windows/main.cpp | 6 ---- android/jni/app-android.cpp | 6 ---- - 12 files changed, 5 insertions(+), 138 deletions(-) + 12 files changed, 5 insertions(+), 145 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp -index 214aeb433..04e3b151d 100644 +index 1c53e8e57..2fa74a6b8 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp -@@ -428,7 +428,6 @@ static ConfigSetting generalSettings[] = { +@@ -439,7 +439,6 @@ static ConfigSetting generalSettings[] = { ConfigSetting("IgnoreBadMemAccess", &g_Config.bIgnoreBadMemAccess, true, true), ConfigSetting("CurrentDirectory", &g_Config.currentDirectory, ""), ConfigSetting("ShowDebuggerOnLoad", &g_Config.bShowDebuggerOnLoad, false), @@ -30,7 +30,7 @@ index 214aeb433..04e3b151d 100644 ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion), ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, true, true), ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, true, false), // Or maybe it makes sense to have it per-game? Race conditions abound... -@@ -1229,16 +1228,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { +@@ -1293,16 +1292,6 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename) { upgradeMessage = ""; } @@ -48,29 +48,29 @@ index 214aeb433..04e3b151d 100644 bSaveSettings = true; diff --git a/Core/Config.h b/Core/Config.h -index 084eacc94..e7134cab5 100644 +index 13bce8a36..70d6c8aaf 100644 --- a/Core/Config.h +++ b/Core/Config.h -@@ -99,7 +99,6 @@ struct Config { - bool bIgnoreBadMemAccess; +@@ -101,7 +101,6 @@ struct Config { + bool bFastMemory; int iCpuCore; - bool bCheckForNewVersion; bool bForceLagSync; bool bFuncReplacements; bool bHideSlowWarnings; -@@ -521,4 +520,3 @@ std::string CreateRandMAC(); +@@ -540,4 +539,3 @@ std::string CreateRandMAC(); // TODO: Find a better place for this. extern http::Downloader g_DownloadManager; extern Config g_Config; - diff --git a/Qt/QtMain.cpp b/Qt/QtMain.cpp -index 7713b6587..1d92d1175 100644 +index 5be0cefa0..b11cb1c64 100644 --- a/Qt/QtMain.cpp +++ b/Qt/QtMain.cpp -@@ -194,12 +194,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return true; +@@ -218,12 +218,6 @@ bool System_GetPropertyBool(SystemProperty prop) { case SYSPROP_HAS_FILE_BROWSER: + case SYSPROP_HAS_FOLDER_BROWSER: return true; - case SYSPROP_APP_GOLD: -#ifdef GOLD @@ -82,10 +82,10 @@ index 7713b6587..1d92d1175 100644 return false; } diff --git a/SDL/SDLMain.cpp b/SDL/SDLMain.cpp -index 52028d087..d8697d210 100644 +index 98b56fe91..6af0fcb1a 100644 --- a/SDL/SDLMain.cpp +++ b/SDL/SDLMain.cpp -@@ -356,12 +356,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -380,12 +380,6 @@ bool System_GetPropertyBool(SystemProperty prop) { switch (prop) { case SYSPROP_HAS_BACK_BUTTON: return true; @@ -99,10 +99,10 @@ index 52028d087..d8697d210 100644 return false; } diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp -index f146d099e..625ee124c 100644 +index 8daac5bc8..c0c09ce79 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp -@@ -603,9 +603,6 @@ void SystemInfoScreen::CreateViews() { +@@ -605,9 +605,6 @@ void SystemInfoScreen::CreateViews() { #ifdef _M_SSE buildConfig->Add(new InfoItem("_M_SSE", StringFromFormat("0x%x", _M_SSE))); #endif @@ -113,35 +113,35 @@ index f146d099e..625ee124c 100644 ViewGroup *cpuExtensionsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); cpuExtensionsScroll->SetTag("DevSystemInfoCPUExt"); diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp -index 8202870c7..81112f822 100644 +index 2f1e157ee..38c586b06 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp -@@ -796,7 +796,6 @@ void GameSettingsScreen::CreateViews() { +@@ -914,7 +914,6 @@ void GameSettingsScreen::CreateViews() { + } } #endif - - systemSettings->Add(new CheckBox(&g_Config.bCheckForNewVersion, sy->T("VersionCheck", "Check for new versions of PPSSPP"))); const std::string bgPng = GetSysDirectory(DIRECTORY_SYSTEM) + "background.png"; const std::string bgJpg = GetSysDirectory(DIRECTORY_SYSTEM) + "background.jpg"; if (File::Exists(bgPng) || File::Exists(bgJpg)) { diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp -index 43535913d..36834020d 100644 +index ca870ab8f..84cde88ac 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp -@@ -1054,11 +1054,7 @@ void MainScreen::CreateViews() { +@@ -1064,11 +1064,7 @@ void MainScreen::CreateViews() { sprintf(versionString, "%s", PPSSPP_GIT_VERSION); rightColumnItems->SetSpacing(0.0f); - LinearLayout *logos = new LinearLayout(ORIENT_HORIZONTAL); + AnchorLayout *logos = new AnchorLayout(new AnchorLayoutParams(FILL_PARENT, 60.0f, false)); - if (System_GetPropertyBool(SYSPROP_APP_GOLD)) { -- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- logos->Add(new ImageView(ImageID("I_ICONGOLD"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } else { -- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); +- logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); - } -+ logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 10, 10, NONE, NONE, false))); - logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new LinearLayoutParams(Margins(-12, 0, 0, 0)))); - rightColumnItems->Add(logos); - TextView *ver = rightColumnItems->Add(new TextView(versionString, new LinearLayoutParams(Margins(70, -6, 0, 0)))); -@@ -1070,11 +1066,6 @@ void MainScreen::CreateViews() { ++ logos->Add(new ImageView(ImageID("I_ICON"), IS_DEFAULT, new AnchorLayoutParams(64, 64, 0, 0, NONE, NONE, false))); + logos->Add(new ImageView(ImageID("I_LOGO"), IS_DEFAULT, new AnchorLayoutParams(180, 64, 64, -5.0f, NONE, NONE, false))); + + #if !defined(MOBILE_DEVICE) +@@ -1089,11 +1085,6 @@ void MainScreen::CreateViews() { rightColumnItems->Add(new Choice(mm->T("Game Settings", "Settings")))->OnClick.Handle(this, &MainScreen::OnGameSettings); rightColumnItems->Add(new Choice(mm->T("Credits")))->OnClick.Handle(this, &MainScreen::OnCredits); rightColumnItems->Add(new Choice(mm->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg); @@ -153,7 +153,7 @@ index 43535913d..36834020d 100644 #if !PPSSPP_PLATFORM(UWP) // Having an exit button is against UWP guidelines. -@@ -1099,28 +1090,6 @@ void MainScreen::CreateViews() { +@@ -1118,32 +1109,6 @@ void MainScreen::CreateViews() { } else if (tabHolder_->GetVisibility() != V_GONE) { root_->SetDefaultFocusView(tabHolder_); } @@ -169,7 +169,11 @@ index 43535913d..36834020d 100644 - UI::Drawable solid(0xFFbd9939); - upgradeBar_->SetBG(solid); - upgradeBar_->Add(new TextView(u->T("New version of PPSSPP available") + std::string(": ") + g_Config.upgradeVersion, new LinearLayoutParams(1.0f, textMargins))); +-#if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(WINDOWS) - upgradeBar_->Add(new Button(u->T("Download"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); +-#else +- upgradeBar_->Add(new Button(u->T("Details"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDownloadUpgrade); +-#endif - upgradeBar_->Add(new Button(u->T("Dismiss"), new LinearLayoutParams(buttonMargins)))->OnClick.Handle(this, &MainScreen::OnDismissUpgrade); - - // Slip in under root_ @@ -182,7 +186,7 @@ index 43535913d..36834020d 100644 } UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { -@@ -1128,27 +1097,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { +@@ -1151,30 +1116,6 @@ UI::EventReturn MainScreen::OnAllowStorage(UI::EventParams &e) { return UI::EVENT_DONE; } @@ -194,9 +198,12 @@ index 43535913d..36834020d 100644 - } else { - LaunchBrowser("market://details?id=org.ppsspp.ppsspp"); - } +-#elif PPSSPP_PLATFORM(WINDOWS) +- LaunchBrowser("https://www.ppsspp.org/downloads.html"); -#else - // Go directly to ppsspp.org and let the user sort it out -- LaunchBrowser("https://www.ppsspp.org/downloads.html"); +- // (for details and in case downloads doesn't have their platform.) +- LaunchBrowser("https://www.ppsspp.org/"); -#endif - return UI::EVENT_DONE; -} @@ -210,7 +217,7 @@ index 43535913d..36834020d 100644 void MainScreen::sendMessage(const char *message, const char *value) { // Always call the base class method first to handle the most common messages. UIScreenWithBackground::sendMessage(message, value); -@@ -1319,15 +1267,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { +@@ -1390,15 +1331,6 @@ UI::EventReturn MainScreen::OnCredits(UI::EventParams &e) { return UI::EVENT_DONE; } @@ -227,10 +234,10 @@ index 43535913d..36834020d 100644 LaunchBrowser("https://www.ppsspp.org"); return UI::EVENT_DONE; diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp -index a6542c65d..f5f101594 100644 +index a7284654b..2413d6c89 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp -@@ -498,11 +498,7 @@ void LogoScreen::render() { +@@ -539,11 +539,7 @@ void LogoScreen::render() { char temp[256]; // Manually formatting UTF-8 is fun. \xXX doesn't work everywhere. snprintf(temp, sizeof(temp), "%s Henrik Rydg%c%crd", cr->T("created", "Created by"), 0xC3, 0xA5); @@ -243,7 +250,7 @@ index a6542c65d..f5f101594 100644 dc.Draw()->DrawImage(ImageID("I_LOGO"), bounds.centerX() + 40, bounds.centerY() - 30, 1.5f, textColor, ALIGN_CENTER); //dc.Draw()->DrawTextShadow(UBUNTU48, "PPSSPP", xres / 2, yres / 2 - 30, textColor, ALIGN_CENTER); dc.SetFontScale(1.0f, 1.0f); -@@ -538,10 +534,6 @@ void CreditsScreen::CreateViews() { +@@ -579,10 +575,6 @@ void CreditsScreen::CreateViews() { // Really need to redo this whole layout with some linear layouts... int rightYOffset = 0; @@ -254,7 +261,7 @@ index a6542c65d..f5f101594 100644 root_->Add(new Button(cr->T("PPSSPP Forums"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 158, false)))->OnClick.Handle(this, &CreditsScreen::OnForums); root_->Add(new Button(cr->T("Discord"), new AnchorLayoutParams(260, 64, 10, NONE, NONE, 232, false)))->OnClick.Handle(this, &CreditsScreen::OnDiscord); root_->Add(new Button("www.ppsspp.org", new AnchorLayoutParams(260, 64, 10, NONE, NONE, 10, false)))->OnClick.Handle(this, &CreditsScreen::OnPPSSPPOrg); -@@ -550,20 +542,7 @@ void CreditsScreen::CreateViews() { +@@ -591,20 +583,7 @@ void CreditsScreen::CreateViews() { #if PPSSPP_PLATFORM(ANDROID) || PPSSPP_PLATFORM(IOS) root_->Add(new Button(cr->T("Share PPSSPP"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, rightYOffset + 158, false)))->OnClick.Handle(this, &CreditsScreen::OnShare); #endif @@ -276,7 +283,7 @@ index a6542c65d..f5f101594 100644 } UI::EventReturn CreditsScreen::OnTwitter(UI::EventParams &e) { -@@ -747,11 +726,7 @@ void CreditsScreen::render() { +@@ -794,11 +773,7 @@ void CreditsScreen::render() { // TODO: This is kinda ugly, done on every frame... char temp[256]; @@ -290,10 +297,10 @@ index a6542c65d..f5f101594 100644 UIContext &dc = *screenManager()->getUIContext(); diff --git a/UWP/PPSSPP_UWPMain.cpp b/UWP/PPSSPP_UWPMain.cpp -index 24f3b964d..1d66ba7ee 100644 +index 0ba7fac4b..d1b687c47 100644 --- a/UWP/PPSSPP_UWPMain.cpp +++ b/UWP/PPSSPP_UWPMain.cpp -@@ -399,12 +399,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -433,12 +433,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return false; case SYSPROP_HAS_BACK_BUTTON: return true; @@ -307,10 +314,10 @@ index 24f3b964d..1d66ba7ee 100644 return false; } diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp -index b5e1bb0eb..71b29b48a 100644 +index 979a60ecb..a57927544 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp -@@ -1377,7 +1377,7 @@ namespace MainWindow { +@@ -1393,7 +1393,7 @@ namespace MainWindow { { W32Util::CenterWindow(hDlg); HWND versionBox = GetDlgItem(hDlg, IDC_VERSION); @@ -320,10 +327,10 @@ index b5e1bb0eb..71b29b48a 100644 SetWindowText(versionBox, ConvertUTF8ToWString(windowText).c_str()); } diff --git a/Windows/main.cpp b/Windows/main.cpp -index 3795597e2..fd98d0453 100644 +index 4d948cfe5..e609cc1e0 100644 --- a/Windows/main.cpp +++ b/Windows/main.cpp -@@ -268,12 +268,6 @@ bool System_GetPropertyBool(SystemProperty prop) { +@@ -301,12 +301,6 @@ bool System_GetPropertyBool(SystemProperty prop) { return true; case SYSPROP_HAS_BACK_BUTTON: return true; @@ -337,13 +344,13 @@ index 3795597e2..fd98d0453 100644 return false; } diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp -index 086371085..0a340c0ae 100644 +index 10fdf97e5..736b1fa66 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp -@@ -372,12 +372,6 @@ bool System_GetPropertyBool(SystemProperty prop) { - return true; - case SYSPROP_HAS_IMAGE_BROWSER: - return true; +@@ -437,12 +437,6 @@ bool System_GetPropertyBool(SystemProperty prop) { + case SYSPROP_HAS_FOLDER_BROWSER: + // Uses OPEN_DOCUMENT_TREE to let you select a folder. + return androidVersion >= 21; - case SYSPROP_APP_GOLD: -#ifdef GOLD - return true; @@ -354,5 +361,5 @@ index 086371085..0a340c0ae 100644 return false; } -- -2.26.2 +2.30.1 -- cgit 1.4.1 From 3483886cf47199eaf3f11fb132605e7f39e9e12d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Wed, 17 Feb 2021 11:16:40 +0100 Subject: gnu: Add orchis-theme. * gnu/packages/gnome-xyz.scm (orchis-theme): New variable. --- gnu/packages/gnome-xyz.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index aa7949478c..e481a10e11 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -781,6 +781,64 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public numix-theme (deprecated-package "numix-theme" numix-gtk-theme)) +(define-public orchis-theme + (package + (name "orchis-theme") + (version "2021-01-22") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/vinceliuice/Orchis-theme") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc")) + (modules '((guix build utils) + (ice-9 regex) + (srfi srfi-26))) + (snippet + '(begin + (for-each + (lambda (f) + (let* ((r (make-regexp "\\.scss")) + (f* (regexp-substitute #f (regexp-exec r f) 'pre ".css"))) + (if (file-exists? f*) + (delete-file f*)))) + (find-files "." ".*\\.scss")) + #t)))) + (build-system gnu-build-system) + (arguments + '(#:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure) + (replace 'build (lambda _ (invoke "./parse-sass.sh"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((themes (string-append (assoc-ref outputs "out") + "/share/themes"))) + (mkdir-p themes) + (invoke "./install.sh" "-d" themes) + #t)))))) + (inputs + `(("gtk-engines" ,gtk-engines))) + (native-inputs + `(;("coreutils" ,coreutils) + ("gtk+" ,gtk+) + ("sassc" ,sassc))) + (home-page "https://github.com/vinceliuice/Orchis-theme") + (synopsis "Material Design theme for a wide range of environments") + (description "Orchis is a Material Design them for GNOME/GTK based +desktop environments. It is based on materia-theme and adds more color +variants.") + (license (list license:gpl3 ; Claimed by README.md. + license:lgpl2.1 ; Some style sheets. + license:cc-by-sa4.0)))) ; Some icons + (define-public markets (package (name "markets") -- cgit 1.4.1 From 94466f9594789f5320a79fa5555254e0b4a90f5b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 17:21:31 +0100 Subject: gnu: surgescript: Update to 0.5.5. * gnu/packages/game-development.scm (surgescript): Update to 0.5.5. --- 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 1f6ed0665a..55a7d71c17 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -638,7 +638,7 @@ sounds from presets such as \"explosion\" or \"powerup\".") (define-public surgescript (package (name "surgescript") - (version "0.5.4.4") + (version "0.5.5") (source (origin (method git-fetch) @@ -647,7 +647,7 @@ sounds from presets such as \"explosion\" or \"powerup\".") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1vck1wk6r6jrrw5xzpqldplz601dfgpk5s5p45fam00nfsid0p7p")))) + (base32 "0xwd4g7n0b0rxkpbyshkzyl472h1y606ghyvf8gv034n3jz2g4jk")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From 497a4646b37843187851787e34cc99683799f345 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 17:22:05 +0100 Subject: gnu: surgescript: Do not want static libraries. * gnu/packages/game-development.scm (surgescript)[arguments]: Add "-DWANT_STATIC=NO" to #:configure-flags. --- gnu/packages/game-development.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 55a7d71c17..7e17142b9e 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -652,7 +652,8 @@ sounds from presets such as \"explosion\" or \"powerup\".") (arguments '(#:configure-flags (let ((share (string-append (assoc-ref %outputs "out") "/share"))) - (list (string-append "-DICON_PATH=" share "/pixmaps") + (list "-DWANT_STATIC=NO" + (string-append "-DICON_PATH=" share "/pixmaps") (string-append "-DMETAINFO_PATH=" share "/metainfo"))) #:tests? #f)) (home-page "https://docs.opensurge2d.org") -- cgit 1.4.1 From 596aa62d7c88fa2b646087d7a3461bb2ba85ae16 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 17:31:37 +0100 Subject: gnu: font-mononoki: Update to 1.3. * gnu/packages/fonts.scm (font-mononoki): Update to 1.3. [arguments]: Add a 'make-files-writable phase. --- gnu/packages/fonts.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index a1c30b8fa7..8c49c05c47 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1755,7 +1755,7 @@ files (TTF).") (define-public font-mononoki (package (name "font-mononoki") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) (uri (git-reference @@ -1763,9 +1763,15 @@ files (TTF).") (commit version))) (sha256 (base32 - "1rkzyxn30rn8qv2h2xz324j7q15hzg2lci8790a7cdl1dfgic4xi")) + "07gh84iw84g8fha3gx4yjyl1rsksqhy2kk38f01m048sgjp6ww5j")) (file-name (git-file-name name version)))) (build-system font-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-files-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) (synopsis "Font for programming and code review") (description "Mononoki is a typeface by Matthias Tellen, created to enhance code -- cgit 1.4.1 From 9055546943dba1ac5f957a59e2ea3adcf29bd07e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:01:10 +0100 Subject: gnu: gnote: Update to 3.38.1. * gnu/packages/gnome.scm (gnote): Update to 3.38.1. --- 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 1aaffe0b00..29bf210ff2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11159,7 +11159,7 @@ index files needed for Adwaita to be used outside of GNOME.") (define-public gnote (package (name "gnote") - (version "3.38.0") + (version "3.38.1") (source (origin (method url-fetch) @@ -11167,7 +11167,7 @@ index files needed for Adwaita to be used outside of GNOME.") (version-major+minor version) "/" "gnote-" version ".tar.xz")) (sha256 - (base32 "1ingbaw4d8vpjn083xvzqw7kz8z0k2bx7msk78pbzd68bwgkadpx")))) + (base32 "1adjfjhmsm2d33999khjyzvli6kiz1jlzavn77jhd49kfzhxa9y4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) -- cgit 1.4.1 From 22f16f17eb6a3bb56da186867ef7bae6ea3aa46d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:01:27 +0100 Subject: gnu: gexiv2: Update to 0.12.2. * gnu/packages/gnome.scm (gexiv2): Update to 0.12.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 29bf210ff2..adcf7fa873 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6928,7 +6928,7 @@ classes for commonly used data structures.") (define-public gexiv2 (package (name "gexiv2") - (version "0.12.1") + (version "0.12.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6936,7 +6936,7 @@ classes for commonly used data structures.") name "-" version ".tar.xz")) (sha256 (base32 - "0xxxq8xdkgkn146my307jgws4qgxx477h0ybg1mqza1ycmczvsla")))) + "0k4ljzzz5dwqndw8awvlw3ala8rh3b2rk9i4jzvywc53mi9ba8i3")))) (build-system meson-build-system) (native-inputs `(("gcr" ,gcr) -- cgit 1.4.1 From bb0e62a1d03e561ead3ffc49f1b4f62e98b833ee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:07:46 +0100 Subject: gnu: libgovirt: Update to 0.3.8. * gnu/packages/gnome.scm (libgovirt): Update to 0.3.8. --- 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 adcf7fa873..eeb4e2f83b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9029,7 +9029,7 @@ associations for GNOME.") (define-public libgovirt (package (name "libgovirt") - (version "0.3.6") + (version "0.3.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9037,7 +9037,7 @@ associations for GNOME.") name "-" version ".tar.xz")) (sha256 (base32 - "19pb71pag3vsi83kbv8h08kimwym4hpw36kjl6a5ik5nk50mc8sg")))) + "1y0x1wyakj3ya33hgj0w1jkbcn50q21gmn2zyalxysqp55i1ij8x")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From 222679d2d97711f0d4fd6ec9e48f137783ab7bf4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:29:05 +0100 Subject: gnu: getmail: Update to 5.15. * gnu/packages/mail.scm (getmail): Update to 5.15. --- 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 d90bfead72..dd166ca97b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1438,14 +1438,14 @@ pairs have previously synchronized.") (define-public getmail (package (name "getmail") - (version "5.14") + (version "5.15") (source (origin (method url-fetch) (uri (string-append "http://pyropus.ca/software/getmail/old-versions/" "getmail-" version ".tar.gz")) (sha256 - (base32 "1hcrd9h4g12f5gvl1djsbchcjry02ghq4icdr897s8v48pkrzagk")))) + (base32 "0ahn2jyj4ka996qzs99id59pwxv6sqxp61g7drcf53rzzigq0lyl")))) (build-system python-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 8dba81e68c544e2958024e7919f209953764a8fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:29:27 +0100 Subject: gnu: libgxps: Update to 0.3.2. * gnu/packages/gnome.scm (libgxps): Update to 0.3.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 eeb4e2f83b..5c6d247471 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1974,7 +1974,7 @@ access the common Google services, and has full asynchronous support.") (define-public libgxps (package (name "libgxps") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1982,7 +1982,7 @@ access the common Google services, and has full asynchronous support.") name "-" version ".tar.xz")) (sha256 (base32 - "157s4c9gjjss6yd7qp7n4q6s72gz1k4ilsx4xjvp357azk49z4qs")))) + "07156nj7yrp3h9zyzx6mjwxwmfijialb4gi5d6dwyp53arr8c9vd")))) (build-system meson-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From 7a4dcb4c0c6a53e9fe7e414684189cf3691285e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:42:19 +0100 Subject: gnu: polybar: Update to 3.5.5. * gnu/packages/wm.scm (polybar): Update to 3.5.5. --- 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 e0c4d1db84..5d2b36f312 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1343,14 +1343,14 @@ its size (define-public polybar (package (name "polybar") - (version "3.5.4") + (version "3.5.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar.gz")) (sha256 - (base32 "0awwjp3l0y9yhmrl914710ipawp2xr43jxrvmnanahlznblg8fhk")))) + (base32 "1c8br9972x1qw7l2shj9aqzv0gsx58fdh3r0f1z5i1bqdwxmsqky")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the -- cgit 1.4.1 From 42637f847e904bcee0c93beadf757742962e4916 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:42:32 +0100 Subject: gnu: libgnt: Update to 2.14.1. * gnu/packages/messaging.scm (libgnt): Update to 2.14.1. --- 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 c3e4a5edd0..00e68e48a7 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -134,7 +134,7 @@ (define-public libgnt (package (name "libgnt") - (version "2.14.0") + (version "2.14.1") (source (origin (method url-fetch) @@ -142,7 +142,7 @@ (string-append "mirror://sourceforge/pidgin/libgnt/" version "/libgnt-" version ".tar.xz")) (sha256 - (base32 "1grs9fxl404rscscxk1ff55fzjnwjqrisjxbasbssmcp1h1s4zkb")))) + (base32 "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From cc808564b8168b5756f23c979d66c19edcc3fc31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 19:12:03 +0100 Subject: gnu: scrot: Update to 1.5. * gnu/packages/xdisorg.scm (scrot): Update to 1.5. [inputs]: Remove unused libxcursor. Add libxext. --- gnu/packages/xdisorg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2e09be525f..56ac53edec 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -700,7 +700,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "1.4") + (version "1.5") (source (origin (method git-fetch) @@ -710,8 +710,7 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "12xq6glg70icwsvbnfw9gm4dahlbnrc7b6adpd0mpf89h4sj2gds")))) + (base32 "0x64b7xqi5cbq29pb8s8r2kzbxaday1f5k0j70n3s2p7sahjxy72")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -720,8 +719,8 @@ move windows, switch between desktops, etc.).") (inputs `(("giblib" ,giblib) ("libx11" ,libx11) - ("libXcursor" ,libxcursor) ("libxcomposite" ,libxcomposite) + ("libxext" ,libxext) ("libXfixes" ,libxfixes))) (home-page "https://github.com/resurrecting-open-source-projects/scrot") (synopsis "Command-line screen capture utility for X Window System") -- cgit 1.4.1 From 8ae79a2d827ef8b2b137c05abad1a72895e59d78 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 19:50:12 +0100 Subject: gnu: aws-checksums: Update to 0.1.11. * gnu/packages/c.scm (aws-checksums): Update to 0.1.11. --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index d9e5e4d7de..b104b2f2c1 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -567,7 +567,7 @@ portability.") (define-public aws-checksums (package (name "aws-checksums") - (version "0.1.10") + (version "0.1.11") (source (origin (method git-fetch) (uri (git-reference @@ -576,7 +576,7 @@ portability.") (file-name (git-file-name name version)) (sha256 (base32 - "1f9scl5734pgjlsixspwljrrlndzhllwlfygdcr1gx5p0za08zjb")) + "1pjs31x3cq9wyw511y00kksz660m8im9zxk30hid8iwlilcbnyvx")) (patches (search-patches "aws-checksums-cmake-prefix.patch")))) (build-system cmake-build-system) (inputs -- cgit 1.4.1 From 055104ee56cf34089f6ae12934cd1fece507fe6c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 18:09:23 +0100 Subject: gnu: gron: Update to 0.6.1. * gnu/packages/golang.scm (go-github-com-tomnomnom-gron): Update to 0.6.1. --- gnu/packages/golang.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e54496c9aa..dd50da1c8e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari ;;; Copyright © 2017 Sergei Trofimovich ;;; Copyright © 2017 Alex Vong -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Christopher Baines ;;; Copyright © 2018 Tomáš Čech ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -1470,7 +1470,7 @@ optimized for performance yet simple to use.") (define-public go-github-com-tomnomnom-gron (package (name "gron") - (version "0.6.0") + (version "0.6.1") (home-page "https://github.com/tomnomnom/gron") (source (origin @@ -1480,7 +1480,7 @@ optimized for performance yet simple to use.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "05f3w4zr15wd7xk75l12y5kip4gnv719a2x9w2hy23q3pnss9wk0")))) + (base32 "0qmzawkhg0qn9kxxrssbdjni2khvamhrcklv3yxc0ljmh77mh61m")))) (build-system go-build-system) (arguments (let ((import-path "github.com/tomnomnom/gron")) -- cgit 1.4.1 From 46fdee4fe1bbc795f0cbafc661992abaf57dfea2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 6 Mar 2021 20:43:37 +0100 Subject: gnu: telegram-desktop: Fix typo in description. * gnu/packages/telegram.sc (telegram-desktop)[description]: Fix typo. --- gnu/packages/telegram.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index daff57a544..82d1dc463c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -561,7 +561,7 @@ Telegram project, for its use in telegram desktop client.") `(("dconf" ,dconf))) (synopsis "Telegram Desktop") (description "Telegram desktop is the official desktop version of the -Telegram instant messager.") +Telegram instant messenger.") (home-page "https://desktop.telegram.org/") (license (list -- cgit 1.4.1 From 8a920dc6716599e58776d41f73b0aff4281530ed Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 6 Mar 2021 21:36:31 +0100 Subject: gnu: orchis-theme: Fix misleading comment. * gnu/packages/gnome-xyz.scm (orchis-theme)[license]: Adjust comment. --- gnu/packages/gnome-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index e481a10e11..55af65b686 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -835,7 +835,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (description "Orchis is a Material Design them for GNOME/GTK based desktop environments. It is based on materia-theme and adds more color variants.") - (license (list license:gpl3 ; Claimed by README.md. + (license (list license:gpl3 ; According to COPYING. license:lgpl2.1 ; Some style sheets. license:cc-by-sa4.0)))) ; Some icons -- cgit 1.4.1 From 6bf49dfa2606071fcd023f5487b7798fa2383a5e Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sat, 6 Mar 2021 23:00:49 +0200 Subject: gnu: dunst: Update to 1.6.1. * gnu/packages/dunst.scm (dunst): Update to 1.6.1. Signed-off-by: Brice Waegeneire --- gnu/packages/dunst.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 2741336746..ce2c04bac6 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -23,6 +24,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages base) #:use-module (gnu packages freedesktop) @@ -36,7 +38,7 @@ (define-public dunst (package (name "dunst") - (version "1.5.0") + (version "1.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -45,25 +47,20 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c")))) + "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no check target - #:make-flags (list "CC=gcc" + `(#:tests? #f ; no check target + #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output) + (string-append "SYSCONFDIR=" %output "/etc") ;; Otherwise it tries to install service file ;; to "dbus" store directory. (string-append "SERVICEDIR_DBUS=" %output "/share/dbus-1/services") "dunstify") #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'install 'install-dunstify - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "dunstify" - (string-append out "/bin"))) - #t))))) + (delete 'configure)))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl) ; for pod2man @@ -79,7 +76,8 @@ ("libxscrnsaver" ,libxscrnsaver) ("libxinerama" ,libxinerama) ("libxrandr" ,libxrandr) - ("libxdg-basedir" ,libxdg-basedir))) + ("libxdg-basedir" ,libxdg-basedir) + ("wayland" ,wayland))) ; for wayland support (home-page "https://dunst-project.org/") (synopsis "Customizable and lightweight notification daemon") (description -- cgit 1.4.1 From 18d9eb223ed427cc308f02f1012a6f1304232761 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 12:54:58 +0100 Subject: gnu: xf86-video-nouveau: Update to 1.0.17. * gnu/packages/xorg.scm (xf86-video-nouveau): Update to 1.0.17. --- gnu/packages/xorg.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 597e0b86b6..2ee617aa55 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3193,17 +3193,14 @@ supported, and the RENDER extension is not accelerated by this driver.") (define-public xf86-video-nouveau (package (name "xf86-video-nouveau") - (version "1.0.16") + (version "1.0.17") (source (origin (method url-fetch) - (uri (string-append - "mirror://xorg/individual/driver/xf86-video-nouveau-" - version - ".tar.bz2")) + (uri (string-append "mirror://xorg/individual/driver/xf86-video-nouveau-" + version ".tar.bz2")) (sha256 - (base32 - "01mz8gnq7j6bvrqb2ljm3d1wpjhi9p2z2w8zbkdrqmqmcj060h1h")))) + (base32 "0sqm1jwjg15sp8v7039y2hsbhph8gpjd2bdzcqqiij2mgbi254s9")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 6b2684c732aee89dd0eec8e32446fcc9be1db654 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 12:55:08 +0100 Subject: gnu: nginx: Update to 1.19.7. * gnu/packages/web.scm (nginx): Update to 1.19.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 9892dde0b9..23244d151a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -292,14 +292,14 @@ the same, being completely separated from the Internet.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.19.6") + (version "1.19.7") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "1d9kzks8x1226prjbpdin4dz93fjnv304zlqybfqachx5fh9a4di")))) + "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit 1.4.1 From fa8288230192dd3d4df0e81aa0e47281b66c0cbc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 12:55:19 +0100 Subject: gnu: nginx-documentation: Update to 1.19.7. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.7. 2655 eb417a9a089b --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 23244d151a..836328d758 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -382,9 +382,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.19.6") - (revision 2636) - (changeset "a0824dab33ff")) + (let ((version "1.19.7") + (revision 2655) + (changeset "eb417a9a089b")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -396,7 +396,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "06w6fg33pnkqpaagzp9rqizill61vj7db7083mrd6i6by0j7cp1b")))) + "0l4rachjn5gr705f50d9pwgqzkb4fqd4fzz7083ilfarpg36wgv2")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit 1.4.1 From a04b285cf54deec630b577445dfa0c05daef3261 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:14:28 +0100 Subject: gnu: get-iplayer: Update to 3.27. * gnu/packages/video.scm (get-iplayer): Update to 3.27. --- gnu/packages/video.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4cc1f0b441..bcda41a292 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5032,7 +5032,7 @@ brightness, contrast, and frame rate.") (define-public get-iplayer (package (name "get-iplayer") - (version "3.26") + (version "3.27") (source (origin (method git-fetch) @@ -5041,11 +5041,10 @@ brightness, contrast, and frame rate.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0lsz5hz1ia5j612540rb0f31y7j2k5gf7x5i43l8k06b90wi73d6")))) + (base32 "077y31gg020wjpx5pcivqgkqawcjxh5kjnvq97x2gd7i3wwc30qi")))) (build-system perl-build-system) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'configure) -- cgit 1.4.1 From 99146ab871de1567e52b4b60f65fc02d9f46d723 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:14:40 +0100 Subject: gnu: xonsh: Update to 0.9.27. * gnu/packages/shells.scm (xonsh): Update to 0.9.27. --- 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 bb49833912..34ef460e10 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -524,13 +524,13 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.9.26") + (version "0.9.27") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 - (base32 "00cfhl17hvycqv4vly8cdfj82949hn7572d910z7qkkqy6yy9957")) + (base32 "1maz7yvb5py91n699yqsna81x2i25mvrqkrcn7h7870nxd87ral2")) (modules '((guix build utils))) (snippet `(begin -- cgit 1.4.1 From ca9912cb2055e33c15cdc5933c40aefb97c75510 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:27:17 +0100 Subject: gnu: skalibs: Update to 2.10.0.2. * gnu/packages/skarnet.scm (skalibs): Update to 2.10.0.2. --- 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 8e8abffbfb..5b5b232d62 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -30,14 +30,14 @@ (define-public skalibs (package (name "skalibs") - (version "2.10.0.1") + (version "2.10.0.2") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/skalibs/skalibs-" version ".tar.gz")) (sha256 - (base32 "1chwjzlh13jbrldk77h3i4qjqv8hjpvvd3papcb8j46mvj7sxysg")))) + (base32 "03qyi77wgcw3nzy7i932wd98d6j7nnzxc8ddl973vf5sa1v3vflb")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit 1.4.1 From 4607fe2cdbc8dc1be7ca7139c789ed721eb31477 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:27:24 +0100 Subject: gnu: execline: Update to 2.8.0.0. * gnu/packages/skarnet.scm (execline): Update to 2.8.0.0. --- 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 5b5b232d62..1af210d839 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -62,14 +62,14 @@ and file system operations. It is used by all skarnet.org software.") (define-public execline (package (name "execline") - (version "2.7.0.1") + (version "2.8.0.0") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/execline/execline-" version ".tar.gz")) (sha256 - (base32 "1pfwiynr3vk7ajzknjqs5mpzb78m97aqcsd3mc34lxkzz5j13xnd")))) + (base32 "0vbn4pdazy6x6213vn42k0khcij5bvkbrcfg7nw6inhf8154nx77")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs))) (arguments -- cgit 1.4.1 From 27ffa16c5821f69f4fe3efcffde76cff9c58b9e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:27:30 +0100 Subject: gnu: s6: Update to 2.10.0.2. * gnu/packages/skarnet.scm (s6): Update to 2.10.0.2. --- 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 1af210d839..5e90fadcc2 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -104,14 +104,14 @@ complexity."))) (define-public s6 (package (name "s6") - (version "2.10.0.1") + (version "2.10.0.2") (source (origin (method url-fetch) (uri (string-append "https://skarnet.org/software/s6/s6-" version ".tar.gz")) (sha256 - (base32 "1xfil1a138k7a83rqmrgmhklmasgspgdqszn8nyyn3vrnh7ny0nh")))) + (base32 "08bcrp7ck1l3wmjyzxi3vgk6j0n2jfymxs4rjjw4if40f3lgqfmj")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline))) -- cgit 1.4.1 From eafce719f100ead10421ecbdf9f3b978f14da73b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:27:38 +0100 Subject: gnu: s6-networking: Update to 2.4.1.0. * gnu/packages/skarnet.scm (s6-networking): Update to 2.4.1.0. --- gnu/packages/skarnet.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index 5e90fadcc2..10397d662f 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -179,14 +179,14 @@ as an alternative to the BIND, djbdns or other DNS clients."))) (define-public s6-networking (package (name "s6-networking") - (version "2.4.0.0") + (version "2.4.1.0") (source (origin (method url-fetch) - (uri (string-append "https://skarnet.org/software/s6-networking/s6-networking-" - version ".tar.gz")) + (uri (string-append "https://skarnet.org/software/s6-networking/" + "s6-networking-" version ".tar.gz")) (sha256 - (base32 "1yqykwfl5jnkxgr6skfj5kzd896pknij0hi5m7lj0r18jpfs5zgq")))) + (base32 "023wnayv1gddklnsh3qv7i5jfy2fisbp24wa0nzjg0nfq3p807yc")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit 1.4.1 From a20ce91b49332020d49149f68d5151a87e689c36 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:27:46 +0100 Subject: gnu: s6-linux-init: Update to 1.0.6.1. * gnu/packages/skarnet.scm (s6-linux-init): Update to 1.0.6.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 10397d662f..4ada54a842 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -295,7 +295,7 @@ systems and other constrained environments, but they work everywhere."))) (define-public s6-linux-init (package (name "s6-linux-init") - (version "1.0.6.0") + (version "1.0.6.1") (source (origin (method url-fetch) @@ -303,7 +303,7 @@ systems and other constrained environments, but they work everywhere."))) "https://skarnet.org/software/s6-linux-init/s6-linux-init-" version ".tar.gz")) (sha256 - (base32 "0kzif3dqhm7h4h7c6npzdbcy7w756222g8ysw116fgb8j385dr6w")))) + (base32 "0sq8ya39a1qs61cdjns8ijwrvxnqd4snk2ab4j5wl9a87i7wixhn")))) (build-system gnu-build-system) (inputs `(("execline" ,execline) -- cgit 1.4.1 From f5f41b4261580b50cb40de5d3244bb2602e4a1a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:34:25 +0100 Subject: gnu: straw-viewer: Update to 0.1.3. * gnu/packages/video.scm (straw-viewer): Update to 0.1.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 bcda41a292..a46a55e855 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1014,7 +1014,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public straw-viewer (package (name "straw-viewer") - (version "0.1.2") + (version "0.1.3") (source (origin (method git-fetch) @@ -1023,7 +1023,7 @@ H.264 (MPEG-4 AVC) video streams.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1s6w8m9377ajy21x7lf6mbgp5yk5i70nhzmqscibjnarr3xfg9zs")))) + (base32 "1n21byn7hqykpm94jmmnir1fwsskq6dp9wgj0bd2qf0qx5nq33cl")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit 1.4.1 From 291a26dbca8a52cce32798b544dce306a6b7dfa6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 7 Mar 2021 14:34:37 +0100 Subject: gnu: libupnp: Update to 1.14.2. * gnu/packages/upnp.scm (libupnp): Update to 1.14.2. --- gnu/packages/upnp.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 8f4e9952f2..33f3fb21c0 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Sree Harsha Totakura ;;; Copyright © 2015 Federico Beffa -;;; Copyright © 2016, 2017, 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Theodoros Foradis ;;; Copyright © 2019 Jens Mølgaard ;;; Copyright © 2020 Jan Wielkiewicz @@ -96,15 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 - "1sswsdqzarrd6h9mld2lncbcrfhd4p16zcafvmxqm34nj513vcpc")))) + (base32 "0w62sn95fnp12qwz5nid6ksg2h9k0k6rinz00p8m3jd4j5dh9qzz")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit 1.4.1 From ba35d2b56565016a296846e9f190bcfec86d1e1b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 7 Mar 2021 17:45:50 +0100 Subject: gnu: python-pikepdf: Update to 2.8.0.post1. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.8.0.post1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index aec5b5e77a..912b9db62b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5808,13 +5808,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.8.0") + (version "2.8.0.post1") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1dfc8a7gp6ib6a2gdx6fz2zvvk4yx8vr2m7b6044rk91vpyrdzvl")))) + (base32 "08miajml3mzlaqxr8phzymshmkkm93f8vv1dvq5gzkj15kysqhpp")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From acec0d9f5d25e06c898fcba7b9fac315918d35de Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 7 Mar 2021 17:51:51 +0100 Subject: gnu: emacs-ctrlf: Update to 1.3. * gnu/packages/emacs-xyz.scm (emacs-ctrlf): Update to 1.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e1726731b3..960a5668ca 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2058,7 +2058,7 @@ is set.") (define-public emacs-ctrlf (package (name "emacs-ctrlf") - (version "1.2") + (version "1.3") (source (origin (method git-fetch) @@ -2067,7 +2067,7 @@ is set.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1f0k3432brc96am6az6xr1nks1vacqzixhdgwfn2xklb8if9a5xi")))) + (base32 "06wq6scqy2ax0h6aahy2r7hn3bbmkzl4w99bkrc3cqd4ij78sc8g")))) (build-system emacs-build-system) (home-page "https://github.com/raxod502/ctrlf/") (synopsis "Single-buffer text search in Emacs") -- cgit 1.4.1 From a4640f40fb155b37282450da1b12caa2c705eb50 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 7 Mar 2021 18:00:16 +0100 Subject: gnu: snap: Update to 6.6.0. * gnu/packages/education.scm (snap): Update to 6.6.0. --- 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 c4ddc24ec7..365bb9864f 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -276,7 +276,7 @@ easy.") (define-public snap (package (name "snap") - (version "6.5.0") + (version "6.6.0") (source (origin (method git-fetch) @@ -285,7 +285,7 @@ easy.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sqd4ddkfc7f7gx02wffvwbqgfbhpkcgyv7v5rh3gx60jca02p4w")))) + (base32 "1k0j0sp6zz2hnh7zc7f086zc3sld01h7sk277j6fak914yv6slzy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) -- cgit 1.4.1 From 0bcf42a403ca4f0deefc2269b0ba96d136e9e3c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Mar 2021 22:31:44 +0200 Subject: gnu: ruby-memory-profiler: Remove unneeded input. * gnu/packages/ruby.scm (ruby-memory-profiler)[propagated-inputs]: Remove ruby-rake. --- gnu/packages/ruby.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 39e1792471..ca09167fec 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7849,8 +7849,6 @@ Profiling multiple threads simultaneously is supported. (base32 "07yqv11q68xg2fqkrhs6ysngryk8b9zq6qzh24rgx9xqv6qfnj0w")))) (build-system ruby-build-system) - (native-inputs - `(("ruby-rake" ,ruby-rake))) (synopsis "Memory profiling routines for Ruby") (description "This package provides memory profiling routines for Ruby.") -- cgit 1.4.1 From 5a7e86f8b5a29b3df071054c8181f0e29f67491d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Mar 2021 22:34:25 +0200 Subject: gnu: ruby-rubocop: Build without ruby-memory-profiler. Ruby-memory-profiler isn't required for the test suite and it fails to build on some architectures. * gnu/packages/ruby.scm (ruby-rubocop)[native-inputs]: Remove ruby-memory-profiler. --- gnu/packages/ruby.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ca09167fec..cfa071e46f 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7384,7 +7384,6 @@ run.") #t))))) (native-inputs `(("ruby-bump" ,ruby-bump) - ("ruby-memory-profiler" ,ruby-memory-profiler) ("ruby-pry" ,ruby-pry) ("ruby-rake" ,ruby-rake) ("ruby-rspec" ,ruby-rspec) -- cgit 1.4.1 From 2e9fe98a4bafd6243baa2a50f8771e49fae30d66 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 6 Mar 2021 23:50:37 -0500 Subject: gnu: nimf: Use separate outputs for gtk and qt modules. * gnu/packages/language.scm (nimf) [outputs]: Add gtk and qt. [arguments]<#:phases>['patch-paths]: Modify. Signed-off-by: Leo Famulari --- gnu/packages/language.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 576a1c14ab..9bf94271b4 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -83,7 +83,7 @@ (sha256 (base32 "01qi7flmaqrn2fk03sa42r0caks9d8lsv88s0bgxahhxwk1x76gc")))) (build-system glib-or-gtk-build-system) - (outputs '("out" "doc")) + (outputs '("out" "gtk" "qt" "doc")) (arguments `(#:imported-modules (,@%glib-or-gtk-build-system-modules @@ -132,18 +132,18 @@ "/bin:$GTK2_LIBDIR/libgtk2.0-0"))) (substitute* "modules/clients/gtk/Makefile.am" (("\\$\\(GTK3_LIBDIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "gtk") "/lib")) (("\\$\\(GTK2_LIBDIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "gtk") "/lib"))) (substitute* "modules/clients/qt4/Makefile.am" (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "qt") "/lib"))) (substitute* "modules/clients/qt5/Makefile.am" (("\\$\\(QT5_IM_MODULE_DIR\\)") - (string-append (assoc-ref outputs "out") + (string-append (assoc-ref outputs "qt") "/lib/qt5/plugins/inputmethods"))) (substitute* '("bin/nimf-settings/Makefile.am" "data/apparmor-abstractions/Makefile.am" -- cgit 1.4.1 From 76c32fcab4e476181fffba2710166b6ac060290c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 00:30:36 -0500 Subject: gnu: nimf: Disable qt4 support. * gnu/packages/language.scm (nimf) [arguments]: Add new phase 'disable-qt4 and modify phase 'patch-paths. [inputs]: Remove qt4. Signed-off-by: Leo Famulari --- gnu/packages/language.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 9bf94271b4..d4b9b8d4cb 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -103,7 +103,15 @@ "/share/gtk-doc/html")) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-flags + (add-after 'unpack 'disable-qt4 + (lambda _ + (substitute* '("configure.ac" "modules/clients/Makefile.am") + (("\\[QtGui\\]") + "[Qt5Gui]") + ((" qt4") + "")) + #t)) + (add-after 'disable-qt4 'patch-flags (lambda* (#:key inputs #:allow-other-keys) (substitute* "configure.ac" (("-Werror") @@ -137,10 +145,6 @@ (("\\$\\(GTK2_LIBDIR\\)") (string-append (assoc-ref outputs "gtk") "/lib"))) - (substitute* "modules/clients/qt4/Makefile.am" - (("\\$\\(QT4_LIB_DIR\\)") - (string-append (assoc-ref outputs "qt") - "/lib"))) (substitute* "modules/clients/qt5/Makefile.am" (("\\$\\(QT5_IM_MODULE_DIR\\)") (string-append (assoc-ref outputs "qt") @@ -180,7 +184,6 @@ ("hangul" ,libhangul) ("m17n-db" ,m17n-db) ("m17n-lib" ,m17n-lib) - ("qt-4" ,qt-4) ("qtbase" ,qtbase) ("rime" ,librime) ("rsvg" ,librsvg) -- cgit 1.4.1 From 387cac30bc4161055aba0c51e798a440f44592c2 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Sat, 6 Mar 2021 02:17:21 +0000 Subject: gnu: Add t. * gnu/packages/task-management.scm (t): New variable. Co-authored-by: jgart Co-authored-by: donotshake Co-authored-by: Raghav Gururajan Signed-off-by: Nicolas Goaziou --- gnu/packages/task-management.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 99bff5aa23..9667df6030 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2021 Eric Bavier ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 LibreMiami ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,13 +33,42 @@ #:use-module (gnu packages lua) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system go) - #:use-module (guix build-system meson)) + #:use-module (guix build-system meson) + #:use-module (guix build-system python)) + +(define-public t + ;; Last release is more than 10 years old. Using latest commit. + (let ((changeset "89ad444c000b") + (revision "97")) + (package + (name "t") + (version (git-version "1.2.0" revision changeset)) + (source + (origin + (method hg-fetch) + (uri (hg-reference + (url "https://hg.stevelosh.com/t") + (changeset changeset))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 "0c8zn7l0xq65wp07h7mxnb5ww56d1443l2vkjvx5sj6wpcchfn0s")))) + (build-system python-build-system) + (native-inputs + `(("python-cram" ,python-cram))) + (synopsis "Command-line todo list manager") + (description + "@command{t} is a command-line todo list manager for people that want +to finish tasks, not organize them.") + (home-page "https://stevelosh.com/projects/t/") + (license license:expat)))) (define-public taskwarrior (package -- cgit 1.4.1 From 2fa624ddd16c3a8c6180b441c8e9f520816225f6 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Fri, 5 Mar 2021 22:46:42 +0100 Subject: gnu: Add xzgv. * gnu/packages/image-viewers.scm (xzgv): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-viewers.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index bddf86568c..b7c1ebc829 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2021 Rovanion Luckey ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -748,3 +749,40 @@ allows creating false color images. A unique feature of Nomacs is the synchronization of multiple instances.") (home-page "https://nomacs.org/") (license license:gpl3+))) + +(define-public xzgv + (package + (name "xzgv") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/xzgv/" + version "/xzgv-" version ".tar.gz")) + (sha256 + (base32 "17l1xr9v07ggwga3vn0z1i4lnwjrr20rr8z1kjbw71aaijxl18i5")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-target-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "config.mk" + (("/usr/local") (assoc-ref outputs "out"))))) + (delete 'configure) ; no configure script + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "src/xzgv" bin))))) ; just install the executable + #:tests? #f)) ; no rule for target 'test' + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("gtk+" ,gtk+-2) + ("libexif" ,libexif))) + (home-page "https://sourceforge.net/projects/xzgv/") + (synopsis "Picture viewer for X with a thumbnail-based selector") + (description + "xzgv is a fast image viewer that provides extensive keyboard support.") + (license license:gpl2+))) -- cgit 1.4.1 From 89f5cec879473ded8f0ffb3e563f08efb0f71890 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 7 Mar 2021 20:27:46 +0100 Subject: gnu: fetchmail: Update to 6.4.17. * gnu/packages/mail.scm (fetchmail): Update to 6.4.17. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index dd166ca97b..d21c0e204d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 divoplade +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,7 +411,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.16") + (version "6.4.17") (source (origin (method url-fetch) @@ -418,7 +419,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1fagi10fv8pdil6gss6a3ca3jbp3wbiyz7cp8ivsxyrsq059ljq4")))) + (base32 "1ijh9l7pg2yk5s5h1yj3vpd1az31giqy9bjrna10daj13gqws6x4")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit 1.4.1 From 18aec6c93ad84069d70a6555c252e48a791a789c Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Sun, 7 Mar 2021 22:57:41 +0100 Subject: gnu: Add emacs-tup-mode. * gnu/packages/emacs-xyz.scm (emacs-tup-mode): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 960a5668ca..aeaedc2597 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -94,6 +94,7 @@ ;;; Copyright © 2021 Yurii Kholodkov ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -5313,6 +5314,28 @@ view the build status of those servers' build jobs, and possibly to trigger build jobs.") (license license:gpl3+))) +(define-public emacs-tup-mode + (package + (name "emacs-tup-mode") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ejmr/tup-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y")))) + (build-system emacs-build-system) + (home-page "https://github.com/ejmr/tup-mode") + (synopsis "Major mode for editing ``tupfiles'' used by the Tup build system") + (description + "Tup mode provides syntax highlighting for all of the elements of +tupfiles, such as rule definitions, user-defined variables, macros, flags, bin +variables, and so on. The mode also allows you to execute Tup commands.") + (license license:gpl3+))) + (define-public emacs-company (package (name "emacs-company") -- cgit 1.4.1 From f4a435cccad892b8b7892ce9795e5cf039c1d2fe Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 7 Mar 2021 16:33:08 +0100 Subject: gnu: orchis-theme: Update to 2021-02-28. * gnu/packages/gnome-xyz.scm (orchis-theme): Update to 2021-02-28. --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 55af65b686..de43d255f0 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -784,7 +784,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (define-public orchis-theme (package (name "orchis-theme") - (version "2021-01-22") + (version "2021-02-28") (source (origin (method git-fetch) @@ -795,7 +795,7 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (file-name (git-file-name name version)) (sha256 (base32 - "1m0wilvrscg2xnkp6a90j0iccxd8ywvfpza1345sc6xmml9gvjzc")) + "1qp3phiza93qllrjm5xjjca5b7l2sbng8c382khy9m97grxvcq0y")) (modules '((guix build utils) (ice-9 regex) (srfi srfi-26))) -- cgit 1.4.1 From c4195a1078336281592394ff9585c85e8d2f6e6d Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 7 Mar 2021 16:33:24 +0100 Subject: gnu: orchis-theme: Build all versions. * gnu/packages/gnome-xyz.scm (orchis-theme)[arguments]: Add #:configure-flags. Use them in 'install phase. --- gnu/packages/gnome-xyz.scm | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index de43d255f0..f73001f64b 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -811,19 +811,25 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ; no tests + `(#:configure-flags (list + "--dest" (string-append + (assoc-ref %outputs "out") + "/share/themes") + "--theme" "all" + "--radio-color") + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (delete 'bootstrap) (delete 'configure) (replace 'build (lambda _ (invoke "./parse-sass.sh"))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((themes (string-append (assoc-ref outputs "out") - "/share/themes"))) - (mkdir-p themes) - (invoke "./install.sh" "-d" themes) - #t)))))) + (lambda* (#:key configure-flags #:allow-other-keys) + (mkdir-p + (cadr (or (member "--dest" configure-flags) + (member "-d" configure-flags)))) + (apply invoke "./install.sh" configure-flags) + #t))))) (inputs `(("gtk-engines" ,gtk-engines))) (native-inputs -- cgit 1.4.1 From ed128a6bbc507de2c4440e66698c638a0cac316b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 8 Mar 2021 09:31:04 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.6.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.6.0. --- 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 17d52995f6..a60f49a04a 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1090,7 +1090,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.5.0") + (version "0.6.0") (source (origin (method git-fetch) @@ -1099,7 +1099,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1hrilm9lxy7zdidn4wac4yfqryg3hfw0371nanhd7g9bcfjx7n1q")))) + (base32 "0f9rfi8lszm0v35f9vfxxdvwm8fc5909qdsrwj7c2jvl6iaa9n6p")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit 1.4.1 From 612dc6dbe0904f39238a89d3b63ee66abd861b51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Mar 2021 10:35:48 +0200 Subject: gnu: ruby-rake-compiler: Update to 1.1.1. * gnu/packages/ruby.scm (ruby-rake-compiler): Update to 1.1.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 cfa071e46f..f6a1c69c52 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -413,13 +413,13 @@ announcement.") (define-public ruby-rake-compiler (package (name "ruby-rake-compiler") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (rubygems-uri "rake-compiler" version)) (sha256 (base32 - "0l4hg21v0phfrfsc2hilgmwvn2imxr0byqh8dv16bya1s5d3km0q")))) + "11sxgw10jrd6a4irb51jjwam9wikixn5kss11pw4b80cmh32yvpf")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; needs cucumber -- cgit 1.4.1 From fe830ffd8d761cee27edd069e3d99c1ab891cbf3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Mar 2021 15:48:08 +0200 Subject: gnu: libcaca: Patch for CVE-2021-3410. * gnu/packages/video.scm (libcaca)[source]: Add patches. * gnu/packages/patches/libcaca-CVE-2021-3410-pt1.patch, gnu/packages/patches/libcaca-CVE-2021-3410-pt2.patch: New files. * gnu/local.mk (dist_patch_DATA): Register them. --- gnu/local.mk | 2 + .../patches/libcaca-CVE-2021-3410-pt1.patch | 137 +++++++++++++++++++++ .../patches/libcaca-CVE-2021-3410-pt2.patch | 96 +++++++++++++++ gnu/packages/video.scm | 6 +- 4 files changed, 239 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/libcaca-CVE-2021-3410-pt1.patch create mode 100644 gnu/packages/patches/libcaca-CVE-2021-3410-pt2.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fb3b395852..3a516d487f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1266,6 +1266,8 @@ dist_patch_DATA = \ %D%/packages/patches/libbase-fix-includes.patch \ %D%/packages/patches/libbase-use-own-logging.patch \ %D%/packages/patches/libbonobo-activation-test-race.patch \ + %D%/packages/patches/libcaca-CVE-2021-3410-pt1.patch \ + %D%/packages/patches/libcaca-CVE-2021-3410-pt2.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libcanberra-wayland-crash.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ diff --git a/gnu/packages/patches/libcaca-CVE-2021-3410-pt1.patch b/gnu/packages/patches/libcaca-CVE-2021-3410-pt1.patch new file mode 100644 index 0000000000..b23b01d33a --- /dev/null +++ b/gnu/packages/patches/libcaca-CVE-2021-3410-pt1.patch @@ -0,0 +1,137 @@ +https://github.com/cacalabs/libcaca/commit/46b4ea7cea72d6b3ffe65d33e604b1774dcc2bbd.patch + +From 46b4ea7cea72d6b3ffe65d33e604b1774dcc2bbd Mon Sep 17 00:00:00 2001 +From: Sam Hocevar +Date: Fri, 26 Feb 2021 10:55:38 +0100 +Subject: [PATCH] canvas: fix an integer overflow in caca_resize(). + +Fixes: #52 (CVE-2021-3410) +--- + caca/canvas.c | 13 +++++++++++-- + caca/codec/import.c | 1 + + caca/codec/text.c | 21 ++++++++++++++------- + 3 files changed, 26 insertions(+), 9 deletions(-) + +diff --git a/caca/canvas.c b/caca/canvas.c +index 3fdd37ae..d0715392 100644 +--- a/caca/canvas.c ++++ b/caca/canvas.c +@@ -45,6 +45,7 @@ static int caca_resize(caca_canvas_t *, int, int); + * + * If an error occurs, NULL is returned and \b errno is set accordingly: + * - \c EINVAL Specified width or height is invalid. ++ * - \c EOVERFLOW Specified width and height overflowed. + * - \c ENOMEM Not enough memory for the requested canvas size. + * + * \param width The desired canvas width +@@ -200,6 +201,7 @@ int caca_unmanage_canvas(caca_canvas_t *cv, int (*callback)(void *), void *p) + * + * If an error occurs, -1 is returned and \b errno is set accordingly: + * - \c EINVAL Specified width or height is invalid. ++ * - \c EOVERFLOW Specified width and height overflowed. + * - \c EBUSY The canvas is in use by a display driver and cannot be resized. + * - \c ENOMEM Not enough memory for the requested canvas size. If this + * happens, the canvas handle becomes invalid and should not be used. +@@ -363,7 +365,7 @@ int caca_rand(int min, int max) + + int caca_resize(caca_canvas_t *cv, int width, int height) + { +- int x, y, f, old_width, old_height, new_size, old_size; ++ int x, y, f, old_width, old_height, old_size; + + old_width = cv->width; + old_height = cv->height; +@@ -375,7 +377,14 @@ int caca_resize(caca_canvas_t *cv, int width, int height) + * dirty rectangle handling */ + cv->width = width; + cv->height = height; +- new_size = width * height; ++ int new_size = width * height; ++ ++ /* Check for overflow */ ++ if (new_size / width != height) ++ { ++ seterrno(EOVERFLOW); ++ return -1; ++ } + + /* If width or height is smaller (or both), we have the opportunity to + * reduce or even remove dirty rectangles */ +diff --git a/caca/codec/import.c b/caca/codec/import.c +index 8836fd08..2dafe3cf 100644 +--- a/caca/codec/import.c ++++ b/caca/codec/import.c +@@ -61,6 +61,7 @@ static ssize_t import_caca(caca_canvas_t *, void const *, size_t); + * + * If an error occurs, -1 is returned and \b errno is set accordingly: + * - \c ENOMEM Not enough memory to allocate canvas. ++ * - \c EOVERFLOW Importing data caused a value overflow. + * - \c EINVAL Invalid format requested. + * + * \param cv A libcaca canvas in which to import the file. +diff --git a/caca/codec/text.c b/caca/codec/text.c +index 358b7224..94a2a4d7 100644 +--- a/caca/codec/text.c ++++ b/caca/codec/text.c +@@ -46,7 +46,7 @@ ssize_t _import_text(caca_canvas_t *cv, void const *data, size_t size) + char const *text = (char const *)data; + unsigned int width = 0, height = 0, x = 0, y = 0, i; + +- caca_set_canvas_size(cv, width, height); ++ caca_set_canvas_size(cv, 0, 0); + + for(i = 0; i < size; i++) + { +@@ -70,15 +70,19 @@ ssize_t _import_text(caca_canvas_t *cv, void const *data, size_t size) + if(y >= height) + height = y + 1; + +- caca_set_canvas_size(cv, width, height); ++ if (caca_set_canvas_size(cv, width, height) < 0) ++ return -1; + } + + caca_put_char(cv, x, y, ch); + x++; + } + +- if(y > height) +- caca_set_canvas_size(cv, width, height = y); ++ if (y > height) ++ { ++ if (caca_set_canvas_size(cv, width, height = y) < 0) ++ return -1; ++ } + + return (ssize_t)size; + } +@@ -431,7 +435,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8) + { + savedattr = caca_get_attr(cv, -1, -1); + caca_set_attr(cv, im.clearattr); +- caca_set_canvas_size(cv, width = x + wch, height); ++ if (caca_set_canvas_size(cv, width = x + wch, height) < 0) ++ return -1; + caca_set_attr(cv, savedattr); + } + else +@@ -448,7 +453,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8) + caca_set_attr(cv, im.clearattr); + if(growy) + { +- caca_set_canvas_size(cv, width, height = y + 1); ++ if (caca_set_canvas_size(cv, width, height = y + 1) < 0) ++ return -1; + } + else + { +@@ -480,7 +486,8 @@ ssize_t _import_ansi(caca_canvas_t *cv, void const *data, size_t size, int utf8) + { + savedattr = caca_get_attr(cv, -1, -1); + caca_set_attr(cv, im.clearattr); +- caca_set_canvas_size(cv, width, height = y); ++ if (caca_set_canvas_size(cv, width, height = y)) ++ return -1; + caca_set_attr(cv, savedattr); + } + diff --git a/gnu/packages/patches/libcaca-CVE-2021-3410-pt2.patch b/gnu/packages/patches/libcaca-CVE-2021-3410-pt2.patch new file mode 100644 index 0000000000..e6fd506b37 --- /dev/null +++ b/gnu/packages/patches/libcaca-CVE-2021-3410-pt2.patch @@ -0,0 +1,96 @@ +https://github.com/cacalabs/libcaca/commit/e4968ba6e93e9fd35429eb16895c785c51072015.patch +Patch adjusted to remove the lines modifying caca/t/canvas.cpp. This file does not exist in the current release. + +From e4968ba6e93e9fd35429eb16895c785c51072015 Mon Sep 17 00:00:00 2001 +From: Sam Hocevar +Date: Fri, 26 Feb 2021 12:40:06 +0100 +Subject: [PATCH] Fix a problem in the caca_resize() overflow detection and add + several unit tests. + +--- + caca/canvas.c | 16 ++++++++-------- + caca/t/canvas.cpp | 18 +++++++++++++++--- + tools/makefont.c | 22 +++++++++++++++++++--- + 3 files changed, 42 insertions(+), 14 deletions(-) + +diff --git a/caca/canvas.c b/caca/canvas.c +index d0715392..08c628c9 100644 +--- a/caca/canvas.c ++++ b/caca/canvas.c +@@ -367,6 +367,14 @@ int caca_resize(caca_canvas_t *cv, int width, int height) + { + int x, y, f, old_width, old_height, old_size; + ++ /* Check for overflow */ ++ int new_size = width * height; ++ if (new_size < 0 || (width > 0 && new_size / width != height)) ++ { ++ seterrno(EOVERFLOW); ++ return -1; ++ } ++ + old_width = cv->width; + old_height = cv->height; + old_size = old_width * old_height; +@@ -377,14 +385,6 @@ int caca_resize(caca_canvas_t *cv, int width, int height) + * dirty rectangle handling */ + cv->width = width; + cv->height = height; +- int new_size = width * height; +- +- /* Check for overflow */ +- if (new_size / width != height) +- { +- seterrno(EOVERFLOW); +- return -1; +- } + + /* If width or height is smaller (or both), we have the opportunity to + * reduce or even remove dirty rectangles */ +diff --git a/tools/makefont.c b/tools/makefont.c +index 226c8838..66718605 100644 +--- a/tools/makefont.c ++++ b/tools/makefont.c +@@ -40,7 +40,8 @@ + * and the UTF-8 glyphs necessary for canvas rotation and mirroring. */ + static unsigned int const blocklist[] = + { +- 0x0000, 0x0080, /* Basic latin: A, B, C, a, b, c */ ++ 0x0020, 0x0080, /* Basic latin: A, B, C, a, b, c */ ++#if 0 + 0x0080, 0x0100, /* Latin-1 Supplement: Ä, Ç, å, ß */ + 0x0100, 0x0180, /* Latin Extended-A: Ā č Ō œ */ + 0x0180, 0x0250, /* Latin Extended-B: Ǝ Ƹ */ +@@ -63,6 +64,7 @@ static unsigned int const blocklist[] = + 0x30a0, 0x3100, /* Katakana: ロ ル */ + 0xff00, 0xfff0, /* Halfwidth and Fullwidth Forms: Ａ, Ｂ, Ｃ, ａ, ｂ, ｃ */ + 0x10400, 0x10450, /* Deseret: 𐐒 𐐋 */ ++#endif + 0, 0 + }; + +@@ -317,8 +319,22 @@ int main(int argc, char *argv[]) + printf_unicode(>ab[n]); + + if(gtab[n].same_as == n) +- printf_hex(" */ %s\n", +- glyph_data + gtab[n].data_offset, gtab[n].data_size); ++ { ++ char const *lut = " .:nmW@"; ++ printf("\n"); ++ for (int y = 0; y < height; ++y) ++ { ++ for (int x = 0; x < gtab[n].data_width; ++x) ++ { ++ int val = glyph_data[gtab[n].data_offset + y * gtab[n].data_width + x]; ++ char ch = lut[val * val * 7 / 256 / 256]; ++ printf("%c%c", ch, ch); ++ } ++ printf("\n"); ++ } ++ //printf_hex(" */ %s\n", ++ // glyph_data + gtab[n].data_offset, gtab[n].data_size); ++ } + else + { + printf(" is "); diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a46a55e855..92ecfb99ff 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015, 2016 David Thompson ;;; Copyright © 2014, 2015, 2016, 2018, 2020 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015 Andy Patterson ;;; Copyright © 2015, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Alex Vong @@ -1234,7 +1234,9 @@ ASS/SSA (Advanced Substation Alpha/SubStation Alpha) subtitle format.") version ".tar.gz")) (sha256 (base32 - "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj")))) + "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj")) + (patches (search-patches "libcaca-CVE-2021-3410-pt1.patch" + "libcaca-CVE-2021-3410-pt2.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) -- cgit 1.4.1 From 875b0bf640ce7a8d959b218c180a0b400b9d0290 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 20:48:29 +0000 Subject: gnu: sbcl-cl-interpol: Update to 0.2.7-1.70a1137. * gnu/packages/lisp-xyz: (sbcl-cl-interpol): Update to 0.2.7-1.70a1137. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 161a15c44f..911712e978 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7991,21 +7991,21 @@ intending to program in Lisp.") (sbcl-package->cl-source-package sbcl-antik)) (define-public sbcl-cl-interpol - (let ((commit "1fd288d861db85bc4677cff3cdd6af75fda1afb4") + (let ((commit "70a1137f41dd8889004dbab9536b1adeac2497aa") (revision "1")) (package (name "sbcl-cl-interpol") - (version (git-version "0.2.6" revision commit)) + (version (git-version "0.2.7" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/edicl/cl-interpol") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "cl-interpol" version)) (sha256 (base32 - "1hnikak52hmcq1r5f616m6qq1108qnkw80pja950nv1fq5p0ppjn")))) + "1kr00zf62m7la7rxa2m5w49r9cyzamc106hvjcc8ffmi7a4jw490")))) (build-system asdf-build-system/sbcl) (inputs `(("cl-unicode" ,sbcl-cl-unicode) -- cgit 1.4.1 From 4c3a003a5e0b48307630fc101767bc04ee0032a4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 20:53:59 +0000 Subject: gnu: sbcl-nodgui: Update to 0.1.1-1.4a9c2e7. * gnu/packages/lisp-xyz.scm: (sbcl-nodgui): Update to 0.1.1-1.4a9c2e7. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 911712e978..b48af1a880 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -9000,20 +9000,20 @@ for reading and writing JPEG image files.") (sbcl-package->ecl-package sbcl-cl-jpeg)) (define-public sbcl-nodgui - (let ((commit "bc59ed9b787dfc9e68ae3bd7f7e8507c5c619212") + (let ((commit "4a9c2e7714b278fbe97d198c56f54ea87290001d") (revision "1")) (package (name "sbcl-nodgui") - (version (git-version "0.0.5" revision commit)) + (version (git-version "0.1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://notabug.org/cage/nodgui.git") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "nodgui" version)) (sha256 - (base32 "0xx0dk54d882i598ydnwmy7mnfk0b7vib3ddsgpqxhjck1rwq8l8")))) + (base32 "1vgzzw459h32v2mi41cia6i940jqmvxlc8w3xj3516hbc2mqkaib")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit 1.4.1 From 3eec0e9b63c96f8839dff38881262865d8a14ec9 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 21:51:32 +0000 Subject: gnu: Add cl-mount-info. * gnu/packages/lisp-xyz.scm (sbcl-cl-mount-info, cl-mount-info, ecl-cl-mount-info): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index b48af1a880..2563b8f799 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15062,3 +15062,36 @@ Lisp.") (define-public cl-percent-encoding (sbcl-package->cl-source-package sbcl-percent-encoding)) + +(define-public sbcl-cl-mount-info + (let ((commit "2024f5037a7f63db3e3587dc9972cd7b9318f06b") + (revision "1")) + (package + (name "sbcl-cl-mount-info") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://notabug.org/cage/cl-mount-info.git") + (commit commit))) + (file-name (git-file-name "cl-mount-info" version)) + (sha256 + (base32 "0vza9gj9q42nzb5v8aj22lmn4aqx9vrddsb5a343nbwfz89hbh9x")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "https://notabug.org/cage/cl-mount-info.git") + (synopsis "Library to get information about mounted filesystems") + (description + "CL-MOUNT-INFO is a Common Lisp wrapper around @code{getmntent(3)} and +related C functions to get information about the mounted file system.") + (license license:lgpl3)))) + +(define-public ecl-cl-mount-info + (sbcl-package->ecl-package sbcl-cl-mount-info)) + +(define-public cl-mount-info + (sbcl-package->cl-source-package sbcl-cl-mount-info)) -- cgit 1.4.1 From d5a474beaabdb73bc21820e4cc5e3eb36122bc8c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 21:56:49 +0000 Subject: gnu: Add cl-diskspace. * gnu/packages/lisp-xyz.scm: (sbcl-cl-diskspace, cl-diskspace, ecl-cl-diskspace): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2563b8f799..35a119a0eb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15095,3 +15095,48 @@ related C functions to get information about the mounted file system.") (define-public cl-mount-info (sbcl-package->cl-source-package sbcl-cl-mount-info)) + +(define-public sbcl-cl-diskspace + (let ((commit "2dce2d0387d58221c452bd76c7b9b7a7de81ef55") + (revision "1")) + (package + (name "sbcl-cl-diskspace") + (version (git-version "0.3.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muyinliu/cl-diskspace") + (commit commit))) + (file-name (git-file-name "cl-diskspace" version)) + (sha256 + (base32 "0l19hxqw6b8i5i1jdbr45k1xib9axcwdagsp3y8wkb35g6wwc0s7")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp" + (("grep") + (string-append (assoc-ref inputs "grep") "/bin/grep"))) + (substitute* "src/unix/cl-diskspace-list-all-disks-with-df.lisp" + (("/bin/df") + (which "df"))) + #t))))) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre) + ("cffi" ,sbcl-cffi) + ("grep" ,grep))) + (home-page "https://github.com/muyinliu/cl-diskspace") + (synopsis "Disk space information library for Common Lisp") + (description + "CL-DISKSPACE is a Common Lisp library to list disks with the command +line tool @code{df} and get disk space information using @code{statvfs}.") + (license license:isc)))) + +(define-public ecl-cl-diskspace + (sbcl-package->ecl-package sbcl-cl-diskspace)) + +(define-public cl-diskspace + (sbcl-package->cl-source-package sbcl-cl-diskspace)) -- cgit 1.4.1 From 1f3b7c0289715dc44c96cf019b492c4a8993a875 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 22:03:01 +0000 Subject: gnu: Add cl-chronicity. * gnu/packages/lisp-xyz.scm: (sbcl-chronicity, cl-chronicity, ecl-chronicity): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 35a119a0eb..e4f4caf595 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4811,6 +4811,39 @@ Long Painful History of Time\".") (define-public ecl-local-time (sbcl-package->ecl-package sbcl-local-time)) +(define-public sbcl-chronicity + (package + (name "sbcl-chronicity") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chaitanyagupta/chronicity") + (commit (string-append "v" version)))) + (file-name (git-file-name "chronicity" version)) + (sha256 + (base32 "0rzrl9is2v1aqbm0sym0qx3blnpd0bl13dkkmll6mb3983k2mkax")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("lisp-unit" ,sbcl-lisp-unit))) + (inputs + `(("cl-interpol" ,sbcl-cl-interpol) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("local-time" ,sbcl-local-time))) + (home-page "https://github.com/chaitanyagupta/chronicity") + (synopsis "Natural language date and time parser for Common Lisp") + (description + "CHRONICITY is Common Lisp natural language date and time parser inspired +by Ruby's @code{Chronic}.") + (license license:bsd-3))) + +(define-public ecl-chronicity + (sbcl-package->ecl-package sbcl-chronicity)) + +(define-public cl-chronicity + (sbcl-package->cl-source-package sbcl-chronicity)) + (define-public sbcl-trivial-mimes (let ((commit "a741fc2f567a4f86b853fd4677d75e62c03e51d9") (revision "2")) -- cgit 1.4.1 From a0a2449df350bfff0a8ece713aa91d2faacde257 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 22:06:45 +0000 Subject: gnu: Add cl-debug. * gnu/packages/lisp-xyz.scm: (sbcl-cl-debug, cl-debug, ecl-cl-debug): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e4f4caf595..d7b694685d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5123,6 +5123,36 @@ macro for Common Lisp.") (define-public cl-printv (sbcl-package->cl-source-package sbcl-printv)) +(define-public sbcl-cl-debug + (let ((commit "b334280806104ee7f7d3aec666bf7e08d2f89b31") + (revision "1")) + (package + (name "sbcl-cl-debug") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kmx-io/cl-debug") + (commit commit))) + (file-name (git-file-name "cl-debug" version)) + (sha256 + (base32 "0w5vxbjsgr3zfpivdmghmhzxskfdvm1p34c8whwps2xlhypxsa78")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/kmx-io/cl-debug") + (synopsis "Common Lisp cross-package debugging facility") + (description + "CL-DEBUG provides a unified way to enable or disable debug-specific code. +Debugging code can be enabled or disabled relative to program features denoted +by either a symbol or a keyword.") + (license license:isc)))) + +(define-public ecl-cl-debug + (sbcl-package->ecl-package sbcl-cl-debug)) + +(define-public cl-debug + (sbcl-package->cl-source-package sbcl-cl-debug)) + (define-public sbcl-verbose (let ((commit "c5b7ecd465be61b35af17ef57564697b88397174") (revision "1")) -- cgit 1.4.1 From 622489873bb0d46b2c27c127666f19f39fe4c559 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 22:10:29 +0000 Subject: gnu: Add cl-parse. * gnu/packages/lisp-xyz.scm: (sbcl-parse, cl-parse, ecl-parse): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7b694685d..2dcffd4052 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -581,6 +581,34 @@ compatible with ANSI-compliant Common Lisp implementations.") (define-public ecl-cl-ppcre (sbcl-package->ecl-package sbcl-cl-ppcre)) +(define-public sbcl-parse + (let ((commit "2351ee78acac065fcf10b8713d3f404e2e910786") + (revision "1")) + (package + (name "sbcl-parse") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/massung/parse") + (commit commit))) + (file-name (git-file-name "parse" version)) + (sha256 + (base32 "0l18yabyh7jizm5lgvra0jxi8s1cfwghidi6ix1pyixjkdbjlmvy")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/massung/parse") + (synopsis "Monadic parsing for Common Lisp") + (description + "PARSE is a simple token parsing library for Common Lisp.") + (license license:asl2.0)))) + +(define-public ecl-parse + (sbcl-package->ecl-package sbcl-parse)) + +(define-public cl-parse + (sbcl-package->cl-source-package sbcl-parse)) + (define-public sbcl-ubiquitous (let ((commit "35eb7bd9e1b3daee1705f6b41260775180cce8af") (revision "1")) -- cgit 1.4.1 From 1cf22d4759342ded292c93adf2b0231312622d00 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 6 Mar 2021 22:13:29 +0000 Subject: gnu: Add cl-re. * gnu/package/lisp-xyz.scm: (sbcl-re, cl-re, ecl-re): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2dcffd4052..acef021314 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -609,6 +609,37 @@ compatible with ANSI-compliant Common Lisp implementations.") (define-public cl-parse (sbcl-package->cl-source-package sbcl-parse)) +(define-public sbcl-re + (let ((commit "cfbc1f482970221e80d445080a188fd5c755cd2c") + (revision "1")) + (package + (name "sbcl-re") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/massung/re") + (commit commit))) + (file-name (git-file-name "re" version)) + (sha256 + (base32 "1y2gq2sckspnq8118bix55p2j43dk9qn3p8a2rplp1ip2qxqbb1i")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("parse" ,sbcl-parse))) + (home-page "https://github.com/massung/re") + (synopsis "Lua-style Pattern Matching for Common Lisp") + (description + "RE is a small, portable, lightweight, and quick, regular +expression library for Common Lisp. It is a non-recursive, backtracing VM.") + (license license:asl2.0)))) + +(define-public ecl-re + (sbcl-package->ecl-package sbcl-re)) + +(define-public cl-re + (sbcl-package->cl-source-package sbcl-re)) + (define-public sbcl-ubiquitous (let ((commit "35eb7bd9e1b3daee1705f6b41260775180cce8af") (revision "1")) -- cgit 1.4.1 From 80599a739d04fb1830ee0169256021764784e850 Mon Sep 17 00:00:00 2001 From: Ron Nazarov via Guix-patches via Date: Sun, 7 Mar 2021 21:21:25 +0000 Subject: gnu: Add python-mistletoe. * gnu/packages/markup.scm (python-mistletoe): New variable. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/markup.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 95a3eb269e..695eed67b1 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 EuAndreh +;;; Copyright © 2021 Noisytoot ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix build-system trivial) #:use-module (guix build-system cmake) #:use-module (guix build-system perl) + #:use-module (guix build-system python) #:use-module (guix utils) #:use-module (gnu packages compression) #:use-module (gnu packages) @@ -300,3 +302,25 @@ and smu is that smu doesn't support reference style links.") SAX-like interface. It is compliant to the CommonMark specification, with a few extensions.") (license expat))) + +(define-public python-mistletoe + (package + (name "python-mistletoe") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mistletoe" version)) + (sha256 + (base32 "18z6hqfnfjqnrcgfgl5pkj9ggf9yx0yyy94azcn1qf7hqn6g3l14")))) + (build-system python-build-system) + (home-page "https://github.com/miyuchina/mistletoe") + (synopsis "Extensible Markdown parser in pure Python") + (description + "The @code{mistletoe} Markdown parser is a CommonMark-compliant Markdown +parser that supports definitions of custom tokens. + +Parsing Markdown into an abstract syntax tree also allows @code{mistletoe} to +swap out renderers for different output formats, without touching any of the +core components.") + (license expat))) -- cgit 1.4.1 From a9b11ce179a7d33589b5ede94457b20b8a9d6b06 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:20:45 -0500 Subject: gnu: linux-libre: Update to 5.11.4. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.4. (linux-libre-5.11-pristine-source): 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 9e35e533de..9fc2c497b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.3") +(define-public linux-libre-5.11-version "5.11.4") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1znbn7n2jzm2rd7gsfj897lgrvaw48ljqfyza3166mw0nc5wfn1m"))) + (hash (base32 "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 2c8aa5fab626fed6e516390bd4f246adbf2f05ae Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:24:36 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.21. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.21. (linux-libre-5.10-pristine-source): 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 9fc2c497b8..25ae23d2b4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.20") +(define-public linux-libre-5.10-version "5.10.21") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "18rh56aqc7ysr309prfml6sr0a81v6kh1ybw2c2vwhmszr373qwv"))) + (hash (base32 "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 28e3c283eebaba859b9af7188738ed01263a4f90 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:24:56 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.103. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.103. (linux-libre-5.4-pristine-source): 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 25ae23d2b4..ba4e160ac2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.102") +(define-public linux-libre-5.4-version "5.4.103") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"))) + (hash (base32 "12wy2w7yc6fcn61xm6l7a86rfwwcchfq89lpznm2v3dmy5y3mqw4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From cf60b80304b4ec6070931797c5a0d51087d6acfc Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:25:14 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.179. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.179. (linux-libre-4.19-pristine-source): 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 ba4e160ac2..01eacc4bb6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.178") +(define-public linux-libre-4.19-version "4.19.179") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1vln86ksignzw3d2xk5qgc5a2vghngczfsk949dn3r5dxygvlx8b"))) + (hash (base32 "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 100d31a489c6b7a9bcfec5bc5ece0501967c2cf4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:25:41 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.224. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.224. (linux-libre-4.14-pristine-source): 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 01eacc4bb6..28958a54e2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.223") +(define-public linux-libre-4.14-version "4.14.224") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "04zn74k1b7hfnfdi9fgifrn4jz0j00d4ymp8vhgbrdj75jrmynhs"))) + (hash (base32 "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 32e415a72586b0aa709f556024d4f2f8fbe58439 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:26:05 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.260. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.260. (linux-libre-4.9-pristine-source): 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 28958a54e2..64b8405014 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.259") +(define-public linux-libre-4.9-version "4.9.260") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1r71vgbw17srsjdmsdr1jra7v412mhiysi4kpa77y29r2h3zk5r3"))) + (hash (base32 "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 7a436517384b7a30d4e49bcd818aa9a1e70db443 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 18:26:28 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.260. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.260. (linux-libre-4.4-pristine-source): 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 64b8405014..42745e29cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.259") +(define-public linux-libre-4.4-version "4.4.260") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "18mw4xgza2szgz9x7lq3nzbf48cfkg2g4rli5p5ix4w3ni34h0sr"))) + (hash (base32 "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From a0b24d5f8c5813329986b1bd690ed50b5308cc78 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 23 Feb 2021 20:02:14 +0000 Subject: gnu: guile-lib: Fix cross compilation. These changes were sent upstream as https://lists.gnu.org/archive/html/guile-devel/2021-02/msg00004.html Without this change, the .go files are built for the host architecture, rather than the target. I noticed this when cross building the guix-build-coordinator (for which guile-lib is an input) to the Hurd. * gnu/packages/guile-xyz.scm (guile-lib)[arguments]: Add 'patch-for-cross-compilation phase. [native-inputs]: Add autoconf, automake and gettext. (guile2.0-lib): Adjust to use alist-replace. (guile2.2-lib): Adjust to use alist-replace. --- gnu/packages/guile-xyz.scm | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 45b3a82d00..bd26010918 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -116,6 +116,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix utils) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (alist-delete))) @@ -2191,6 +2192,21 @@ library.") '("GUILE_AUTO_COMPILE=0") ; to prevent guild errors #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-cross-compilation + (lambda _ + (substitute* "configure.ac" + (("GUILE_FLAGS") + "GUILE_FLAGS +if test \"$cross_compiling\" != no; then + GUILE_TARGET=\"--target=$host_alias\" + AC_SUBST([GUILE_TARGET]) +fi +")) + (substitute* "am/guile.mk" + (("guild compile") "guild compile $(GUILE_TARGET)")) + (delete-file "configure") ; trigger the bootstrap phase to run + ; autoreconf + #t)) (add-before 'configure 'patch-module-dir (lambda _ (substitute* "src/Makefile.in" @@ -2201,7 +2217,10 @@ library.") $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t))))) (native-inputs - `(("guile" ,guile-3.0) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-3.0))) @@ -2222,15 +2241,23 @@ for Guile\".") (package (inherit guile-lib) (name "guile2.0-lib") - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))))) + (native-inputs + (alist-replace "guile" (list guile-2.0) + (package-native-inputs guile-lib))) + (inputs + (alist-replace "guile" (list guile-2.0) + (package-inputs guile-lib))))) (define-public guile2.2-lib (package (inherit guile-lib) (name "guile2.2-lib") - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))))) + (native-inputs + (alist-replace "guile" (list guile-2.2) + (package-native-inputs guile-lib))) + (inputs + (alist-replace "guile" (list guile-2.2) + (package-inputs guile-lib))))) (define-public guile3.0-lib (deprecated-package "guile3.0-lib" guile-lib)) -- cgit 1.4.1 From f5c6e6966c020722700ef0343ab0a6030e2d61b5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 7 Mar 2021 13:30:55 +0000 Subject: gnu: rust-1.19: Don't include i686-linux in supported-systems. Currently rust fails to build for i686-linux, so this will avoid computing lots of derivations that depend on rust, but won't be possible to build. * gnu/packages/rust.scm (rust-1.19)[supported-systems]: Switch hardcoding only supporting x86_64-linux for supporting all supported systems, other than i686-linux. --- gnu/packages/rust.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 98a6bfffa5..1fc540f0f8 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -453,7 +453,9 @@ test = { path = \"../libtest\" } (variable "LIBRARY_PATH") (files '("lib" "lib64"))))) - (supported-systems '("x86_64-linux")) + (supported-systems + (delete "i686-linux" ; fails to build, see #35519 + %supported-systems)) (synopsis "Compiler for the Rust programming language") (description "Rust is a systems programming language that provides memory safety and thread safety guarantees.") -- cgit 1.4.1 From df138dc20858725b90ed77be85f3318cbe1be73a Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Sat, 30 Jan 2021 21:08:08 +0100 Subject: gnu: services: Add activate script to the profile system directory. * gnu/services.scm (activation-profile-entry): New procedure... (activation-service-type): ... use it. --- gnu/services.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services.scm b/gnu/services.scm index 13259dfaee..ddd1bac30c 100644 --- a/gnu/services.scm +++ b/gnu/services.scm @@ -617,13 +617,21 @@ ACTIVATION-SCRIPT-TYPE." "Return a gexp that runs the activation script containing GEXPS." #~(primitive-load #$(activation-script gexps))) +(define (activation-profile-entry gexps) + "Return, as a monadic value, an entry for the activation script in the +system directory." + (mlet %store-monad ((activate (lower-object (activation-script gexps)))) + (return `(("activate" ,activate))))) + (define (second-argument a b) b) (define activation-service-type (service-type (name 'activate) (extensions (list (service-extension boot-service-type - gexps->activation-gexp))) + gexps->activation-gexp) + (service-extension system-service-type + activation-profile-entry))) (compose identity) (extend second-argument) (description -- cgit 1.4.1 From 0d9b7fd0c1578b68b74097a5f15565d1a3d28179 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 02:45:11 -0500 Subject: gnu: libaom: Update to 2.0.2. * gnu/packages/video.scm (libaom): Update to 2.0.2. --- 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 92ecfb99ff..96c7165ae9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -772,7 +772,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "2.0.1") + (version "2.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -781,7 +781,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "1vakwmcwvmmrdw7460m8hzq96y71lxqix8b2g07c6s12br0rrdhl")))) + "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) -- cgit 1.4.1 From 84c70996884a1c9ea533f76c05ff40b7092cc837 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 02:45:28 -0500 Subject: gnu: dav1d: Update to 0.8.2. * gnu/packages/video.scm (dav1d): Update to 0.8.2. --- 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 96c7165ae9..0bb941946c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4571,7 +4571,7 @@ transitions, and effects and then export your film to many common formats.") (define-public dav1d (package (name "dav1d") - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -4580,7 +4580,7 @@ transitions, and effects and then export your film to many common formats.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1820fpmmq1vxjzjmza6ydk4fgxipb8gmcc5skybki64qn7410v7x")))) + (base32 "0plmnxpz66yv3nqv1kgbyyfnwfqi9dqs0zbsdj488i6464a1m6si")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit 1.4.1 From 31dcf19ea33b3cdbc9615e69e1396bcebdae9dc0 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 02:47:26 -0500 Subject: gnu: libavif: Update to 0.9.0. * gnu/packages/image.scm (libavif): Update to 0.9.0. --- 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 a48b1e1afb..a68ff66448 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2110,7 +2110,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (define-public libavif (package (name "libavif") - (version "0.8.4") + (version "0.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -2119,7 +2119,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (file-name (git-file-name name version)) (sha256 (base32 - "1qvjd3xi9r89pcblxdgz4c6hqp67ss53b1x9zkg7lrik7g3lwq8d")))) + "1aw41m8ddrckq375w0lv2zd4ybhccsy1hw4f9kipppwxhgvk17gf")))) (build-system cmake-build-system) (arguments `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON" -- cgit 1.4.1 From 0cac5f75ed370f5a9e63936d2dda5fd2186db530 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 02:47:40 -0500 Subject: gnu: svt-vp9: Fix typo. * gnu/packages/video.scm (svt-vp9): Fix typo in comment. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0bb941946c..9bb1af0da6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4800,7 +4800,7 @@ applications. It only supports Intel-compatible CPUs (x86).") (sha256 (base32 "1ypdiw4cq22llvm8jyszxdq6r1aydkj80dsxjarjn5b7c1f2q3ar")))) - ;; SVT-AV1 only supports 64-bit Intel-compatible CPUs. + ;; SVT-VP9 only supports 64-bit Intel-compatible CPUs. (supported-systems '("x86_64-linux")) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From a7da527d59a8108f853fbae39ddcd51d8ac99423 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 03:08:18 -0500 Subject: gnu: Remove FFmpeg 4.2. * gnu/packages/video.scm (ffmpeg-4.2): Remove variable. --- gnu/packages/video.scm | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9bb1af0da6..10ad131e40 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1612,27 +1612,6 @@ convert and stream audio and video. It includes the libavcodec audio/video codec library.") (license license:gpl2+))) -;; ungoogled-chromium crashes with ffmpeg 4.3, so stick with this version for -;; now. See . -(define-public ffmpeg-4.2 - (package - (inherit ffmpeg) - (version "4.2.3") - (source (origin - (method url-fetch) - (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" - version ".tar.xz")) - (sha256 - (base32 - "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx")))) - (arguments - (substitute-keyword-arguments (package-arguments ffmpeg) - ((#:configure-flags flags) - `(delete "--enable-librav1e" ,flags)))) - (inputs (fold alist-delete - (package-inputs ffmpeg) - '("rav1e"))))) - (define-public ffmpeg-3.4 (package (inherit ffmpeg) -- cgit 1.4.1 From d099c9c09b9a17fba556715568ab910d6af14ee8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 03:40:14 -0500 Subject: gnu: VLC: Ensure AV1 files are played with dav1d by default. * gnu/packages/video.scm (vlc)[inputs]: Add dav1d. --- 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 10ad131e40..eb1c329c1b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1771,6 +1771,7 @@ videoformats depend on the configuration flags of ffmpeg.") (inputs `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) + ("dav1d" ,dav1d) ("dbus" ,dbus) ("eudev" ,eudev) ("flac" ,flac) -- cgit 1.4.1 From a72888995173ace3190c69d324265dcc5fd66d3e Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 9 Mar 2021 08:52:09 +0000 Subject: gnu: rust-1.26: Remove aarch64-linux from the supported systems. Because this package is a transitive input to many rust packages, Cuirass is spending lots of time failing to build it on ci.guix.gnu.org. This change will hopefully help with that issue. * gnu/packages/rust.scm (rust-1.26)[supported-systems]: Remove aarch64-linux. --- gnu/packages/rust.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1fc540f0f8..c7840e1a20 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -822,7 +822,10 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (substitute* "src/tools/cargo/tests/testsuite/generate_lockfile.rs" ;; This test wants to update the crate index. (("fn no_index_update") "#[ignore]\nfn no_index_update")) - #t))))))))) + #t)))))) + (supported-systems + (delete "aarch64-linux" ; fails to build, see #47019 + (package-supported-systems base-rust)))))) (define-public rust-1.27 (let ((base-rust -- cgit 1.4.1 From 49d85b3f11a2ea28ac862857e7f040ef26ce39ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 11:53:58 +0100 Subject: gnu: bbmap: Update to 38.90. * gnu/packages/bioinformatics.scm (bbmap): Update to 38.90. --- 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 be07bd18a3..61c9e06a99 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -14449,14 +14449,14 @@ is a Cython wrapper for FIt-SNE.") (define-public bbmap (package (name "bbmap") - (version "35.82") + (version "38.90") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bbmap/BBMap_" version ".tar.gz")) (sha256 (base32 - "1q4rfhxcb6z3gm8zg2davjz98w22lkf4hm9ikxz9kdl93pil3wkd")))) + "1wb94bcc006qq86x77z2rz0lc8m9f1kpnw6gdhjfg9bdaqf56rm3")))) (build-system ant-build-system) (arguments `(#:build-target "dist" -- cgit 1.4.1 From 133a91892315da653ec9654580942970b8e273be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 11:54:09 +0100 Subject: gnu: trim-galore: Update to 0.6.6. * gnu/packages/bioinformatics.scm (trim-galore): 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 61c9e06a99..8b38c7ce0d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11028,7 +11028,7 @@ with narrow binding events such as transcription factor ChIP-seq.") (define-public trim-galore (package (name "trim-galore") - (version "0.6.1") + (version "0.6.6") (source (origin (method git-fetch) @@ -11038,7 +11038,7 @@ with narrow binding events such as transcription factor ChIP-seq.") (file-name (git-file-name name version)) (sha256 (base32 - "1y31wbxwkm9xqzr5zv1pk5q418whnmlmgmfyxxpnl12h83m2i9iv")))) + "0yrwg6325j4sb9vnplvl3jplzab0qdhp92wl480qjinpfq88j4rs")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests -- cgit 1.4.1 From 40b3e9da49f37790aae84c17291745cdc1f0fab2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 15:31:52 +0200 Subject: gnu: xygrib: Fix compiling with newer qt. * gnu/packages/geo.scm (xygrib)[source]: Adjust snippet to add missing include header. --- gnu/packages/geo.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index ae37c8f151..c988d6b114 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018, 2019, 2020 Julien Lepiller ;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant -;;; Copyright © 2019, 2020 Efraim Flashner +;;; Copyright © 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke @@ -1170,7 +1170,13 @@ map display. Downloads map data from a number of websites, including "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia")) (modules '((guix build utils))) (snippet - '(begin (delete-file-recursively "data/fonts") #t)))) + '(begin + (delete-file-recursively "data/fonts") + ;; Fixes compilation, can be removed with the next release. + ;; Upstream link: https://github.com/opengribs/XyGrib/pull/255 + (substitute* "src/SkewT.h" + (("QMessageBox>") "QMessageBox>\n#include ")) + #t)))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1 From 12640deb502d99d37ae6fe7a06d5c5335a80973e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 15:44:31 +0200 Subject: gnu: symengine: Fix build. * gnu/packages/algebra.scm (symengine)[native-inputs]: Remove llvm. [arguments]: Adjust accordingly. --- gnu/packages/algebra.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 6f36f267b0..948f9bd42e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -44,7 +44,6 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages java) - #:use-module (gnu packages llvm) #:use-module (gnu packages maths) #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) @@ -971,11 +970,8 @@ algorithms from the FORTRAN library MINPACK.") "-DWITH_MPFR=on" "-DWITH_MPC=on" "-DINTEGER_CLASS=flint" - "-DWITH_LLVM=on" "-DWITH_SYMENGINE_THREAD_SAFE=on" "-DBUILD_SHARED_LIBS=on"))) ;also build libsymengine - (native-inputs - `(("llvm" ,llvm))) (inputs `(("flint" ,flint) ("gmp" ,gmp) -- cgit 1.4.1 From c3fb753045706b047c5c7564299f20d755d4ed65 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 16:04:40 +0200 Subject: gnu: python-logwrap: Update to 8.2.0.post0. * gnu/packages/python-xyz.scm (python-logwrap): Update to 8.2.0.post0. [arguments]: Disable tests. Replace 'check phase. [propagated-inputs]: Remove python-six, python-typing. [native-inputs]: Remove unzip, python-pytest-cov, python-pytest-runner. Add python-setuptools-scm, python-toml, python-wheel. [home-page]: Update to new upstream URI. --- gnu/packages/python-xyz.scm | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 912b9db62b..b1ac3e2e3b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -662,25 +662,31 @@ module and then similar looking characters are removed.") (define-public python-logwrap (package (name "python-logwrap") - (version "3.2.1") + (version "8.2.0.post0") (source (origin (method url-fetch) - (uri (pypi-uri "logwrap" version ".zip")) + (uri (pypi-uri "logwrap" version)) (sha256 (base32 - "1d2k0hvpbi51vl410y8fbs5m0nxnlh2k7gr2nrh3k81ibhzscsra")))) + "1dv7gny3rfci5cal2ipr6d0pcz3yhka7af96dfsd3ir1mxy8p1j9")))) (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six) - ("python-typing" ,python-typing))) + (arguments + `(#:tests? #f ; Tests not included in pypi release. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")) + #t))))) (native-inputs - `(("unzip" ,unzip) - ("python-cython" ,python-cython) + `(("python-cython" ,python-cython) ("python-pytest" ,python-pytest) - ("python-pytest-cov" ,python-pytest-cov) - ("python-pytest-runner" ,python-pytest-runner))) - (home-page "https://github.com/penguinolog/logwrap") + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-toml" ,python-toml) + ("python-wheel" ,python-wheel))) + (home-page "https://github.com/python-useful-helpers/logwrap") (synopsis "Decorator for logging function arguments") (description "This package provides a decorator to log function arguments and function call return values in a human-readable way.") -- cgit 1.4.1 From d90165826c26ad2ea252f0adbc3f9468cdf95512 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 16:13:18 +0200 Subject: gnu: solfege: Build with older texinfo. The package failed to build with texinfo-6.7. * gnu/packages/music.scm (solfege)[native-inputs]: Replace texinfo with texinfo-5. --- 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 9c809154f1..4fb5049ac7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1861,7 +1861,7 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite ("txt2man" ,txt2man) ("libxml2" ,libxml2) ; for tests ("ghostscript" ,ghostscript) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo-5))) (home-page "https://www.gnu.org/software/solfege/") (synopsis "Ear training") (description -- cgit 1.4.1 From de1f8664651b21d8704d87ff69e032328cce0cd9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:05:54 +0100 Subject: gnu: solaar: Update to 1.0.5. * gnu/packages/admin.scm (solaar): Update to 1.0.5. --- 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 b0fee13907..7f8c332e64 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3956,7 +3956,7 @@ cache of unix and unix-like systems.") (define-public solaar (package (name "solaar") - (version "1.0.4") + (version "1.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -3965,7 +3965,7 @@ cache of unix and unix-like systems.") (file-name (git-file-name name version)) (sha256 (base32 - "15wzxxr2m5349kkvcs3k5clg1rsmvh6by2066qm4hlgvjwmigggy")))) + "17gkr2lf1kzp1198gcdr30j3c8xd81kg7ly12aar1jrgi6lc7klk")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 17db882d29f14e24da477f823fd48c5e9e0d600a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:13:35 +0100 Subject: gnu: solaar: Fix home page. * gnu/packages/admin.scm (solaar)[home-page]: Correct. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7f8c332e64..71af3b9d94 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3984,7 +3984,7 @@ cache of unix and unix-like systems.") ("python-xlib" ,python-xlib) ("gtk+" ,gtk+) ("python-pygobject" ,python-pygobject))) - (home-page "https://smxi.org/docs/inxi.htm") + (home-page "https://pwr-solaar.github.io/Solaar/") (synopsis "Linux devices manager for the Logitech Unifying Receiver") (description "This package provides tools to manage clients of the Logitech Unifying Receiver.") -- cgit 1.4.1 From 4c6fa851363b9e9d0bf4e4d83009b05e363e126d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:45:09 +0100 Subject: gnu: ppsspp: Update to 1.11.3. * gnu/packages/emulators.scm (ppsspp): Update to 1.11.3. --- 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 a2e7b9970a..1cd23c3e6c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2094,7 +2094,7 @@ framework based on QEMU.") (define-public ppsspp (package (name "ppsspp") - (version "1.11.2") + (version "1.11.3") (source (origin (method git-fetch) @@ -2102,7 +2102,7 @@ framework based on QEMU.") (url "https://github.com/hrydgard/ppsspp") (commit (string-append "v" version)))) (sha256 - (base32 "03nxarx0l1ndi9fffl1wjfwsg3pk2bwf72cwcfaski1sg3dxsv7h")) + (base32 "1dpxnwvl6jq7z67lbjws4lqc1bxc31xi6ddlmg5n3aig008yi2fp")) (file-name (git-file-name name version)) (patches (search-patches "ppsspp-disable-upgrade-and-gold.patch")) -- cgit 1.4.1 From 9f87758fd5a5fd2e4c04683aebee13d9a19218b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 13:56:03 +0100 Subject: gnu: Add xvfb-run. * gnu/packages/xorg.scm (xvfb-run): New public variable. --- gnu/packages/xorg.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2ee617aa55..a8faa8c5f4 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6766,3 +6766,77 @@ are easier to see and use, and Xdialog adds more functionality such as a help button and box, a treeview, an editbox, file and directory selectors, a range box, and a calendar. It uses GTK+, and will match your desktop theme.") (license license:gpl2+))) + +(define-public xvfb-run + (package + (name "xvfb-run") + (version "1.20.10-3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://debian/pool/main/x/xorg-server/" + "xorg-server_" version ".diff.gz")) + (sha256 + (base32 "08gs9ni8ss8rw4n9cql1s8q05mj517vk1vm1varj1dsx75k4j25v")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'unpack + ;; Apply the source patch to an empty directory. + (lambda* (#:key inputs #:allow-other-keys) + (let* ((source (assoc-ref inputs "source")) + (diff.gz (basename source)) + (diff (substring diff.gz 0 (string-rindex diff.gz #\.)))) + (mkdir "source") + (chdir "source") + (copy-file source diff.gz) + (invoke "gunzip" diff.gz) + (invoke "patch" "-Np1" "-i" diff) + (chdir "debian/local")))) + (delete 'configure) ; nothing to configure + (replace 'build + (lambda _ + (chmod "xvfb-run" #o755) + (substitute* "xvfb-run" + (("(\\(| )(fmt|stty|awk|kill|getopt|mktemp|touch|rm|mcookie)" + _ prefix command) + (string-append prefix (which command))) + ;; These also feature in UI messages, so be more strict. + (("(AUTHFILE |command -v |exec )(Xvfb|xauth)" + _ prefix command) + (string-append prefix (which command)))))) + (replace 'check + ;; There are no tests included. Here we test whether we can run + ;; a simple client without xvfb-run itself relying on $PATH. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (let ((old-PATH (getenv "PATH")) + (xterm (which "xterm"))) + (unsetenv "PATH") + (invoke "./xvfb-run" xterm "-e" "true") + (setenv "PATH" old-PATH))))) + (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"))) + (install-file "xvfb-run" bin) + (install-file "xvfb-run.1" man))))))) + (inputs + `(("util-linux" ,util-linux) ; for getopt + ("xauth" ,xauth) + ("xorg-server" ,xorg-server))) + (native-inputs + `(("xterm" ,xterm))) ; for the test + ;; This script is not part of the upstream xorg-server. It is provided only + ;; as a patch added to Debian's package. + (home-page "https://packages.debian.org/sid/xorg-server-source") + (synopsis "Run X11 client or command in a virtual X server environment") + (description + "The @command{xvfb-run} wrapper simplifies running commands and scripts +within a virtual X server environment. It sets up an X authority file or uses +an existing user-specified one, writes a cookie to it, and then starts the +@command{Xvfb} X server as a background process. It also takes care of killing +the server and cleaning up before returning the exit status of the command.") + (license license:x11))) -- cgit 1.4.1 From 5a948f3142d927a0d7bda75e5713e5dd0536c1d6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:03:42 +0100 Subject: gnu: progress: Update to 0.16. * gnu/packages/admin.scm (progress): Update to 0.16. --- 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 71af3b9d94..9997b31e37 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -221,7 +221,7 @@ usual file attributes can be checked for inconsistencies.") (define-public progress (package (name "progress") - (version "0.15") + (version "0.16") (source (origin (method git-fetch) @@ -229,7 +229,7 @@ usual file attributes can be checked for inconsistencies.") (url "https://github.com/Xfennec/progress") (commit (string-append "v" version)))) (sha256 - (base32 "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm")) + (base32 "0gf10j9zd8spain94b5kigknwbdqajiy6fjsa5hhwsc1biz34hcj")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit 1.4.1 From 362d4787460a8a8414f671aef6c19ad354cb0463 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:23:12 +0100 Subject: gnu: libfastjson: Update to 0.99.9. * gnu/packages/c.scm (libfastjson): Update to 0.99.9. --- 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 b104b2f2c1..7d8d41d266 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -447,7 +447,7 @@ more, like escaping special characters.") (define-public libfastjson (package (name "libfastjson") - (version "0.99.8") + (version "0.99.9") (source (origin (method git-fetch) @@ -456,8 +456,7 @@ more, like escaping special characters.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0qhs0g9slj3p0v2z4s3cnsx44msrlb4k78ljg7714qiziqbrbwyl")))) + (base32 "12rqcdqxazw8czzxbivdapdgj19pcswpw1jp2915sxbljis83g6q")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From 4685a468f85b064fff6ba0a037812eaa86935310 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 15:06:45 +0100 Subject: gnu: libime: Update to 1.0.4. * gnu/packages/fcitx5.scm (libime): Update to 1.0.4. --- gnu/packages/fcitx5.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 79d5799774..4c79f4d856 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Zhu Zihao +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -171,14 +172,14 @@ client.") (define-public libime (package (name "libime") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv")))) + (base32 "0bwl12cy7crpf62f669qn99rv4df1sjlggvcn80z64yabs36nhjr")))) (build-system cmake-build-system) (inputs `(("fcitx5" ,fcitx5) -- cgit 1.4.1 From 2e6d40b373f78ab9880d0f725cbcf59e32a0413e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:25:05 +0100 Subject: gnu: lrzip: Update to 0.641. * gnu/packages/compression.scm (lrzip): Update to 0.641. --- gnu/packages/compression.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ee7f607dcb..32fd358ac8 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1110,15 +1110,14 @@ human-readable output.") (define-public lrzip (package (name "lrzip") - (version "0.640") + (version "0.641") (source (origin (method url-fetch) (uri (string-append "http://ck.kolivas.org/apps/lrzip/lrzip-" version ".tar.xz")) (sha256 - (base32 - "175466drfpz8rsfr0pzfn5rqrj3wmcmcs3i2sfmw366w2kbjm4j9")))) + (base32 "0ziyanspd96dc3lp2qdcylc7aq8dhb511jhqrhxvlp502fjqjqrc")))) (build-system gnu-build-system) (native-inputs `(;; nasm is only required when building for 32-bit x86 platforms -- cgit 1.4.1 From 1e4b80ad65c4dc2cf51a8c7c2b76863cd2821e5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:48:16 +0100 Subject: gnu: sigrok-cli: Update to 0.7.2. * gnu/packages/electronics.scm (sigrok-cli): Update to 0.7.2. --- gnu/packages/electronics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 232a6c8c44..c578fda334 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Clément Lassieur ;;; Copyright © 2021 Efraim Flashner ;;; Copyright © 2021 Leo Famulari @@ -220,7 +220,7 @@ format support.") (define-public sigrok-cli (package (name "sigrok-cli") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) (uri (string-append @@ -228,7 +228,7 @@ format support.") version ".tar.gz")) (sha256 (base32 - "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m")))) + "1f0a2k8qdcin0pqiqq5ni4khzsnv61l21v1dfdjzayw96qzl9l3i")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 77077d90cd1a9c6666559c6e60ee5226afa770aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:19:51 +0100 Subject: gnu: inxi-minimal: Update to 3.3.01-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.01-1. --- 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 9997b31e37..96db1fdba6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3743,7 +3743,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.2.02-2") + (version "3.3.01-1") (source (origin (method git-fetch) @@ -3752,7 +3752,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "0fwx798v9kwiwkgbj97w6rjdanwf7ap65vvq1fqy7gd9x78xcxsq")))) + (base32 "06r5iq78ldrvr5fmmb5mchaaji49195fsgx9ysr1mjs122rp13y1")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit 1.4.1 From 35d9d5bfa69f619f3b34cf06bb7c572549e797ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 14:21:07 +0100 Subject: gnu: s-tui: Update to 1.1.1. * gnu/packages/admin.scm (s-tui): Update to 1.1.1. --- 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 96db1fdba6..edcd1097a3 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1997,13 +1997,13 @@ development, not the kernel implementation of ACPI.") (define-public s-tui (package (name "s-tui") - (version "1.0.2") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "s-tui" version)) (sha256 - (base32 "0xkfdaz5np21311ffdvhks58155qby8j8scbcixhvjd913pj66qx")))) + (base32 "1clk59wf6v1lq33h4x5qwxvz5ng9mfkp1s6ynxa58w2raq8dbmy5")))) (build-system python-build-system) (inputs `(("python-psutil" ,python-psutil) -- cgit 1.4.1 From 07f77812c44aa3b7a6b963613b783da56110d2f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 15:28:55 +0100 Subject: gnu: xvfb-run: Add man page licence. * gnu/packages/xorg.scm (xvfb-run)[license]: Add gpl2+. --- gnu/packages/xorg.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index a8faa8c5f4..2f740ecbc2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6839,4 +6839,5 @@ within a virtual X server environment. It sets up an X authority file or uses an existing user-specified one, writes a cookie to it, and then starts the @command{Xvfb} X server as a background process. It also takes care of killing the server and cleaning up before returning the exit status of the command.") - (license license:x11))) + (license license:x11 ; the script + license:gpl2+))) ; the man page -- cgit 1.4.1 From 973c6f18eb5ac6ee76f742f06ba1589759f4d4bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Mar 2021 16:12:13 +0100 Subject: gnu: guile-next: Reintroduce as a 3.0.x snapshot. * gnu/packages/guile.scm (guile-next): Rewrite as a 3.0.x snapshot. --- gnu/packages/guile.scm | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6662315e78..650fe1289a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver @@ -44,6 +44,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) + #:use-module (gnu packages gperf) #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) #:use-module (gnu packages libunistring) @@ -324,9 +325,6 @@ without requiring the source code to be rewritten.") ;; Remove on the next rebuild cycle. (search-patches "guile-2.2-skip-so-test.patch"))) -(define-public guile-next - (deprecated-package "guile-next" guile-3.0)) - (define-public guile-3.0/libgc-7 ;; Using libgc-7 avoid crashes that can occur, particularly when loading ;; data in to the Guix Data Service: @@ -348,6 +346,44 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) +(define-public guile-next + (let ((version "3.0.5") + (revision "0") + (commit "91547abf54d5e0795afda2781259ab8923eb527b")) + (package + (inherit guile-3.0) + (name "guile-next") + (version (git-version version revision commit)) + (source (origin + ;; The main goal here is to allow for '--with-branch'. + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile.git") + (commit commit))) + (sha256 + (base32 + "09i1c77h2shygylfk0av31jsc1my6zjl230b2cx6vyl58q8c0cqy")))) + (arguments + (substitute-keyword-arguments (package-arguments guile-3.0) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'skip-failing-tests + (lambda _ + (substitute* "test-suite/standalone/test-out-of-memory" + (("!#") "!#\n\n(exit 77)\n")) + (delete-file "test-suite/tests/version.test") + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("flex" ,flex) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("gperf" ,gperf) + ,@(package-native-inputs guile-3.0))) + (synopsis "Development version of GNU Guile")))) + (define* (make-guile-readline guile #:optional (name "guile-readline")) (package (name name) -- cgit 1.4.1 From b1cabedd28b92324259875fc52ca5d52d411a026 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 9 Mar 2021 16:17:56 +0100 Subject: gnu: xvfb-run: Fix syntax error. Error introduced in 07f77812c44aa3b7a6b963613b783da56110d2f0. * gnu/packages/xorg.scm (xvfb-run)[license]: Fix syntax. --- 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 2f740ecbc2..92ae6a824b 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6839,5 +6839,5 @@ within a virtual X server environment. It sets up an X authority file or uses an existing user-specified one, writes a cookie to it, and then starts the @command{Xvfb} X server as a background process. It also takes care of killing the server and cleaning up before returning the exit status of the command.") - (license license:x11 ; the script - license:gpl2+))) ; the man page + (license (list license:x11 ; the script + license:gpl2+)))) ; the man page -- cgit 1.4.1 From eb4ed63fc42db5aceaeed3b864bd21d2a304e1d9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 07:37:28 -0500 Subject: gnu: Rename "t" to "t-todo-manager". * gnu/packages/task-management.scm (t): Rename to t-todo-manager. Signed-off-by: Nicolas Goaziou --- gnu/packages/task-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 9667df6030..3edf01a9f5 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -44,12 +44,12 @@ #:use-module (guix build-system meson) #:use-module (guix build-system python)) -(define-public t +(define-public t-todo-manager ;; Last release is more than 10 years old. Using latest commit. (let ((changeset "89ad444c000b") (revision "97")) (package - (name "t") + (name "t-todo-manager") (version (git-version "1.2.0" revision changeset)) (source (origin -- cgit 1.4.1 From d019bce1a3e174079ad0ed94e18a0080e632d36b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 9 Mar 2021 21:08:36 +0100 Subject: gnu: emacs-php-mode: Update to 1.24.0. * gnu/packages/emacs-xyz.scm (emacs-php-mode): Update to 1.24.0. [arguments]: Include "lisp/" directory, and add it to load path before byte-compiling. --- gnu/packages/emacs-xyz.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index aeaedc2597..b5785505a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12313,7 +12313,7 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") (define-public emacs-php-mode (package (name "emacs-php-mode") - (version "1.23.0") + (version "1.24.0") (source (origin (method git-fetch) @@ -12322,8 +12322,17 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wnkcxg6djy4jvxhshiy1iw6b5cf79pjwjhfd1a060cavhfm4v5c")))) + (base32 "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn")))) (build-system emacs-build-system) + (arguments + `(#:include (cons "^lisp/" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'add-source-to-load-path 'add-lisp-dir-to-emacs-load-path + (lambda _ + (setenv "EMACSLOADPATH" + (string-append (getcwd) "/lisp:" (getenv "EMACSLOADPATH")))))))) + (propagated-inputs `(("emacs-projectile" ,emacs-projectile))) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") (description -- cgit 1.4.1 From 5b74e21e1212767083a5b796ebae9d32d5ff5e99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 22:27:39 +0200 Subject: gnu: ruby-pstree: Update to 0.3.0. * gnu/packages/ruby.scm (ruby-pstree): Update to 0.3.0. --- 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 f6a1c69c52..c138f18f7e 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6154,13 +6154,13 @@ interface so that Terraform can be more easily invoked from Ruby code.") (define-public ruby-pstree (package (name "ruby-pstree") - (version "0.1.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (rubygems-uri "pstree" version)) (sha256 (base32 - "1mig1sv5qx1cdyhjaipy8jlh9j8pnja04vprrzihyfr54x0215p1")))) + "0ld3ng37y92kv9vqnachw1l3n07hsc8hrnjs9d840liw0mysf1vp")))) (build-system ruby-build-system) (native-inputs `(("ruby-gem-hadar" ,ruby-gem-hadar) -- cgit 1.4.1 From 251b0f7a6fa550ef4e0975668d7ab8c4c7b214d3 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 7 Mar 2021 15:32:33 +0100 Subject: gnu: vtk: Fix build failure. * gnu/packages/image-processing.scm (vtk): Fix build failure. [source]: Add patch to fix build failure with recent versions of freetype. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Efraim Flashner --- gnu/local.mk | 3 +- gnu/packages/image-processing.scm | 3 ++ .../vtk-fix-freetypetools-build-failure.patch | 36 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3a516d487f..bcee06a97a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -31,7 +31,7 @@ # Copyright © 2020 R Veera Kumar # Copyright © 2020 Nicolò Balzarotti # Copyright © 2020 Michael Rohleder -# Copyright © 2020 Felix Gruber +# Copyright © 2020, 2021 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz # Copyright © 2020 Brice Waegeneire @@ -1720,6 +1720,7 @@ dist_patch_DATA = \ %D%/packages/patches/vsearch-unbundle-cityhash.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt1.patch \ %D%/packages/patches/vte-CVE-2012-2738-pt2.patch \ + %D%/packages/patches/vtk-fix-freetypetools-build-failure.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/webkitgtk-share-store.patch \ %D%/packages/patches/webkitgtk-bind-all-fonts.patch \ diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 5dfd18d1bd..6f4576b8b9 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021 Oleh Malyi +;;; Copyright © 2021 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -254,6 +255,8 @@ many popular formats.") (sha256 (base32 "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) + (patches + (search-patches "vtk-fix-freetypetools-build-failure.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch new file mode 100644 index 0000000000..6988e65872 --- /dev/null +++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch @@ -0,0 +1,36 @@ +This fixes a build failure in VTK when building against recent versions +of freetype. + + https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7432 + +Patch by Ben Boeckel + +Subject: [PATCH] vtkFreeTypeTools: avoid using an internal macro + +This macro has been removed upstream as it was always intended to be +private. +--- + Rendering/FreeType/vtkFreeTypeTools.cxx | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFreeTypeTools.cxx +index c54289dc60..03b899c4da 100644 +--- a/Rendering/FreeType/vtkFreeTypeTools.cxx ++++ b/Rendering/FreeType/vtkFreeTypeTools.cxx +@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() + } + + //---------------------------------------------------------------------------- +-FT_CALLBACK_DEF(FT_Error) +-vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, +- FT_Library lib, +- FT_Pointer request_data, +- FT_Face* face) ++static FT_Error vtkFreeTypeToolsFaceRequester( ++ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + { + #if VTK_FTFC_DEBUG_CD + printf("vtkFreeTypeToolsFaceRequester()\n"); +-- +2.30.1 + -- cgit 1.4.1 From 80c83756e9ce7350ef236d72ecdfb0f2fa03ebfc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 22:59:20 +0200 Subject: gnu: evisum: Update to 0.5.11. * gnu/packages/enlightenment.scm (evisum): Update to 0.5.11. --- 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 d2769a4d76..15ea89454f 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -567,14 +567,14 @@ directories. (define-public evisum (package (name "evisum") - (version "0.5.8") + (version "0.5.11") (source (origin (method url-fetch) (uri (string-append "https://download.enlightenment.org/rel/apps/" "evisum/evisum-" version ".tar.xz")) (sha256 - (base32 "0cg4vqd069h89k3wrvl550p29y3yzbdnvii58gwc8rghwym621jx")))) + (base32 "0cbfg393nlf0k91a2hdlyakns3dpzvs3isd95dm3zizydyf9h8wc")))) (build-system meson-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 3c04e179b7dc86bb6af5d6b7aec63430885e1c6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:30:07 +0100 Subject: gnu: Add r-fastghquad. * gnu/packages/cran.scm (r-fastghquad): 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 0943a8972b..c9d65a0efd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1344,6 +1344,28 @@ are used. Fastmap avoids this memory leak issue by implementing the map using data structures in C++.") (license license:expat))) +(define-public r-fastghquad + (package + (name "r-fastghquad") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "fastGHQuad" version)) + (sha256 + (base32 + "1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj")))) + (properties `((upstream-name . "fastGHQuad"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/awblocker/fastGHQuad") + (synopsis "Fast Rcpp implementation of Gauss-Hermite Quadrature") + (description + "This package implements numerically-stable Gauss-Hermite quadrature +rules and utility functions for adaptive GH quadrature.") + (license license:expat))) + ;; This package includes minified JavaScript files. When upgrading please ;; check that there are no new minified JavaScript files. (define-public r-jquerylib -- cgit 1.4.1 From bcdf0cf3a59287db5716359998fd124dcc1d83c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:30:45 +0100 Subject: gnu: Add r-rstpm2. * gnu/packages/cran.scm (r-rstpm2): 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 c9d65a0efd..e00b611a83 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1366,6 +1366,39 @@ data structures in C++.") rules and utility functions for adaptive GH quadrature.") (license license:expat))) +(define-public r-rstpm2 + (package + (name "r-rstpm2") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "rstpm2" version)) + (sha256 + (base32 + "0c6l3z250b2kn6mh2xyb0bd2y5nsbj11n9xfi51dac9s8xq3v7m4")))) + (properties `((upstream-name . "rstpm2"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bbmle" ,r-bbmle) + ("r-bh" ,r-bh) + ("r-desolve" ,r-desolve) + ("r-fastghquad" ,r-fastghquad) + ("r-mgcv" ,r-mgcv) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-survival" ,r-survival))) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://github.com/mclements/rstpm2") + (synopsis "Link-based survival models") + (description + "This package provides R implementations of @dfn{generalized survival +models} (GSMs), smooth @dfn{accelerated failure time} (AFT) models and Markov +multi-state models.") + ;; One of these licenses + (license (list license:gpl2 license:gpl3)))) + ;; This package includes minified JavaScript files. When upgrading please ;; check that there are no new minified JavaScript files. (define-public r-jquerylib -- cgit 1.4.1 From 91aa72bfe2b72c3fd3142caa879ad00510b13c19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:31:03 +0100 Subject: gnu: Add r-palmerpenguins. * gnu/packages/cran.scm (r-palmerpenguins): 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 e00b611a83..a5c8de4d64 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2546,6 +2546,30 @@ inspired by Python's Literal String Interpolation (PEP-0498) and Docstrings (PEP-0257) and Julia's Triple-Quoted String Literals.") (license license:expat))) +(define-public r-palmerpenguins + (package + (name "r-palmerpenguins") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "palmerpenguins" version)) + (sha256 + (base32 + "0q1k3cdkliq7kwrg1n0vs9b6cjwyfarhlgdijhp9c6riy6y5ik7x")))) + (properties + `((upstream-name . "palmerpenguins"))) + (build-system r-build-system) + (home-page "https://allisonhorst.github.io/palmerpenguins/") + (synopsis "Palmer Archipelago (Antarctica) penguin data") + (description + "This package includes size measurements, clutch observations, and blood +isotope ratios for adult foraging Adélie, Chinstrap, and Gentoo penguins +observed on islands in the Palmer Archipelago near Palmer Station, Antarctica. +Data were collected and made available by Dr. Kristen Gorman and the Palmer +Station Long Term Ecological Research (LTER) Program.") + (license license:cc0))) + (define-public r-pastecs (package (name "r-pastecs") -- cgit 1.4.1 From c341a4d02e9e63856bd763f8aba016767abb30ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:31:28 +0100 Subject: gnu: Add r-gridtext. * gnu/packages/cran.scm (r-gridtext): 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 a5c8de4d64..bb5fea95b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16747,6 +16747,37 @@ matrix and displays the significance level on the plot. It also includes a function for computing a matrix of correlation p-values.") (license license:gpl2))) +(define-public r-gridtext + (package + (name "r-gridtext") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "gridtext" version)) + (sha256 + (base32 + "131kw7nkfwksviwfifd2kk7lyvhxzzzv1nnj8rahkr3dik3akk61")))) + (properties `((upstream-name . "gridtext"))) + (build-system r-build-system) + (propagated-inputs + `(("r-jpeg" ,r-jpeg) + ("r-markdown" ,r-markdown) + ("r-png" ,r-png) + ("r-rcpp" ,r-rcpp) + ("r-rcurl" ,r-rcurl) + ("r-rlang" ,r-rlang) + ("r-stringr" ,r-stringr) + ("r-xml2" ,r-xml2))) + (home-page "https://wilkelab.org/gridtext/") + (synopsis "Improved text rendering support for Grid graphics") + (description + "This package provides support for rendering of formatted text using Grid +graphics. Text can be formatted via a minimal subset of Markdown, HTML, and +inline CSS directives, and it can be rendered both with and without word +wrap.") + (license license:expat))) + ;; This package includes minified JavaScript files. When upgrading please ;; check that there are no new minified JavaScript files. (define-public r-flexdashboard -- cgit 1.4.1 From 1bbf632574dc47db680e883beb0d6a997fc867e6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:32:32 +0100 Subject: gnu: Add r-ggtext. * gnu/packages/cran.scm (r-ggtext): 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 bb5fea95b8..232cea5cbc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16778,6 +16778,33 @@ inline CSS directives, and it can be rendered both with and without word wrap.") (license license:expat))) +(define-public r-ggtext + (package + (name "r-ggtext") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "ggtext" version)) + (sha256 + (base32 + "0n19dlcys8v7myfyckr6dnq0kx79k3sbh8nwx1jsx8pgzfbi8a2b")))) + (properties `((upstream-name . "ggtext"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-gridtext" ,r-gridtext) + ("r-rlang" ,r-rlang) + ("r-scales" ,r-scales))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://wilkelab.org/ggtext/") + (synopsis "Improved text rendering support for ggplot2") + (description + "This package provides a ggplot2 extension that enables the rendering of +complex formatted plot labels (titles, subtitles, facet labels, axis labels, +etc.). Text boxes with automatic word wrap are also supported.") + (license license:gpl2))) + ;; This package includes minified JavaScript files. When upgrading please ;; check that there are no new minified JavaScript files. (define-public r-flexdashboard -- cgit 1.4.1 From 7fffee5e34c92359178da67206be348e42957e30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:32:48 +0100 Subject: gnu: Add r-terra. * gnu/packages/cran.scm (r-terra): 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 232cea5cbc..6b4370749c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18127,6 +18127,41 @@ stress majorization by Gansner et al. (2004) emphasize hidden group structures in networks or focus on specific nodes.") (license license:expat))) +(define-public r-terra + (package + (name "r-terra") + (version "1.1-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "terra" version)) + (sha256 + (base32 + "1vsh55sq56shc8s2vmkl27yvrdbrbn3l6jrigqf2hmvppkb2jsbg")))) + (properties `((upstream-name . "terra"))) + (build-system r-build-system) + (inputs + `(("gdal" ,gdal) + ("geos" ,geos) + ("proj" ,proj) + ("sqlite" ,sqlite) ; needed for proj + ("zlib" ,zlib))) + (propagated-inputs + `(("r-raster" ,r-raster) + ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://rspatial.org/terra") + (synopsis "Spatial data analysis") + (description + "This package provides methods for spatial data analysis, especially +raster data. The included methods allow for low-level data manipulation as +well as high-level global, local, zonal, and focal computation. The predict +and interpolate methods facilitate the use of regression type (interpolation, +machine learning) models for spatial prediction. Processing of very large +files is supported.") + (license license:gpl3+))) + (define-public r-tidygraph (package (name "r-tidygraph") -- cgit 1.4.1 From ef8e4f4172c080acae4f7253ecd316559d00468d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:37:45 +0100 Subject: gnu: r-wgcna: Update to 1.70-3. * gnu/packages/bioconductor.scm (r-wgcna): Update to 1.70-3. --- 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 89b191585b..0899a013d5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8700,14 +8700,14 @@ routines.") (define-public r-wgcna (package (name "r-wgcna") - (version "1.69") + (version "1.70-3") (source (origin (method url-fetch) (uri (cran-uri "WGCNA" version)) (sha256 (base32 - "022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f")))) + "1m6b4a2xpb02c1ajndhk8qlqnhwxa7lkkwj6nzv3l618jy1kp15r")))) (properties `((upstream-name . "WGCNA"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 4be2e0f309673cc83046573659c3823291399234 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:37:48 +0100 Subject: gnu: r-cachem: Update to 1.0.4. * gnu/packages/cran.scm (r-cachem): Update to 1.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 6b4370749c..fd101b6895 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -129,14 +129,14 @@ files and provide more explicit control over line endings.") (define-public r-cachem (package (name "r-cachem") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "cachem" version)) (sha256 (base32 - "0y3jb96lyn3vc3nq8gs9x669w3xp69vdg5xc69qy0l356r39gp3r")))) + "1b1gk837rk9kbfq385ybrrk12ckxwvhjvf0z9635l3vw49wal4mh")))) (properties `((upstream-name . "cachem"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 260259f5ef0baa37cf9180cfc184e1410a07828a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:37:52 +0100 Subject: gnu: r-waldo: Update to 0.2.5. * gnu/packages/cran.scm (r-waldo): Update to 0.2.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 fd101b6895..c5da1f1429 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -175,14 +175,14 @@ visualization of their differences.") (define-public r-waldo (package (name "r-waldo") - (version "0.2.3") + (version "0.2.5") (source (origin (method url-fetch) (uri (cran-uri "waldo" version)) (sha256 (base32 - "0lsw8p4wiggqm9fvh5vgmf0ms0npcg3hcwyzlg5ahv5yx4pv5fhz")))) + "09jhwpgd6hg4qyip4r7wzpjz0jr139fyspd5ncriqimp522snqbr")))) (properties `((upstream-name . "waldo"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From fa00e35b9ed1dac48258f24bc86d22cf76368760 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:37:55 +0100 Subject: gnu: r-rticles: Update to 0.19. * gnu/packages/cran.scm (r-rticles): Update to 0.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 c5da1f1429..4c5ea04b25 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -205,14 +205,14 @@ easier.") (define-public r-rticles (package (name "r-rticles") - (version "0.18") + (version "0.19") (source (origin (method url-fetch) (uri (cran-uri "rticles" version)) (sha256 (base32 - "1srczjy9dqw06glrv95798xsg462kfbbwm3yk1fv1zhpz9jhakwv")))) + "1zcj5y54z1max1df9j2iclm6zlcic4wj684y18wcnmmdwfs51818")))) (properties `((upstream-name . "rticles"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From f0f2e2cbda1d0b8280c3e9d76ffef8dbc090e592 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:37:58 +0100 Subject: gnu: r-partykit: Update to 1.2-13. * gnu/packages/cran.scm (r-partykit): Update to 1.2-13. --- 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 4c5ea04b25..c786fff38f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2594,13 +2594,13 @@ initiative to bring PASSTEC 2000 functionalities to R.") (define-public r-partykit (package (name "r-partykit") - (version "1.2-12") + (version "1.2-13") (source (origin (method url-fetch) (uri (cran-uri "partykit" version)) (sha256 (base32 - "15d5g89winndv8cy8jjjxy87fliafp5zyb8b58czrijwcmagg50l")))) + "15bfhqvx2y4vclnc3sw4v7ggs70pk57b3qk9aqjfvdrx444d2gd4")))) (build-system r-build-system) (propagated-inputs `(("r-formula" ,r-formula) -- cgit 1.4.1 From 601a112bb21f52f1ecdded107bfba2892eb1873d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:01 +0100 Subject: gnu: r-ps: Update to 1.6.0. * gnu/packages/cran.scm (r-ps): Update to 1.6.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 c786fff38f..ee99374735 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2674,13 +2674,13 @@ print, summary, plot, update, etc. (define-public r-ps (package (name "r-ps") - (version "1.5.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (cran-uri "ps" version)) (sha256 - (base32 "15pyz94b0z6ibrjp25np5nd4z20whnnr35wsavdgwmsmynba2qbl")))) + (base32 "0cdzjqgap108whhsilxllg12m2d05pgksryhrz5bq608bvf7vbc9")))) (build-system r-build-system) (home-page "https://ps.r-lib.org") (synopsis "List, query, and manipulate system processes") -- cgit 1.4.1 From 84e39b3d9979126323e5acb9a23852d1ad27baab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:04 +0100 Subject: gnu: r-pkgload: Update to 1.2.0. * gnu/packages/cran.scm (r-pkgload): 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 ee99374735..afc3dd5678 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2720,14 +2720,14 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "03bv8xq4s6s7m34y1kjs99jzlb95vwrfi76mbnhmzcx2pc6ld78q")))) + "185xr79z2vncq62bni7x4qv3p7dxvnfsbdnnglma0a196hz6pj7v")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit 1.4.1 From 7ff93d34830ea4d97694b2954db0bf180eea790a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:07 +0100 Subject: gnu: r-ffbase: Update to 0.13.3. * gnu/packages/cran.scm (r-ffbase): Update to 0.13.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 afc3dd5678..0675a3660c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3126,14 +3126,14 @@ in main memory.") (define-public r-ffbase (package (name "r-ffbase") - (version "0.13.1") + (version "0.13.3") (source (origin (method url-fetch) (uri (cran-uri "ffbase" version)) (sha256 (base32 - "0knl0vnh8w4q3ry24gp4fd55ipnaj9hb1rwm31fs119kgmh3gd8x")))) + "1dp6lblfq2j7r1b4b8ls47jlx8j27n88d5vp8w116lb8pa01zxmk")))) (build-system r-build-system) (propagated-inputs `(("r-bit" ,r-bit) -- cgit 1.4.1 From adbd713085e71ee6356445689470e7a0727ce99f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:11 +0100 Subject: gnu: r-ggally: Update to 2.1.1. * gnu/packages/cran.scm (r-ggally): Update to 2.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 0675a3660c..77e41babd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3246,14 +3246,14 @@ package also provides a C++ API, that works with or without Rcpp.") (define-public r-ggally (package (name "r-ggally") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "0lvcvlc8p2cii7rqx7m81f7cv3kk9mlf7cbbgv7l75g7ljw8dyvz")))) + "0lly659kd43cnz1bmmzqj6dbf4v0nm8dhj8xq2wlv9qbnfhq5r9p")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 4fcbe65d61299031059a2909a7a59a155e1066f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:14 +0100 Subject: gnu: r-proxy: Update to 0.4-25. * gnu/packages/cran.scm (r-proxy): Update to 0.4-25. --- 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 77e41babd6..0aa98cadf0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3285,14 +3285,14 @@ plot networks.") (define-public r-proxy (package (name "r-proxy") - (version "0.4-24") + (version "0.4-25") (source (origin (method url-fetch) (uri (cran-uri "proxy" version)) (sha256 (base32 - "0z4wdnpv5x135nssxnmkkba7fivd5xgbpaabqjkl2na76vq9pzwc")))) + "1m893djrv6ckadmlx9n5bxfp0ycdh2w63sy6yxfyj1migvc7072f")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/proxy") (synopsis "Distance and similarity measures") -- cgit 1.4.1 From 37097b923c6cb7c768105b561cbd13a624569079 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:17 +0100 Subject: gnu: r-rmpi: Update to 0.6-9.1. * gnu/packages/cran.scm (r-rmpi): Update to 0.6-9.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 0aa98cadf0..c62b2cf042 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3368,13 +3368,13 @@ matrices.") (define-public r-rmpi (package (name "r-rmpi") - (version "0.6-9") + (version "0.6-9.1") (source (origin (method url-fetch) (uri (cran-uri "Rmpi" version)) (sha256 (base32 - "1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj")))) + "1j8akqjan59yzwx2s1zxc214qyd323fd2i2dhgq0n11mb6ajmq4r")))) (properties `((upstream-name . "Rmpi"))) (build-system r-build-system) (arguments -- cgit 1.4.1 From b3700e61d4e30a938f8107e1f93969d97a27a861 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:21 +0100 Subject: gnu: r-energy: Update to 1.7-8. * gnu/packages/cran.scm (r-energy): Update to 1.7-8. [propagated-inputs]: Add r-gsl. --- 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 c62b2cf042..16e0c71e30 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3750,17 +3750,18 @@ data). Weighted versions of MLE, MME and QME are available.") (define-public r-energy (package (name "r-energy") - (version "1.7-7") + (version "1.7-8") (source (origin (method url-fetch) (uri (cran-uri "energy" version)) (sha256 (base32 - "13wnx5nwk7nsv7vf5sxhz4y0rxrnzm76ldgywk1bxrz67srqzf37")))) + "12a7gy681aq3l55iys044cs6sn1s2l5qihghpdl01cvv0ggfh26y")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) + ("r-gsl" ,r-gsl) ("r-rcpp" ,r-rcpp))) (home-page "https://cran.r-project.org/web/packages/energy") (synopsis "Multivariate inference via the energy of data") -- cgit 1.4.1 From 6c7d9efdd87ac8bd71364cbb00b8514d44d60fd3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:24 +0100 Subject: gnu: r-ipred: Update to 0.9-10. * gnu/packages/cran.scm (r-ipred): Update to 0.9-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 16e0c71e30..58e397df3c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4214,14 +4214,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-9") + (version "0.9-10") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d")))) + "0p9cd2v47h71jbz8q0z6xykkaqpcp0mkpsfmd2bn961n1hfgpa63")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit 1.4.1 From 0496ce3c4424976e55597d464319b05868c9a6d6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:27 +0100 Subject: gnu: r-broom: Update to 0.7.5. * gnu/packages/cran.scm (r-broom): 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 58e397df3c..c387dadc25 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4294,14 +4294,14 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1zwdgv59a5c4mdcfn3anvsf83ymi11ij6k9nssw3aqzirp6fwg3w")))) + "1qjyl5b100bsakm48w1vi3819lkpys7vb86n1sv9h4y2wr1c4jmw")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit 1.4.1 From 5136cc1306596a8c3eec4b440263e632301cef02 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:31 +0100 Subject: gnu: r-cli: Update to 2.3.1. * gnu/packages/cran.scm (r-cli): Update to 2.3.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 c387dadc25..70571e0f7f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5067,14 +5067,14 @@ plots in @code{ggplot2}.") (define-public r-cli (package (name "r-cli") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "128bx3bds0dnkixc4frbky11rz1ilnvdfzz9mggajj690i11b62q")))) + "1jh64ixn6mg2ap1sx4azrxkjnlsyjbfxyc9zjkx8m9dlakgf4v2i")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit 1.4.1 From 6fe7e138b95720d1f20de3f39681b0233499da8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:34 +0100 Subject: gnu: r-argparser: Update to 0.7.1. * gnu/packages/cran.scm (r-argparser): Update to 0.7.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 70571e0f7f..e514adf42e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5089,14 +5089,14 @@ rules, boxes, trees, and Unicode symbols with ASCII alternatives.") (define-public r-argparser (package (name "r-argparser") - (version "0.6") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "argparser" version)) (sha256 (base32 - "1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x")))) + "0xcl0ivsbc4iw8s7027q4cx68j6s5lihbby0xa9pmlv4wjmcvdr6")))) (build-system r-build-system) (home-page "https://bitbucket.org/djhshih/argparser") (synopsis "Command-line argument parser") -- cgit 1.4.1 From bd1ff10ea0a70b1530c46d63bb10e71c8316bfd1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:38 +0100 Subject: gnu: r-pillar: Update to 1.5.1. * gnu/packages/cran.scm (r-pillar): Update to 1.5.1. [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 e514adf42e..ff5347de48 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5379,14 +5379,14 @@ to variables on the left-hand side of the assignment.") (define-public r-pillar (package (name "r-pillar") - (version "1.4.7") + (version "1.5.1") (source (origin (method url-fetch) (uri (cran-uri "pillar" version)) (sha256 (base32 - "167ji21fx04s2niw5pjq9vzxgagxzsg3gimh8dzr2kl5ljrb5vfd")))) + "0wp68cg95895aybi7yjqy0sidvc68lmfqndinpd63dysci9x3r8c")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) @@ -5397,6 +5397,8 @@ to variables on the left-hand side of the assignment.") ("r-rlang" ,r-rlang) ("r-utf8" ,r-utf8) ("r-vctrs" ,r-vctrs))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/pillar") (synopsis "Coloured formatting for columns") (description -- cgit 1.4.1 From 17747033833c17fd1911e3ef4508e5495bf592da Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:41 +0100 Subject: gnu: r-tinytex: Update to 0.30. * gnu/packages/cran.scm (r-tinytex): Update to 0.30. --- 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 ff5347de48..f4723fd00e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5429,14 +5429,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.29") + (version "0.30") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0my1412vn5zri01w2myzn268lfwinbhfgdj4bbcib3s48i9djw0n")))) + "0dk6mpszwh1m65b0wfwjlcvpzywmasf6p31niqiq53wnd92my0gw")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit 1.4.1 From 0505facdd550522276f69810701cd93cb8212e4d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:45 +0100 Subject: gnu: r-rio: Update to 0.5.26. * gnu/packages/cran.scm (r-rio): Update to 0.5.26. [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 f4723fd00e..1fb64241a3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6868,14 +6868,14 @@ dependency on Java.") (define-public r-rio (package (name "r-rio") - (version "0.5.16") + (version "0.5.26") (source (origin (method url-fetch) (uri (cran-uri "rio" version)) (sha256 (base32 - "0rfl56fdawlhc98451a9lcb6a6m56kw0i7dvd5hx58z025d8vsyk")))) + "1k6zxjb2bb0z6rv7zmkbaz85cbvs84mj602ikkwk60alh8kpdw2d")))) (build-system r-build-system) (propagated-inputs `(("r-curl" ,r-curl) @@ -6885,6 +6885,8 @@ dependency on Java.") ("r-openxlsx" ,r-openxlsx) ("r-readxl" ,r-readxl) ("r-tibble" ,r-tibble))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/leeper/rio") (synopsis "Swiss-army knife for data I/O") (description -- cgit 1.4.1 From 9d9d11b5d3f4dbf43ec51d137f5d6232e77aad2f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:49 +0100 Subject: gnu: r-promises: Update to 1.2.0.1. * gnu/packages/cran.scm (r-promises): Update to 1.2.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 1fb64241a3..3e0a608ba4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6957,14 +6957,14 @@ time after the current time, after the R execution stack has emptied.") (define-public r-promises (package (name "r-promises") - (version "1.1.1") + (version "1.2.0.1") (source (origin (method url-fetch) (uri (cran-uri "promises" version)) (sha256 (base32 - "002qkhcn3ri6a3w5fizjvdvrjgvqiw8i7rl9jglcnqik5kmwc61p")))) + "1dy4cbqw17awh4q8m7cy3anaj0n9iynabfzflb1g94cyj0bq4fld")))) (build-system r-build-system) (propagated-inputs `(("r-later" ,r-later) -- cgit 1.4.1 From b592c4dbe6e95c4c9c6a56c0aa67e341c0d6b97a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:53 +0100 Subject: gnu: r-rastervis: Update to 0.50. * gnu/packages/cran.scm (r-rastervis): Update to 0.50. [propagated-inputs]: Add r-terra. --- 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 3e0a608ba4..96055c68b2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7248,14 +7248,14 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (define-public r-rastervis (package (name "r-rastervis") - (version "0.49") + (version "0.50") (source (origin (method url-fetch) (uri (cran-uri "rasterVis" version)) (sha256 (base32 - "0d12h7xqcwy1wps6yya9nzfppbnsxpmbkqmy3a8pvxpg81l632kk")))) + "0m7fjd53apxim0d0rjnyzc28vmfcg4spcrn0zbnk8llillxji1hi")))) (properties `((upstream-name . "rasterVis"))) (build-system r-build-system) (propagated-inputs @@ -7265,6 +7265,7 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") ("r-raster" ,r-raster) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-sp" ,r-sp) + ("r-terra" ,r-terra) ("r-viridislite" ,r-viridislite) ("r-zoo" ,r-zoo))) (home-page "https://oscarperpinan.github.io/rastervis/") -- cgit 1.4.1 From 2c49fe40630721735e4e7ad088502fbf264416b9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:56 +0100 Subject: gnu: r-renv: Update to 0.13.0. * gnu/packages/cran.scm (r-renv): Update to 0.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 96055c68b2..5704a2d5f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7307,14 +7307,14 @@ those searches and pull data into their R sessions.") (define-public r-renv (package (name "r-renv") - (version "0.12.5") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "0wfq1z5glng6jrfxj25mjhp129z6468gaszr9ggks5gp8lrwszzh")))) + "16n2dz9jibc03f7q1wrzxss6l5jmaks7m2lnli9dz9anvcmxbdia")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit 1.4.1 From b6d9965d41b239573b3d6a47c92a3a8899750e22 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:38:59 +0100 Subject: gnu: r-ggsignif: Update to 0.6.1. * gnu/packages/cran.scm (r-ggsignif): Update to 0.6.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 5704a2d5f4..4f9b6406e5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7497,14 +7497,14 @@ movies, and TV shows.") (define-public r-ggsignif (package (name "r-ggsignif") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "ggsignif" version)) (sha256 (base32 - "17j9hg967k1wp9xw3x84mqss58jkb8pvlrnlchz4i1hklgykxqbg")))) + "0rjy9wqsq67jjm1jz3j7hm599x0rshrrhw2w01iaqb9kf506hvjh")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From fdf375346adeaab801709828f5f473c9690ca01c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:02 +0100 Subject: gnu: r-rstatix: Update to 0.7.0. * gnu/packages/cran.scm (r-rstatix): 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 4f9b6406e5..dc2de4b5a2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7524,14 +7524,14 @@ and adds the annotation to the plot.") (define-public r-rstatix (package (name "r-rstatix") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "rstatix" version)) (sha256 (base32 - "0nwwvxwr4z3j4n9z8cnvwghppc836g47n0ia98chk272qwh8xcpb")))) + "0330y8iziffqg8j9j5h9zv4qcdyf8ybhmzxrr9fzq9nc6bf1gbm5")))) (properties `((upstream-name . "rstatix"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 0281b306cafcf9eb77891a61ba1f097f99dfd778 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:07 +0100 Subject: gnu: r-rdpack: Update to 2.1.1. * gnu/packages/cran.scm (r-rdpack): Update to 2.1.1. [propagated-inputs]: Remove r-gbrd. --- 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 dc2de4b5a2..33670bf5a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7900,19 +7900,18 @@ implemented in bibutils.") (define-public r-rdpack (package (name "r-rdpack") - (version "2.1") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "Rdpack" version)) (sha256 (base32 - "1kmz0kq2z1xl55w22paz98x9jpss06abvicmkslv4zq77kz99q16")))) + "11psw5yiamq0g7jc6fqn2wis565i60qgda4a5d09qi8fyzd6mnfb")))) (properties `((upstream-name . "Rdpack"))) (build-system r-build-system) (propagated-inputs - `(("r-rbibutils" ,r-rbibutils) - ("r-gbrd" ,r-gbrd))) + `(("r-rbibutils" ,r-rbibutils))) (home-page "https://github.com/GeoBosh/Rdpack") (synopsis "Update and manipulate Rd documentation objects") (description -- cgit 1.4.1 From ad037d6ecb92628e35de7d0655bf790f927f67ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:10 +0100 Subject: gnu: r-officer: Update to 0.3.17. * gnu/packages/cran.scm (r-officer): Update to 0.3.17. --- 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 33670bf5a0..2ce7ba04b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7926,14 +7926,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.16") + (version "0.3.17") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1ls5kp70jfxrzxxb3xrg8sn2fyk6qd7rmx23n5jxi7z7850avjrj")))) + "1apg0dh1zfhrqcbbmm8318l40gyjbqc2l9sdvwxx7qi8mzc1mqvw")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit 1.4.1 From 111400674ff4699e4ddd8ce03d3d4bff0650885e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:13 +0100 Subject: gnu: r-insight: Update to 0.13.1. * gnu/packages/cran.scm (r-insight): Update to 0.13.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 2ce7ba04b3..70b3ff1106 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8187,14 +8187,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0gkvcw9d729ql1gfrpxzgrag4xafd0hchrdww215qz11ma1rzy7s")))) + "1la4yxzfl9fnknamnaziil6gvpdzl78z16lfzis9jgzg8r9q0y5l")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From c1037edc89b2ca4e8c9aee4f410aa148cff20a99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:16 +0100 Subject: gnu: r-deriv: Update to 4.1.3. * gnu/packages/cran.scm (r-deriv): Update to 4.1.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 70b3ff1106..1e3716bb37 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8549,14 +8549,14 @@ Group (Non-)Overlap considerations.") (define-public r-deriv (package (name "r-deriv") - (version "4.1.2") + (version "4.1.3") (source (origin (method url-fetch) (uri (cran-uri "Deriv" version)) (sha256 (base32 - "1j9sh1w9lsnnhlh59g4ghykyfx46rxh380s8imvm7pzna7rw7c64")))) + "130g3mv0z9sqs6y23a0a94512iiw05yr6fp378vhdxxbignzbnyv")))) (properties `((upstream-name . "Deriv"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/Deriv") -- cgit 1.4.1 From 2dae640d8ab417c71dfedc7c5ac1c013d1c057b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:19 +0100 Subject: gnu: r-doby: Update to 4.6.9. * gnu/packages/cran.scm (r-doby): Update to 4.6.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 1e3716bb37..f390c0814b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8571,14 +8571,14 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.8") + (version "4.6.9") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "0r97kwsj6g87m7shgnjc5c9y71jkhiq4xd9q0s2bxl0vl92qqwvg")))) + "02f545md5yhbpp3wb3q2c8zabqwgf02555r5c6g7znab5zjbyr00")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 4c113c54f11a44a3f81b46bc4ced480a4620a744 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:25 +0100 Subject: gnu: r-labelled: Update to 2.8.0. * gnu/packages/cran.scm (r-labelled): Update to 2.8.0. [propagated-inputs]: Remove r-pillar; add r-stringr. --- 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 f390c0814b..61102aca55 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9005,22 +9005,22 @@ and coverage methods to tune the choice of threshold.") (define-public r-labelled (package (name "r-labelled") - (version "2.7.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (cran-uri "labelled" version)) (sha256 (base32 - "1nsb0mh0jg7gggc41b6v55nmfq07g0qn9fy55x4jws5dscs6pdmi")))) + "0fs8fhmk9j2nv2j87mpkmm0clz34f8kybnzn6pzqpcbwk0i2pcwg")))) (properties `((upstream-name . "labelled"))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-haven" ,r-haven) ("r-lifecycle" ,r-lifecycle) - ("r-pillar" ,r-pillar) ("r-rlang" ,r-rlang) + ("r-stringr" ,r-stringr) ("r-tidyr" ,r-tidyr) ("r-vctrs" ,r-vctrs))) (native-inputs -- cgit 1.4.1 From 70d490eb7381ec181820b635b316a76e3a55a997 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:28 +0100 Subject: gnu: r-gert: Update to 1.2.0. * gnu/packages/cran.scm (r-gert): 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 61102aca55..4e00be66e5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10674,14 +10674,14 @@ user credentials.") (define-public r-gert (package (name "r-gert") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "gert" version)) (sha256 (base32 - "09har6mj7qy813s6dxyzfzmjwg60m8c01yx3q6lfsnvwqzxlqxv8")))) + "0ag2ia6cfb5drf3517lg5nhik1w0nv09a75wdy5jdciws1qra3d6")))) (properties `((upstream-name . "gert"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 7db329a300dac9ec40646dbd5c30c31eb2f0632d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:31 +0100 Subject: gnu: r-mvabund: Update to 4.1.9. * gnu/packages/cran.scm (r-mvabund): Update to 4.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 4e00be66e5..fed0f32df5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11052,14 +11052,14 @@ the interfaces between R and C++.") (define-public r-mvabund (package (name "r-mvabund") - (version "4.1.6") + (version "4.1.9") (source (origin (method url-fetch) (uri (cran-uri "mvabund" version)) (sha256 (base32 - "0aisvax9d7bk6aykrcdcn1ji618r520mcrkr1i3jnck1qs31z41f")))) + "19kyg0agjk7gxipa5kmklz4cqh97xrdbibmmy1g99r1gp3s9ml30")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit 1.4.1 From ed7f3e3c2f4f04068a837767486c3ba8224505d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:34 +0100 Subject: gnu: r-rcppparallel: Update to 5.0.3. * gnu/packages/cran.scm (r-rcppparallel): Update to 5.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 fed0f32df5..98a13020c0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11241,14 +11241,14 @@ package provides a minimal R interface by relying on the Rcpp package.") (define-public r-rcppparallel (package (name "r-rcppparallel") - (version "5.0.2") + (version "5.0.3") (source (origin (method url-fetch) (uri (cran-uri "RcppParallel" version)) (sha256 (base32 - "10bg4fw38m64dhy543rwq2nnjjc9y24iggk343xslrb3ij8018lc")))) + "0ihcirny4al2ydymxhdfacwmybmrgrz5nm0lbf49gk2zy8w124ki")))) (properties `((upstream-name . "RcppParallel"))) (build-system r-build-system) (home-page "https://rcppcore.github.io/RcppParallel/") -- cgit 1.4.1 From 1b9009ce98fa373ade5952b4abc38c490a9a9625 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:37 +0100 Subject: gnu: r-rgl: Update to 0.105.22. * gnu/packages/cran.scm (r-rgl): Update to 0.105.22. --- 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 98a13020c0..99b947540f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11310,14 +11310,14 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "0.104.16") + (version "0.105.22") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "169a8riiam8445nl7rcwn0x92dlwyzh5xldvap6dcxjyjqmjwbdq")))) + "1y69phym8pkdh1k808y3rp1030xmhjpc8vig9035v9n1r7v7a1kz")))) (build-system r-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 1ef3abaff3f78b3c7e406b9a5e45f4f6e4a9ace0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:40 +0100 Subject: gnu: r-activity: Update to 1.3.1. * gnu/packages/cran.scm (r-activity): Update to 1.3.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 99b947540f..b68e52f02f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11505,14 +11505,14 @@ Scientific.") (define-public r-activity (package (name "r-activity") - (version "1.3") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "activity" version)) (sha256 (base32 - "12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92")))) + "1wn2a0hx7wfr2jyj1b772w5fgl6bcqkkw8cybais2s1wyjx8kjr5")))) (build-system r-build-system) (propagated-inputs `(("r-circular" ,r-circular) -- cgit 1.4.1 From 7fab62cecb59010980b62f867ed777b5b6d1729c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:44 +0100 Subject: gnu: r-ouch: Update to 2.15-1. * gnu/packages/cran.scm (r-ouch): Update to 2.15-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 b68e52f02f..b8304c064f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11531,14 +11531,14 @@ circular variables).") (define-public r-ouch (package (name "r-ouch") - (version "2.14-1") + (version "2.15-1") (source (origin (method url-fetch) (uri (cran-uri "ouch" version)) (sha256 (base32 - "0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b")))) + "0myddn3b28pswyk42kvwhyvkj30q41f677vpxclxacdfkhgvrj6q")))) (build-system r-build-system) (propagated-inputs `(("r-subplex" ,r-subplex))) (home-page "https://kingaa.github.io/ouch/") -- cgit 1.4.1 From cf1ef75cc4542eed74db8d22877e412f9302e8db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:48 +0100 Subject: gnu: r-fftwtools: Update to 0.9-11. * gnu/packages/cran.scm (r-fftwtools): Update to 0.9-11. [native-inputs]: Add pkg-config. --- 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 b8304c064f..607ea4a7c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11689,16 +11689,18 @@ components).") (define-public r-fftwtools (package (name "r-fftwtools") - (version "0.9-9") + (version "0.9-11") (source (origin (method url-fetch) (uri (cran-uri "fftwtools" version)) (sha256 (base32 - "0h8lyl2i6zq16ir7xnfj9dhyivxvwikm8lml19s8s8jx95z3n9x9")))) + "0zrchp4l0jdbir2gibjf00x225y9giqk80zvqmr2yyvc12lwkw7i")))) (build-system r-build-system) (inputs `(("fftw" ,fftw))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/krahim/fftwtools") (synopsis "Wrapper for FFTW3") (description -- cgit 1.4.1 From 1443bb0f1991c9c07f2187d15803a2e5be167f5b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:51 +0100 Subject: gnu: r-tiff: Update to 0.1-7. * gnu/packages/cran.scm (r-tiff): Update to 0.1-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 607ea4a7c6..b6fb030c9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11716,14 +11716,14 @@ redundant complex conjugate when the input is real data.") (define-public r-tiff (package (name "r-tiff") - (version "0.1-6") + (version "0.1-7") (source (origin (method url-fetch) (uri (cran-uri "tiff" version)) (sha256 (base32 - "1yy4im2lwzhjnnkfwxgkknsajvm83pcwaf370pkgfva2db0xjfv2")))) + "101n6x70fr1dhcwx53g3s8q1j4wh93y0388v1s1316f8558rxqxh")))) (build-system r-build-system) (inputs `(("libtiff" ,libtiff) -- cgit 1.4.1 From b63f13b59f36f8155644122e0209c40ddd75568e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:54 +0100 Subject: gnu: r-gargle: Update to 1.0.0. * gnu/packages/cran.scm (r-gargle): Update to 1.0.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 b6fb030c9b..ddd6e74a07 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12630,14 +12630,14 @@ and manipulating sets of ontological terms.") (define-public r-gargle (package (name "r-gargle") - (version "0.5.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "gargle" version)) (sha256 (base32 - "1fykmiv3x8c9ai31r9wr7qcca51h6kqn9cgwbxvxfj15fhwskh4n")))) + "0hsqn4hf935wn6vk2pwym7la4sdvy271y4cashp38pg4hkpg9zph")))) (build-system r-build-system) (propagated-inputs `(("r-fs" ,r-fs) -- cgit 1.4.1 From 690940cc53a27117e7c8e8fec486f24bae2a9f0b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:39:57 +0100 Subject: gnu: r-dotcall64: Update to 1.0-1. * gnu/packages/cran.scm (r-dotcall64): 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 ddd6e74a07..73719042b8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13164,14 +13164,14 @@ to throw errors if they aren't in the right form.") (define-public r-dotcall64 (package (name "r-dotcall64") - (version "1.0-0") + (version "1.0-1") (source (origin (method url-fetch) (uri (cran-uri "dotCall64" version)) (sha256 (base32 - "1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9")))) + "1im5k8jbviwj2i42mq1kmjskh80isa7jr9w8i0fknidrzzy2h2zi")))) (properties `((upstream-name . "dotCall64"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit 1.4.1 From 089a3a7fcdc1d1572c805361c2776166ac162366 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:01 +0100 Subject: gnu: r-epi: Update to 2.44. * gnu/packages/cran.scm (r-epi): Update to 2.44. --- 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 73719042b8..cc22283da9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13510,14 +13510,14 @@ model with finite state space using the Aalen-Johansen estimator.") (define-public r-epi (package (name "r-epi") - (version "2.43") + (version "2.44") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "0wsjvilcivrhy2kh2dcagkzy7bjmfa0sq9xjpv6qb4b0nc0mv089")))) + "1wcxr1f7irgfdwzz4vf67114yhxrhxxxnhy4hfaww0zy91vzxx10")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 34471fa1b21b32673da05563a3568aba79826a7f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:04 +0100 Subject: gnu: r-shinyjqui: Update to 0.4.0. * gnu/packages/cran.scm (r-shinyjqui): 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 cc22283da9..5617415eba 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13968,14 +13968,14 @@ several common set, element and attribute related tasks.") (define-public r-shinyjqui (package (name "r-shinyjqui") - (version "0.3.3") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "shinyjqui" version)) (sha256 (base32 - "0n4ijxmkp8x6dwrsxwvx0zgd8b5129cmn6q6rrav38v1q5k8889x")) + "0ins0pmfis34jr0rimsp1k1aw856r3xjdnsvv8lkwqhvp58nzqah")) (snippet '(begin (delete-file "inst/www/shinyjqui.min.js"))))) -- cgit 1.4.1 From a9ab8761142663eedb373216cd93525474a8b7ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:07 +0100 Subject: gnu: r-gamlss-dist: Update to 5.3-2. * gnu/packages/cran.scm (r-gamlss-dist): Update to 5.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 5617415eba..6b797675f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14185,13 +14185,13 @@ such software by imputing dropout events.") (define-public r-gamlss-dist (package (name "r-gamlss-dist") - (version "5.1-7") + (version "5.3-2") (source (origin (method url-fetch) (uri (cran-uri "gamlss.dist" version)) (sha256 - (base32 "0nzgq3rnziy0i2zxn88hqy3pakpyin2m2csk9j3zg39si66c6wcq")))) + (base32 "1lyf2rvkplywgyhcni93k52z3b89vv86yrgl38dx3ln3436r5ahc")))) (properties `((upstream-name . "gamlss.dist"))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit 1.4.1 From 8c866232e1b219e2047418767d5b289bdfb7739b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:10 +0100 Subject: gnu: r-units: Update to 0.7-0. * gnu/packages/cran.scm (r-units): 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 6b797675f4..8a225d843e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15144,14 +15144,14 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.6-7") + (version "0.7-0") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "1rdpbkiqcabz00fqzzs98v89v4cgvcd4pb00pwxzkq6vmwmscwrz")))) + "0kwfcrrbcwl7s50n1wp33vswqzmprh91clvakbd1jpznqpg5m3js")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) -- cgit 1.4.1 From 5a3996538c61148dde8de17f788a1a0dbf42b6f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:13 +0100 Subject: gnu: r-deldir: Update to 0.2-10. * gnu/packages/cran.scm (r-deldir): Update to 0.2-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 8a225d843e..4e1a0282ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15273,14 +15273,14 @@ sampling.") (define-public r-deldir (package (name "r-deldir") - (version "0.2-9") + (version "0.2-10") (source (origin (method url-fetch) (uri (cran-uri "deldir" version)) (sha256 (base32 - "0jfwff5kk0zraspsvbk26lphl3fnrc6xmhl4690hr0a5k177ildm")))) + "08ij6zb6id71zk6gzs9z779y49y41c2gpi7p7mljnlw7py92g8k5")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) (home-page "https://cran.r-project.org/web/packages/deldir") -- cgit 1.4.1 From ab8c8693c1d504224fd9a51d5eb53d502db0bad4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:17 +0100 Subject: gnu: r-genetics: Update to 1.3.8.1.3. * gnu/packages/cran.scm (r-genetics): Update to 1.3.8.1.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 4e1a0282ee..058e15c289 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15462,14 +15462,14 @@ genetics of complex population dynamics.") (define-public r-genetics (package (name "r-genetics") - (version "1.3.8.1.2") + (version "1.3.8.1.3") (source (origin (method url-fetch) (uri (cran-uri "genetics" version)) (sha256 (base32 - "1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh")))) + "0lljxvz7nc6y2z303icphar2niir0i407w5cyhy2pwspd9gwkwpy")))) (build-system r-build-system) (propagated-inputs `(("r-combinat" ,r-combinat) -- cgit 1.4.1 From b96724c423fc582d5e510fad0b6a893db4a7fb20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:20 +0100 Subject: gnu: r-arsenal: Update to 3.6.2. * gnu/packages/cran.scm (r-arsenal): Update to 3.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 058e15c289..09bfd12b97 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15583,14 +15583,14 @@ generalized linear models, and quantile regression.") (define-public r-arsenal (package (name "r-arsenal") - (version "3.6.1") + (version "3.6.2") (source (origin (method url-fetch) (uri (cran-uri "arsenal" version)) (sha256 (base32 - "13ql3rb79a764ppsc1sqi8glzzkw79la0j2ahzbxgz7cz879sazy")))) + "0spm0s23xs5bm88slkz6a65mbs663qhnravwxp7rkdkr378vb5fn")))) (properties `((upstream-name . "arsenal"))) (build-system r-build-system) (propagated-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From a5cfb3f330e739485e2fb82d3c4941a2700d8297 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:23 +0100 Subject: gnu: r-farver: Update to 2.1.0. * gnu/packages/cran.scm (r-farver): Update to 2.1.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 09bfd12b97..39708dbcef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16206,14 +16206,14 @@ consists of @code{grid} grobs and viewports that can then be manipulated with (define-public r-farver (package (name "r-farver") - (version "2.0.3") + (version "2.1.0") (source (origin (method url-fetch) (uri (cran-uri "farver" version)) (sha256 (base32 - "1k75v07dsfkjra2gsgxg9s55cw3b46b1nh960kqphq7cg7gr058f")))) + "1x6ffwxqbrwlylnk995jz2a6nz2y9z59jaq0ncpni7q40w367j75")))) (build-system r-build-system) (home-page "https://github.com/thomasp85/farver") (synopsis "Vectorized color conversion and comparison") -- cgit 1.4.1 From df20df3512e324d737f784513257024a2eba1a31 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:26 +0100 Subject: gnu: r-ggforce: Update to 0.3.3. * gnu/packages/cran.scm (r-ggforce): Update to 0.3.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 39708dbcef..44aa815f38 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16359,14 +16359,14 @@ sets of URLs.") (define-public r-ggforce (package (name "r-ggforce") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "ggforce" version)) (sha256 (base32 - "1lplxyq5bgx90dgaimhynpcywag1gp6vlsy7q52ay1nfc35qmkjc")))) + "0bwzjbjl678xvc2ihm80dwn9pidwafqjdab3k299csys16s3na1a")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit 1.4.1 From 744190fe45575aa5dc30ee5f227926826fd95eb0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:29 +0100 Subject: gnu: r-ggraph: Update to 2.0.5. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.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 44aa815f38..9f0c8ca760 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16432,14 +16432,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.") (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.4") + (version "2.0.5") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "1j3xf4fsv0i0gbppdrw4yprfyk53wx6s8nvnkipi2ywbm7cr4q4w")))) + "0m4n8iw2b9jk8hcy5blg5w59zsqcpsbv27wbw598dvljpafx8sp3")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) -- cgit 1.4.1 From 6802fe3cb72633731cb46e74de178642716513ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:32 +0100 Subject: gnu: r-xmlparsedata: Update to 1.0.5. * gnu/packages/cran.scm (r-xmlparsedata): Update to 1.0.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 9f0c8ca760..1b339938d1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17054,14 +17054,14 @@ regular expressions from human readable expressions") (define-public r-xmlparsedata (package (name "r-xmlparsedata") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "xmlparsedata" version)) (sha256 (base32 - "177vfyjrqfi3wam8scpsradap1lv35yc25xq745dr7gabg116yrq")))) + "1c6bnz3ng1qw7sfip8wq3a4dn36a4d6rbja0sadn0a4pbsmk8q3n")))) (properties `((upstream-name . "xmlparsedata"))) (build-system r-build-system) (home-page "https://github.com/r-lib/xmlparsedata#readme") -- cgit 1.4.1 From fa82677b275a99d1538dc1b2190ce2b3f1ae7280 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:36 +0100 Subject: gnu: r-dalex: Update to 2.1.1. * gnu/packages/cran.scm (r-dalex): Update to 2.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 1b339938d1..cab5edae05 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17482,14 +17482,14 @@ been used in the call to @code{aov}.") (define-public r-dalex (package (name "r-dalex") - (version "2.0.1") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "1hiknx55d91abyfj3w4a2xxin7f1q8h5k0041m7w93xjdc4kis98")))) + "1dnqsml94s648w8swsrq8spddnd4mj5pl3q6xxr917w6a1jxgyfz")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ce5c9704b36cc3a783d352ecc157affc51c2ecc7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:40 +0100 Subject: gnu: r-kableextra: Update to 1.3.4. * gnu/packages/cran.scm (r-kableextra): Update to 1.3.4. [propagated-inputs]: Add r-svglite. --- 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 cab5edae05..ed617a2563 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17746,14 +17746,14 @@ LargeVis method of Tang et al. (2016) is also provided.") (define-public r-kableextra (package (name "r-kableextra") - (version "1.3.1") + (version "1.3.4") (source (origin (method url-fetch) (uri (cran-uri "kableExtra" version)) (sha256 (base32 - "1zixccpgy9x95fgzfgxc43pm020c80c21flch71klc3zzzsq53gf")))) + "1c5vzy95cbz36jwyssr927qicrayifinv861rvnmg4nghb1gl7q9")))) (properties `((upstream-name . "kableExtra"))) (build-system r-build-system) (propagated-inputs @@ -17767,6 +17767,7 @@ LargeVis method of Tang et al. (2016) is also provided.") ("r-rvest" ,r-rvest) ("r-scales" ,r-scales) ("r-stringr" ,r-stringr) + ("r-svglite" ,r-svglite) ("r-viridislite" ,r-viridislite) ("r-webshot" ,r-webshot) ("r-xml2" ,r-xml2))) -- cgit 1.4.1 From a9797ab65835bcde62c3042940db164537d77373 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:43 +0100 Subject: gnu: r-parameters: Update to 0.12.0. * gnu/packages/cran.scm (r-parameters): Update to 0.12.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 ed617a2563..68e30a3205 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18263,14 +18263,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "020k3vxnp0vjrlkcxx5vj30vag474hw48zxzw9315whsq4hhhbqc")))) + "0dfqn4l4qmlpwmdva2ahyhlngkzdm0sgiirbdrf3mbbw52bhlmpm")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 894308dddbb1ad2b9b40ee157def90dab86f87a1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:46 +0100 Subject: gnu: r-lifecycle: Update to 1.0.0. * gnu/packages/cran.scm (r-lifecycle): Update to 1.0.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 68e30a3205..37c1b2b80d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18348,14 +18348,14 @@ atmospheric physics.") (define-public r-lifecycle (package (name "r-lifecycle") - (version "0.2.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "lifecycle" version)) (sha256 (base32 - "0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19")))) + "13hgxk93q9387s8dnqpm8dfx610y0pr76khqksj4kbgj2fr4lcq3")))) (properties `((upstream-name . "lifecycle"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 8bf21d40767fde8e0a1204d0cc69d41301fbe1f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:49 +0100 Subject: gnu: r-gamlss: Update to 5.3-1. * gnu/packages/cran.scm (r-gamlss): Update to 5.3-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 37c1b2b80d..812d37e464 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19583,14 +19583,14 @@ models.") (define-public r-gamlss (package (name "r-gamlss") - (version "5.2-0") + (version "5.3-1") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "1q82md0439si0n7vqbbbdk45sjr0ad7i8mgrn3kwnr4h213pb4nk")))) + "1ngf6g4zixwm6ni5r0fs0f6132xd2f2a6mlski9hlqnvvwb46iwr")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 61967afbc56fdf2459fbd12d98982be42f48b226 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:53 +0100 Subject: gnu: r-imager: Update to 0.42.7. * gnu/packages/cran.scm (r-imager): Update to 0.42.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 812d37e464..0ff1ea8452 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20871,14 +20871,14 @@ number embedded in the file rather than the file extension.") (define-public r-imager (package (name "r-imager") - (version "0.42.3") + (version "0.42.7") (source (origin (method url-fetch) (uri (cran-uri "imager" version)) (sha256 (base32 - "1wxvbv803222gjrf1ys6a349xlnmmdw3kqgi93piq9gq7lahihvg")))) + "1dq0rblnrmnk689bcdmml179gk9lff8x92s2npkjllgjq5q2vfpd")))) (properties `((upstream-name . "imager"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 60f85395263dd7d9dead523024150ece7f0932e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:56 +0100 Subject: gnu: r-isocodes: Update to 2021.02.24. * gnu/packages/cran.scm (r-isocodes): Update to 2021.02.24. --- 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 0ff1ea8452..36d6f89b06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21945,14 +21945,14 @@ and Euclidean distance is particularly fast.") (define-public r-isocodes (package (name "r-isocodes") - (version "2020.12.04") + (version "2021.02.24") (source (origin (method url-fetch) (uri (cran-uri "ISOcodes" version)) (sha256 (base32 - "18373rkhmwm7y2drvfbhrxkqw9d23avf0ndvh0fg00z4djvddkjx")))) + "19irnn2yi1bzhf03g666la84kj8040f5913kfrmd16dfnjy6j9qm")))) (properties `((upstream-name . "ISOcodes"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=ISOcodes") -- cgit 1.4.1 From b631f7f8e4fd898ba62ad9402e247ef81c1ed35b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:40:59 +0100 Subject: gnu: r-openmx: Update to 2.19.1. * gnu/packages/cran.scm (r-openmx): Update to 2.19.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 36d6f89b06..d3fe280ef4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22421,14 +22421,14 @@ Complete access to optimized C functions is made available with (define-public r-openmx (package (name "r-openmx") - (version "2.18.1") + (version "2.19.1") (source (origin (method url-fetch) (uri (cran-uri "OpenMx" version)) (sha256 (base32 - "0gyjps0l3ig90piccgd04s63cz65kk5i5l9iyakps4bv27h1lzwm")))) + "0fbndmwb3krypsavgm3blqkhh8blmi3p186yxmvgv3a9m6r154rj")))) (properties `((upstream-name . "OpenMx"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From e59f4ecda8809d29281bb29502492b95816e5f26 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:02 +0100 Subject: gnu: r-erm: Update to 1.0-2. * gnu/packages/cran.scm (r-erm): 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 d3fe280ef4..f468369d35 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22727,14 +22727,14 @@ Latent regression models and plausible value imputation are also supported.") (define-public r-erm (package (name "r-erm") - (version "1.0-1") + (version "1.0-2") (source (origin (method url-fetch) (uri (cran-uri "eRm" version)) (sha256 (base32 - "0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9")))) + "0smym010kswc5vx90qr3x1vl16xj1x1i54rvrj006dc4agc1vmlk")))) (properties `((upstream-name . "eRm"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 2be47c7a9a5eaa1b4c05f0272d3d60a94a6c0f34 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:07 +0100 Subject: gnu: r-isoband: Update to 0.2.4. * gnu/packages/cran.scm (r-isoband): Update to 0.2.4. [propagated-inputs]: Remove r-testthat. --- gnu/packages/cran.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f468369d35..5d6a045f60 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23365,18 +23365,16 @@ Encyclopedia of Integer Sequences} (OEIS) in the function help page.") (define-public r-isoband (package (name "r-isoband") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (cran-uri "isoband" version)) (sha256 (base32 - "1zkzdc39dpw2z59bjck27nimz9a2vskmw0f7wb17s53dvy7k3lzr")))) + "0z1qpxcl8b6fi691fbdr3vrb19mn4pas1iff62zl1bafzbdvpmcn")))) (properties `((upstream-name . "isoband"))) (build-system r-build-system) - (propagated-inputs - `(("r-testthat" ,r-testthat))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/wilkelab/isoband") -- cgit 1.4.1 From abdb1090a7331734dc40355885d484d4dda8171e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:14 +0100 Subject: gnu: r-flexsurv: Update to 2.0. * gnu/packages/cran.scm (r-flexsurv): Update to 2.0. [propagated-inputs]: Add r-assertthat, r-dplyr, r-generics, r-magrittr, r-matrix, r-numderiv, r-purrr, r-rlang, r-rstpm2, and r-tidyselect. --- gnu/packages/cran.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5d6a045f60..e840b2aa89 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25084,26 +25084,36 @@ censored data.") (define-public r-flexsurv (package (name "r-flexsurv") - (version "1.1.1") + (version "2.0") (source (origin (method url-fetch) (uri (cran-uri "flexsurv" version)) (sha256 (base32 - "0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr")))) + "0vshsijqlzsz0xh426vsswpai1v5c990ggyniqqzsjbg3mn8dbl9")))) (properties `((upstream-name . "flexsurv"))) (build-system r-build-system) (propagated-inputs - `(("r-desolve" ,r-desolve) + `(("r-assertthat" ,r-assertthat) + ("r-desolve" ,r-desolve) + ("r-dplyr" ,r-dplyr) + ("r-generics" ,r-generics) + ("r-magrittr" ,r-magrittr) + ("r-matrix" ,r-matrix) ("r-mstate" ,r-mstate) ("r-muhaz" ,r-muhaz) ("r-mvtnorm" ,r-mvtnorm) + ("r-numderiv" ,r-numderiv) + ("r-purrr" ,r-purrr) ("r-quadprog" ,r-quadprog) ("r-rcpp" ,r-rcpp) + ("r-rlang" ,r-rlang) + ("r-rstpm2" ,r-rstpm2) ("r-survival" ,r-survival) ("r-tibble" ,r-tibble) - ("r-tidyr" ,r-tidyr))) + ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/chjackson/flexsurv-dev") -- cgit 1.4.1 From 8b1f08ba04cfd0508cb45f470d6ea1a043b53cfe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:18 +0100 Subject: gnu: r-survminer: Update to 0.4.9. * gnu/packages/cran.scm (r-survminer): Update to 0.4.9. [propagated-inputs]: Add r-ggtext. --- 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 e840b2aa89..e78a24c893 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25279,14 +25279,14 @@ p-value approximations.") (define-public r-survminer (package (name "r-survminer") - (version "0.4.8") + (version "0.4.9") (source (origin (method url-fetch) (uri (cran-uri "survminer" version)) (sha256 (base32 - "1niysd89mxb2a6ncvzm1s6xgfvq3psba65af0whh2p56r2hwrwff")))) + "0byh0wxdbjfwdrzsnqv4xlmnik6lj0vkkzfxy7lssk8dv5zmj7nz")))) (properties `((upstream-name . "survminer"))) (build-system r-build-system) (propagated-inputs @@ -25294,6 +25294,7 @@ p-value approximations.") ("r-dplyr" ,r-dplyr) ("r-ggplot2" ,r-ggplot2) ("r-ggpubr" ,r-ggpubr) + ("r-ggtext" ,r-ggtext) ("r-gridextra" ,r-gridextra) ("r-magrittr" ,r-magrittr) ("r-maxstat" ,r-maxstat) -- cgit 1.4.1 From b5b344fb2684261264dd20cb20b1a2eeb2359788 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:23 +0100 Subject: gnu: r-rsample: Update to 0.0.9. * gnu/packages/cran.scm (r-rsample): Update to 0.0.9. [propagated-inputs]: Remove r-modeldata. --- 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 e78a24c893..16b9a89235 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25612,14 +25612,14 @@ sliding windows are to be created.") (define-public r-rsample (package (name "r-rsample") - (version "0.0.8") + (version "0.0.9") (source (origin (method url-fetch) (uri (cran-uri "rsample" version)) (sha256 (base32 - "1psmxk16d4bz1v05x0gb9hn4brkdjxw8hjbxmj62snichnix3q3i")))) + "03qwsvylgmj2a2h764mzy0x57pgzmvjvl0ypmbn4lcf912bvrd2c")))) (properties `((upstream-name . "rsample"))) (build-system r-build-system) (propagated-inputs @@ -25627,7 +25627,6 @@ sliding windows are to be created.") ("r-ellipsis" ,r-ellipsis) ("r-furrr" ,r-furrr) ("r-generics" ,r-generics) - ("r-modeldata" ,r-modeldata) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-slider" ,r-slider) -- cgit 1.4.1 From 2d89c723aba05e76c8863b779510dd0dc34935d7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:26 +0100 Subject: gnu: r-dicedesign: Update to 1.9. * gnu/packages/cran.scm (r-dicedesign): Update to 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 16b9a89235..a0d3e89e23 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25646,14 +25646,14 @@ different types of resampling objects (e.g. bootstrap, cross-validation).") (define-public r-dicedesign (package (name "r-dicedesign") - (version "1.8-1") + (version "1.9") (source (origin (method url-fetch) (uri (cran-uri "DiceDesign" version)) (sha256 (base32 - "11s1m543kxd6gv4amh8z6pph1n67sj9sfwm6hjy83wfs65syf5vp")))) + "1a8ixa65xgyfri03cviic8qi2plbhdyz8m02bwif8w94w0q3ghlk")))) (properties `((upstream-name . "DiceDesign"))) (build-system r-build-system) (home-page "http://dice.emse.fr/") -- cgit 1.4.1 From e08e5f9fe2adae3249c396e643e4737036178dfd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:30 +0100 Subject: gnu: r-tune: Update to 0.1.3. * gnu/packages/cran.scm (r-tune): Update to 0.1.3. [propagated-inputs]: Remove r-hardhat. --- 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 a0d3e89e23..1e627fbfd3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25698,14 +25698,14 @@ for creating, simulating, or validating values for such parameters.") (define-public r-tune (package (name "r-tune") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (cran-uri "tune" version)) (sha256 (base32 - "0ja7rjkjj88v3ngrc6izcz2qh9qv4s8abgcafmvx2ihgz99hds37")))) + "05r5jzg96g2z10a2w4w8wq1ysfaxr91acwrvn75pmcy4rmixf293")))) (properties `((upstream-name . "tune"))) (build-system r-build-system) (propagated-inputs @@ -25717,7 +25717,6 @@ for creating, simulating, or validating values for such parameters.") ("r-ggplot2" ,r-ggplot2) ("r-glue" ,r-glue) ("r-gpfit" ,r-gpfit) - ("r-hardhat" ,r-hardhat) ("r-parsnip" ,r-parsnip) ("r-purrr" ,r-purrr) ("r-recipes" ,r-recipes) -- cgit 1.4.1 From ca718b9e3496fdcf74fd3ec2a5699d017d974932 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:33 +0100 Subject: gnu: r-paradox: Update to 0.7.1. * gnu/packages/cran.scm (r-paradox): Update to 0.7.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 1e627fbfd3..349598f3d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26735,13 +26735,13 @@ package also supersedes the package @code{BBmisc}.") (define-public r-paradox (package (name "r-paradox") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "paradox" version)) (sha256 (base32 - "1fz6sdwvvifm4qbmwgm27dil278mswvcfw8bbsvli5v4l1ghw8kj")))) + "1difp0bzsfxcmbm1snahh3i6417k1a2w4mnjx65p20n2yiclmrgs")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit 1.4.1 From 9a9d470ae04acfd68c5d2f33ef633679c73cf6e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:38 +0100 Subject: gnu: r-mlr3: Update to 0.11.0. * gnu/packages/cran.scm (r-mlr3): Update to 0.11.0. [propagated-inputs]: Add r-palmerpenguins and r-parallelly. --- 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 349598f3d9..becc25c6ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26760,13 +26760,13 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "1arqijbbmhv57mj8kyq30zxykah83ab1d1c7gs0cxs0xhfwln66g")))) + "0qh9vdac1als2123wf51bwa7spdqk33iydlawi5n5dpci892iahl")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) @@ -26779,7 +26779,9 @@ implemented as @code{R6} classes.") ("r-mlbench" ,r-mlbench) ("r-mlr3measures" ,r-mlr3measures) ("r-mlr3misc" ,r-mlr3misc) + ("r-palmerpenguins" ,r-palmerpenguins) ("r-paradox" ,r-paradox) + ("r-parallelly" ,r-parallelly) ("r-uuid" ,r-uuid))) (home-page "https://mlr3.mlr-org.com/") (synopsis "Machine Learning in R - Next Generation") -- cgit 1.4.1 From bf7ad534e47013f56b0b3ad8c9956f4be07104d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:42 +0100 Subject: gnu: r-mlr3tuning: Update to 0.7.0. * gnu/packages/cran.scm (r-mlr3tuning): 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 becc25c6ab..fcd85edd41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26852,13 +26852,13 @@ annealing.") (define-public r-mlr3tuning (package (name "r-mlr3tuning") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuning" version)) (sha256 (base32 - "0kxf9wl1jnwyrj2zfmiz12w2594407y44m0xxwp9b2lrwxk31wm7")))) + "0xpq16qij05nsfwg0qnfziqjvgk5wn0dgl0sb5gg3qsp1cs6vfqj")))) (build-system r-build-system) (propagated-inputs `(("r-bbotk" ,r-bbotk) -- cgit 1.4.1 From 6c714c19f8fae71f14eb28dd184f26203868ab4a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:45 +0100 Subject: gnu: r-textshaping: Update to 0.3.1. * gnu/packages/cran.scm (r-textshaping): Update to 0.3.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 fcd85edd41..2e642b21eb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27151,14 +27151,14 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "053pbw45by96q62kjfnyc3d0ssar9svssrdqy6a09kdmdh75xdar")))) + "16y3amb9cxwq126q1mxssx7kswzalqf9n2437mi5n7q1nqby6wlq")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 31c9810b7e778e86bc7712fe7eee60da34cfe4d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:48 +0100 Subject: gnu: r-ragg: Update to 1.1.1. * gnu/packages/cran.scm (r-ragg): 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 2e642b21eb..9ec0d952c0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27184,14 +27184,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "0.4.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "0443dhfi7bjfpap041vrnslw3ql3vpsxx18raz2w9nfdb7id8lsc")))) + "0nh1xxrxgdbq9anzkc6k3n519czp9hqyiizakm3m2gl4l4w0vp0q")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 85b2d41eebd400be2c9a58d065355f3cd0a17773 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:51 +0100 Subject: gnu: r-boot: Update to 1.3-27. * gnu/packages/statistics.scm (r-boot): Update to 1.3-27. --- 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 ac8b4e959e..b80e49c7bc 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -416,14 +416,14 @@ available, greatly increasing its breadth and scope.") (define-public r-boot (package (name "r-boot") - (version "1.3-26") + (version "1.3-27") (source (origin (method url-fetch) (uri (cran-uri "boot" version)) (sha256 (base32 - "161l3q3kdmi7s3xwl3xxg3x3zx8787hsvsr2mmawwxq2cad131fl")))) + "1v9anpxj4p83kd40gyfy8a454b2jmn11incrzym7wdvh8mdxpcil")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/boot") (synopsis "Bootstrap functions for R") -- cgit 1.4.1 From 71939b503b1c04195bac9b987f341fe4338964bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:54 +0100 Subject: gnu: r-mass: Update to 7.3-53.1. * gnu/packages/statistics.scm (r-mass): Update to 7.3-53.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 b80e49c7bc..e08aefd4c1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -437,14 +437,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-53") + (version "7.3-53.1") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "0f2bwsbqr3nzsqxva051lg8wd068naqif3vc48hac0m3mmq4x0j1")))) + "0ra46441y4iwcpd8px7j7vcjfj09fawl5khilaivjbg3gswiwnz4")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "http://www.stats.ox.ac.uk/pub/MASS4/") -- cgit 1.4.1 From ea2197cbe867bbb3cc9eca3693e0d8ba046d640f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:41:57 +0100 Subject: gnu: r-cluster: Update to 2.1.1. * gnu/packages/statistics.scm (r-cluster): Update to 2.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 e08aefd4c1..596d751322 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -480,14 +480,14 @@ k-nearest neighbour, Learning Vector Quantization and Self-Organizing Maps.") (define-public r-cluster (package (name "r-cluster") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "cluster" version)) (sha256 (base32 - "055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga")))) + "0qw06n1f7771mszc9y1f1c9zngd82zlf2s2z30p9514vxh4wgf5x")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit 1.4.1 From ba522c9fa31195f2ae06bb9ccce7a68195c85410 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:00 +0100 Subject: gnu: r-mgcv: Update to 1.8-34. * gnu/packages/statistics.scm (r-mgcv): Update to 1.8-34. --- 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 596d751322..f14a0e8f40 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -629,13 +629,13 @@ nonlinear mixed-effects models.") (define-public r-mgcv (package (name "r-mgcv") - (version "1.8-33") + (version "1.8-34") (source (origin (method url-fetch) (uri (cran-uri "mgcv" version)) (sha256 - (base32 "1x1bdzz2b2f05626xygwqp30b4rhblgg76hs15j9ab4fjan7pjwq")))) + (base32 "1pkky9xb3wsinqd75gkfbgw270vx8zh52id6bf1xj9njnzrkmc8m")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix) -- cgit 1.4.1 From 84bd32a964ee9524ff448ab9c082fb59ebb7ea67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:06 +0100 Subject: gnu: r-svglite: Update to 2.0.0. * gnu/packages/statistics.scm (r-svglite): Update to 2.0.0. [inputs]: Add libpng and zlib. [propagated-inputs]: Remove r-bh, r-gdtools, and r-rcpp; add r-cpp11 and r-systemfonts. --- gnu/packages/statistics.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index f14a0e8f40..96a60e198d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1202,19 +1202,21 @@ and to generate base64 encoded string from raster matrix.") (define-public r-svglite (package (name "r-svglite") - (version "1.2.3.2") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "svglite" version)) (sha256 (base32 - "00n8bg4iligl0h24v42cka417w26zmcxrr4r6k8wdal1riwhgmi5")))) + "19ggknw5322yw7r1bzhw0bqggcrpn0qxddk7kblpqnra2zz2brkn")))) (build-system r-build-system) + (inputs + `(("libpng" ,libpng) + ("zlib" ,zlib))) (propagated-inputs - `(("r-bh" ,r-bh) - ("r-gdtools" ,r-gdtools) - ("r-rcpp" ,r-rcpp))) + `(("r-cpp11" ,r-cpp11) + ("r-systemfonts" ,r-systemfonts))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/hadley/svglite") -- cgit 1.4.1 From 440dd95f72eaf9405ef37fd73929e7ccb5f6368e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:09 +0100 Subject: gnu: r-mime: Update to 0.10. * gnu/packages/statistics.scm (r-mime): Update to 0.10. --- 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 96a60e198d..5fb55f4a5c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1368,13 +1368,13 @@ supported via Andre Simon's highlight package.") (define-public r-mime (package (name "r-mime") - (version "0.9") + (version "0.10") (source (origin (method url-fetch) (uri (cran-uri "mime" version)) (sha256 (base32 - "107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc")))) + "1xz37fizlx4w3g8kbim7vr5slqd6cmaq5sa0s4q7ayl1bahk6ckq")))) (build-system r-build-system) (home-page "https://github.com/yihui/mime") (synopsis "R package to map filenames to MIME types") -- cgit 1.4.1 From 4a27e42fd66db384e47c72d6f24197b297d3cf9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:12 +0100 Subject: gnu: r-testthat: Update to 3.0.2. * gnu/packages/statistics.scm (r-testthat): 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 5fb55f4a5c..d2a7a68fbf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1585,13 +1585,13 @@ R packages that praise their users.") (define-public r-testthat (package (name "r-testthat") - (version "3.0.1") + (version "3.0.2") (source (origin (method url-fetch) (uri (cran-uri "testthat" version)) (sha256 (base32 - "1l1s4jgmgbsf711ma5i58ssgkz98an7hijcxvwfz314nf5fc8zr9")))) + "03sbk36vrjhzfap6a9czxw93r7h06rh3mb01inbrhrh5r2pd00qq")))) (build-system r-build-system) (propagated-inputs `(("r-brio" ,r-brio) -- cgit 1.4.1 From 9846034edc4acce55f22ad9fd49fb2deec4ae621 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:16 +0100 Subject: gnu: r-tibble: Update to 3.1.0. * gnu/packages/statistics.scm (r-tibble): Update to 3.1.0. [propagated-inputs]: Remove r-cli and r-crayon. --- 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 d2a7a68fbf..a35842f5d0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1665,19 +1665,17 @@ like tidy evaluation.") (define-public r-tibble (package (name "r-tibble") - (version "3.0.6") + (version "3.1.0") (source (origin (method url-fetch) (uri (cran-uri "tibble" version)) (sha256 (base32 - "0f41gnq0wwmy1z96lg3gicvm54jh685f7i3ag8yfk39r3ql2vzpv")))) + "0khmypf49la8n5gx72n7gr6dl6r6ja404i578g6sg0ail3g2i7lm")))) (build-system r-build-system) (propagated-inputs - `(("r-cli" ,r-cli) - ("r-crayon" ,r-crayon) - ("r-ellipsis" ,r-ellipsis) + `(("r-ellipsis" ,r-ellipsis) ("r-fansi" ,r-fansi) ("r-lifecycle" ,r-lifecycle) ("r-magrittr" ,r-magrittr) -- cgit 1.4.1 From 47b8a239dc936bd8e51c246dc4532dc96b91a71a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:19 +0100 Subject: gnu: r-dplyr: Update to 1.0.5. * gnu/packages/statistics.scm (r-dplyr): Update to 1.0.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 a35842f5d0..5eb37f6ad0 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1695,13 +1695,13 @@ and printing capabilities than traditional data frames.") (define-public r-dplyr (package (name "r-dplyr") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "0fh9ivw4jgdhcdz2mcs0b869jb479cjzr2c0s2x3552is5qqzxlv")))) + "0w3fr6sn0mw5mjs27669czpc8vpjj6ayrjavw8v0gd7ccsfa0hbm")))) (build-system r-build-system) (propagated-inputs `(("r-ellipsis" ,r-ellipsis) -- cgit 1.4.1 From 2dcc88a1532b64df27e1cef9d86f79614803ceb2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:22 +0100 Subject: gnu: r-data-table: Update to 1.14.0. * gnu/packages/statistics.scm (r-data-table): Update to 1.14.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 5eb37f6ad0..5306e42bba 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1852,13 +1852,13 @@ times.") (define-public r-data-table (package (name "r-data-table") - (version "1.13.6") + (version "1.14.0") (source (origin (method url-fetch) (uri (cran-uri "data.table" version)) (sha256 (base32 - "16ryrpzl86krww5nx7a97i09y5xqld4lw4d9pa1vzjl99x6ds36m")))) + "0kgbvap5v2spnkz3dwfm4jh4qcpvbzdn9s8bzfnhzabz9qjdxw8k")))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit 1.4.1 From 658e44abdbd794215e7ddd7789afde2668875af4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:26 +0100 Subject: gnu: r-desc: Update to 1.3.0. * gnu/packages/statistics.scm (r-desc): Update to 1.3.0. [propagated-inputs]: Remove r-assertthat. --- gnu/packages/statistics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 5306e42bba..ed2a4d97ce 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2267,18 +2267,17 @@ module, Java Server Pages, and Python's psp module.") (define-public r-desc (package (name "r-desc") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "desc" version)) (sha256 (base32 - "1s6s13fk6sxwcj8wzkwxl9vr33153xx11p5wi9avqx3rzkabavz6")))) + "1sw4vya3l971gpccq4gnjywgbl73bgx8la18l0wy617qv94f905y")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-crayon" ,r-crayon) + `(("r-crayon" ,r-crayon) ("r-r6" ,r-r6) ("r-rprojroot" ,r-rprojroot))) (home-page "https://github.com/r-pkgs/desc") -- cgit 1.4.1 From 395ab04137e6911dc87712d1c028b5f6d2b47d8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:29 +0100 Subject: gnu: r-rmarkdown: Update to 2.7. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.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 ed2a4d97ce..737ece625e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2725,13 +2725,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.6") + (version "2.7") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "1c7nrpnv2v43msv7nia90rjh6s5x9m5wlb3mpiwy04fyfb29krz6")))) + (base32 "0shj637qhpcf30il3lhl3k5bxi5l3x3gf612hbqlakp1qrgrf8lm")))) (properties `((upstream-name . "rmarkdown"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 84e98bbc4ff4c64fa68b7dc1f8bf00fb39ddbacb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:33 +0100 Subject: gnu: r-segmented: Update to 1.3-3. * gnu/packages/statistics.scm (r-segmented): Update to 1.3-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 737ece625e..934c901edf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3037,14 +3037,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "1.3-2") + (version "1.3-3") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "00fc5lcq5qqmw2c2cimrxw8jmd0jysx2p238c2ycykkb13jdwm5n")))) + "16036lp0dq7qqzy8wc4qsgv58zksz6hmgw51v88gl6xclryc670y")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/segmented") (synopsis "Regression models with breakpoints estimation") -- cgit 1.4.1 From 7901124b5b2ed146cf40ed1835c19e9e41ec1670 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:36 +0100 Subject: gnu: r-sparsem: Update to 1.81. * gnu/packages/statistics.scm (r-sparsem): Update to 1.81. --- 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 934c901edf..30d648f501 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3078,13 +3078,13 @@ worker processes and collect and return the results on the master.") (define-public r-sparsem (package (name "r-sparsem") - (version "1.78") + (version "1.81") (source (origin (method url-fetch) (uri (cran-uri "SparseM" version)) (sha256 (base32 - "0cmlm0lps3daalvp5jzjnjfys388hgkyc8yw0g5r2351h749xdyn")))) + "0csbqd9wm6r4162mday1iaigzf9wv2rp1zq8hnihys6f38w8z0xx")))) (properties `((upstream-name . "SparseM"))) (native-inputs -- cgit 1.4.1 From 4f9f7e7eb2ab48d25158d3afb2bd26cd02a1704f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:39 +0100 Subject: gnu: r-glmnet: Update to 4.1-1. * gnu/packages/statistics.scm (r-glmnet): Update to 4.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 30d648f501..6aff73b45c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3276,13 +3276,13 @@ analysis of large sparse or dense matrices.") (define-public r-glmnet (package (name "r-glmnet") - (version "4.1") + (version "4.1-1") (source (origin (method url-fetch) (uri (cran-uri "glmnet" version)) (sha256 - (base32 "1js01qnznm20h4pslaw1ragxhrzk0w4nw7r6ryg7i27l344za2lg")))) + (base32 "0zpfq0m1y5zks5p9r28553ykywwrhrb3ds8m6b7sm6hj4n1c4csd")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran) -- cgit 1.4.1 From eddff93fd307bfc91e404abbaf943ebc8f842ff2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:42 +0100 Subject: gnu: r-tidyr: Update to 1.1.3. * gnu/packages/statistics.scm (r-tidyr): Update to 1.1.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 6aff73b45c..39843ed631 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3745,14 +3745,14 @@ selection.") (define-public r-tidyr (package (name "r-tidyr") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (cran-uri "tidyr" version)) (sha256 (base32 - "0v7x1pgmwmjypzdr4j2ig2klgrrgryi3qvw8hwqv65a5h9kwpz08")))) + "0cpbrvr759z8p7r9lpkjhj2dcdymsbnaib0rma9b4jb7i3qzmh2a")))) (build-system r-build-system) (propagated-inputs `(("r-cpp11" ,r-cpp11) -- cgit 1.4.1 From 83f98e6317501fd56d9276a9dd8ec5420aaaee8e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:45 +0100 Subject: gnu: r-hmisc: Update to 4.5-0. * gnu/packages/statistics.scm (r-hmisc): Update to 4.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 39843ed631..7aa5df25bf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4033,13 +4033,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "4.4-2") + (version "4.5-0") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "1j7vkckmahdh90ndcl646sjpxq82y4x55ngxqvkni22mv16wc2j9")))) + (base32 "11qj73zj16p113jpwn2vv06l99kqlcxcmrldbpyi5s7pwing9jnx")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs -- cgit 1.4.1 From 12580eb435b4a43be76ad3b900657ec67a70fee7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:48 +0100 Subject: gnu: r-beeswarm: Update to 0.3.1. * gnu/packages/statistics.scm (r-beeswarm): Update to 0.3.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 7aa5df25bf..5c592f29e9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4352,13 +4352,13 @@ within a category based on their density using quasirandom noise.") (define-public r-beeswarm (package (name "r-beeswarm") - (version "0.2.3") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "beeswarm" version)) (sha256 (base32 - "0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581")))) + "1jsggypyww77hkcic03kdb3fp8h938qs142xi0lapzh62bkn2pjj")))) (build-system r-build-system) (home-page "https://www.cbs.dtu.dk/~eklund/beeswarm/") (synopsis "Implementation of bee swarm plots") -- cgit 1.4.1 From 27b17f5e6ccd173f156b40299f7cdfb332979512 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:51 +0100 Subject: gnu: r-matrixmodels: Update to 0.5-0. * gnu/packages/statistics.scm (r-matrixmodels): Update to 0.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 5c592f29e9..da5fb96a88 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5087,14 +5087,14 @@ metrics for evaluating models.") (define-public r-matrixmodels (package (name "r-matrixmodels") - (version "0.4-1") + (version "0.5-0") (source (origin (method url-fetch) (uri (cran-uri "MatrixModels" version)) (sha256 (base32 - "0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy")))) + "1va6i6bpkq71rzl9i4xgyc5x7qcksa3nfzihlaggf6aj30dayzx8")))) (properties `((upstream-name . "MatrixModels"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 15add0c264491e4c6a46b1bc07e946f14533e14f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:54 +0100 Subject: gnu: r-quantreg: Update to 5.85. * gnu/packages/statistics.scm (r-quantreg): Update to 5.85. --- 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 da5fb96a88..cf9a6f3864 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5109,13 +5109,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.83") + (version "5.85") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "05vbnz88qxk141dfxwl6ql2zshw15h0hddf8ajnsk2dxfdb6vdkp")))) + (base32 "1y8sgl16yby1k7g23y6bdnfllwnxj3iik3fqp96iwm5jd8blb7q4")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit 1.4.1 From 382f539b5e4ff49011c748ade94e6c9c81c15309 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:42:57 +0100 Subject: gnu: r-pbkrtest: Update to 0.5.1. * gnu/packages/statistics.scm (r-pbkrtest): Update to 0.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 cf9a6f3864..c98299a780 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5199,14 +5199,14 @@ C++ library for numerical linear algebra and RcppEigen glue.") (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.5-0.1") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "0sgl8r74cknmp8lnq5jvc1w181274ylgk6w4pxf4mzkfii42argm")))) + "1if7msv9i7jhg1as1f7m81a95dnwhwj3yfs24bqr0f6r0ch4b8xj")))) (build-system r-build-system) (propagated-inputs `(("r-broom" ,r-broom) -- cgit 1.4.1 From 6a38d580c7546ef826ccc9d8ab34d921ac001943 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Mar 2021 21:43:01 +0100 Subject: gnu: r-lubridate: Update to 1.7.10. * gnu/packages/statistics.scm (r-lubridate): Update to 1.7.10. --- 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 c98299a780..6ef89185f1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5506,14 +5506,14 @@ is supported.") (define-public r-lubridate (package (name "r-lubridate") - (version "1.7.9.2") + (version "1.7.10") (source (origin (method url-fetch) (uri (cran-uri "lubridate" version)) (sha256 (base32 - "0yfvlgksasmia7rsp83lsipjpgvlly5qkldcfxj68lfaz9l2sspf")))) + "1s653d6rnpf9bkynxmbq4fdjdcz7r9ma19aph8f5y9ck70his4hm")))) (build-system r-build-system) (propagated-inputs `(("r-generics" ,r-generics) -- cgit 1.4.1 From 82e887ba48c2ba91b17aa9b6b17501e3e0ef4aef Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 9 Mar 2021 23:02:51 +0100 Subject: gnu: imagemagick: Update to 6.9.12-2 [security fixes]. * gnu/packages/imagemagick.scm (imagemagick/fixed): New variable. (imagemagick)[replacement]: Graft. --- gnu/packages/imagemagick.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 02a627f17e..d7abf6ea03 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -58,6 +58,7 @@ (sha256 (base32 "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) + (replacement imagemagick/fixed) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" @@ -126,6 +127,18 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) +(define-public imagemagick/fixed + (package + (inherit imagemagick) + (version "6.9.12-2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))))) + (define-public perl-image-magick (package (name "perl-image-magick") -- cgit 1.4.1 From afd83de0879f43f82e9f0765b710cc12808a7e1e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 14 Jan 2021 23:32:27 -0500 Subject: gnu: Add appstream. * gnu/packages/freedesktop.scm (appstream): New variable. Signed-off-by: Leo Prikler --- gnu/packages/freedesktop.scm | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e00454f7b3..e5f9ea71b6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -58,8 +58,10 @@ #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages databases) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -75,6 +77,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages language) #:use-module (gnu packages libffi) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) @@ -101,6 +104,101 @@ #:use-module (gnu packages xorg) #:use-module (srfi srfi-1)) +(define-public appstream + (package + (name "appstream") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://www.freedesktop.org/software/" + "appstream/releases/" + "AppStream-" version ".tar.xz")) + (sha256 + (base32 "09l6ixz1w29pi0nb0flz14m4r3f2hpqpp1fq8y66v9xa4c9fczds")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libstemmer + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("/usr/include") + (string-append (assoc-ref inputs "libstemmer") + "/include"))) + #t)) + (add-after 'patch-libstemmer 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/api" + (substitute* "appstream-docs.xml" + (("http://www.oasis-open.org/docbook/xml/4.3/") + (string-append (assoc-ref inputs "docbook-xml-4.3") + "/xml/dtd/docbook/")))) + (for-each (lambda (file) + (substitute* file + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/")))) + (find-files "scripts/desc" "\\.xml$")) + #t)) + (add-after 'patch-docbook-xml 'disable-failing-tests + (lambda _ + (substitute* "tests/test-pool.c" + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolReadAsync?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/PoolEmpty?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/Cache?.*;") + "") + (("[ \t]*g_test_add_func \\(\"/AppStream/Merges?.*;") + "")) + #t)) + (add-after 'disable-failing-tests 'patch-install-dir + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "data/meson.build" + (("/etc") + (string-append (assoc-ref outputs "out") + "/etc"))) + #t))))) + (native-inputs + `(("cmake" ,cmake) + ("docbook-xml-4.3" ,docbook-xml-4.3) + ("docbook-xml" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gperf" ,gperf) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("xsltproc" ,libxslt))) + (inputs + `(("libsoup" ,libsoup) + ("libstemmer" ,libstemmer) + ("libxml2" ,libxml2) + ("libyaml" ,libyaml) + ("lmdb" ,lmdb))) + (propagated-inputs + `(("glib" ,glib))) + (synopsis "Tools and libraries to work with AppStream metadata") + (description "AppStream is a cross-distribution effort for enhancing the way +we interact with the software repositories provided by distributions by +standardizing software component metadata. It provides the foundation to build +software-center applications, by providing metadata necessary for an +application-centric view on package repositories. It additionally provides +specifications for things like an unified software metadata database, screenshot +services and various other things needed to create user-friendly +application-centers for distributions.") + (home-page "https://www.freedesktop.org/wiki/Distributions/AppStream/") + ;; XXX: meson.build claims both, headers just indicate lgpl2.1+ + ;; there are also some (irrelevant) wtfpl2 examples + (license (list license:gpl2+ license:lgpl2.1+)))) + (define-public farstream (package (name "farstream") -- cgit 1.4.1 From 92a432c1f83f1929ae41fb53c1cf9910836e6b3a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 02:14:56 -0500 Subject: gnu: Add qtsolutions. * gnu/packages/qt.scm (qtsolutions): New variable. Signed-off-by: Leo Prikler --- gnu/packages/qt.scm | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 11e69ff5db..d921aa87fe 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2473,6 +2473,117 @@ This package provides the Python bindings."))) securely. It will not store any data unencrypted unless explicitly requested.") (license license:bsd-3))) +(define-public qtsolutions + (let ((commit "9568abd142d581b67b86a5f63d823a34b0612702") + (revision "53")) + (package + (name "qtsolutions") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/qtproject/qt-solutions") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17fnmassflm3vxi0krpr6fff368jy38cby31a48rban4nqqmgx7n")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + ;; Unvendor QtLockFile from QtSingleApplication. + '(begin + (with-directory-excursion "qtsingleapplication/src" + (for-each delete-file + (find-files "." "qtlockedfile.*\\.(h|cpp)")) + (substitute* "qtsingleapplication.pri" + ;; Add include path of LockedFile. + (("INCLUDEPATH \\+=") + "INCLUDEPATH += ../../qtlockedfile/src") + ;; Link library of LockedFile. + (("LIBS \\+=") + "LIBS += -lQtSolutions_LockedFile")) + (substitute* '("qtlocalpeer.h" "qtlocalpeer.cpp") + (("#include \"qtlockedfile.*\\.cpp\"") "") + ;; Unwrap namespace added in the vendoring process. + (("QtLP_Private::QtLockedFile") + "QtLockedFile"))) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (find-files "." "common.pri") + ;; Remove unnecessary prefixes/suffixes in library names. + (("qt5") "qt") + (("-head") "")) + ;; Disable building of examples. + (substitute* (find-files "." "\\.pro$") + (("SUBDIRS\\+=examples") "")) + ;; Fix deprecated functions. + (substitute* "qtsoap/src/qtsoap.cpp" + (("toAscii") "toUtf8")) + #t)) + (replace 'configure + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "./configure" "-library") + (invoke "qmake"))) + '("qtlockedfile" "qtpropertybrowser" "qtservice" + "qtsingleapplication" "qtsoap")) + #t)) + (replace 'build + (lambda _ + (for-each (lambda (solution) + (with-directory-excursion solution + (invoke "make"))) + '("qtlockedfile" "qtpropertybrowser" "qtservice" + "qtsingleapplication" "qtsoap")) + #t)) + (replace 'install + (lambda args + (for-each (lambda (solution) + (with-directory-excursion solution + (apply + (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "include" #:include-regexp ("\\.h$")) + ("lib" "lib")) + args))) + '("qtlockedfile" "qtpropertybrowser" "qtservice" + "qtsingleapplication" "qtsoap"))))))) + (inputs + `(("qtbase" ,qtbase))) + (synopsis "Collection of Qt extensions") + (description "QtSolutions is a set of components extending Qt. +@itemize +@item QtLockedFile: A class that extends QFile with advisory locking functions. +@item QtPropertyBrowser: A framework that enables the user to edit a set of +properties. +@item QtService: A helper for writing services such as Unix daemons. +@item QtSingleApplication: A component that provides support for applications +that can be only started once per user. +@item QtSoap: A component that provides basic web service support with version +1.1 of the SOAP protocol. +@end itemize\n") + (home-page "https://doc.qt.io/archives/qq/qq09-qt-solutions.html") + (license (list license:bsd-3 + ;; QScriptParser and QScriptGrammar specifically allow + ;; redistribution under GPL3 or LGPL2.1 + license:gpl3 license:lgpl2.1))))) + (define-public qwt (package (name "qwt") -- cgit 1.4.1 From 82a2f182c59cd9adef4991e0adfb575fec95e52d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 02:19:00 -0500 Subject: gnu: Add nextcloud-client. * gnu/packages/messaging.scm (nextcloud-client): New variable. Signed-off-by: Leo Prikler --- gnu/packages/sync.scm | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d7c9009f3b..2b64117dc6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -30,6 +30,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -42,8 +43,11 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages linux) @@ -52,15 +56,165 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) + #:use-module (gnu packages ruby) #:use-module (gnu packages selinux) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) +(define-public nextcloud-client + (package + (name "nextcloud-client") + (version "3.1.3") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/nextcloud/desktop") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "15ymk3gvfmgwzmqbhlw7jjy9y65ib3391h1dlmpll65iaj2miajk")) + (modules '((guix build utils) + (ice-9 ftw) + (srfi srfi-1))) + (snippet + '(begin + ;; Not available in Guix. + (let* ((keep '("QProgressIndicator" "qtokenizer"))) + (with-directory-excursion "src/3rdparty" + (for-each delete-file-recursively + (lset-difference string=? + (scandir ".") + (cons* "." ".." keep))))) + (with-directory-excursion "src/gui" + (substitute* "CMakeLists.txt" + ;; Remove references of deleted 3rdparties. + (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp") + "") + (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp") + "") + (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleapplication") + "") + (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidget") + ;; For this, we rely on build inputs, so let's just replace + ;; them by an autoconf-style variable. + "@kwidgetsaddons@") + ;; Expand libraries, that used to be statically linked, but + ;; no longer are post-vendoring. + (("\\$\\{synclib_NAME\\}") + (string-append "${synclib_NAME} " + "QtSolutions_LockedFile " + "QtSolutions_SingleApplication " + "KF5WidgetsAddons"))) + ;; Fix compatibility with QtSingleApplication from QtSolutions. + (substitute* '("application.h" "application.cpp") + (("SharedTools::QtSingleApplication") + "QtSingleApplication") + (("slotParseMessage\\(const QString &(msg)?.*\\)") + "slotParseMessage(const QString &msg)"))) + #t)))) + (build-system qt-build-system) + (arguments + `(#:configure-flags + (list + "-DUNIT_TESTING=ON" + ;; Upstream Bug: https://github.com/nextcloud/desktop/issues/2885 + "-DNO_SHIBBOLETH=ON") + #:imported-modules + ((guix build glib-or-gtk-build-system) + ,@%qt-build-system-modules) + #:modules + (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) + (guix build qt-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda* (#:key inputs #:allow-other-keys) + ;; Patch install directory for dbus service files. + (substitute* "shell_integration/libcloudproviders/CMakeLists.txt" + (("PKGCONFIG_GETVAR\\(.+ _install_dir\\)") + (string-append "set(_install_dir \"${CMAKE_INSTALL_PREFIX}" + "/share/dbus-1/services\")"))) + (substitute* "shell_integration/dolphin/CMakeLists.txt" + ;; Make sure, that Qt modules are installed under $prefix. + (("ON CACHE") "OFF CACHE")) + (substitute* "src/gui/CMakeLists.txt" + (("@kwidgetsaddons@") + (string-append (assoc-ref inputs "kwidgetsaddons") + "/include/KF5/KWidgetsAddons/"))) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests write to $HOME. + (setenv "HOME" (getcwd)) + #t)) + (add-after 'install 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("cmocka" ,cmocka) + ("dot" ,graphviz) + ("doxygen" ,doxygen) + ("extra-cmake-modules" ,extra-cmake-modules) + ("glib:bin" ,glib "bin") + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("qttools" ,qttools) + ("ruby" ,ruby))) + (inputs + `(("appstream" ,appstream) + ("desktop-file-utils" ,desktop-file-utils) + ("glib" ,glib) + ("kconfig" ,kconfig) + ("kcoreaddons" ,kcoreaddons) + ("kio" ,kio) + ("kjs" ,kjs) + ("kwidgetsaddons" ,kwidgetsaddons) + ("libcloudproviders" ,libcloudproviders) + ("libzip" ,libzip) + ("openssl" ,openssl) + ("python-nautilus" ,python-nautilus) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtkeychain" ,qtkeychain) + ("qtquickcontrols2" ,qtquickcontrols2) + ("qtsolutions" ,qtsolutions) + ("qtsvg" ,qtsvg) + ("qtwebchannel" ,qtwebchannel) + ("qtwebsockets" ,qtwebsockets) + ("qtwebkit" ,qtwebkit) + ("sqlite" ,sqlite) + ("xdg-utils" ,xdg-utils) + ("zlib" ,zlib))) + (propagated-inputs + `(("qtwebengine" ,qtwebengine))) + (synopsis "Desktop sync client for Nextcloud") + (description "Nextcloud-Desktop is a tool to synchronize files from +Nextcloud Server with your computer.") + (home-page "https://nextcloud.com") + (license (list license:expat ; QProgressIndicator + license:lgpl2.1+ ; qtokenizer + license:gpl2+)))) + (define-public megacmd (package (name "megacmd") -- cgit 1.4.1 From 6320700b114f09c09fbe613e2032abe077d28583 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 00:45:48 +0100 Subject: gnu: libtiff: Update to 4.2.0 [security fixes]. Non-exhaustively, fixes CVE-2020-35523, CVE-2020-35522 and CVE-2020-35521. * gnu/packages/image.scm (libtiff/fixed): New variable. (libtiff)[replacement]: Graft. --- gnu/packages/image.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index a68ff66448..94d5e4d358 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -590,6 +590,7 @@ extracting icontainer icon files.") (sha256 (base32 "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax")))) + (replacement libtiff/fixed) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation @@ -612,6 +613,19 @@ collection of tools for doing simple manipulations of TIFF images.") "See COPYRIGHT in the distribution.")) (home-page "http://www.simplesystems.org/libtiff/"))) +(define-public libtiff/fixed + (package + (inherit libtiff) + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://download.osgeo.org/libtiff/tiff-" + version ".tar.gz")) + (sha256 + (base32 + "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b")))))) + (define-public leptonica (package (name "leptonica") -- cgit 1.4.1 From cbb5b5c4d5d7e027c85c0ed221f0291b83c567b8 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 01:01:46 +0100 Subject: gnu: git: Update to 2.30.2 [fixes CVE-2021-21300]. * gnu/packages/version-control.scm (git): Update to 2.30.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 8292a5df15..d85b5352fa 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -170,14 +170,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.30.1") + (version "2.30.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0rwlbps9x8kgk2hsm0bvsrkpsk9bnbnz8alknbd7i688jnhai27r")))) + "1ajz6lng6yldqm66lhrjfgbbxk09rq8cngv7hz9nqizrf46dkxs1")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -194,7 +194,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "015rqnz3ly1h6z6k9hfikgh401s3mzkmys8srai1kfv4v75pxz1h")))) + "1aiabqbc6mg23r19g2cwd4iajf55cpkxqylwn14hgpg64piaqr2y")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From 5f299b4a31550155508ce4e10d66cdfbb1a65bdd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 20:52:29 +0100 Subject: gnu: lmdb: Update to 0.9.28. * gnu/packages/databases.scm (lmdb): Update to 0.9.28. --- 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 261d2391b1..8ec2dc448a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2493,7 +2493,7 @@ database.") (define-public lmdb (package (name "lmdb") - (version "0.9.27") + (version "0.9.28") (source (origin (method git-fetch) @@ -2502,7 +2502,7 @@ database.") (commit (string-append "LMDB_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "09xqqm8yjsf1gv4gd4llal48sms76hfhxadx6rik1j2g5v3d3f1k")))) + (base32 "012a8bs49cswsnzw7k4piis5b6dn4by85w7a7mai9i04xcjyy9as")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 42364648baf071e08d5995eaaa063b1dfe4f80a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 20:52:52 +0100 Subject: gnu: fcitx5: Update to 5.0.5. * gnu/packages/fcitx5.scm (fcitx5): Update to 5.0.5. --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 4c79f4d856..17632ed9a6 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -87,7 +87,7 @@ client.") (define-public fcitx5 (package (name "fcitx5") - (version "5.0.4") + (version "5.0.5") (source (origin (method url-fetch) @@ -95,7 +95,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" version "_dict.tar.xz")) (sha256 - (base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as")))) + (base32 "16j716xawbszkb3fxzpdza1a4czh0fvkysikjc9bfyvbwp72p6an")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From d5542627fa890bebc03f5c899075595952d0e2df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 23:24:18 +0100 Subject: gnu: range-v3: Fix typo in description. * gnu/packages/cpp.scm (range-v3)[description]: Fix typo. --- gnu/packages/cpp.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index eeb45950af..ce9c9502ef 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -91,7 +91,7 @@ (description "Range-v3 is an extension of the Standard Template Library that makes its iterators and algorithms more powerful by making them composable. Unlike other range-like solutions which, seek to do away with iterators, in -range-v3 ranges are an abstration layer on top of iterators.") +range-v3 ranges are an abstraction layer on top of iterators.") (home-page "https://github.com/ericniebler/range-v3/") (license (list -- cgit 1.4.1 From 4aef8e0af5f15b76c57efa07751f93f0a4313577 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 9 Mar 2021 23:30:29 +0100 Subject: gnu: electron-cash: Update to 4.2.4. * gnu/packages/finance.scm (electron-cash): Update to 4.2.4. --- 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 7686f60675..e6df40c168 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -559,7 +559,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.2.3") + (version "4.2.4") (source (origin (method git-fetch) @@ -568,7 +568,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1q18p86a3a3wpf9nbpymhyilmaw9vffvwxh4hhx29bywfzvav11f")))) + (base32 "1a4jqsfadv6xr7ydj79my71jyrp0sjlznsbxdxjsjgnsqk8r48w6")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) -- cgit 1.4.1 From 5d0f394b85be0b450c11cd7efa2376d1c0e9e67b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Mar 2021 00:49:53 +0100 Subject: gnu: dcmtk: Update to 3.6.6. * gnu/packages/image-processing.scm (dcmtk): Update to 3.6.6. [inputs]: Add icu4c. --- 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 6f4576b8b9..26f6faea8c 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages maths) @@ -85,7 +86,7 @@ (define-public dcmtk (package (name "dcmtk") - (version "3.6.5") + (version "3.6.6") (source (origin (method url-fetch) @@ -94,11 +95,10 @@ "dcmtk" (string-join (string-split version #\.) "") "/dcmtk-" version ".tar.gz")) (sha256 - (base32 "1fdyz5wwjp4grys61mxb2ia9fi6i3ax6s43l16xnv291bxk7hld0")))) + (base32 "13j5yf3p6qj3mr17d77r3kcqchf055hgvk1w15vmdr8f54mwcnb8")))) (build-system cmake-build-system) (inputs - `(;; Our ICU is too recent: “error: ‘UChar’ does not name a type“. - ;; ("icu4c" ,icu4c) + `(("icu4c" ,icu4c) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libtiff" ,libtiff) -- cgit 1.4.1 From 81404a858cc1e51c73ed1af7a842e471cac9b8a7 Mon Sep 17 00:00:00 2001 From: Sébastien Lerique Date: Sun, 7 Mar 2021 22:15:26 +0900 Subject: gnu: password-store: Update to 1.7.3-1.918992c. * gnu/packages/password-utils.scm (password-store): Update to 1.7.3-1.918992c. [arguments]<#:phases>['wrap-path]: Add "wl-clipboard". [inputs]: Add "wl-clipboard". Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/password-utils.scm | 171 +++++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 82 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 92c483f14b..0d86a3d69e 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -516,93 +516,100 @@ any X11 window.") (license license:gpl3+))) (define-public password-store - (package - (name "password-store") - (version "1.7.3") - (source (origin - (method url-fetch) - (uri - (string-append "https://git.zx2c4.com/password-store/snapshot/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (add-before 'install 'patch-system-extension-dir - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (extension-dir (string-append out "/lib/password-store/extensions"))) - (substitute* "src/password-store.sh" - (("^SYSTEM_EXTENSION_DIR=.*$") - ;; lead with whitespace to prevent 'make install' from - ;; overwriting it again - (string-append " SYSTEM_EXTENSION_DIR=\"" - "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" - extension-dir - "}\"\n")))) - #t)) - (add-before 'install 'patch-passmenu-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "contrib/dmenu/passmenu" - (("dmenu") (string-append (assoc-ref inputs "dmenu") - "/bin/dmenu")) - (("xdotool") (string-append (assoc-ref inputs "xdotool") - "/bin/xdotool"))) - #t)) - (add-after 'install 'install-passmenu - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "contrib/dmenu/passmenu" bin) - #t))) - (add-after 'install 'wrap-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (path (map (lambda (pkg) - (string-append (assoc-ref inputs pkg) "/bin")) - '("coreutils" "getopt" "git" "gnupg" "qrencode" - "sed" "tree" "which" "xclip")))) - (wrap-program (string-append out "/bin/pass") - `("PATH" ":" prefix (,(string-join path ":")))) - #t)))) - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) - "WITH_ALLCOMP=yes" - (string-append "BASHCOMPDIR=" - %output "/etc/bash_completion.d")) - ;; Parallel tests may cause a race condition leading to a - ;; timeout in some circumstances. - #:parallel-tests? #f - #:test-target "test")) - (native-search-paths - (list (search-path-specification - (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") - (separator #f) ;single entry - (files '("lib/password-store/extensions"))))) - (inputs - `(("dmenu" ,dmenu) - ("getopt" ,util-linux) - ("git" ,git) - ("gnupg" ,gnupg) - ("qrencode" ,qrencode) - ("sed" ,sed) - ("tree" ,tree) - ("which" ,which) - ("xclip" ,xclip) - ("xdotool" ,xdotool))) - (home-page "https://www.passwordstore.org/") - (synopsis "Encrypted password manager") - (description "Password-store is a password manager which uses GnuPG to + ;; The 1.7.3 release does not include support for wl-clipboard, which was + ;; added in b0b784b1a57c0b06936e6f5d6560712b4b810cd3. Instead, use the + ;; latest commit on master at the time of writing. + (let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") + (revision "1")) + (package + (name "password-store") + (version (git-version "1.7.3" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zx2c4.com/password-store") + (commit commit))) + (sha256 + (base32 + "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) + (file-name (git-file-name name version)) )) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (add-before 'install 'patch-system-extension-dir + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (extension-dir (string-append out "/lib/password-store/extensions"))) + (substitute* "src/password-store.sh" + (("^SYSTEM_EXTENSION_DIR=.*$") + ;; lead with whitespace to prevent 'make install' from + ;; overwriting it again + (string-append " SYSTEM_EXTENSION_DIR=\"" + "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" + extension-dir + "}\"\n")))) + #t)) + (add-before 'install 'patch-passmenu-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "contrib/dmenu/passmenu" + (("dmenu") (string-append (assoc-ref inputs "dmenu") + "/bin/dmenu")) + (("xdotool") (string-append (assoc-ref inputs "xdotool") + "/bin/xdotool"))) + #t)) + (add-after 'install 'install-passmenu + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "contrib/dmenu/passmenu" bin) + #t))) + (add-after 'install 'wrap-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (path (map (lambda (pkg) + (string-append (assoc-ref inputs pkg) "/bin")) + '("coreutils" "getopt" "git" "gnupg" "qrencode" + "sed" "tree" "which" "wl-clipboard" "xclip")))) + (wrap-program (string-append out "/bin/pass") + `("PATH" ":" prefix (,(string-join path ":")))) + #t)))) + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) + "WITH_ALLCOMP=yes" + (string-append "BASHCOMPDIR=" + %output "/etc/bash_completion.d")) + ;; Parallel tests may cause a race condition leading to a + ;; timeout in some circumstances. + #:parallel-tests? #f + #:test-target "test")) + (native-search-paths + (list (search-path-specification + (variable "PASSWORD_STORE_SYSTEM_EXTENSION_DIR") + (separator #f) ;single entry + (files '("lib/password-store/extensions"))))) + (inputs + `(("dmenu" ,dmenu) + ("getopt" ,util-linux) + ("git" ,git) + ("gnupg" ,gnupg) + ("qrencode" ,qrencode) + ("sed" ,sed) + ("tree" ,tree) + ("which" ,which) + ("wl-clipboard" ,wl-clipboard) + ("xclip" ,xclip) + ("xdotool" ,xdotool))) + (home-page "https://www.passwordstore.org/") + (synopsis "Encrypted password manager") + (description "Password-store is a password manager which uses GnuPG to store and retrieve passwords. The tool stores each password in its own GnuPG-encrypted file, allowing the program to be simple yet secure. Synchronization is possible using the integrated git support, which commits changes to your password database to a git repository that can be managed through the pass command.") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public pass-otp (package -- cgit 1.4.1 From 852ba914a43da0977d4f53b53da7039cdd6706b2 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 01:34:11 +0100 Subject: gnu: imagemagick/fixed: Retain version length for successful grafting. * gnu/packages/imagemagick.scm (imagemagick/fixed): [version]: Append 'g'. [source]: Hardcode version. --- gnu/packages/imagemagick.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index d7abf6ea03..1a5ddb63d4 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -130,11 +130,14 @@ text, lines, polygons, ellipses and Bézier curves.") (define-public imagemagick/fixed (package (inherit imagemagick) - (version "6.9.12-2") + (version "6.9.12-2g") ;; 'g' for 'guix', appended character to retain + ;; version length so grafting works properly. (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" - version ".tar.xz")) + "6.9.12-2" ;; Hardcode version here since we + ;; had to change it up there. + ".tar.xz")) (sha256 (base32 "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))))) -- cgit 1.4.1 From 674474f646556b1898738dacc9adef29f007d044 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 03:52:04 +0100 Subject: gnu: c-ares: Update to 1.17.1 [fixes CVE-2020-8277]. * gnu/packages/adns.scm (c-ares/fixed): New variable. (c-ares)[replacement]: Graft. --- gnu/packages/adns.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index 57f34942d5..b36ec18462 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -74,6 +74,7 @@ scripts.") (sha256 (base32 "129sm0wzij0mp8vdv68v18hnykcjb6ivi66wnqnnw598q7bql1fy")))) + (replacement c-ares/fixed) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -87,6 +88,23 @@ The primary examples of such applications are servers which communicate with multiple clients and programs with graphical user interfaces.") (license (x11-style "https://c-ares.haxx.se/license.html")))) +(define-public c-ares/fixed + (package + (inherit c-ares) + (name "c-ares") + (version "1.17.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://c-ares.haxx.se/download/" name "-" version + ".tar.gz")) + (sha256 + (base32 + "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp")))) + (arguments + `(;; FIXME: Some tests require network access + #:tests? #f)))) + ;; gRPC requires a c-ares built with CMake in order to get the .cmake modules. ;; We can not build c-ares itself with CMake because that would introduce a ;; circular dependency through nghttp2. -- cgit 1.4.1 From b38f73f35ceca3559114784a236b4ea145b2c463 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 14:18:12 -0500 Subject: gnu: linux-libre: Update to 5.11.5. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.5. (linux-libre-5.11-pristine-source): 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 42745e29cb..973acf560e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.4") +(define-public linux-libre-5.11-version "5.11.5") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"))) + (hash (base32 "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 79aafab07d78267cc6a948cfc2ecd5438cb8609a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 14:18:34 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.22. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.22. (linux-libre-5.10-pristine-source): 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 973acf560e..f5a629fe37 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.21") +(define-public linux-libre-5.10-version "5.10.22") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy"))) + (hash (base32 "1pv3661d1gvkdl2jg6wx95lr5lcp6q77jrmx0m4a6z6n6asicnr4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 014ef060eab4aa596119ed0d83edd87c1ee8c7d9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 9 Mar 2021 14:18:55 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.104. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.104. (linux-libre-5.4-pristine-source): 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 f5a629fe37..e1527ad4b2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.103") +(define-public linux-libre-5.4-version "5.4.104") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "12wy2w7yc6fcn61xm6l7a86rfwwcchfq89lpznm2v3dmy5y3mqw4"))) + (hash (base32 "1p8459plp3a6xw7cib34p7bddjs0dlv2m34dy4z6bbsvgfg51m74"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From f736dedc4f5d3a2702dea59f692ff3ac9bb3a978 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 04:57:58 +0100 Subject: gnu: python-m2crypto: Disable tests because they are date-sensitive. * gnu/packages/python-crypto.scm (python-m2crypto)[arguments]: Set '#:tests?' to '#f'. --- gnu/packages/python-crypto.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bf39f124a1..2712482e6f 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1101,6 +1101,10 @@ provides drop-in compatibility with PyCrypto."))) (sha256 (base32 "09yirf3w77w6f49q6nxhrjm9c3a4y9s30s1k09chqrw8zdgx8sjc")))) (build-system python-build-system) + (arguments + `(;; FIXME: Tests start failing with time due to date checks in TLS + ;; certificates. + #:tests? #f)) (inputs `(("openssl" ,openssl))) (native-inputs `(("swig" ,swig))) (home-page "https://gitlab.com/m2crypto/m2crypto") -- cgit 1.4.1 From ca15eaeb069716892b9e060e7920460147f052bb Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 05:00:03 +0100 Subject: gnu: osc: Update to 0.172.0 [fixes CVE-2019-3681]. * gnu/packages/build-tools.scm (osc): Update to 0.172.0. [native-inputs]: Add python-chardet. Required by tests. --- gnu/packages/build-tools.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 1b4a2effd5..ae3debd87f 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -462,7 +462,7 @@ a build worked by accident.") (define-public osc (package (name "osc") - (version "0.165.2") + (version "0.172.0") (source (origin (method git-fetch) @@ -471,7 +471,7 @@ a build worked by accident.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0yjwvbvv9fgkpiyvrag89zxchyn3nbgp9jz0wn5p0z9450zwfyz6")))) + (base32 "1sqdnkka3c6b6hwnrmlwrgy7w62cp8raq8mph9pgd2lydzzbvwlp")))) (build-system python-build-system) (arguments `(#:phases @@ -485,6 +485,8 @@ a build worked by accident.") (string-append bin "osc-wrapper.py") (string-append bin "osc")) #t)))))) + (native-inputs + `(("python-chardet" ,python-chardet))) (inputs `(("python-m2crypto" ,python-m2crypto) ("python-pycurl" ,python-pycurl) -- cgit 1.4.1 From 80739ea480a7db667b83b45e3a08be740449f689 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 06:54:48 +0100 Subject: gnu: gnucobol: Update to 3.1.2 [security fixes]. * gnu/packages/cobol.scm (gnucobol): Update to 3.1.2. [arguments]: Add 'set-TERM phase before 'check to set the TERM environment variable for tests that expect it. --- gnu/packages/cobol.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cobol.scm b/gnu/packages/cobol.scm index 257527e3b8..bc191e6b09 100644 --- a/gnu/packages/cobol.scm +++ b/gnu/packages/cobol.scm @@ -30,7 +30,7 @@ (define-public gnucobol (package (name "gnucobol") - (version "2.2") + (version "3.1.2") (source (origin (method url-fetch) @@ -39,7 +39,7 @@ version ".tar.xz")) (sha256 (base32 - "1814s1n95xax2dz938cf4fkcp0q94nkj1gjbdblbzpk9q92zq66w")))) + "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r")))) (arguments '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") @@ -49,7 +49,10 @@ (add-after 'unpack 'place-cobol85-test-suite (lambda* (#:key inputs #:allow-other-keys) (let ((newcob (assoc-ref inputs "newcob"))) - (copy-file newcob "tests/cobol85/newcob.val.Z"))))) + (copy-file newcob "tests/cobol85/newcob.val.Z")))) + (add-before 'check 'set-TERM + ;; Some tests expect a known terminal + (lambda _ (setenv "TERM" "xterm-256color")))) #:test-target "checkall")) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 0d5e2c587f5ac58f7a4f810629692e05255c804c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 08:40:34 +0100 Subject: gnu: guile-simple-zmq: Update to 0.0.0-9.b2ea97e. * gnu/packages/guile-xyz.scm (guile-simple-zmq): Update to 0.0.0-9.b2ea97e. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index bd26010918..115c3d82f5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1002,8 +1002,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "e9446173280117e98ab4208e2aa5273128650e19") - (revision "8")) + (let ((commit "b2ea97e5a0e7417ce718b27b6fd55a3146364b82") + (revision "9")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -1015,7 +1015,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "1nhlp5kl1095k1irvv0kgdbc7lp5qki3d3wg9rla6f7822hkmrzw")) + "08qvcxx0njz9545xa0lq3wpf55v9cl9nbb640ry1lig11wpymqxb")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From ff52d1156c249ce8906972941a92e1816f86e395 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 08:41:10 +0100 Subject: gnu: cuirass: Update to 0.0.1-73.14e1335. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-73.14e1335. [arguments]: Enable tests and add new 'set-PATH-for-tests phase. [native-inputs]: Add ephemeralpg. --- gnu/packages/ci.scm | 68 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5fa800be4a..bf1346f628 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,20 +66,21 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "543e26addc6e2304611e2feb8dd3a5a0646507b6") - (revision "72")) + (let ((commit "14e1335732271fdce730cb7e5043429ea9155201") + (revision "73")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01cxg0nwafzfg0phbv1b4cv24w7yaalkkdib3qfwf6jqagbfg85y")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guix/guix-cuirass.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -87,9 +88,14 @@ (ice-9 rdelim) (ice-9 popen)) #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass - #:tests? #f ;requires a PostgreSQL database. #:phases (modify-phases %standard-phases + (add-before 'check 'set-PATH-for-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((pg (assoc-ref inputs "ephemeralpg")) + (path (getenv "PATH"))) + (setenv "PATH" (string-append pg "/bin:" path)) + #t))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. @@ -110,22 +116,25 @@ (deps (list avahi gcrypt json zmq squee git bytes fibers zlib matd tls mail 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-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))) + (effective + (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (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. (for-each @@ -157,7 +166,8 @@ `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ("ephemeralpg" ,ephemeralpg))) (native-search-paths ;; For HTTPS access, Cuirass itself honors these variables, with the ;; same semantics as Git and OpenSSL (respectively). -- cgit 1.4.1 From 0be2474d42990871170578e3a14a2e6b548157bd Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 9 Mar 2021 17:04:27 +0100 Subject: services: cuirass: Do not create the database directory. Fixes: . * gnu/services/cuirass.scm (cuirass-activation): Since the PostgreSQL switch, it is no longer needed to create the database directory. --- gnu/services/cuirass.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 4d5e3a1041..dae895107e 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -280,8 +280,6 @@ (remote-cache (and remote-server (cuirass-remote-server-configuration-cache remote-server))) - (db (dirname - (cuirass-configuration-database config))) (user (cuirass-configuration-user config)) (log "/var/log/cuirass") (group (cuirass-configuration-group config))) @@ -290,7 +288,6 @@ (use-modules (guix build utils)) (mkdir-p #$cache) - (mkdir-p #$db) (mkdir-p #$log) (when #$remote-cache @@ -299,7 +296,6 @@ (let ((uid (passwd:uid (getpw #$user))) (gid (group:gid (getgr #$group)))) (chown #$cache uid gid) - (chown #$db uid gid) (chown #$log uid gid) (when #$remote-cache -- cgit 1.4.1 From 76bea3f8bcd951ded88dfb7f8cad5bc3e5a1701f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 08:48:19 +0100 Subject: ci: Remove hydra support. This removes hydra support to use Cuirass as the only continuous integration system. * build-aux/hydra/gnu-system.scm: Remove it. * build-aux/hydra/guix-modular.scm: Ditto. * build-aux/hydra/guix.scm: Ditto. * build-aux/cuirass/hydra-to-cuirass.scm: Ditto. * Makefile.am (EXTRA_DIST): Update it. (hydra-jobs.scm): Remove it. (cuirass-jobs.scm): Update it. * build-aux/hydra/evaluate.scm: Move it to ... * build-aux/cuirass/evaluate.scm: ... here. * build-aux/cuirass/guix-modular.scm: Remove it. * build-aux/cuirass/gnu-system.scm: Ditto. * guix/packages.scm (%hydra-supported-systems): Rename it to ... (%cuirass-supported-systems): ... this variable. * build-aux/check-final-inputs-self-contained: Adapt it. * etc/release-manifest.scm: Ditto. * gnu/ci.scm (package->alist): Remove it. (derivation->job): New procedure. (package-job, package-cross-job, cross-jobs, image-jobs, system-test-jobs, tarball-jobs): Use it. (guix-jobs): New procedure. (hydra-jobs): Rename it to ... (cuirass-jobs): ... this procedure. --- Makefile.am | 29 +- build-aux/check-final-inputs-self-contained.scm | 3 +- build-aux/cuirass/evaluate.scm | 105 ++++++ build-aux/cuirass/gnu-system.scm | 25 -- build-aux/cuirass/guix-modular.scm | 6 - build-aux/cuirass/hydra-to-cuirass.scm | 47 --- build-aux/hydra/evaluate.scm | 131 ------- build-aux/hydra/gnu-system.scm | 88 ----- build-aux/hydra/guix-modular.scm | 91 ----- build-aux/hydra/guix.scm | 106 ------ etc/release-manifest.scm | 2 +- gnu/ci.scm | 452 +++++++++++------------- guix/packages.scm | 4 +- 13 files changed, 320 insertions(+), 769 deletions(-) create mode 100644 build-aux/cuirass/evaluate.scm delete mode 100644 build-aux/cuirass/gnu-system.scm delete mode 100644 build-aux/cuirass/guix-modular.scm delete mode 100644 build-aux/cuirass/hydra-to-cuirass.scm delete mode 100644 build-aux/hydra/evaluate.scm delete mode 100644 build-aux/hydra/gnu-system.scm delete mode 100644 build-aux/hydra/guix-modular.scm delete mode 100644 build-aux/hydra/guix.scm (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index bb27297096..0f87c958f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -608,14 +608,7 @@ EXTRA_DIST += \ etc/historical-authorizations \ build-aux/build-self.scm \ build-aux/compile-all.scm \ - build-aux/hydra/evaluate.scm \ - build-aux/hydra/gnu-system.scm \ - build-aux/hydra/guix.scm \ - build-aux/hydra/guix-modular.scm \ - build-aux/cuirass/gnu-system.scm \ - build-aux/cuirass/guix-modular.scm \ build-aux/cuirass/hurd-manifest.scm \ - build-aux/cuirass/hydra-to-cuirass.scm \ build-aux/check-final-inputs-self-contained.scm \ build-aux/check-channel-news.scm \ build-aux/compile-as-derivation.scm \ @@ -955,28 +948,18 @@ check-channel-news: $(GOBJECTS) $(AM_V_at)$(top_builddir)/pre-inst-env "$(GUILE)" \ "$(top_srcdir)/build-aux/check-channel-news.scm" -# Compute the Hydra jobs and write them in the target file. -hydra-jobs.scm: $(GOBJECTS) - $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" +# Compute the Cuirass jobs. +cuirass-jobs: $(GOBJECTS) + rm -rf "$@" + $(AM_V_at)$(MKDIR_P) "$@" $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ - "$(top_srcdir)/build-aux/hydra/evaluate.scm" \ - "$(top_srcdir)/build-aux/hydra/gnu-system.scm" > "$@.tmp" - $(AM_V_at)mv "$@.tmp" "$@" - -# Compute the Cuirass jobs and write them in the target file. -cuirass-jobs.scm: $(GOBJECTS) - $(AM_V_at)$(MKDIR_P) "`dirname "$@"`" - $(AM_V_GEN)$(top_builddir)/pre-inst-env "$(GUILE)" \ - "$(top_srcdir)/build-aux/hydra/evaluate.scm" \ - "$(top_srcdir)/build-aux/cuirass/gnu-system.scm" \ - cuirass > "$@.tmp" - $(AM_V_at)mv "$@.tmp" "$@" + "$(top_srcdir)/build-aux/cuirass/evaluate.scm" "$@" .PHONY: gen-ChangeLog gen-AUTHORS gen-tarball-version .PHONY: assert-no-store-file-names assert-binaries-available .PHONY: assert-final-inputs-self-contained check-channel-news .PHONY: clean-go make-go as-derivation authenticate -.PHONY: update-guix-package update-NEWS release +.PHONY: update-guix-package update-NEWS cuirass-jobs release # Downloading up-to-date PO files. diff --git a/build-aux/check-final-inputs-self-contained.scm b/build-aux/check-final-inputs-self-contained.scm index c819086508..a6148d12e3 100644 --- a/build-aux/check-final-inputs-self-contained.scm +++ b/build-aux/check-final-inputs-self-contained.scm @@ -83,5 +83,4 @@ refer to the bootstrap tools." (set-build-options store #:use-substitutes? #t) (for-each (cut test-final-inputs store <>) - %hydra-supported-systems))) - + %cuirass-supported-systems))) diff --git a/build-aux/cuirass/evaluate.scm b/build-aux/cuirass/evaluate.scm new file mode 100644 index 0000000000..fc0744ad2a --- /dev/null +++ b/build-aux/cuirass/evaluate.scm @@ -0,0 +1,105 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016, 2017, 2018, 2020 Ludovic Courtès +;;; Copyright © 2017 Jan Nieuwenhuizen +;;; Copyright © 2021 Mathieu Othacehe +;;; +;;; 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 . + +;;; This program replicates the behavior of Cuirass's 'evaluate' process. +;;; It displays the evaluated jobs on the standard output. + +(use-modules (guix channels) + (guix derivations) + (guix git-download) + (guix inferior) + (guix packages) + (guix store) + (guix ui) + ((guix ui) #:select (build-notifier)) + (ice-9 match) + (ice-9 threads)) + +(define %top-srcdir + (and=> (assq-ref (current-source-location) 'filename) + (lambda (file) + (canonicalize-path + (string-append (dirname file) "/../.."))))) + +(match (command-line) + ((command directory) + (let ((real-build-things build-things)) + (with-store store + ;; Make sure we don't resort to substitutes. + (set-build-options store + #:use-substitutes? #f + #:substitute-urls '()) + + ;; The evaluation of Guix itself requires building a "trampoline" + ;; program, and possibly everything it depends on. Thus, allow builds + ;; but print a notification. + (with-build-handler (build-notifier #:use-substitutes? #f) + + ;; Add %TOP-SRCDIR to the store with a proper Git predicate so we + ;; work from a clean checkout. + (let ((source (add-to-store store "guix-source" #t + "sha256" %top-srcdir + #:select? (git-predicate %top-srcdir)))) + (define instances + (list (checkout->channel-instance source))) + + (define channels + (map channel-instance-channel instances)) + + (define derivation + ;; Compute the derivation of Guix for COMMIT. + (run-with-store store + (channel-instances->derivation instances))) + + ;; TODO: Remove 'show-what-to-build' call when Cuirass' 'evaluate' + ;; scripts uses 'with-build-handler'. + (show-what-to-build store (list derivation)) + (build-derivations store (list derivation)) + + + ;; Evaluate jobs on a per-system basis for two reasons. It speeds + ;; up the evaluation speed as the evaluations can be performed + ;; concurrently. It also decreases the amount of memory needed per + ;; evaluation process. + (n-par-for-each + (/ (current-processor-count) 2) + (lambda (system) + (with-store store + (let ((inferior + (open-inferior (derivation->output-path derivation))) + (channels (map channel-instance->sexp instances))) + (inferior-eval '(use-modules (gnu ci)) inferior) + (let ((jobs + (inferior-eval-with-store + inferior store + `(lambda (store) + (cuirass-jobs store + '((subset . all) + (systems . ,(list system)) + (channels . ,channels)))))) + (file + (string-append directory "/jobs-" system ".scm"))) + (call-with-output-file file + (lambda (port) + (write jobs port))))))) + %cuirass-supported-systems)))))) + (x + (format (current-error-port) "Wrong command: ~a~%." x) + (exit 1))) diff --git a/build-aux/cuirass/gnu-system.scm b/build-aux/cuirass/gnu-system.scm deleted file mode 100644 index 0eb834cfba..0000000000 --- a/build-aux/cuirass/gnu-system.scm +++ /dev/null @@ -1,25 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Jan Nieuwenhuizen -;;; -;;; 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 . - -;;; -;;; This file defines build jobs for the Cuirass continuation integration -;;; tool. -;;; - -(include "../hydra/gnu-system.scm") -(include "hydra-to-cuirass.scm") diff --git a/build-aux/cuirass/guix-modular.scm b/build-aux/cuirass/guix-modular.scm deleted file mode 100644 index cbbdbf1133..0000000000 --- a/build-aux/cuirass/guix-modular.scm +++ /dev/null @@ -1,6 +0,0 @@ -;;; -;;; This file defines Cuirass build jobs to build Guix itself. -;;; - -(include "../hydra/guix-modular.scm") -(include "hydra-to-cuirass.scm") diff --git a/build-aux/cuirass/hydra-to-cuirass.scm b/build-aux/cuirass/hydra-to-cuirass.scm deleted file mode 100644 index 75c77ea35a..0000000000 --- a/build-aux/cuirass/hydra-to-cuirass.scm +++ /dev/null @@ -1,47 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017 Jan Nieuwenhuizen -;;; -;;; 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 . - -;;; -;;; This file defines the conversion of Hydra build jobs to Cuirass build -;;; jobs. It is meant to be included in other files. -;;; - -(use-modules ((guix licenses) - #:select (license? license-name license-uri license-comment))) - -(define (cuirass-jobs store arguments) - "Return Cuirass jobs." - (map hydra-job->cuirass-job (hydra-jobs store arguments))) - -(define (hydra-job->cuirass-job hydra-job) - (let ((name (car hydra-job)) - (job ((cdr hydra-job)))) - (lambda _ (acons #:job-name (symbol->string name) - (map symbol-alist-entry->keyword-alist-entry job))))) - -(define (symbol-alist-entry->keyword-alist-entry entry) - (cons (symbol->keyword (car entry)) (entry->sexp-entry (cdr entry)))) - -(define (entry->sexp-entry o) - (match o - ((? license?) `((name . (license-name o)) - (uri . ,(license-uri o)) - (comment . ,(license-comment o)))) - ((lst ...) - (map entry->sexp-entry lst)) - (_ o))) diff --git a/build-aux/hydra/evaluate.scm b/build-aux/hydra/evaluate.scm deleted file mode 100644 index c74fcdb763..0000000000 --- a/build-aux/hydra/evaluate.scm +++ /dev/null @@ -1,131 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2020 Ludovic Courtès -;;; Copyright © 2017 Jan Nieuwenhuizen -;;; -;;; 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 . - -;;; This program replicates the behavior of Hydra's 'hydra-eval-guile-job'. -;;; It evaluates the Hydra job defined by the program passed as its first -;;; arguments and outputs an sexp of the jobs on standard output. - -(use-modules (guix store) - (guix git-download) - ((guix build utils) #:select (with-directory-excursion)) - ((guix ui) #:select (build-notifier)) - (srfi srfi-19) - (ice-9 match) - (ice-9 pretty-print) - (ice-9 format)) - -(define %top-srcdir - (and=> (assq-ref (current-source-location) 'filename) - (lambda (file) - (canonicalize-path - (string-append (dirname file) "/../.."))))) - -(define %user-module - ;; Hydra user module. - (let ((m (make-module))) - (beautify-user-module! m) - m)) - -(define (call-with-time thunk kont) - "Call THUNK and pass KONT the elapsed time followed by THUNK's return -values." - (let* ((start (current-time time-monotonic)) - (result (call-with-values thunk list)) - (end (current-time time-monotonic))) - (apply kont (time-difference end start) result))) - -(define (call-with-time-display thunk) - "Call THUNK and write to the current output port its duration." - (call-with-time thunk - (lambda (time . results) - (format #t "~,3f seconds~%" - (+ (time-second time) - (/ (time-nanosecond time) 1e9))) - (apply values results)))) - -(define (assert-valid-job job thing) - "Raise an error if THING is not an alist with a valid 'derivation' entry. -Otherwise return THING." - (unless (and (list? thing) - (and=> (assoc-ref thing 'derivation) - (lambda (value) - (and (string? value) - (string-suffix? ".drv" value))))) - (error "job did not produce a valid alist" job thing)) - thing) - - -;; Without further ado... -(match (command-line) - ((command file cuirass? ...) - ;; Load FILE, a Scheme file that defines Hydra jobs. - (let ((port (current-output-port)) - (real-build-things build-things)) - (with-store store - ;; Make sure we don't resort to substitutes. - (set-build-options store - #:use-substitutes? #f - #:substitute-urls '()) - - ;; The evaluation of Guix itself requires building a "trampoline" - ;; program, and possibly everything it depends on. Thus, allow builds - ;; but print a notification. - (with-build-handler (build-notifier #:use-substitutes? #f) - - ;; Add %TOP-SRCDIR to the store with a proper Git predicate so we work - ;; from a clean checkout - (let ((source (add-to-store store "guix-source" #t - "sha256" %top-srcdir - #:select? (git-predicate %top-srcdir)))) - (with-directory-excursion source - (save-module-excursion - (lambda () - (set-current-module %user-module) - (format (current-error-port) - "loading '~a' relative to '~a'...~%" - file source) - (primitive-load file)))) - - ;; Call the entry point of FILE and print the resulting job sexp. - (pretty-print - (match ((module-ref %user-module - (if (equal? cuirass? "cuirass") - 'cuirass-jobs - 'hydra-jobs)) - store `((guix - . ((file-name . ,source))))) - (((names . thunks) ...) - (map (lambda (job thunk) - (format (current-error-port) "evaluating '~a'... " job) - (force-output (current-error-port)) - (cons job - (assert-valid-job job - (call-with-time-display thunk)))) - names thunks))) - port)))))) - ((command _ ...) - (format (current-error-port) "Usage: ~a FILE [cuirass] -Evaluate the Hydra or Cuirass jobs defined in FILE.~%" - command) - (exit 1))) - -;;; Local Variables: -;;; eval: (put 'call-with-time 'scheme-indent-function 1) -;;; End: - diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm deleted file mode 100644 index a03324daeb..0000000000 --- a/build-aux/hydra/gnu-system.scm +++ /dev/null @@ -1,88 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès -;;; Copyright © 2017 Jan Nieuwenhuizen -;;; Copyright © 2018, 2019 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 . - -;;; -;;; This file defines build jobs for the Hydra continuation integration -;;; tool. -;;; - -(use-modules (guix inferior) (guix channels) - (guix) - (guix ui) - (srfi srfi-1) - (ice-9 match)) - -;; XXX: Debugging hack: since `hydra-eval-guile-jobs' redirects the output -;; port to the bit bucket, let us write to the error port instead. -(setvbuf (current-error-port) 'line) -(set-current-output-port (current-error-port)) - -(define (find-current-checkout arguments) - "Find the first checkout of ARGUMENTS that provided the current file. -Return #f if no such checkout is found." - (let ((current-root - (canonicalize-path - (string-append (dirname (current-filename)) "/../..")))) - (find (lambda (argument) - (and=> (assq-ref argument 'file-name) - (lambda (name) - (string=? name current-root)))) arguments))) - -(define (hydra-jobs store arguments) - "Return a list of jobs where each job is a NAME/THUNK pair." - - (define checkout - (find-current-checkout arguments)) - - (define commit - (assq-ref checkout 'revision)) - - (define source - (assq-ref checkout 'file-name)) - - (define instance - (checkout->channel-instance source #:commit commit)) - - (define derivation - ;; Compute the derivation of Guix for COMMIT. - (run-with-store store - (channel-instances->derivation (list instance)))) - - ;; TODO: Remove 'show-what-to-build' call when Cuirass' 'evaluate' scripts - ;; uses 'with-build-handler'. - (show-what-to-build store (list derivation)) - (build-derivations store (list derivation)) - - ;; Open an inferior for the just-built Guix. - (let ((inferior (open-inferior (derivation->output-path derivation)))) - (inferior-eval '(use-modules (gnu ci) (ice-9 match)) inferior) - - (map (match-lambda - ((name . fields) - ;; Hydra expects a thunk, so here it is. - (cons name (lambda () fields)))) - (inferior-eval-with-store - inferior store - `(lambda (store) - (map (match-lambda - ((name . thunk) - (cons name (thunk)))) - (hydra-jobs store '((superior-guix-checkout . ,checkout) - ,@arguments)))))))) diff --git a/build-aux/hydra/guix-modular.scm b/build-aux/hydra/guix-modular.scm deleted file mode 100644 index 060b84b8ef..0000000000 --- a/build-aux/hydra/guix-modular.scm +++ /dev/null @@ -1,91 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2020 Ludovic Courtès -;;; -;;; 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 . - -;;; -;;; This file defines a continuous integration job to build the same modular -;;; Guix as 'guix pull', which is defined in (guix self). -;;; - -(use-modules (guix store) - (guix config) - (guix utils) - ((guix packages) #:select (%hydra-supported-systems)) - (guix derivations) - (guix monads) - ((guix licenses) #:prefix license:) - (srfi srfi-1) - (ice-9 match)) - -;; XXX: Debugging hack: since `hydra-eval-guile-jobs' redirects the output -;; port to the bit bucket, let us write to the error port instead. -(setvbuf (current-error-port) 'line) -(set-current-output-port (current-error-port)) - -(define* (build-job store source version system) - "Return a Hydra job a list building the modular Guix derivation from SOURCE -for SYSTEM. Use VERSION as the version identifier." - (lambda () - (define build - (primitive-load (string-append source "/build-aux/build-self.scm"))) - - (let ((drv (run-with-store store - (build source #:version version #:system system - #:pull-version 1 - #:guile-version "2.2")))) - `((derivation . ,(derivation-file-name drv)) ;the latest 2.2.x - (log . ,(log-file store (derivation-file-name drv))) - (outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (nix-name . ,(derivation-name drv)) - (system . ,(derivation-system drv)) - (description . "Modular Guix") - (long-description - . "This is the modular Guix package as produced by 'guix pull'.") - (license . ,license:gpl3+) - (home-page . ,%guix-home-page-url) - (maintainers . (,%guix-bug-report-address)))))) - -(define (hydra-jobs store arguments) - "Return Hydra jobs." - (define systems - (match (assoc-ref arguments 'systems) - (#f %hydra-supported-systems) - ((lst ...) lst) - ((? string? str) (call-with-input-string str read)))) - - (define guix-checkout - (or (assq-ref arguments 'guix) ;Hydra on hydra - (assq-ref arguments 'guix-modular))) ;Cuirass on berlin - - (define version - (or (assq-ref guix-checkout 'revision) - "0.unknown")) - - (let ((file (assq-ref guix-checkout 'file-name))) - (format (current-error-port) "using checkout ~s (~s; arguments: ~s)~%" - guix-checkout file arguments) - - (map (lambda (system) - (let ((name (string->symbol - (string-append "guix." system)))) - `(,name - . ,(build-job store file version system)))) - systems))) diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm deleted file mode 100644 index 08193ec82e..0000000000 --- a/build-aux/hydra/guix.scm +++ /dev/null @@ -1,106 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès -;;; -;;; 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 . - -;;; -;;; This file defines build jobs of Guix itself for the Hydra continuation -;;; integration tool. -;;; - -;; Attempt to use our very own Guix modules. -(eval-when (expand load eval) - - ;; Ignore any available .go, and force recompilation. This is because our - ;; checkout in the store has mtime set to the epoch, and thus .go files look - ;; newer, even though they may not correspond. - (set! %fresh-auto-compile #t) - - ;; Display which files are loaded. - (set! %load-verbosely #t) - - (and=> (assoc-ref (current-source-location) 'filename) - (lambda (file) - (let ((dir (string-append (dirname file) "/../.."))) - (format (current-error-port) "prepending ~s to the load path~%" - dir) - (set! %load-path (cons dir %load-path)))))) - - -(use-modules (guix store) - (guix packages) - (guix utils) - (guix grafts) - (guix derivations) - (guix build-system gnu) - (gnu packages package-management) - (srfi srfi-1) - (srfi srfi-26) - (ice-9 match)) - -;; XXX: Debugging hack: since `hydra-eval-guile-jobs' redirects the output -;; port to the bit bucket, let us write to the error port instead. -(setvbuf (current-error-port) _IOLBF) -(set-current-output-port (current-error-port)) - -(define* (package->alist store package system - #:optional (package-derivation package-derivation)) - "Convert PACKAGE to an alist suitable for Hydra." - `((derivation . ,(derivation-file-name - (parameterize ((%graft? #f)) - (package-derivation store package system - #:graft? #f)))) - (description . ,(package-synopsis package)) - (long-description . ,(package-description package)) - (license . ,(package-license package)) - (home-page . ,(package-home-page package)) - (maintainers . ("bug-guix@gnu.org")))) - -(define (hydra-jobs store arguments) - "Return Hydra jobs." - (define systems - (match (filter-map (match-lambda - (('system . value) - value) - (_ #f)) - arguments) - ((lst ..1) - lst) - (_ - (list (%current-system))))) - - (define guix-checkout - (assq-ref arguments 'guix)) - - (let ((file (assq-ref guix-checkout 'file-name))) - (format (current-error-port) "using checkout ~s (~s)~%" - guix-checkout file) - - `((tarball . ,(cute package->alist store - (dist-package guix file) - (%current-system))) - - ,@(map (lambda (system) - (let ((name (string->symbol - (string-append "guix." system)))) - `(,name - . ,(cute package->alist store - (package - (inherit guix) - (version "latest") - (source file)) - system)))) - %hydra-supported-systems)))) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index da98d6e00b..a1f731a945 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -103,7 +103,7 @@ TARGET." (if (string=? system "i586-gnu") %base-packages/hurd %base-packages))) - %hydra-supported-systems))) + %cuirass-supported-systems))) (define %system-manifest (manifest diff --git a/gnu/ci.scm b/gnu/ci.scm index 96bff64875..6edcdd0e19 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2020 Julien Lepiller -;;; Copyright © 2020 Mathieu Othacehe +;;; Copyright © 2020, 2021 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -21,6 +21,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu ci) + #:use-module (guix channels) #:use-module (guix config) #:use-module (guix store) #:use-module (guix grafts) @@ -64,67 +65,69 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) - #:export (%cross-targets + #:export (%core-packages + %cross-targets channel-source->package - hydra-jobs)) + cuirass-jobs)) ;;; Commentary: ;;; -;;; This file defines build jobs for the Hydra and Cuirass continuation -;;; integration tools. +;;; This file defines build jobs for Cuirass. ;;; ;;; Code: -(define* (package->alist store package system - #:optional (package-derivation package-derivation)) - "Convert PACKAGE to an alist suitable for Hydra." - (parameterize ((%graft? #f)) - (let ((drv (package-derivation store package system - #:graft? #f))) - `((derivation . ,(derivation-file-name drv)) - (log . ,(log-file store (derivation-file-name drv))) - (outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (nix-name . ,(derivation-name drv)) - (system . ,(derivation-system drv)) - (description . ,(package-synopsis package)) - (long-description . ,(package-description package)) - - ;; XXX: Hydra ignores licenses that are not a structure or a - ;; list thereof. - (license . ,(let loop ((license (package-license package))) - (match license - ((? license?) - (license-name license)) - ((lst ...) - (map loop license))))) - - (home-page . ,(package-home-page package)) - (maintainers . ("bug-guix@gnu.org")) - (max-silent-time . ,(or (assoc-ref (package-properties package) - 'max-silent-time) - 3600)) ;1 hour by default - (timeout . ,(or (assoc-ref (package-properties package) 'timeout) - 72000)))))) ;20 hours by default - -(define (package-job store job-name package system) +(define* (derivation->job name drv + #:key + period + (max-silent-time 3600) + (timeout 3600)) + "Return a Cuirass job called NAME and describing DRV. PERIOD is the minimal +duration that must separate two evaluations of the same job. If PERIOD is +false, then the job will be evaluated as soon as possible. + +MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when +building the derivation." + `((#:job-name . ,name) + (#:derivation . ,(derivation-file-name drv)) + (#:outputs . ,(filter-map + (lambda (res) + (match res + ((name . path) + `(,name . ,path)))) + (derivation->output-paths drv))) + (#:nix-name . ,(derivation-name drv)) + (#:system . ,(derivation-system drv)) + (#:period . ,period) + (#:max-silent-time . ,max-silent-time) + (#:timeout . ,timeout))) + +(define* (package-job store job-name package system + #:key cross? target) "Return a job called JOB-NAME that builds PACKAGE on SYSTEM." - (let ((job-name (symbol-append job-name (string->symbol ".") - (string->symbol system)))) - `(,job-name . ,(cut package->alist store package system)))) + (let ((job-name (string-append job-name "." system))) + (parameterize ((%graft? #f)) + (let* ((drv (if cross? + (package-cross-derivation store package target system + #:graft? #f) + (package-derivation store package system + #:graft? #f))) + (max-silent-time (or (assoc-ref (package-properties package) + 'max-silent-time) + 3600)) + (timeout (or (assoc-ref (package-properties package) + 'timeout) + 72000))) + (derivation->job job-name drv + #:max-silent-time max-silent-time + #:timeout timeout))))) (define (package-cross-job store job-name package target system) "Return a job called TARGET.JOB-NAME that cross-builds PACKAGE for TARGET on SYSTEM." - `(,(symbol-append (string->symbol target) (string->symbol ".") job-name - (string->symbol ".") (string->symbol system)) . - ,(cute package->alist store package system - (lambda* (store package system #:key graft?) - (package-cross-derivation store package target system - #:graft? graft?))))) + (let ((name (string-append target "." job-name "." system))) + (package-job store name package system + #:cross? #t + #:target target))) (define %core-packages ;; Note: Don't put the '-final' package variants because (1) that's @@ -200,6 +203,22 @@ SYSTEM." (remove (either from-32-to-64? same? pointless?) %cross-targets))) +(define* (guix-jobs store systems #:key source commit) + "Return a list of jobs for Guix itself." + (define build + (primitive-load (string-append source "/build-aux/build-self.scm"))) + + (map + (lambda (system) + (let ((name (string->symbol + (string-append "guix." system))) + (drv (run-with-store store + (build source #:version commit #:system system + #:pull-version 1 + #:guile-version "2.2")))) + (derivation->job name drv))) + systems)) + ;; Architectures that are able to build or cross-build Guix System images. ;; This does not mean that other architectures are not supported, only that ;; they are often not fast enough to support Guix System images building. @@ -219,32 +238,11 @@ SYSTEM." "Return a list of jobs that build images for SYSTEM. Those jobs are expensive in storage and I/O operations, hence their periodicity is limited by passing the PERIOD argument." - (define (->alist drv) - `((derivation . ,(derivation-file-name drv)) - (log . ,(log-file store (derivation-file-name drv))) - (outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (nix-name . ,(derivation-name drv)) - (system . ,(derivation-system drv)) - (description . "Stand-alone image of the GNU system") - (long-description . "This is a demo stand-alone image of the GNU -system.") - (license . ,(license-name gpl3+)) - (period . ,(hours 48)) - (max-silent-time . 3600) - (timeout . 3600) - (home-page . ,%guix-home-page-url) - (maintainers . ("bug-guix@gnu.org")))) - (define (->job name drv) - (let ((name (symbol-append name (string->symbol ".") - (string->symbol system)))) - `(,name . ,(lambda () - (parameterize ((%graft? #f)) - (->alist drv)))))) + (let ((name (string-append name "." system))) + (parameterize ((%graft? #f)) + (derivation->job name drv + #:period (hours 48))))) (define (build-image image) (run-with-store store @@ -256,25 +254,26 @@ system.") (expt 2 20)) (if (member system %guix-system-supported-systems) - `(,(->job 'usb-image + `(,(->job "usb-image" (build-image (image (inherit efi-disk-image) (operating-system installation-os)))) - ,(->job 'iso9660-image + ,(->job "iso9660-image" (build-image (image (inherit (image-with-label - iso9660-image - (string-append "GUIX_" system "_" - (if (> (string-length %guix-version) 7) - (substring %guix-version 0 7) - %guix-version)))) + iso9660-image + (string-append "GUIX_" system "_" + (if (> (string-length %guix-version) 7) + (substring %guix-version 0 7) + %guix-version)))) (operating-system installation-os)))) ;; Only cross-compile Guix System images from x86_64-linux for now. ,@(if (string=? system "x86_64-linux") (map (lambda (image) - (->job (image-name image) (build-image image))) + (->job (symbol->string (image-name image)) + (build-image image))) %guix-system-images) '())) '())) @@ -322,112 +321,72 @@ system.") (define* (system-test-jobs store system #:key source commit) "Return a list of jobs for the system tests." - (define (test->thunk test) - (lambda () - (define drv - (run-with-store store - (mbegin %store-monad - (set-current-system system) - (set-grafting #f) - (set-guile-for-build (default-guile)) - (system-test-value test)))) - - ;; Those tests are extremely expensive in I/O operations and storage - ;; size, use the "period" attribute to run them with a period of at - ;; least 48 hours. - `((derivation . ,(derivation-file-name drv)) - (log . ,(log-file store (derivation-file-name drv))) - (outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (nix-name . ,(derivation-name drv)) - (system . ,(derivation-system drv)) - (description . ,(format #f "Guix '~a' system test" - (system-test-name test))) - (long-description . ,(system-test-description test)) - (license . ,(license-name gpl3+)) - (period . ,(hours 48)) - (max-silent-time . 3600) - (timeout . 3600) - (home-page . ,%guix-home-page-url) - (maintainers . ("bug-guix@gnu.org"))))) - (define (->job test) - (let ((name (string->symbol - (string-append "test." (system-test-name test) - "." system)))) - (cons name (test->thunk test)))) + (parameterize ((current-guix-package + (channel-source->package source #:commit commit))) + (let ((name (string-append "test." (system-test-name test) + "." system)) + (drv (run-with-store store + (mbegin %store-monad + (set-current-system system) + (set-grafting #f) + (set-guile-for-build (default-guile)) + (system-test-value test))))) + + ;; Those tests are extremely expensive in I/O operations and storage + ;; size, use the "period" attribute to run them with a period of at + ;; least 48 hours. + (derivation->job name drv + #:period (hours 24))))) (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a ;; channel instance makes tests that rely on 'current-guix' less ;; expensive. It also makes sure we get a valid Guix package when this ;; code is not running from a checkout. - (parameterize ((current-guix-package - (channel-source->package source #:commit commit))) - (map ->job (all-system-tests))) + (map ->job (all-system-tests)) '())) (define (tarball-jobs store system) - "Return Hydra jobs to build the self-contained Guix binary tarball." - (define (->alist drv) - `((derivation . ,(derivation-file-name drv)) - (log . ,(log-file store (derivation-file-name drv))) - (outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (nix-name . ,(derivation-name drv)) - (system . ,(derivation-system drv)) - (description . "Stand-alone binary Guix tarball") - (long-description . "This is a tarball containing binaries of Guix and -all its dependencies, and ready to be installed on \"foreign\" distributions.") - (license . ,(license-name gpl3+)) - (home-page . ,%guix-home-page-url) - (maintainers . ("bug-guix@gnu.org")) - (period . ,(hours 24)))) - + "Return jobs to build the self-contained Guix binary tarball." (define (->job name drv) - (let ((name (symbol-append name (string->symbol ".") - (string->symbol system)))) - `(,name . ,(lambda () - (parameterize ((%graft? #f)) - (->alist drv)))))) + (let ((name (string-append name "." system))) + (parameterize ((%graft? #f)) + (derivation->job name drv + #:period (hours 24))))) ;; XXX: Add a job for the stable Guix? - (list (->job 'binary-tarball - (run-with-store store - (mbegin %store-monad - (set-guile-for-build (default-guile)) - (>>= (profile-derivation (packages->manifest (list guix))) - (lambda (profile) - (self-contained-tarball "guix-binary" profile - #:localstatedir? #t - #:compressor - (lookup-compressor "xz"))))) - #:system system)))) + (list + (->job "binary-tarball" + (run-with-store store + (mbegin %store-monad + (set-guile-for-build (default-guile)) + (>>= (profile-derivation (packages->manifest (list guix))) + (lambda (profile) + (self-contained-tarball "guix-binary" profile + #:localstatedir? #t + #:compressor + (lookup-compressor "xz"))))) + #:system system)))) (define job-name ;; Return the name of a package's job. - (compose string->symbol package-name)) + package-name) (define package->job (let ((base-packages (delete-duplicates (append-map (match-lambda - ((_ package _ ...) - (match (package-transitive-inputs package) - (((_ inputs _ ...) ...) - inputs)))) + ((_ package _ ...) + (match (package-transitive-inputs package) + (((_ inputs _ ...) ...) + inputs)))) (%final-inputs))))) (lambda (store package system) "Return a job for PACKAGE on SYSTEM, or #f if this combination is not valid." (cond ((member package base-packages) - (package-job store (symbol-append 'base. (job-name package)) + (package-job store (string-append "base." (job-name package)) package system)) ((supported-package? package system) (let ((drv (package-derivation store package system @@ -461,14 +420,19 @@ valid." packages))) #:select? (const #t))) ;include hidden packages -(define (arguments->manifests arguments) +(define (arguments->manifests arguments channels) "Return the list of manifests extracted from ARGUMENTS." + (define (channel-name->checkout name) + (let ((channel (find (lambda (channel) + (eq? (channel-name channel) name)) + channels))) + (channel-url channel))) + (map (match-lambda - ((input-name . relative-path) - (let* ((checkout (assq-ref arguments (string->symbol input-name))) - (base (assq-ref checkout 'file-name))) - (in-vicinity base relative-path)))) - (assq-ref arguments 'manifests))) + ((name . path) + (let ((checkout (channel-name->checkout name))) + (in-vicinity checkout path)))) + arguments)) (define (manifests->packages store manifests) "Return the list of packages found in MANIFESTS." @@ -484,100 +448,94 @@ valid." load-manifest) manifests)))) -(define (find-current-checkout arguments) - "Find the first checkout of ARGUMENTS that provided the current file. -Return #f if no such checkout is found." - (let ((current-root - (canonicalize-path - (string-append (dirname (current-filename)) "/..")))) - (find (lambda (argument) - (and=> (assq-ref argument 'file-name) - (lambda (name) - (string=? name current-root)))) arguments))) - ;;; -;;; Hydra entry point. +;;; Cuirass entry point. ;;; -(define (hydra-jobs store arguments) - "Return Hydra jobs." +(define (cuirass-jobs store arguments) + "Register Cuirass jobs." (define subset - (match (assoc-ref arguments 'subset) - ("core" 'core) ; only build core packages - ("hello" 'hello) ; only build hello - (((? string?) (? string?) ...) 'list) ; only build selected list of packages - ("manifests" 'manifests) ; only build packages in the list of manifests - (_ 'all))) ; build everything + (assoc-ref arguments 'subset)) (define systems (match (assoc-ref arguments 'systems) - (#f %hydra-supported-systems) + (#f %cuirass-supported-systems) ((lst ...) lst) ((? string? str) (call-with-input-string str read)))) - (define checkout - (or (find-current-checkout arguments) - (assq-ref arguments 'superior-guix-checkout))) + (define channels + (let ((channels (assq-ref arguments 'channels))) + (map sexp->channel channels))) + + (define guix + (find guix-channel? channels)) (define commit - (assq-ref checkout 'revision)) + (channel-commit guix)) (define source - (assq-ref checkout 'file-name)) + (channel-url guix)) ;; Turn off grafts. Grafting is meant to happen on the user's machines. (parameterize ((%graft? #f)) ;; Return one job for each package, except bootstrap packages. - (append-map (lambda (system) - (format (current-error-port) - "evaluating for '~a' (heap size: ~a MiB)...~%" - system - (round - (/ (assoc-ref (gc-stats) 'heap-size) - (expt 2. 20)))) - (invalidate-derivation-caches!) - (case subset - ((all) - ;; Build everything, including replacements. - (let ((all (all-packages)) - (job (lambda (package) - (package->job store package - system)))) - (append (filter-map job all) - (image-jobs store system) - (system-test-jobs store system - #:source source - #:commit commit) - (tarball-jobs store system) - (cross-jobs store system)))) - ((core) - ;; Build core packages only. - (append (map (lambda (package) - (package-job store (job-name package) - package system)) - %core-packages) - (cross-jobs store system))) - ((hello) - ;; Build hello package only. - (let ((hello (specification->package "hello"))) - (list (package-job store (job-name hello) hello system)))) - ((list) - ;; Build selected list of packages only. - (let* ((names (assoc-ref arguments 'subset)) - (packages (map specification->package names))) - (map (lambda (package) - (package-job store (job-name package) - package system)) - packages))) - ((manifests) - ;; Build packages in the list of manifests. - (let* ((manifests (arguments->manifests arguments)) - (packages (manifests->packages store manifests))) - (map (lambda (package) - (package-job store (job-name package) - package system)) - packages))) - (else - (error "unknown subset" subset)))) - systems))) + (append-map + (lambda (system) + (format (current-error-port) + "evaluating for '~a' (heap size: ~a MiB)...~%" + system + (round + (/ (assoc-ref (gc-stats) 'heap-size) + (expt 2. 20)))) + (invalidate-derivation-caches!) + (match subset + ('all + ;; Build everything, including replacements. + (let ((all (all-packages)) + (job (lambda (package) + (package->job store package system)))) + (append + (filter-map job all) + (image-jobs store system) + (system-test-jobs store system + #:source source + #:commit commit) + (tarball-jobs store system) + (cross-jobs store system)))) + ('core + ;; Build core packages only. + (append + (map (lambda (package) + (package-job store (job-name package) + package system)) + %core-packages) + (cross-jobs store system))) + ('guix + ;; Build Guix modules only. + (guix-jobs store systems + #:source source + #:commit commit)) + ('hello + ;; Build hello package only. + (let ((hello (specification->package "hello"))) + (list (package-job store (job-name hello) + hello system)))) + (('packages . rest) + ;; Build selected list of packages only. + (let ((packages (map specification->package rest))) + (map (lambda (package) + (package-job store (job-name package) + package system)) + packages))) + (('manifests . rest) + ;; Build packages in the list of manifests. + (let* ((manifests (arguments->manifests rest channels)) + (packages (manifests->packages store manifests))) + (map (lambda (package) + (package-job store (job-name package) + package system)) + packages))) + (else + (error "unknown subset" subset)))) + systems))) diff --git a/guix/packages.scm b/guix/packages.scm index eae8fcbb6e..a057a88c63 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -131,7 +131,7 @@ %supported-systems %hurd-systems - %hydra-supported-systems + %cuirass-supported-systems supported-package? &package-error @@ -351,7 +351,7 @@ name of its URI." ;; The GNU/Hurd systems for which support is being developed. '("i586-gnu" "i686-gnu")) -(define %hydra-supported-systems +(define %cuirass-supported-systems ;; This is the list of system types for which build machines are available. ;; ;; XXX: MIPS is unavailable in CI: -- cgit 1.4.1 From 6c883d0f1deacff4fc227a4f925414a3733efc6e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 09:05:02 +0100 Subject: services: cuirass: Remove simple cuirass configuration. The Cuirass configuration has been simplified so that this is no longer needed. * gnu/services/cuirass.scm (, , simple-cuirass-configuration->specs): Remove them. --- gnu/services/cuirass.scm | 82 +----------------------------------------------- 1 file changed, 1 insertion(+), 81 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index dae895107e..317d877459 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -50,17 +50,7 @@ cuirass-remote-worker-configuration cuirass-remote-worker-configuration? - cuirass-remote-worker-service-type - - - build-manifest - build-manifest? - - - simple-cuirass-configuration - simple-cuirass-configuration? - - simple-cuirass-configuration->specs)) + cuirass-remote-worker-service-type)) ;;;; Commentary: ;;; @@ -395,73 +385,3 @@ CONFIG." cuirass-remote-worker-shepherd-service))) (description "Run the Cuirass remote build worker service."))) - -(define-record-type* - build-manifest make-build-manifest - build-manifest? - (channel-name build-manifest-channel-name) ;symbol - (manifest build-manifest-manifest)) ;string - -(define-record-type* - simple-cuirass-configuration make-simple-cuirass-configuration - simple-cuirass-configuration? - (build simple-cuirass-configuration-build - (default 'all)) ;symbol or list of - (channels simple-cuirass-configuration-channels - (default %default-channels)) ;list of - (non-package-channels simple-cuirass-configuration-package-channels - (default '())) ;list of channels name - (systems simple-cuirass-configuration-systems - (default (list (%current-system))))) ;list of strings - -(define* (simple-cuirass-configuration->specs config) - (define (format-name name) - (if (string? name) - name - (symbol->string name))) - - (define (format-manifests build-manifests) - (map (lambda (build-manifest) - (match-record build-manifest - (channel-name manifest) - (cons (format-name channel-name) manifest))) - build-manifests)) - - (define (channel->input channel) - (let ((name (channel-name channel)) - (url (channel-url channel)) - (branch (channel-branch channel))) - `((#:name . ,(format-name name)) - (#:url . ,url) - (#:load-path . ".") - (#:branch . ,branch) - (#:no-compile? #t)))) - - (define (package-path channels non-package-channels) - (filter-map (lambda (channel) - (let ((name (channel-name channel))) - (and (not (member name non-package-channels)) - (not (eq? name 'guix)) - (format-name name)))) - channels)) - - (define (config->spec config) - (match-record config - (build channels non-package-channels systems) - `((#:name . "simple-config") - (#:load-path-inputs . ("guix")) - (#:package-path-inputs . ,(package-path channels - non-package-channels)) - (#:proc-input . "guix") - (#:proc-file . "build-aux/cuirass/gnu-system.scm") - (#:proc . cuirass-jobs) - (#:proc-args . ((systems . ,systems) - ,@(if (eq? build 'all) - '() - `((subset . "manifests") - (manifests . ,(format-manifests build)))))) - (#:inputs . ,(map channel->input channels)) - (#:build-outputs . ()) - (#:priority . 1)))) - - #~(list '#$(config->spec config))) -- cgit 1.4.1 From 207ef1a2b4f6ffd4781d1f5aab8e5984bc515f4c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 09:37:11 +0100 Subject: tests: cuirass: Remove cuirass simple test. This is a follow-up of 6c883d0f1deacff4fc227a4f925414a3733efc6e. * gnu/tests/cuirass.scm (simple-cuirass-service, %cuirass-simple-test): Remove them. --- gnu/tests/cuirass.scm | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm index 04a7a71dcf..ea5db34515 100644 --- a/gnu/tests/cuirass.scm +++ b/gnu/tests/cuirass.scm @@ -35,8 +35,7 @@ #:use-module (guix gexp) #:use-module (guix store) #:export (%cuirass-test - %cuirass-remote-test - %cuirass-simple-test)) + %cuirass-remote-test)) (define %derivation-file (scheme-file @@ -298,33 +297,3 @@ (name "cuirass-remote") (description "Connect to a Cuirass server with remote build.") (value (run-cuirass-test name os))))) - -(define simple-cuirass-service - (service cuirass-service-type - (cuirass-configuration - (specifications - (simple-cuirass-configuration->specs - (simple-cuirass-configuration - (build 'all) - (channels - (list (channel - (name 'guix) - (url "file:///tmp/cuirass-main/"))))))) - (host "0.0.0.0") - (use-substitutes? #t)))) - -(define %cuirass-simple-test - (let ((os (operating-system - (inherit %simple-os) - (services - (append - (list cow-service - (service dhcp-client-service-type) - git-service - simple-cuirass-service) - (operating-system-user-services %simple-os)))))) - (system-test - (name "cuirass-simple") - (description "Connect to a simple Cuirass server.") - (value - (run-cuirass-test name os))))) -- cgit 1.4.1 From b66fc0a64bbcf4c198c117f0eca1ee95661b5b4a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 09:50:14 +0100 Subject: gnu: bsdiff: Fix CVE-2014-9862. * gnu/packages/patches/bsdiff-CVE-2014-9862.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (bsdiff): Apply it. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 3 ++- gnu/packages/patches/bsdiff-CVE-2014-9862.patch | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/bsdiff-CVE-2014-9862.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index bcee06a97a..dcee722e79 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -840,6 +840,7 @@ dist_patch_DATA = \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ %D%/packages/patches/bc-fix-cross-compilation.patch \ %D%/packages/patches/bear-disable-preinstall-tests.patch \ + %D%/packages/patches/bsdiff-CVE-2014-9862.patch \ %D%/packages/patches/bsd-games-2.17-64bit.patch \ %D%/packages/patches/bsd-games-add-configure-config.patch \ %D%/packages/patches/bsd-games-add-wrapper.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 32fd358ac8..fbe3b06347 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -963,7 +963,8 @@ tarballs.") (uri (string-append home-page name "-" version ".tar.gz")) (sha256 (base32 - "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq")))) + "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq")) + (patches (search-patches "bsdiff-CVE-2014-9862.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "INSTALL=install" diff --git a/gnu/packages/patches/bsdiff-CVE-2014-9862.patch b/gnu/packages/patches/bsdiff-CVE-2014-9862.patch new file mode 100644 index 0000000000..7aab818090 --- /dev/null +++ b/gnu/packages/patches/bsdiff-CVE-2014-9862.patch @@ -0,0 +1,15 @@ +diff --git a/bspatch.c b/bspatch.c +index 8d95633..ab77722 100644 +--- a/bspatch.c ++++ b/bspatch.c + +@@ -187,6 +187,10 @@ + }; + + /* Sanity-check */ ++ if ((ctrl[0] < 0) || (ctrl[1] < 0)) ++ errx(1,"Corrupt patch\n"); ++ ++ /* Sanity-check */ + if(newpos+ctrl[0]>newsize) + errx(1,"Corrupt patch\n"); -- cgit 1.4.1 From f4fd7bda51f26c3ae00c4c8681c344074739df5c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 01:25:33 -0500 Subject: gnu: python-nbxmpp: Update to 2.0.2. * gnu/packages/messaging.scm (python-nbxmpp) [version]: Update to 2.0.2. Signed-off-by: Efraim Flashner --- 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 00e68e48a7..33a0d4fa56 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -932,14 +932,14 @@ simultaneously and therefore appear under the same nickname on IRC.") (define-public python-nbxmpp (package (name "python-nbxmpp") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (pypi-uri "nbxmpp" version)) (sha256 - (base32 "0184nklbpzriq081lghsfavw9m8jr5kc45qqy4v4rdnxn64j7njc")))) + (base32 "1482fva70i01w60fk70c0fhqmqgzi1fb4xflllz2v6c8mdqkd1m3")))) (build-system python-build-system) (native-inputs `(("glib:bin" ,glib "bin"))) -- cgit 1.4.1 From e212f32dcefee7522084f7af845be4a9a662e4c7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 10 Mar 2021 09:45:52 +0100 Subject: gnu: Add aldo. * gnu/packages/radio.scm (aldo): New variable. --- gnu/packages/radio.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 6a48e8746f..e7f3b33cc2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages video) + #:use-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) @@ -1240,3 +1241,30 @@ It can perform as: @item APRStt gateway @end itemize\n") (license license:gpl2+))) + +(define-public aldo + (package + (name "aldo") + (version "0.7.7") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://savannah/aldo/aldo-" version ".tar.bz2")) + (sha256 + (base32 "14lzgldqzbbzydsy1cai3wln3hpyj1yhj8ji3wygyzr616fq9f7i")))) + (build-system gnu-build-system) + (inputs + `(("ao" ,ao))) + (home-page "https://www.nongnu.org/aldo/") + (synopsis "Morse code tutor") + (description + "Aldo is a morse code learning tool providing four type of training +methods: + +@itemize +@item Classic exercice, +@item Koch method, +@item Read from file, +@item Callsign exercice. +@end itemize\n") + (license license:gpl3+))) -- cgit 1.4.1 From b8e71b390d797621f4c6e9b179c38d89bbcfdb1b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 10 Mar 2021 10:15:30 +0100 Subject: gnu: Add unixcw. * gnu/packages/radio.scm (unixcw): New variable. --- gnu/packages/radio.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e7f3b33cc2..b7a546eb53 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1268,3 +1268,46 @@ methods: @item Callsign exercice. @end itemize\n") (license license:gpl3+))) + +(define-public unixcw + (package + (name "unixcw") + (version "3.6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/unixcw/unixcw-" + version ".tar.gz")) + (sha256 + (base32 "15wriwv91583kmmyijbzam3dpclzmg4qjyfzjv5f75x9b0gqabxm")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("ncurses" ,ncurses) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase))) + (arguments + `(#:configure-flags '("--disable-static") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("configure" + "src/config.h.in" + "src/cwcp/Makefile.am" + "src/cwcp/Makefile.in") + (("-lcurses") + "-lncurses")) + (substitute* "src/libcw/libcw_pa.c" + (("libpulse-simple.so" all) + (string-append (assoc-ref inputs "pulseaudio") + "/lib/" all)))))))) + (home-page "http://unixcw.sourceforge.net/") + (synopsis "Morse code library and programs") + (description + "@code{unixcw} is a project providing the libcw library and a set of +programs using the library: cw, cwgen, cwcp and xcwcp. The programs are +intended for people who want to learn receiving and sending morse code.") + (license license:gpl2+))) -- cgit 1.4.1 From f7fdafeff52cb900d76a1de855a5a238aacedd7d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 10:55:04 +0100 Subject: gnu: zziplib: Update to 0.13.72 [security fixes]. Non-exhaustively, fixes CVE-2018-16548 and CVE-2018-17828. * gnu/packages/compression.scm (zziplib/fixed): New variable. (zziplib)[replacement]: Graft. --- gnu/packages/compression.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index fbe3b06347..571088dcbc 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -87,7 +87,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xml) #:use-module (ice-9 match) - #:use-module ((srfi srfi-1) #:select (last))) + #:use-module (srfi srfi-1)) (define-public zlib (package @@ -1728,6 +1728,7 @@ timestamps in the file header with a fixed time (1 January 2008). (sha256 (base32 "0fbk9k7ryas2wh2ykwkvm1pbi40i88rfvc3dydh9xyd7w2jcki92")))) + (replacement zziplib/fixed) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -1756,6 +1757,27 @@ timestamps in the file header with a fixed time (1 January 2008). ;; files carry the Zlib license; see "docs/copying.html" for details. (license (list license:lgpl2.0+ license:mpl1.1)))) +(define-public zziplib/fixed + (package + (inherit zziplib) + (name "zziplib") + (version "0.13.72") + (home-page "https://github.com/gdraheim/zziplib") + (source (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i6bpa2b13z19alm6ig80364dnin1w28cvif18k6wkkb0w3dzp8y")))) + (arguments `()) + (native-inputs + `(("python" ,python) + ,@(alist-delete "python" + (package-native-inputs zziplib)))) + (build-system cmake-build-system))) + (define-public libzip (package (name "libzip") -- cgit 1.4.1 From 47ce29666b0b66de906dcfebf24776f3e06f1572 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 11:17:53 +0100 Subject: gnu: botan: Update to 2.17.3 [fixes CVE-2021-24115]. * gnu/packages/crypto.scm (botan): Update to 2.17.3. [arguments]: Add 'library-path-for-tests phase to fix 'check phase by setting LD_LIBRARY_PATH to intermediate build directory so tests can find libbotan. --- gnu/packages/crypto.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 5c8e4d6b22..0000e7fbf2 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -887,14 +887,14 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R (define-public botan (package (name "botan") - (version "2.12.1") + (version "2.17.3") (source (origin (method url-fetch) (uri (string-append "https://botan.randombit.net/releases/" "Botan-" version ".tar.xz")) (sha256 (base32 - "1ada3ga7b0z4m0vjmxlvfi4nsic2l8kjcy85jwss3z2i58a5y0vy")))) + "121vn1aryk36cpks70kk4c4cfic5g0qs82bf92xap9258ijkn4kr")))) (build-system gnu-build-system) (arguments '(#:phases @@ -916,6 +916,8 @@ SHA256, SHA512, SHA3, AICH, ED2K, Tiger, DC++ TTH, BitTorrent BTIH, GOST R ;; Recommended by upstream "--with-zlib" "--with-bzip2" "--with-sqlite3")))) + (add-before 'check 'library-path-for-tests + (lambda _ (setenv "LD_LIBRARY_PATH" (getcwd)))) (replace 'check (lambda _ (invoke "./botan-test")))))) (native-inputs -- cgit 1.4.1 From e6cd049e2f02811d1a6f264e4bc4e4143a272629 Mon Sep 17 00:00:00 2001 From: Simon South Date: Tue, 9 Mar 2021 09:03:43 -0500 Subject: gnu: sdcc: Update to 4.1.0. * gnu/packages/embedded.scm (sdcc): Update to 4.1.0. * gnu/packages/patches/sdcc-disable-non-free-code.patch: Update to match new version. Signed-off-by: Efraim Flashner --- gnu/packages/embedded.scm | 4 +- .../patches/sdcc-disable-non-free-code.patch | 257 ++++++++++----------- 2 files changed, 130 insertions(+), 131 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 51ee244f3c..413760ab72 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1469,7 +1469,7 @@ and Zilog Z80 families, plus many of their variants.") (define-public sdcc (package (name "sdcc") - (version "4.0.0") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append @@ -1477,7 +1477,7 @@ and Zilog Z80 families, plus many of their variants.") "/" version "/sdcc-src-" version ".tar.bz2")) (sha256 (base32 - "042fxw5mnsfhpc0z9lxfsw88kdkm32pwrxacp88kj2n2dy0814a8")) + "0gskzli17ghnn5qllvn4d56qf9bvvclqjh63nnj63p52smvggvc1")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/sdcc-disable-non-free-code.patch b/gnu/packages/patches/sdcc-disable-non-free-code.patch index ad9a3e7a9e..1c823c3c18 100644 --- a/gnu/packages/patches/sdcc-disable-non-free-code.patch +++ b/gnu/packages/patches/sdcc-disable-non-free-code.patch @@ -15,10 +15,10 @@ remove instructions that encourage the use of SDCC with non-free software. diff --git a/Makefile.common.in b/Makefile.common.in -index 412fd5a..81bbd61 100644 +index 926b761..0362fd5 100644 --- a/Makefile.common.in +++ b/Makefile.common.in -@@ -69,7 +69,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@ +@@ -71,7 +71,6 @@ OPT_DISABLE_PACKIHX = @OPT_DISABLE_PACKIHX@ OPT_DISABLE_SDBINUTILS = @OPT_DISABLE_SDBINUTILS@ OPT_DISABLE_SDCPP = @OPT_DISABLE_SDCPP@ OPT_DISABLE_UCSIM = @OPT_DISABLE_UCSIM@ @@ -27,7 +27,7 @@ index 412fd5a..81bbd61 100644 SLIB = $(top_builddir)/support/util diff --git a/Makefile.in b/Makefile.in -index f3b028d..cfdf06d 100644 +index 5485074..3071472 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,9 +100,6 @@ endif @@ -73,7 +73,7 @@ index f3b028d..cfdf06d 100644 # doc depends on latex and latex2html diff --git a/configure b/configure -index 43ccb6f..d345f54 100755 +index 4c2226b..b8a9251 100755 --- a/configure +++ b/configure @@ -632,7 +632,6 @@ LATEX @@ -84,7 +84,7 @@ index 43ccb6f..d345f54 100755 OPT_DISABLE_SDBINUTILS OPT_DISABLE_SDCDB OPT_DISABLE_SDCPP -@@ -659,10 +658,7 @@ OPT_DISABLE_R2K +@@ -661,10 +660,7 @@ OPT_DISABLE_R2K OPT_DISABLE_Z180 OPT_DISABLE_Z80 OPT_DISABLE_MCS51 @@ -95,7 +95,7 @@ index 43ccb6f..d345f54 100755 include_dir_suffix inclib_dir_suffix LIB_TYPE -@@ -780,7 +776,6 @@ enable_packihx +@@ -785,7 +781,6 @@ enable_packihx enable_sdcpp enable_sdcdb enable_sdbinutils @@ -103,7 +103,7 @@ index 43ccb6f..d345f54 100755 enable_doc enable_libgc ' -@@ -801,10 +796,7 @@ sdccconf_h_dir_separator +@@ -806,10 +801,7 @@ sdccconf_h_dir_separator LIB_TYPE inclib_dir_suffix include_dir_suffix @@ -114,7 +114,7 @@ index 43ccb6f..d345f54 100755 docdir' ac_subdirs_all='support/cpp support/packihx -@@ -812,9 +804,7 @@ sim/ucsim +@@ -817,9 +809,7 @@ sim/ucsim debugger/mcs51 support/sdbinutils device/lib/pic14 @@ -125,7 +125,7 @@ index 43ccb6f..d345f54 100755 # Initialize some variables set by options. ac_init_help= -@@ -1455,7 +1445,6 @@ Optional Features: +@@ -1473,7 +1463,6 @@ Optional Features: --disable-sdcpp Disables building sdcpp --disable-sdcdb Disables building sdcdb --disable-sdbinutils Disables configuring and building of sdbinutils @@ -133,7 +133,7 @@ index 43ccb6f..d345f54 100755 --enable-doc Enables building the documentation --enable-libgc Use the Bohem memory allocator. Lower runtime footprint. -@@ -1484,16 +1473,8 @@ Some influential environment variables: +@@ -1502,16 +1491,8 @@ Some influential environment variables: appended to datadir to define SDCC's include/lib directory include_dir_suffix appended to datadir to define SDCC's include directory @@ -150,7 +150,7 @@ index 43ccb6f..d345f54 100755 docdir documentation installation directory Use these variables to override the choices made by `configure' or to help -@@ -7134,19 +7115,6 @@ if test "${include_dir_suffix}" = ""; then +@@ -7156,19 +7137,6 @@ if test "${include_dir_suffix}" = ""; then include_dir_suffix="${inclib_dir_suffix}/include" fi @@ -170,7 +170,7 @@ index 43ccb6f..d345f54 100755 # lib_dir_suffix: # *nix default: "sdcc/lib" -@@ -7154,13 +7122,6 @@ if test "${lib_dir_suffix}" = ""; then +@@ -7176,13 +7144,6 @@ if test "${lib_dir_suffix}" = ""; then lib_dir_suffix="${inclib_dir_suffix}/lib" fi @@ -184,7 +184,7 @@ index 43ccb6f..d345f54 100755 # docdir: # *nix default: "${datadir}/sdcc/doc" -@@ -7327,24 +7288,6 @@ cat >>confdefs.h <<_ACEOF +@@ -7349,24 +7310,6 @@ cat >>confdefs.h <<_ACEOF #define INCLUDE_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}" _ACEOF @@ -209,7 +209,7 @@ index 43ccb6f..d345f54 100755 norm_lib_dir_suffix=${lib_dir_suffix} case ":$norm_lib_dir_suffix:" in -@@ -7364,24 +7307,6 @@ cat >>confdefs.h <<_ACEOF +@@ -7386,24 +7329,6 @@ cat >>confdefs.h <<_ACEOF #define LIB_DIR_SUFFIX DIR_SEPARATOR_STRING "${norm_lib_dir_suffix}" _ACEOF @@ -234,7 +234,7 @@ index 43ccb6f..d345f54 100755 # relative paths for _lcl_i in expanded_bindir:expanded_datadir:bin2data_dir; do -@@ -8439,28 +8364,6 @@ _ACEOF +@@ -8513,28 +8438,6 @@ _ACEOF @@ -263,7 +263,7 @@ index 43ccb6f..d345f54 100755 # Check whether --enable-doc was given. if test "${enable_doc+set}" = set; then : -@@ -8855,20 +8758,12 @@ if test $OPT_DISABLE_PIC14 = 0; then +@@ -8929,20 +8832,12 @@ if test $OPT_DISABLE_PIC14 = 0; then test $OPT_DISABLE_DEVICE_LIB = 0 && subdirs="$subdirs device/lib/pic14" @@ -283,8 +283,8 @@ index 43ccb6f..d345f54 100755 - fi - if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0; then -@@ -8945,15 +8840,9 @@ fi + if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0; then +@@ -9019,15 +8914,9 @@ fi test $OPT_DISABLE_DEVICE_LIB = 0 && ac_config_files="$ac_config_files device/lib/Makefile" @@ -300,7 +300,7 @@ index 43ccb6f..d345f54 100755 cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -@@ -9692,7 +9581,6 @@ do +@@ -9768,7 +9657,6 @@ do "device/lib/pdk15-stack-auto/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/pdk15-stack-auto/Makefile" ;; "sdas/aspdk16/Makefile") CONFIG_FILES="$CONFIG_FILES sdas/aspdk16/Makefile" ;; "device/lib/Makefile") CONFIG_FILES="$CONFIG_FILES device/lib/Makefile" ;; @@ -308,7 +308,7 @@ index 43ccb6f..d345f54 100755 "main.mk") CONFIG_FILES="$CONFIG_FILES main.mk:main_in.mk" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "device/include/Makefile") CONFIG_FILES="$CONFIG_FILES device/include/Makefile" ;; -@@ -9704,7 +9592,6 @@ do +@@ -9780,7 +9668,6 @@ do "support/regression/ports/host/spec.mk") CONFIG_FILES="$CONFIG_FILES support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "Makefile.common") CONFIG_FILES="$CONFIG_FILES Makefile.common:Makefile.common.in" ;; @@ -316,7 +316,7 @@ index 43ccb6f..d345f54 100755 *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac -@@ -10513,54 +10400,6 @@ esac +@@ -10589,54 +10476,6 @@ esac incPath3=`echo "$incPath3" | sed 's,\\\\\\\\,\\\\,g'` @@ -371,7 +371,7 @@ index 43ccb6f..d345f54 100755 libPath1=`echo "/${prefix2data_dir}/${norm_lib_dir_suffix}" | sed 's,/\./,/,g'` case ":$libPath1:" in -@@ -10610,54 +10449,6 @@ esac +@@ -10686,54 +10525,6 @@ esac libPath3=`echo "$libPath3" | sed 's,\\\\\\\\,\\\\,g'` @@ -426,7 +426,7 @@ index 43ccb6f..d345f54 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: result: sdcc ${VERSION} is now configured for -@@ -10694,7 +10485,6 @@ sdcc ${VERSION} is now configured for +@@ -10772,7 +10563,6 @@ sdcc ${VERSION} is now configured for pdk15 ${enable_pdk15_port} pdk16 ${enable_pdk16_port} @@ -434,7 +434,7 @@ index 43ccb6f..d345f54 100755 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -10709,9 +10499,6 @@ sdcc ${VERSION} is now configured for +@@ -10787,9 +10577,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -444,7 +444,7 @@ index 43ccb6f..d345f54 100755 documentation: ${docdir} prefix: ${prefix} -@@ -10723,15 +10510,9 @@ sdcc ${VERSION} is now configured for +@@ -10801,15 +10588,9 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[0])${incPath2} ${incPath3} @@ -460,7 +460,7 @@ index 43ccb6f..d345f54 100755 " >&5 $as_echo " sdcc ${VERSION} is now configured for -@@ -10769,7 +10550,6 @@ sdcc ${VERSION} is now configured for +@@ -10849,7 +10630,6 @@ sdcc ${VERSION} is now configured for pdk15 ${enable_pdk15_port} pdk16 ${enable_pdk16_port} @@ -468,7 +468,7 @@ index 43ccb6f..d345f54 100755 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -10784,9 +10564,6 @@ sdcc ${VERSION} is now configured for +@@ -10864,9 +10644,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -478,7 +478,7 @@ index 43ccb6f..d345f54 100755 documentation: ${docdir} prefix: ${prefix} -@@ -10798,14 +10575,8 @@ sdcc ${VERSION} is now configured for +@@ -10878,14 +10655,8 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[0])${incPath2} ${incPath3} @@ -494,10 +494,10 @@ index 43ccb6f..d345f54 100755 " >&6; } # End of configure/configure.in diff --git a/configure.ac b/configure.ac -index 2185793..76ab155 100644 +index 455fee1..48e0a20 100644 --- a/configure.ac +++ b/configure.ac -@@ -544,19 +544,6 @@ if test "${include_dir_suffix}" = ""; then +@@ -548,19 +548,6 @@ if test "${include_dir_suffix}" = ""; then include_dir_suffix="${inclib_dir_suffix}/include" fi @@ -517,7 +517,7 @@ index 2185793..76ab155 100644 # lib_dir_suffix: # *nix default: "sdcc/lib" AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory]) -@@ -564,13 +551,6 @@ if test "${lib_dir_suffix}" = ""; then +@@ -568,13 +555,6 @@ if test "${lib_dir_suffix}" = ""; then lib_dir_suffix="${inclib_dir_suffix}/lib" fi @@ -531,7 +531,7 @@ index 2185793..76ab155 100644 # docdir: # *nix default: "${datadir}/sdcc/doc" AC_ARG_VAR([docdir], [documentation installation directory]) -@@ -611,19 +591,11 @@ norm_inc_dir_suffix=${include_dir_suffix} +@@ -615,19 +595,11 @@ norm_inc_dir_suffix=${include_dir_suffix} adl_NORMALIZE_PATH([norm_inc_dir_suffix], [$sdccconf_h_dir_separator]) AC_DEFINE_UNQUOTED(INCLUDE_DIR_SUFFIX, DIR_SEPARATOR_STRING "${norm_inc_dir_suffix}", [XXX]) @@ -551,7 +551,7 @@ index 2185793..76ab155 100644 # relative paths adl_COMPUTE_RELATIVE_PATHS([expanded_bindir:expanded_datadir:bin2data_dir]) -@@ -797,7 +769,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx]) +@@ -803,7 +775,6 @@ AC_DO_DISABLER(packihx, PACKIHX, [Disables building packihx]) AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp]) AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb]) AC_DO_DISABLER(sdbinutils, SDBINUTILS, [Disables configuring and building of sdbinutils]) @@ -559,7 +559,7 @@ index 2185793..76ab155 100644 AC_DO_ENABLER(doc, DOC, [Enables building the documentation]) AC_CHECK_PROG([LYX], [lyx], [lyx], [:]) -@@ -868,16 +839,10 @@ if test $OPT_DISABLE_PIC14 = 0; then +@@ -874,16 +845,10 @@ if test $OPT_DISABLE_PIC14 = 0; then AC_CONFIG_FILES(src/pic14/Makefile) test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/lib/pic14) fi @@ -574,9 +574,9 @@ index 2185793..76ab155 100644 - test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_SUBDIRS(device/non-free/lib/pic16) -fi - if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0; then + if test $OPT_DISABLE_Z80 = 0 || test $OPT_DISABLE_Z180 = 0 || test $OPT_DISABLE_R2K = 0 || test $OPT_DISABLE_R2KA = 0 || test $OPT_DISABLE_R3KA = 0 || test $OPT_DISABLE_GBZ80 = 0 || test $OPT_DISABLE_TLCS90 = 0 || test $OPT_DISABLE_EZ80_Z80 = 0 || test $OPT_DISABLE_Z80N = 0; then AC_CONFIG_FILES([src/z80/Makefile]) -@@ -939,7 +904,6 @@ fi +@@ -947,7 +912,6 @@ fi test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile]) @@ -584,7 +584,7 @@ index 2185793..76ab155 100644 AC_CONFIG_FILES([main.mk:main_in.mk src/Makefile -@@ -953,9 +917,6 @@ support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in +@@ -961,9 +925,6 @@ support/regression/ports/host/spec.mk:support/regression/ports/host/spec.mk.in Makefile Makefile.common:Makefile.common.in ]) @@ -594,7 +594,7 @@ index 2185793..76ab155 100644 AC_OUTPUT # I found no better place -@@ -973,16 +934,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [ +@@ -981,16 +942,10 @@ adl_NORMALIZE_PATH_MSG(/${prefix2bin_dir}, [binPath], [ adl_NORMALIZE_PATH_MSG(/${prefix2data_dir}/${norm_inc_dir_suffix}, [incPath1], [$dirch]) adl_NORMALIZE_PATH_MSG(/${bin2data_dir}/${norm_inc_dir_suffix}, [incPath2], [$dirch]) adl_NORMALIZE_PATH_MSG(${expanded_datadir}/${norm_inc_dir_suffix}, [incPath3], [$dirch]) @@ -611,7 +611,7 @@ index 2185793..76ab155 100644 AC_MSG_RESULT([ sdcc ${VERSION} is now configured for -@@ -1020,7 +975,6 @@ sdcc ${VERSION} is now configured for +@@ -1030,7 +985,6 @@ sdcc ${VERSION} is now configured for pdk15 ${enable_pdk15_port} pdk16 ${enable_pdk16_port} @@ -619,7 +619,7 @@ index 2185793..76ab155 100644 Disable packihx: ${OPT_DISABLE_PACKIHX} Disable ucsim: ${OPT_DISABLE_UCSIM} Disable device lib: ${OPT_DISABLE_DEVICE_LIB} -@@ -1035,9 +989,6 @@ sdcc ${VERSION} is now configured for +@@ -1045,9 +999,6 @@ sdcc ${VERSION} is now configured for include/library files: ${datadir}/${inclib_dir_suffix} include files: ${datadir}/${include_dir_suffix} library files: ${datadir}/${lib_dir_suffix} @@ -629,7 +629,7 @@ index 2185793..76ab155 100644 documentation: ${docdir} prefix: ${prefix} -@@ -1049,14 +1000,8 @@ sdcc ${VERSION} is now configured for +@@ -1059,14 +1010,8 @@ sdcc ${VERSION} is now configured for include files: ${incPath1} path(argv[[0]])${incPath2} ${incPath3} @@ -675,7 +675,7 @@ index 019fe0f..da3389d 100644 ############################################################ # Common actions diff --git a/device/lib/pic14/Makefile.in b/device/lib/pic14/Makefile.in -index 39b6cb0..ae3e37b 100644 +index 039c0cb..90510fd 100644 --- a/device/lib/pic14/Makefile.in +++ b/device/lib/pic14/Makefile.in @@ -335,13 +335,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -704,7 +704,7 @@ index 39b6cb0..ae3e37b 100644 # extensions generated by the build process CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb diff --git a/device/lib/pic14/libc/Makefile.in b/device/lib/pic14/libc/Makefile.in -index 0efeeb0..d4dd8e6 100644 +index 1283cbb..70e82d0 100644 --- a/device/lib/pic14/libc/Makefile.in +++ b/device/lib/pic14/libc/Makefile.in @@ -878,13 +878,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -733,7 +733,7 @@ index 0efeeb0..d4dd8e6 100644 # extensions generated by the build process CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb diff --git a/device/lib/pic14/libm/Makefile.in b/device/lib/pic14/libm/Makefile.in -index f0dc9ca..98ed2cf 100644 +index 409835d..e9fdef8 100644 --- a/device/lib/pic14/libm/Makefile.in +++ b/device/lib/pic14/libm/Makefile.in @@ -511,13 +511,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -762,7 +762,7 @@ index f0dc9ca..98ed2cf 100644 # extensions generated by the build process CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb diff --git a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in -index 098ec94..d1240ba 100644 +index c82f7ba..780fa77 100644 --- a/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in +++ b/device/lib/pic14/libsdcc/enhanced-no-xinst/Makefile.in @@ -518,13 +518,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -791,7 +791,7 @@ index 098ec94..d1240ba 100644 # extensions generated by the build process CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb diff --git a/device/lib/pic14/libsdcc/enhanced/Makefile.in b/device/lib/pic14/libsdcc/enhanced/Makefile.in -index d2dba9c..0857601 100644 +index 33b8299..f4e0398 100644 --- a/device/lib/pic14/libsdcc/enhanced/Makefile.in +++ b/device/lib/pic14/libsdcc/enhanced/Makefile.in @@ -518,13 +518,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -820,7 +820,7 @@ index d2dba9c..0857601 100644 # extensions generated by the build process CLEAN_EXTENSIONS = .asm .lst .sym .d .p .g .v .adb diff --git a/device/lib/pic14/libsdcc/regular/Makefile.in b/device/lib/pic14/libsdcc/regular/Makefile.in -index 3c9bccd..9430fb5 100644 +index 6586b7d..7010287 100644 --- a/device/lib/pic14/libsdcc/regular/Makefile.in +++ b/device/lib/pic14/libsdcc/regular/Makefile.in @@ -511,13 +511,12 @@ GENERIC_SRC_DIR_ABS = $(abspath $(GENERIC_SRC_DIR)) @@ -875,7 +875,7 @@ index 01ad950..62839b9 100644 clean-local: diff --git a/device/lib/pic16/Makefile.in b/device/lib/pic16/Makefile.in -index 15d2e1d..9664ad4 100644 +index e4e3abb..730066b 100644 --- a/device/lib/pic16/Makefile.in +++ b/device/lib/pic16/Makefile.in @@ -87,10 +87,7 @@ PRE_UNINSTALL = : @@ -915,7 +915,7 @@ index 15d2e1d..9664ad4 100644 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/device/lib/pic16/configure b/device/lib/pic16/configure -index c8f5b98..76f93a8 100755 +index ed8ad06..65baa93 100755 --- a/device/lib/pic16/configure +++ b/device/lib/pic16/configure @@ -3657,7 +3657,6 @@ fi @@ -942,7 +942,7 @@ index 3966c11..cdbffc7 100644 # Checks for header files. diff --git a/device/lib/pic16/debug/Makefile.in b/device/lib/pic16/debug/Makefile.in -index df593e3..8cb5137 100644 +index 8d5eb80..9dd8bb2 100644 --- a/device/lib/pic16/debug/Makefile.in +++ b/device/lib/pic16/debug/Makefile.in @@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -982,7 +982,7 @@ index df593e3..8cb5137 100644 .SUFFIXES: diff --git a/device/lib/pic16/libc/Makefile.in b/device/lib/pic16/libc/Makefile.in -index 85bec90..c0ea488 100644 +index 659db72..cbb73bf 100644 --- a/device/lib/pic16/libc/Makefile.in +++ b/device/lib/pic16/libc/Makefile.in @@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -1022,7 +1022,7 @@ index 85bec90..c0ea488 100644 .SUFFIXES: diff --git a/device/lib/pic16/libio/Makefile.in b/device/lib/pic16/libio/Makefile.in -index 06fff29..78fe388 100644 +index 128ffcc..b298c7c 100644 --- a/device/lib/pic16/libio/Makefile.in +++ b/device/lib/pic16/libio/Makefile.in @@ -481,10 +481,7 @@ POST_UNINSTALL = : @@ -1107,7 +1107,7 @@ index 211604e..e8896bf 100755 include \$(top_srcdir)/Makefile.common diff --git a/device/lib/pic16/libm/Makefile.in b/device/lib/pic16/libm/Makefile.in -index 6728a39..495459e 100644 +index af29662..05f1c24 100644 --- a/device/lib/pic16/libm/Makefile.in +++ b/device/lib/pic16/libm/Makefile.in @@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -1147,7 +1147,7 @@ index 6728a39..495459e 100644 .SUFFIXES: diff --git a/device/lib/pic16/libsdcc/Makefile.in b/device/lib/pic16/libsdcc/Makefile.in -index 331aea0..63565be 100644 +index d384631..01129e3 100644 --- a/device/lib/pic16/libsdcc/Makefile.in +++ b/device/lib/pic16/libsdcc/Makefile.in @@ -88,10 +88,7 @@ PRE_UNINSTALL = : @@ -1187,7 +1187,7 @@ index 331aea0..63565be 100644 .SUFFIXES: diff --git a/device/lib/pic16/startup/Makefile.in b/device/lib/pic16/startup/Makefile.in -index 2e59220..b213866 100644 +index 6169096..0172a25 100644 --- a/device/lib/pic16/startup/Makefile.in +++ b/device/lib/pic16/startup/Makefile.in @@ -89,10 +89,7 @@ PRE_UNINSTALL = : @@ -1227,7 +1227,7 @@ index 2e59220..b213866 100644 .SUFFIXES: diff --git a/doc/INSTALL.txt b/doc/INSTALL.txt -index 76a6f42..0f92463 100644 +index d630b99..8cd747f 100644 --- a/doc/INSTALL.txt +++ b/doc/INSTALL.txt @@ -18,9 +18,7 @@ To install: @@ -1279,7 +1279,7 @@ index 88f8c98..a36db81 100644 See: diff --git a/doc/sdccman.lyx b/doc/sdccman.lyx -index d18a509..b95bf61 100644 +index c8f8e73..e4afb0c 100644 --- a/doc/sdccman.lyx +++ b/doc/sdccman.lyx @@ -1092,54 +1092,9 @@ A possible exception are pic device libraries and header files which are @@ -1340,7 +1340,7 @@ index d18a509..b95bf61 100644 \end_layout \begin_layout Itemize -@@ -2870,18 +2825,6 @@ include_dir_suffix environment variable, see table below +@@ -2890,18 +2845,6 @@ include_dir_suffix environment variable, see table below \end_inset @@ -1359,7 +1359,7 @@ index d18a509..b95bf61 100644 \begin_inset space ~ \end_inset -@@ -2894,22 +2837,6 @@ lib_dir_suffix environment variable, see table below +@@ -2914,22 +2857,6 @@ lib_dir_suffix environment variable, see table below \end_inset @@ -1382,7 +1382,7 @@ index d18a509..b95bf61 100644 \begin_inset space ~ \end_inset -@@ -3408,7 +3335,7 @@ These defaults are: +@@ -3428,7 +3355,7 @@ These defaults are: \begin_layout Standard \align center \begin_inset Tabular @@ -1391,7 +1391,7 @@ index d18a509..b95bf61 100644 -@@ -3692,68 +3619,6 @@ sdcc/include +@@ -3712,68 +3639,6 @@ sdcc/include include \end_layout @@ -1460,7 +1460,7 @@ index d18a509..b95bf61 100644 \end_inset -@@ -3764,7 +3629,7 @@ lib +@@ -3784,7 +3649,7 @@ lib \begin_layout Plain Layout \emph on @@ -1469,7 +1469,7 @@ index d18a509..b95bf61 100644 \end_layout \end_inset -@@ -3773,7 +3638,7 @@ NON_FREE_LIB_DIR_SUFFIX +@@ -3793,7 +3658,7 @@ NON_FREE_LIB_DIR_SUFFIX \begin_inset Text \begin_layout Plain Layout @@ -1478,7 +1478,7 @@ index d18a509..b95bf61 100644 \end_layout \end_inset -@@ -3782,7 +3647,7 @@ sdcc/non-free/lib +@@ -3802,7 +3667,7 @@ sdcc/non-free/lib \begin_inset Text \begin_layout Plain Layout @@ -1487,7 +1487,7 @@ index d18a509..b95bf61 100644 \end_layout \end_inset -@@ -4181,20 +4046,6 @@ include +@@ -4201,20 +4066,6 @@ include \end_inset @@ -1508,7 +1508,7 @@ index d18a509..b95bf61 100644 \backslash \begin_inset Newline newline -@@ -4209,20 +4060,6 @@ lib +@@ -4229,20 +4080,6 @@ lib \end_inset @@ -1529,7 +1529,7 @@ index d18a509..b95bf61 100644 \backslash \begin_inset Newline newline -@@ -4403,20 +4240,6 @@ include +@@ -4423,20 +4260,6 @@ include \end_inset @@ -1550,7 +1550,7 @@ index d18a509..b95bf61 100644 \backslash \begin_inset Newline newline -@@ -4431,20 +4254,6 @@ lib +@@ -4451,20 +4274,6 @@ lib \end_inset @@ -1571,7 +1571,7 @@ index d18a509..b95bf61 100644 \backslash \begin_inset Newline newline -@@ -4541,7 +4350,7 @@ Install paths +@@ -4561,7 +4370,7 @@ Install paths \begin_layout Standard \align center \begin_inset Tabular @@ -1580,7 +1580,7 @@ index d18a509..b95bf61 100644 -@@ -4697,64 +4506,6 @@ include +@@ -4717,64 +4526,6 @@ include \begin_inset Text @@ -1645,7 +1645,7 @@ index d18a509..b95bf61 100644 \begin_layout Plain Layout Library file** \end_layout -@@ -4804,64 +4555,6 @@ sdcc +@@ -4824,64 +4575,6 @@ sdcc lib \end_layout @@ -1710,7 +1710,7 @@ index d18a509..b95bf61 100644 \end_inset -@@ -5184,7 +4877,7 @@ $PATH +@@ -5204,7 +4897,7 @@ $PATH \begin_layout Standard \align center \begin_inset Tabular @@ -1719,7 +1719,7 @@ index d18a509..b95bf61 100644 -@@ -5462,203 +5155,13 @@ include +@@ -5482,203 +5175,13 @@ include @@ -1924,7 +1924,7 @@ index d18a509..b95bf61 100644 \end_inset -@@ -5674,21 +5177,13 @@ $DATADIR/ +@@ -5694,21 +5197,13 @@ $DATADIR/ \end_inset @@ -1947,7 +1947,7 @@ index d18a509..b95bf61 100644 \begin_inset Text \begin_layout Plain Layout -@@ -5696,7 +5191,7 @@ $INCLUDE_DIR_SUFFIX +@@ -5716,7 +5211,7 @@ $INCLUDE_DIR_SUFFIX \begin_inset Newline newline \end_inset @@ -1956,7 +1956,7 @@ index d18a509..b95bf61 100644 \end_layout \end_inset -@@ -5794,7 +5289,7 @@ model +@@ -5814,7 +5309,7 @@ model \begin_layout Standard \align center \begin_inset Tabular @@ -1965,7 +1965,7 @@ index d18a509..b95bf61 100644 -@@ -6074,7 +5569,7 @@ lib +@@ -6094,7 +5589,7 @@ lib @@ -1974,7 +1974,7 @@ index d18a509..b95bf61 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6083,7 +5578,7 @@ lib +@@ -6103,7 +5598,7 @@ lib \end_inset @@ -1983,7 +1983,7 @@ index d18a509..b95bf61 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6114,7 +5609,7 @@ $LIB_DIR_SUFFIX/ +@@ -6134,7 +5629,7 @@ $LIB_DIR_SUFFIX/ \end_inset @@ -1992,7 +1992,7 @@ index d18a509..b95bf61 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6129,7 +5624,7 @@ lib/ +@@ -6149,7 +5644,7 @@ lib/ \end_inset @@ -2001,7 +2001,7 @@ index d18a509..b95bf61 100644 \begin_inset Text \begin_layout Plain Layout -@@ -6152,308 +5647,6 @@ lib +@@ -6172,308 +5667,6 @@ lib \end_layout @@ -2310,7 +2310,7 @@ index d18a509..b95bf61 100644 \end_inset -@@ -8717,14 +7910,6 @@ In /share/sdcc/include +@@ -8737,14 +7930,6 @@ In /share/sdcc/include the include files \end_layout @@ -2325,7 +2325,7 @@ index d18a509..b95bf61 100644 \begin_layout Standard In /share/sdcc/lib \end_layout -@@ -8733,14 +7918,6 @@ In /share/sdcc/lib +@@ -8753,14 +7938,6 @@ In /share/sdcc/lib the src and target subdirectories with the precompiled relocatables. \end_layout @@ -2340,7 +2340,7 @@ index d18a509..b95bf61 100644 \begin_layout Standard In /share/sdcc/doc \end_layout -@@ -15254,66 +14431,6 @@ splint +@@ -15274,66 +14451,6 @@ splint myprogram.c \end_layout @@ -2407,7 +2407,7 @@ index d18a509..b95bf61 100644 \begin_layout Subsection Linker Options \begin_inset Index idx -@@ -44656,66 +43773,9 @@ http://sourceforge.net/projects/gputils +@@ -44653,66 +43770,9 @@ http://sourceforge.net/projects/gputils Pic device specific header and c source files are automatically generated from MPLAB include files, which are published by Microchip with a special requirement that they are only to be used with authentic Microchip devices. @@ -2477,7 +2477,7 @@ index d18a509..b95bf61 100644 \begin_inset Newline newline \end_inset -@@ -44769,7 +43829,7 @@ Makefile +@@ -44766,7 +43826,7 @@ Makefile \begin_inset space ~ \end_inset @@ -2486,7 +2486,7 @@ index d18a509..b95bf61 100644 \begin_inset Newline newline \end_inset -@@ -44863,7 +43923,7 @@ Makefile +@@ -44860,7 +43920,7 @@ Makefile \begin_inset space ~ \end_inset @@ -2495,7 +2495,7 @@ index d18a509..b95bf61 100644 \begin_inset Newline newline \end_inset -@@ -45145,47 +44205,6 @@ status collapsed +@@ -45142,47 +44202,6 @@ status collapsed \begin_layout Plain Layout @@ -2543,7 +2543,7 @@ index d18a509..b95bf61 100644 \backslash / \end_layout -@@ -46058,47 +45077,6 @@ status collapsed +@@ -46055,47 +45074,6 @@ status collapsed -all-callee-saves \end_layout @@ -2591,7 +2591,7 @@ index d18a509..b95bf61 100644 \begin_layout Subsection Port Specific Options \begin_inset Index idx -@@ -47375,188 +46353,6 @@ Linker +@@ -47372,188 +46350,6 @@ Linker \end_inset @@ -2780,7 +2780,7 @@ index d18a509..b95bf61 100644 \end_layout \begin_layout Subsection -@@ -48252,66 +47048,9 @@ name "subsec:PIC16_Header-Files-and-Libraries" +@@ -48249,66 +47045,9 @@ name "subsec:PIC16_Header-Files-and-Libraries" Pic device specific header and c source files are automatically generated from MPLAB include files, which are published by Microchip with a special requirement that they are only to be used with authentic Microchip devices. @@ -2850,7 +2850,7 @@ index d18a509..b95bf61 100644 \end_layout \begin_layout Subsection -@@ -48557,195 +47296,6 @@ vfprintf.c +@@ -48554,195 +47293,6 @@ vfprintf.c should also work, but is untested. \end_layout @@ -3046,7 +3046,7 @@ index d18a509..b95bf61 100644 \begin_layout Subsection Memory Models \end_layout -@@ -73531,6 +72081,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC +@@ -73528,6 +72078,12 @@ This document was initially written by Sandeep Dutta and updated by SDCC developers. \end_layout @@ -3060,10 +3060,10 @@ index d18a509..b95bf61 100644 All product names mentioned herein may be trademarks \begin_inset Index idx diff --git a/sdcc.spec b/sdcc.spec -index b8baa92..be90a84 100644 +index 3609ffe..4b4a5cb 100644 --- a/sdcc.spec +++ b/sdcc.spec -@@ -83,15 +83,15 @@ rm -rf $RPM_BUILD_ROOT +@@ -89,9 +89,7 @@ rm -rf $RPM_BUILD_ROOT %files common %defattr(-,root,root) /usr/share/sdcc/include @@ -3073,12 +3073,13 @@ index b8baa92..be90a84 100644 %files doc %defattr(-,root,root) - %doc %{_defaultdocdir} - +@@ -100,6 +98,8 @@ rm -rf $RPM_BUILD_ROOT %changelog + * Sat Feb 20 2021 - pkk AT spth.de + - version updated to 4.0.0 +* Tue Dec 08 2020 - simon AT simonsouth.net +- removed non-free include and lib directories - * Sat Jan 18 2029 - pkk AT spth.de + * Sat Jan 18 2020 - pkk AT spth.de - version updated to 4.0.0 * Fri Apr 05 2019 - krauseph AT informatik.uni-freiburg.de diff --git a/sdcc_vc.h.in b/sdcc_vc.h.in @@ -3095,10 +3096,10 @@ index 06d8cca..736c325 100644 #define BIN2DATA_DIR "\\.." #define PREFIX2BIN_DIR "\\bin" diff --git a/sdccconf_in.h b/sdccconf_in.h -index aeb2724..9c1df9d 100644 +index eb6f48b..9f5b003 100644 --- a/sdccconf_in.h +++ b/sdccconf_in.h -@@ -97,12 +97,6 @@ +@@ -100,12 +100,6 @@ /* XXX */ #undef LIB_DIR_SUFFIX @@ -3111,7 +3112,7 @@ index aeb2724..9c1df9d 100644 /* Define to 1 to disable the AVR port */ #undef OPT_DISABLE_AVR -@@ -127,9 +121,6 @@ +@@ -130,9 +124,6 @@ /* XXX */ #undef OPT_DISABLE_MCS51 @@ -3122,11 +3123,11 @@ index aeb2724..9c1df9d 100644 #undef OPT_DISABLE_PACKIHX diff --git a/src/SDCCglobl.h b/src/SDCCglobl.h -index b8d156b..db81fd7 100644 +index 9383f68..c2f0b42 100644 --- a/src/SDCCglobl.h +++ b/src/SDCCglobl.h @@ -288,7 +288,6 @@ struct options - int no_pack_iram; /* MCS51/DS390 - Deprecated: Tells the linker not to pack variables in internal ram */ + int stack_size; /* MCS51/DS390 - Tells the linker to allocate this space for stack */ int acall_ajmp; /* MCS51 - Use acall/ajmp instead of lcall/ljmp */ int no_ret_without_call; /* MCS51 - Do not use ret independent of acall/lcall */ - int use_non_free; /* Search / include non-free licensed libraries and header files */ @@ -3134,10 +3135,10 @@ index b8d156b..db81fd7 100644 int xstack_loc; /* initial location of external stack */ int stack_loc; /* initial value of internal stack pointer */ diff --git a/src/SDCCmain.c b/src/SDCCmain.c -index d4598a5..cd36f3d 100644 +index 2a7a711..f46370f 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c -@@ -142,7 +142,6 @@ char buffer[PATH_MAX * 2]; +@@ -151,7 +151,6 @@ char buffer[PATH_MAX * 2]; #define OPTION_DATA_SEG "--dataseg" #define OPTION_DOLLARS_IN_IDENT "--fdollars-in-identifiers" #define OPTION_SIGNED_CHAR "--fsigned-char" @@ -3145,7 +3146,7 @@ index d4598a5..cd36f3d 100644 #define OPTION_PEEP_RETURN "--peep-return" #define OPTION_NO_PEEP_RETURN "--no-peep-return" #define OPTION_NO_OPTSDCC_IN_ASM "--no-optsdcc-in-asm" -@@ -197,7 +196,6 @@ static const OPTION optionsTable[] = { +@@ -207,7 +206,6 @@ static const OPTION optionsTable[] = { {0, OPTION_STD_SDCC2X, NULL, "Use ISO C2X standard with SDCC extensions"}, {0, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character"}, {0, OPTION_SIGNED_CHAR, &options.signed_char, "Make \"char\" signed by default"}, @@ -3153,7 +3154,7 @@ index d4598a5..cd36f3d 100644 {0, NULL, NULL, "Code generation options"}, {'m', NULL, NULL, "Set the port to use e.g. -mz80."}, -@@ -2084,10 +2082,6 @@ preProcess (char **envp) +@@ -2113,10 +2111,6 @@ preProcess (char **envp) else addSet (&preArgvSet, Safe_strdup ("-D__SDCC_CHAR_UNSIGNED")); @@ -3164,7 +3165,7 @@ index d4598a5..cd36f3d 100644 /* set the macro for large model */ switch (options.model) { -@@ -2301,12 +2295,6 @@ setIncludePath (void) +@@ -2336,12 +2330,6 @@ setIncludePath (void) * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix) @@ -3177,8 +3178,8 @@ index d4598a5..cd36f3d 100644 */ if (!options.nostdinc) -@@ -2319,17 +2307,6 @@ setIncludePath (void) - includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL); +@@ -2357,17 +2345,6 @@ setIncludePath (void) + includeDirsSet = processStrSet (includeDirsSet, NULL, port->target, NULL); mergeSets (&includeDirsSet, tempSet); - if (options.use_non_free) @@ -3195,7 +3196,7 @@ index d4598a5..cd36f3d 100644 if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL) { struct dbuf_s dbuf; -@@ -2354,9 +2331,6 @@ setLibPath (void) +@@ -2392,9 +2369,6 @@ setLibPath (void) * 3. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/ * 4. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/ * 5. - DATADIR/LIB_DIR_SUFFIX/ (only on *nix) @@ -3205,7 +3206,7 @@ index d4598a5..cd36f3d 100644 */ if (!options.nostdlib) -@@ -2373,13 +2347,6 @@ setLibPath (void) +@@ -2411,13 +2385,6 @@ setLibPath (void) dbuf_makePath (&dbuf, LIB_DIR_SUFFIX, port->general.get_model ? port->general.get_model () : targetname); libDirsSet = processStrSet (dataDirsSet, NULL, dbuf_c_str (&dbuf), NULL); @@ -3273,7 +3274,7 @@ index cdfbba0..5877f09 100644 extern pic16_options_t pic16_options; diff --git a/src/pic16/main.c b/src/pic16/main.c -index 61d9cfb..75d1182 100644 +index d416642..bfe514d 100644 --- a/src/pic16/main.c +++ b/src/pic16/main.c @@ -655,7 +655,6 @@ OPTION pic16_optionsTable[]= { @@ -3495,10 +3496,10 @@ index 6db417a..4b35225 100755 ); diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi -index 68e9035..92e5784 100644 +index da63063..dae8d8d 100644 --- a/support/scripts/sdcc.nsi +++ b/support/scripts/sdcc.nsi -@@ -483,11 +483,6 @@ ${Section} "SDCC include files" SEC05 +@@ -479,11 +479,6 @@ ${Section} "SDCC include files" SEC05 SetOutPath "$INSTDIR\include" File "${DEV_ROOT}\include\*.h" @@ -3510,7 +3511,7 @@ index 68e9035..92e5784 100644 ${SectionEnd} ${Section} "SDCC DS390 library" SEC06 -@@ -585,18 +580,12 @@ ${Section} "SDCC PIC16 library" SEC21 +@@ -581,18 +576,12 @@ ${Section} "SDCC PIC16 library" SEC21 SetOutPath "$INSTDIR\lib\pic16" File "${DEV_ROOT}\lib\pic16\*.o" File "${DEV_ROOT}\lib\pic16\*.lib" @@ -3551,7 +3552,7 @@ index 68e9035..92e5784 100644 SetOutPath "$INSTDIR\lib\src\pic16\libio" File "${DEV_ROOT}\lib\src\pic16\libio\*.ignore" # File "${DEV_ROOT}\lib\src\pic16\libio\Makefile" -@@ -1074,13 +1055,9 @@ ${Section} Uninstall SECUNINSTALL +@@ -1105,13 +1086,9 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\lib\pic14\*.lib" @@ -3565,7 +3566,7 @@ index 68e9035..92e5784 100644 Delete "$INSTDIR\lib\hc08\*.lib" Delete "$INSTDIR\lib\s08\*.lib" -@@ -1144,9 +1121,7 @@ ${Section} Uninstall SECUNINSTALL +@@ -1182,9 +1159,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\include\pic14\*.h" Delete "$INSTDIR\include\pic14\*.txt" Delete "$INSTDIR\include\pic14\*.inc" @@ -3575,7 +3576,7 @@ index 68e9035..92e5784 100644 Delete "$INSTDIR\include\pic16\*.txt" Delete "$INSTDIR\include\mcs51\*.h" Delete "$INSTDIR\include\hc08\*.h" -@@ -1208,9 +1183,7 @@ ${Section} Uninstall SECUNINSTALL +@@ -1246,9 +1221,7 @@ ${Section} Uninstall SECUNINSTALL Delete "$INSTDIR\uninstall.exe" RMDir /r "$INSTDIR\lib\src\pic14" @@ -3585,9 +3586,9 @@ index 68e9035..92e5784 100644 RMDir "$INSTDIR\lib\src\small" RMDir "$INSTDIR\lib\src\medium" RMDir "$INSTDIR\lib\src\large" -@@ -1233,12 +1206,9 @@ ${Section} Uninstall SECUNINSTALL - RMDir "$INSTDIR\lib\src\pdk15" - RMDir "$INSTDIR\lib\src\pdk15-stack-auto" +@@ -1274,12 +1247,9 @@ ${Section} Uninstall SECUNINSTALL + RMDir "$INSTDIR\lib\src\tlcs90" + RMDir "$INSTDIR\lib\src\z80n" RMDir "$INSTDIR\lib\src" - RMDir "$INSTDIR\non-free\lib\src" @@ -3598,17 +3599,15 @@ index 68e9035..92e5784 100644 RMDir "$INSTDIR\lib\z80" RMDir "$INSTDIR\lib\z180" RMDir "$INSTDIR\lib\r2k" -@@ -1261,7 +1231,6 @@ ${Section} Uninstall SECUNINSTALL - RMDir "$INSTDIR\lib\pdk15" - RMDir "$INSTDIR\lib\pdk15-stack-auto" +@@ -1305,15 +1275,12 @@ ${Section} Uninstall SECUNINSTALL + RMDir "$INSTDIR\lib\tlcs90" + RMDir "$INSTDIR\lib\z80n" RMDir "$INSTDIR\lib" - RMDir "$INSTDIR\non-free\lib" RMDir "$INSTDIR\include\asm\z80" - RMDir "$INSTDIR\include\asm\z180" -@@ -1269,9 +1238,7 @@ ${Section} Uninstall SECUNINSTALL + RMDir "$INSTDIR\include\asm\r2k" RMDir "$INSTDIR\include\asm\r3ka" - RMDir "$INSTDIR\include\asm\ez80_z80" RMDir "$INSTDIR\include\asm\pic16" - RMDir "$INSTDIR\non-free\include\asm\pic16" RMDir "$INSTDIR\include\asm\pic14" @@ -3616,7 +3615,7 @@ index 68e9035..92e5784 100644 RMDir "$INSTDIR\include\asm\mcs51" RMDir "$INSTDIR\include\asm\gbz80" RMDir "$INSTDIR\include\asm\ds390" -@@ -1280,17 +1247,12 @@ ${Section} Uninstall SECUNINSTALL +@@ -1322,17 +1289,12 @@ ${Section} Uninstall SECUNINSTALL RMDir "$INSTDIR\include\asm" RMDir "$INSTDIR\include\z180" RMDir "$INSTDIR\include\pic14" -- cgit 1.4.1 From fb4ccb86c26cc06d090576a6c281b5bb417f1ec9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 9 Mar 2021 01:48:15 -0500 Subject: gnu: gajim: Update to 1.3.1. * gnu/packages/messaging.scm (gajim): Update to 1.3.1. [arguments]: Modify custom 'disable-failing-tests phase. --- gnu/packages/messaging.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33a0d4fa56..d8eae12645 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -964,7 +964,7 @@ of xmpppy.") (define-public gajim (package (name "gajim") - (version "1.3.0") + (version "1.3.1") (source (origin (method url-fetch) @@ -973,7 +973,7 @@ of xmpppy.") (version-major+minor version) "/gajim-" version ".tar.gz")) (sha256 - (base32 "1v0cx8r1zr9aj17ik5apxxfpr9rv5w8p1i7hfys6wp9292gc7s25")) + (base32 "070h1n3miq99z6ln77plk3jlisgfqfs2yyn4rhchpf25zd8is1ba")) (patches (search-patches "gajim-honour-GAJIM_PLUGIN_PATH.patch")))) (build-system python-build-system) (arguments @@ -989,7 +989,9 @@ of xmpppy.") (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests (lambda _ - ;; https://dev.gajim.org/gajim/gajim/-/issues/10427 + ;; ModuleNotFoundError: No module named 'gajim.gui.emoji_data' + ;; https://dev.gajim.org/gajim/gajim/-/issues/10478 + (delete-file "test/lib/gajim_mocks.py") (delete-file "test/unit/test_gui_interface.py") #t)) (replace 'check -- cgit 1.4.1 From 70128b8afacf332b0aff69ebcad6868fd158e8ad Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 11:49:35 +0100 Subject: gnu: cyrus-sasl: Fix CVE-2019-19906. * gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/cyrus-sasl.scm (cyrus-sasl/fixed): New variable. Apply patch. (cyrus-sasl)[replacement]: Graft. --- gnu/local.mk | 1 + gnu/packages/cyrus-sasl.scm | 18 ++++++++++++++++ .../patches/cyrus-sasl-CVE-2019-19906.patch | 25 ++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index dcee722e79..43ed97692e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -917,6 +917,7 @@ dist_patch_DATA = \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ + %D%/packages/patches/cyrus-sasl-CVE-2019-19906.patch \ %D%/packages/patches/c++-gsl-find-system-gtest.patch \ %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/datefudge-gettimeofday.patch \ diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 3e65a1faf6..691349a38f 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -45,6 +45,7 @@ (sha256 (base32 "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch")))) + (replacement cyrus-sasl/fixed) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -80,3 +81,20 @@ server writers.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")) (home-page "https://cyrusimap.org/sasl/"))) + +(define-public cyrus-sasl/fixed + (package + (inherit cyrus-sasl) + (version "2.1.27") + (source (origin + (method url-fetch) + (uri (list (string-append + "https://cyrusimap.org/releases/cyrus-sasl-" + version ".tar.gz") + (string-append + "ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-" + version ".tar.gz"))) + (sha256 (base32 + "1m85zcpgfdhm43cavpdkhb1s2zq1b31472hq1w1gs3xh94anp1i6")) + (patches (search-patches "cyrus-sasl-ac-try-run-fix.patch" + "cyrus-sasl-CVE-2019-19906.patch")))))) diff --git a/gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch b/gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch new file mode 100644 index 0000000000..acdf682430 --- /dev/null +++ b/gnu/packages/patches/cyrus-sasl-CVE-2019-19906.patch @@ -0,0 +1,25 @@ +From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001 +From: Quanah Gibson-Mount +Date: Tue, 18 Feb 2020 19:05:12 +0000 +Subject: [PATCH] Fix #587 + +Off by one error in common.c, CVE-2019-19906. + +Thanks to Stephan Zeisberg for reporting +--- + lib/common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/common.c b/lib/common.c +index bc3bf1df..9969d6aa 100644 +--- a/lib/common.c ++++ b/lib/common.c +@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen, + + if (add==NULL) add = "(null)"; + +- addlen=strlen(add); /* only compute once */ ++ addlen=strlen(add)+1; /* only compute once */ + if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK) + return SASL_NOMEM; + -- cgit 1.4.1 From 9a05af61ac2908b7b1f30c77a9b29919eaa4e94d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 11:57:45 +0100 Subject: gnu: python-gssapi: Update to 1.6.12. * gnu/packages/python-xyz.scm (python-gssapi) [version]: Update to 1.6.12. [arguments]: Tests have been fixed upstream, remove. [native-inputs]: python-shouldbea is not required any more, remove. --- gnu/packages/python-xyz.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b1ac3e2e3b..585e0014b9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21616,31 +21616,15 @@ tests.") (define-public python-gssapi (package (name "python-gssapi") - (version "1.6.9") + (version "1.6.12") (source (origin (method url-fetch) (uri (pypi-uri "gssapi" version)) (sha256 (base32 - "1fa78pn5jzfbwf3y6mj4fc8sh11wjf1hwh5qv39cdlxb71qsq2hb")))) + "1j2idrbrbczykzlb56q1bn0ivc9c0rjjljpk4yz86xn3gxfkpv8n")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Work around - ;; https://github.com/pythongssapi/python-gssapi/issues/220. - (add-before 'check 'disable-failing-tests - (lambda _ - (let ((reason "Disabled failing test (see: \ -https://github.com/pythongssapi/python-gssapi/issues/220).")) - (substitute* "gssapi/tests/test_high_level.py" - ((".*def test_add_with_impersonate.*" all) - (string-append all " self.skipTest('" reason "')\n"))) - (substitute* "gssapi/tests/test_raw.py" - ((".*def test_.*impersonate_name.*" all) - (string-append all " self.skipTest('" reason "')\n"))) - #t)))))) (propagated-inputs `(("python-decorator" ,python-decorator) ("python-six" ,python-six))) @@ -21648,8 +21632,7 @@ https://github.com/pythongssapi/python-gssapi/issues/220).")) `(("mit-krb5" ,mit-krb5))) ;; for tests (native-inputs - `(("python-shouldbe" ,python-shouldbe) - ("python-parameterized" ,python-parameterized) + `(("python-parameterized" ,python-parameterized) ("python-k5test" ,python-k5test) ("python-nose" ,python-nose))) (home-page "https://github.com/pythongssapi/python-gssapi") -- cgit 1.4.1 From 714465ec7c1d3c40e710e95ec5bd6651311827d6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 11:59:19 +0100 Subject: gnu: python-asyncssh: Update to 2.5.0. * gnu/packages/ssh.scm (python-asyncssh): Update to 2.5.0. --- 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 b73e9633ea..68590e2fe5 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -781,14 +781,14 @@ shell services and remote host selection.") (define-public python-asyncssh (package (name "python-asyncssh") - (version "2.3.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (pypi-uri "asyncssh" version)) (sha256 (base32 - "0pi6npmsgx7l9r1qrfvg8mxx3i23ipff492xz4yhrw13f56a7ga4")))) + "02xpzir9rmw7b7k07m3f912h6jvy9yzan9yn3ckrmqx2ffpy4r8b")))) (build-system python-build-system) (propagated-inputs `(("python-cryptography" ,python-cryptography) -- cgit 1.4.1 From 38b0c64d7b3e4c6bfc1da9cd6b9a04d27972e90d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 12:00:47 +0100 Subject: gnu: python-shouldbe: Remove. Unmaintained upstream and its only dependent (python-gssapi) dropped it. * gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch: Remove. * gnu/local.mk: Drop patch file. * gnu/packages/python-xyz.scm (python-shouldbe): Remove. --- gnu/local.mk | 1 - .../patches/python-shouldbe-0.1.2-cpy3.8.patch | 82 ---------------------- gnu/packages/python-xyz.scm | 23 ------ 3 files changed, 106 deletions(-) delete mode 100644 gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 43ed97692e..667ec79048 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1560,7 +1560,6 @@ dist_patch_DATA = \ %D%/packages/patches/python2-pygobject-2-deprecation.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ - %D%/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch \ %D%/packages/patches/python2-subprocess32-disable-input-test.patch \ %D%/packages/patches/python-unittest2-python3-compat.patch \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ diff --git a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch b/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch deleted file mode 100644 index f3b56e42d6..0000000000 --- a/gnu/packages/patches/python-shouldbe-0.1.2-cpy3.8.patch +++ /dev/null @@ -1,82 +0,0 @@ -Fix compatibility with Python 3.8. - -Upstream issue: https://github.com/DirectXMan12/should_be/pull/5 - -diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/core.py shouldbe-0.1.2.patched/should_be/core.py ---- shouldbe-0.1.2/should_be/core.py 2019-03-06 07:38:22.000000000 +0100 -+++ shouldbe-0.1.2.patched/should_be/core.py 2020-05-18 08:44:24.214664704 +0200 -@@ -103,7 +103,7 @@ - return resf - - --def buildCode(baseCode, argcount=None, kwonlyargcount=None, -+def buildCode(baseCode, argcount=None, posonlyargcount=None, kwonlyargcount=None, - nlocals=None, stacksize=None, flags=None, - code=None, consts=None, names=None, - varnames=None, filename=None, name=None, -@@ -121,6 +121,24 @@ - nlocals or baseCode.co_nlocals, - stacksize or baseCode.co_stacksize, - flags or baseCode.co_flags, -+ code or baseCode.co_code, -+ consts or baseCode.co_consts, -+ names or baseCode.co_names, -+ varnames or baseCode.co_varnames, -+ filename or baseCode.co_filename, -+ name or baseCode.co_name, -+ firstlineno or baseCode.co_firstlineno, -+ lnotab or baseCode.co_lnotab, -+ freevars or baseCode.co_freevars, -+ cellvars or baseCode.co_cellvars) -+ elif hasattr(baseCode, 'co_posonlyargcount'): -+ # Python 3.8 -+ resc = CodeType(argcount or baseCode.co_argcount, -+ posonlyargcount or baseCode.co_posonlyargcount, -+ kwonlyargcount or baseCode.co_kwonlyargcount, -+ nlocals or baseCode.co_nlocals, -+ stacksize or baseCode.co_stacksize, -+ flags or baseCode.co_flags, - code or baseCode.co_code, - consts or baseCode.co_consts, - names or baseCode.co_names, -diff -x '*.pyc' -Naur shouldbe-0.1.2/should_be/tests/test_container_mixin.py shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py ---- shouldbe-0.1.2/should_be/tests/test_container_mixin.py 2019-03-01 06:38:16.000000000 +0100 -+++ shouldbe-0.1.2.patched/should_be/tests/test_container_mixin.py 2020-05-18 09:00:51.372531064 +0200 -@@ -7,31 +7,31 @@ - self.lst = [1, 2, 3] - - def test_should_include_iter(self): -- err_msg = (r'[a-zA-Z0-9.]+ should have included \[.+?\]' -+ err_msg = (r'[a-zA-Z0-9.()]+ should have included \[.+?\]' - r', but did not have items .+') -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.should_include, [4]) - - self.lst.should_include([1, 2, 3]) - - def test_should_include_item(self): -- err_msg = (r'[a-zA-Z0-9.]+ should have included .+?' -+ err_msg = (r'[a-zA-Z0-9.()]+ should have included .+?' - r', but did not') -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.should_include, 4) - - self.lst.should_include(3) - - def test_shouldnt_include_iter(self): - err_msg = 'should not have included' -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.shouldnt_include, [2, 3]) - - self.lst.shouldnt_include([4, 5]) - - def test_shouldnt_include_item(self): - err_msg = 'should not have included' -- self.assertRaisesRegexp(AssertionError, err_msg, -+ self.assertRaisesRegex(AssertionError, err_msg, - self.lst.shouldnt_include, 3) - - self.lst.shouldnt_include(4) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 585e0014b9..532f26ea8d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21556,29 +21556,6 @@ and cuts down boilerplate code when testing libraries for asyncio.") (description "This project allows Python code to extend built-in types.") (license (list license:gpl3+ license:expat)))) -(define-public python-shouldbe - (package - (name "python-shouldbe") - (version "0.1.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "shouldbe" version)) - (sha256 - (base32 - "16zbvjxf71dl4yfbgcr6idyim3mdrfvix1dv8b95p0s9z07372pj")) - (patches (search-patches "python-shouldbe-0.1.2-cpy3.8.patch")))) - (build-system python-build-system) - (propagated-inputs - `(("python-forbiddenfruit" ,python-forbiddenfruit))) - (native-inputs - `(("python-nose" ,python-nose))) - (home-page "https://github.com/directxman12/should_be") - (synopsis "Python Assertion Helpers inspired by Shouldly") - (description - "Python Assertion Helpers inspired by Shouldly.") - (license license:isc))) - (define-public python-k5test (package (name "python-k5test") -- cgit 1.4.1 From b431840cbedc839a5c1bbbde4433d535b0e6d631 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 13:23:45 +0100 Subject: gnu: python-aiounittest: Update to 1.4.0. * gnu/packages/check.scm (python-aiounittest) [version]: Update to 1.4.0. [source]: Switch to git repository. [arguments]: Run notetests. [propagated-inputs]: Add python-wrapt. --- gnu/packages/check.scm | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 0baf777393..524cc1874d 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2848,15 +2848,27 @@ system. The code under test requires no modification to work with pyfakefs.") (define-public python-aiounittest (package (name "python-aiounittest") - (version "1.3.1") + (version "1.4.0") + ;; Pypi package lacks tests. (source - (origin - (method url-fetch) - (uri (pypi-uri "aiounittest" version)) - (sha256 - (base32 - "1q4bhmi80smaa1lknvdna0sx3915naczlfna1fp435nf6cjyrjl1")))) + (origin (method git-fetch) + (uri (git-reference + (url "https://github.com/kwarunek/aiounittest.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hql5mw62lclrpblbh7xvinwjfcdcfvhhlvl7xlq2hi9isjq1c8r")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "nosetests" "-v") + (format #t "test suite not run~%")) + #t))))) + (propagated-inputs `(("python-wrapt" ,python-wrapt))) (native-inputs `(("python-coverage" ,python-coverage) ("python-nose" ,python-nose))) -- cgit 1.4.1 From f73ee73da72d137e15b0c19f3e3482733e9eaa5a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 13:26:16 +0100 Subject: gnu: python-pypika: Update to 0.47.6. * gnu/packages/databases.scm (python-pypika): Update to 0.47.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 8ec2dc448a..c814cf8954 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3648,7 +3648,7 @@ transforms idiomatic python function calls to well-formed SQL queries.") (define-public python-pypika (package (name "python-pypika") - (version "0.44.0") + (version "0.47.6") (source (origin (method git-fetch) (uri (git-reference @@ -3657,7 +3657,7 @@ transforms idiomatic python function calls to well-formed SQL queries.") (file-name (git-file-name name version)) (sha256 (base32 - "0mpddrw9z1pzcc40j3pzhd583hlgjx96aa8ak6m9zzhpm4bv3ard")))) + "001pg36sw9a36zdd1kccbymcxndphjcjbbrsy6ri7ng8h4dgz549")))) (build-system python-build-system) (native-inputs `(("python-parameterized" ,python-parameterized))) -- cgit 1.4.1 From 281fd9ad71f0e6276adcf4d058b4bcf09dd5e087 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 13:27:11 +0100 Subject: gnu: python-aiosqlite: Update to 0.17.0. * gnu/packages/databases.scm (python-aiosqlite) [version]: Update to 0.17.0. [arguments]: Run tests. [propagated-inputs]: Add python-typing-extensions. --- gnu/packages/databases.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c814cf8954..8bc411ca51 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3237,15 +3237,25 @@ translate the complete SQLite API into Python.") (define-public python-aiosqlite (package (name "python-aiosqlite") - (version "0.12.0") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "aiosqlite" version)) (sha256 (base32 - "1w8248yz85xyzvvh4jaxnc59fqil45aka6h82kn1rcih4rjxbnn1")))) + "0lgfpbkcd730hbgj3zlrbx2y8fzvdns2zj3s4r4l31n49g1arrph")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "python" "-m" "unittest" "aiosqlite.tests") + (format #t "test suite not run~%")) + #t))))) + (propagated-inputs + `(("python-typing-extensions" ,python-typing-extensions))) (native-inputs `(("python-aiounittest" ,python-aiounittest))) (home-page "https://github.com/jreese/aiosqlite") -- cgit 1.4.1 From e7a3ae1e85286288c723af8e0aae8500f1e91e01 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 13:30:09 +0100 Subject: gnu: python-tortoise-orm: Update to 0.16.21. * gnu/packages/databases.scm (python-tortoise-orm) [version]: Update to 0.16.21. [arguments]: Relax version requirements. --- gnu/packages/databases.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8bc411ca51..d8ebc773b7 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2642,17 +2642,25 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (define-public python-tortoise-orm (package (name "python-tortoise-orm") - (version "0.16.7") + (version "0.16.21") (source (origin (method url-fetch) (uri (pypi-uri "tortoise-orm" version)) (sha256 (base32 - "0wr7p4v0b16ypm9fcpwpl99kf491m6w3jkd13xcsgq13fy73fbqc")))) + "1dallk0q8q4v37klm0v3rppf2w8sjkqmypc1w8r9rraqxg1ylacp")))) (build-system python-build-system) - ;; Disable tests for now. They pull in a lot of dependencies. - (arguments `(#:tests? #f)) + (arguments + `(#:tests? #f ; Pypi does not have tests and Git snapshot depends on + ; poetry. + #:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-version-requirements + (lambda _ + (substitute* "setup.py" + (("pypika>=0\\.44\\.0,<0\\.45\\.0") "pypika") + (("aiosqlite>=0.16.0,<0.17.0") "aiosqlite")) + #t))))) (native-inputs `(("python-asynctest" ,python-asynctest) ("python-nose2" ,python-nose2))) -- cgit 1.4.1 From d58a7b45cd01414fa8110c78565a06618fd30c0b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 14:45:26 +0100 Subject: gnu: python-ujson: Update to 4.0.2. * gnu/packages/python-xyz.scm (python-ujson): Update to 4.0.2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 532f26ea8d..1d993f67d7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -21109,14 +21109,14 @@ register custom encoders and decoders.") (define-public python-ujson (package (name "python-ujson") - (version "4.0.1") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "ujson" version)) (sha256 (base32 - "1lr9lbm76y3ah1463jggwg2hjcb709mpns5f752wxxbgnd0n5kr6")) + "0k9w0kypy7vlskzzp2vsjswaw8lbqdrplzkbflxki9vqwglsj5f6")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "deps") #t)))) -- cgit 1.4.1 From 548d0ddd7fbf91c860b5061d4f6ac58ed249ec5d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 14:46:25 +0100 Subject: gnu: python-aiofiles: Update to 0.6.0. * gnu/packages/python-xyz.scm (python-aiofiles): Update to 0.6.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1d993f67d7..d06552c3cc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23594,14 +23594,14 @@ process.") (define-public python-aiofiles (package (name "python-aiofiles") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (pypi-uri "aiofiles" version)) (sha256 (base32 - "1bqmv019x16qa3zah0z915cw6z4va3fjs60fk2s7vyah3gyvrrlq")))) + "14m01kjxm2j7zyljjj6xlhlgygcsriymbx730gc5jp9xglaina70")))) (build-system python-build-system) (home-page "https://github.com/Tinche/aiofiles") (synopsis "File support for @code{asyncio}") -- cgit 1.4.1 From 955fcf0a19d2e328edf429eee251c46dda85d776 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 14:47:22 +0100 Subject: gnu: python-pytest-sanic: Update to 1.7.0. * gnu/packages/python-check.scm (python-pytest-sanic) [version]: Update to 1.7.0. [propagated-inputs]: Replace python-aiohttp with python-httpx and add python-websockets. --- gnu/packages/python-check.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 15efdd3297..3eb561c89a 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1237,22 +1237,23 @@ help in debugging failures and optimizing the scheduler to improve speed.") (define-public python-pytest-sanic (package (name "python-pytest-sanic") - (version "1.6.2") + (version "1.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pytest-sanic" version)) (sha256 (base32 - "02ajd8z77ahi69kzkz200qgxrb4s2j4qb6k8j9ds1kz6qa6fsa34")))) + "0hm7im77dgqfk8k34qbbfhimg8hifl4zwpa2s3mgbknrjvyw5qpx")))) (build-system python-build-system) (arguments ;; Tests depend on python-sanic. `(#:tests? #f)) (propagated-inputs - `(("python-aiohttp" ,python-aiohttp) + `(("python-httpx" ,python-httpx) ("python-async-generator" ,python-async-generator) - ("python-pytest" ,python-pytest))) + ("python-pytest" ,python-pytest) + ("python-websockets" ,python-websockets))) (home-page "https://github.com/yunstanford/pytest-sanic") (synopsis "Pytest plugin for Sanic") -- cgit 1.4.1 From 999a1cba5416bb2099e21d4fc55624d8ef2c7fa1 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Thu, 4 Mar 2021 14:48:28 +0100 Subject: gnu: python-sanic: Update to 20.12.2. * gnu/packages/python-web.scm (python-sanic) [version]: Update to 20.12.2. [arguments]: Relax dependency versions. [native-inputs]: Add python-pytest-asyncio. [home-page]: Update. [synopsis]: Remove Python version. [description]: Ditto. --- gnu/packages/python-web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b0268e5a31..edfff0c6a3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5658,14 +5658,14 @@ as a Python package.") (define-public python-sanic (package (name "python-sanic") - (version "20.9.1") + (version "20.12.2") (source (origin (method url-fetch) (uri (pypi-uri "sanic" version)) (sha256 (base32 - "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6")))) + "1c02gdp1j18xny9jd33fp0w57qqi7g66zwmaykv2dhcks96f5mxr")))) (build-system python-build-system) (arguments '(#:phases @@ -5674,9 +5674,8 @@ as a Python package.") ;; Allow using recent dependencies. (lambda* (#:key inputs #:allow-other-keys) (substitute* "setup.py" - (("httpcore==0.3.0") "httpcore") (("pytest==5.2.1") "pytest") - (("multidict==5.0.0") "multidict") + (("multidict>=5.0,<6.0") "multidict") (("httpx==0\\.15\\.4") "httpx")) #t)) (replace 'check @@ -5702,14 +5701,15 @@ as a Python package.") ("python-pytest-benchmark" ,python-pytest-benchmark) ("python-pytest-sanic" ,python-pytest-sanic) ("python-pytest-sugar" ,python-pytest-sugar) + ("python-pytest-asyncio" ,python-pytest-asyncio) ("python-urllib3" ,python-urllib3) ("python-uvicorn" ,python-uvicorn))) (home-page - "https://github.com/huge-success/sanic/") + "https://github.com/sanic-org/sanic/") (synopsis - "Async Python 3.6+ web server/framework") + "Async Python web server/framework") (description - "Sanic is a Python 3.6+ web server and web framework + "Sanic is a Python web server and web framework that's written to go fast. It allows the usage of the @code{async/await} syntax added in Python 3.5, which makes your code non-blocking and speedy.") -- cgit 1.4.1 From fdf82830d417aeb481f1503ab4dd7e7a31f1772d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 12:22:17 +0100 Subject: gnu: mysql: Update to 5.7.33 [security fixes]. * gnu/packages/databases.scm (mysql): Update to 5.7.33. --- 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 d8ebc773b7..8bb248fa1d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -833,7 +833,7 @@ auto-completion and syntax highlighting.") (define-public mysql (package (name "mysql") - (version "5.7.27") + (version "5.7.33") (source (origin (method url-fetch) (uri (list (string-append @@ -845,7 +845,7 @@ auto-completion and syntax highlighting.") name "-" version ".tar.gz"))) (sha256 (base32 - "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq")))) + "1bb343mf7n0qg2qz497gxjsqprygrjz1q1pbz76hgqxnsy08sfxd")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From e5f89570c1d72c4b674fad6b6ad5591ead02d419 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 13:01:58 +0100 Subject: gnu: mongodb: Update to 3.4.24 [security fixes]. * gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Ditto. * gnu/packages/databases.scm (mongodb): Update to 3.4.24. [source]: Drop patch. Update third_party libs folder names. --- gnu/local.mk | 1 - gnu/packages/databases.scm | 13 ++--- ...ngodb-support-unknown-linux-distributions.patch | 55 ---------------------- 3 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 667ec79048..39037d3499 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1372,7 +1372,6 @@ dist_patch_DATA = \ %D%/packages/patches/mpc123-initialize-ao.patch \ %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 \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8bb248fa1d..03d01b582a 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -664,27 +664,24 @@ replacement for the code@{python-memcached} library.") (define-public mongodb (package (name "mongodb") - (version "3.4.10") + (version "3.4.24") (source (origin (method url-fetch) (uri (string-append "https://github.com/mongodb/mongo/archive/r" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0676lvkljj7a5hdhv78dbykqnqrj9lbn9799mi84b8vbnzsq961r")) + (base32 "0y1669sqj8wyf0y0njhxs4qhn1qzjhrs2h2qllya5samxrlrjhkg")) (modules '((guix build utils))) (snippet '(begin (for-each (lambda (dir) (delete-file-recursively (string-append "src/third_party/" dir))) - '("pcre-8.41" "scons-2.5.0" "snappy-1.1.3" + '("pcre-8.42" "scons-2.5.0" "snappy-1.1.3" "valgrind-3.11.0" "wiredtiger" - "yaml-cpp-0.5.3" "zlib-1.2.8")) - #t)) - (patches - (list - (search-patch "mongodb-support-unknown-linux-distributions.patch"))))) + "yaml-cpp-0.6.2" "zlib-1.2.11")) + #t)))) (build-system scons-build-system) (inputs `(("openssl" ,openssl-1.0) diff --git a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch b/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch deleted file mode 100644 index 6057ebeb08..0000000000 --- a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001 -From: Mark Benvenuto -Date: Wed, 20 Sep 2017 11:50:02 -0400 -Subject: [PATCH] SERVER-30857 Support unknown Linux distributions - ---- - src/mongo/rpc/metadata/client_metadata.cpp | 6 ------ - src/mongo/util/processinfo_linux.cpp | 9 ++++++--- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp -index 845a315dd74..a959a4e31e9 100644 ---- a/src/mongo/rpc/metadata/client_metadata.cpp -+++ b/src/mongo/rpc/metadata/client_metadata.cpp -@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData driverName, - StringData osArchitecture, - StringData osVersion, - BSONObjBuilder* builder) { -- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && -- !osArchitecture.empty() && !osVersion.empty()); -- - BSONObjBuilder metaObjBuilder(builder->subobjStart(kMetadataDocumentName)); - - { -@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData driverName, - StringData osVersion, - StringData appName, - BSONObjBuilder* builder) { -- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && -- !osArchitecture.empty() && !osVersion.empty()); -- - if (appName.size() > kMaxApplicationNameByteLength) { - return Status(ErrorCodes::ClientMetadataAppNameTooLarge, - str::stream() << "The '" << kApplication << "." << kName -diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp -index c3debf377bd..c2813b026b0 100644 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -376,10 +376,13 @@ class LinuxSysHelper { - if ((nl = name.find('\n', nl)) != string::npos) - // stop at first newline - name.erase(nl); -- // no standard format for name and version. use kernel version -- version = "Kernel "; -- version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); -+ } else { -+ name = "unknown"; - } -+ -+ // There is no standard format for name and version so use the kernel version. -+ version = "Kernel "; -+ version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); - } - - /** -- cgit 1.4.1 From f8953bea858f894b406eed4a0aca0cd4c4d8671d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 13:59:44 +0100 Subject: gnu: cuirass: Update to 0.0.1-74.c8051f3. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-74.c8051f3. --- 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 bf1346f628..e9d975d8e5 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "14e1335732271fdce730cb7e5043429ea9155201") - (revision "73")) + (let ((commit "c8051f3b6861f21b250bbf92acf7fa5ac0d5dfaa") + (revision "74")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1xv2c4x1zbsf7ifwkmf1fjbbgbbdv33d8qx6b6iw9nnfr2022fqa")))) + "07z3859vfmxmpknlch7wd1ivnpvcxm6dsll4nh3dgygibxw9pspx")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 6bed29b79846077aa525ccd6b8a022a6513201df Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 14:25:05 +0100 Subject: gnu: guix: Update to 1.2.0-15.f8953be. * gnu/packages/package-management.scm (guix): Update to 1.2.0-15.f8953be. --- 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 4c12e85a01..60aa3f8624 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "112692c0d546d35cd67c5dc70dbd1dc609b18f64") - (revision 14)) + (commit "f8953bea858f894b406eed4a0aca0cd4c4d8671d") + (revision 15)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "081m6zcgscmh3xbz1wrm7bjwj5d1fnwd8w89qbmd8z44a1iknf49")) + "0m4mdg7fnn8vji2mk7ycaqrwwmh9gdwq3xli1fwbcn0ygj4cxlc6")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From c260aff63e9590f9930ff937e4960da7b0c9696c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 16:01:36 +0100 Subject: gnu: cuirass: Update to 0.0.1-75.94a7f87. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-75.94a7f87. --- 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 e9d975d8e5..25e0fe73bd 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "c8051f3b6861f21b250bbf92acf7fa5ac0d5dfaa") - (revision "74")) + (let ((commit "94a7f870a7d813326e6ac6539d243a2994eca918") + (revision "75")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "07z3859vfmxmpknlch7wd1ivnpvcxm6dsll4nh3dgygibxw9pspx")))) + "1i4mlsdlx72y829qh0cavzb9klbnxyl9kah64b473vbnl20whyny")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From efed8e6cb955762379156b609b2c99e60428a34c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:03:27 +0100 Subject: gnu: python-pikepdf: Update to 2.8.0.post2. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.8.0.post2. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d06552c3cc..4dae9eee9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5814,13 +5814,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.8.0.post1") + (version "2.8.0.post2") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "08miajml3mzlaqxr8phzymshmkkm93f8vv1dvq5gzkj15kysqhpp")))) + (base32 "0ya9bir41bz61y2njlcr5ni8l6cjsy0h5vg9ayxhw7dzgcibj0yp")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From c1baf9b8247f4f691b9f78fdc65ac5a1bc28f629 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 16:41:05 +0100 Subject: gnu: cuirass: Update to 0.0.1-76.5f830da. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-76.5f830da. --- 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 25e0fe73bd..6f874165d9 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "94a7f870a7d813326e6ac6539d243a2994eca918") - (revision "75")) + (let ((commit "5f830da3e3fde58044f189a0dfc30fe6aa0d8db6") + (revision "76")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1i4mlsdlx72y829qh0cavzb9klbnxyl9kah64b473vbnl20whyny")))) + "1wkrpxpf52pf37k1v1rnlscmnj64qvpqv3rgx46x4iah0jf57yyc")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 1a1d0fe505da18c1f43996fb7eb3652e42250d0a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 9 Mar 2021 23:25:52 +0100 Subject: gnu: hwloc: Update to 2.4.1. * gnu/packages/mpi.scm (hwloc-2): Update to 2.4.1. Adjust URL. --- gnu/packages/mpi.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 2b73794409..53ee6ef1cd 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Dave Love @@ -142,18 +142,18 @@ bind processes, and much more.") (license license:bsd-3))) (define-public hwloc-2 - ;; Note: 2.0 isn't the default yet, see above. + ;; Note: 2.x isn't the default yet, see above. (package (inherit hwloc-1) - (version "2.2.0") + (version "2.4.1") (source (origin (method url-fetch) - (uri (string-append "https://www.open-mpi.org/software/hwloc/v" + (uri (string-append "https://download.open-mpi.org/release/hwloc/v" (version-major+minor version) - "/downloads/hwloc-" version ".tar.bz2")) + "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f")))) + "0qyywmyns2jf3is3axrwmffvdd7ji7liy5axp650q4i6kzk2291r")))) ;; libnuma is no longer needed. (inputs (alist-delete "numactl" (package-inputs hwloc-1))) -- cgit 1.4.1 From 520bac7ed00a949a0391ad680de65a1498105c2b Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sun, 14 Feb 2021 12:57:32 +0100 Subject: services: Prevent following symlinks during activation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This addresses a potential security issue, where a compromised service could trick the activation code in changing the permissions, owner and group of arbitrary files. However, this patch is currently only a partial fix, due to a TOCTTOU (time-of-check to time-of-use) race, which can be fixed once guile has bindings to openat and friends. Fixes: * gnu/build/activation.scm: new procedure 'mkdir-p/perms'. * gnu/services/authentication.scm (%nslcd-activation, nslcd-service-type): use new procedure. * gnu/services/cups.scm (%cups-activation): likewise. * gnu/services/dbus.scm (dbus-activation): likewise. * gnu/services/dns.scm (knot-activation): likewise. Signed-off-by: Ludovic Courtès --- gnu/build/activation.scm | 53 ++++++++++++++++++++++++++++++++++++++--- gnu/services/authentication.scm | 22 ++++++++++------- gnu/services/cups.scm | 12 +++++----- gnu/services/dbus.scm | 37 ++++++++++++++-------------- gnu/services/dns.scm | 21 ++++++++-------- 5 files changed, 98 insertions(+), 47 deletions(-) (limited to 'gnu') diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index b458aee4ae..6cb6f8819b 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -1,6 +1,11 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2015 Mark H Weaver +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2015, 2018 Mark H Weaver +;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,7 +42,8 @@ activate-modprobe activate-firmware activate-ptrace-attach - activate-current-system)) + activate-current-system + mkdir-p/perms)) ;;; Commentary: ;;; @@ -55,6 +61,47 @@ (define (dot-or-dot-dot? file) (member file '("." ".."))) +;; Based upon mkdir-p from (guix build utils) +(define (verify-not-symbolic dir) + "Verify DIR or its ancestors aren't symbolic links." + (define absolute? + (string-prefix? "/" dir)) + + (define not-slash + (char-set-complement (char-set #\/))) + + (define (verify-component file) + (unless (eq? 'directory (stat:type (lstat file))) + (error "file name component is not a directory" dir))) + + (let loop ((components (string-tokenize dir not-slash)) + (root (if absolute? + "" + "."))) + (match components + ((head tail ...) + (let ((file (string-append root "/" head))) + (catch 'system-error + (lambda () + (verify-component file) + (loop tail file)) + (lambda args + (if (= ENOENT (system-error-errno args)) + #t + (apply throw args)))))) + (() #t)))) + +;; TODO: the TOCTTOU race can be addressed once guile has bindings +;; for fstatat, openat and friends. +(define (mkdir-p/perms directory owner bits) + "Create the directory DIRECTORY and all its ancestors. +Verify no component of DIRECTORY is a symbolic link. +Warning: this is currently suspect to a TOCTTOU race!" + (verify-not-symbolic directory) + (mkdir-p directory) + (chown directory (passwd:uid owner) (passwd:gid owner)) + (chmod directory bits)) + (define* (copy-account-skeletons home #:key (directory %skeleton-directory) diff --git a/gnu/services/authentication.scm b/gnu/services/authentication.scm index 73969a5a6d..d7efc48cd0 100644 --- a/gnu/services/authentication.scm +++ b/gnu/services/authentication.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Danny Milosavljevic ;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix packages) + #:use-module (guix modules) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -521,6 +523,16 @@ password.") (define (pam-ldap-pam-services config) (list (pam-ldap-pam-service config))) +(define %nslcd-activation + (with-imported-modules (source-module-closure '((gnu build activation))) + #~(begin + (use-modules (gnu build activation)) + (let ((rundir "/var/run/nslcd") + (user (getpwnam "nslcd"))) + (mkdir-p/perms rundir user #o755) + (when (file-exists? "/etc/nslcd.conf") + (chmod "/etc/nslcd.conf" #o400)))))) + (define nslcd-service-type (service-type (name 'nslcd) @@ -531,15 +543,7 @@ password.") (service-extension etc-service-type nslcd-etc-service) (service-extension activation-service-type - (const #~(begin - (use-modules (guix build utils)) - (let ((rundir "/var/run/nslcd") - (user (getpwnam "nslcd"))) - (mkdir-p rundir) - (chown rundir (passwd:uid user) (passwd:gid user)) - (chmod rundir #o755) - (when (file-exists? "/etc/nslcd.conf") - (chmod "/etc/nslcd.conf" #o400)))))) + (const %nslcd-activation)) (service-extension pam-root-service-type pam-ldap-pam-services) (service-extension nscd-service-type diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 17ed04e58b..20e3917b93 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Tobias Geerinckx-Rice +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (append-map find)) #:export (cups-service-type @@ -871,13 +873,11 @@ IPP specifications.") (define %cups-activation ;; Activation gexp. - (with-imported-modules '((guix build utils)) + (with-imported-modules (source-module-closure '((gnu build activation) + (guix build utils))) #~(begin - (use-modules (guix build utils)) - (define (mkdir-p/perms directory owner perms) - (mkdir-p directory) - (chown directory (passwd:uid owner) (passwd:gid owner)) - (chmod directory perms)) + (use-modules (gnu build activation) + (guix build utils)) (define (build-subject parameters) (string-concatenate (map (lambda (pair) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index e015d3f68d..af1a1e4c3a 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Sou Bunnbu +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (guix gexp) #:use-module ((guix packages) #:select (package-name)) #:use-module (guix records) + #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (dbus-configuration @@ -161,24 +163,23 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (define (dbus-activation config) "Return an activation gexp for D-Bus using @var{config}." - #~(begin - (use-modules (guix build utils)) - - (mkdir-p "/var/run/dbus") - - (let ((user (getpwnam "messagebus"))) - (chown "/var/run/dbus" - (passwd:uid user) (passwd:gid user)) - - ;; This directory contains the daemon's socket so it must be - ;; world-readable. - (chmod "/var/run/dbus" #o755)) - - (unless (file-exists? "/etc/machine-id") - (format #t "creating /etc/machine-id...~%") - (invoke (string-append #$(dbus-configuration-dbus config) - "/bin/dbus-uuidgen") - "--ensure=/etc/machine-id")))) + (with-imported-modules (source-module-closure + '((gnu build activation) + (guix build utils))) + #~(begin + (use-modules (gnu build activation) + (guix build utils)) + + (let ((user (getpwnam "messagebus"))) + ;; This directory contains the daemon's socket so it must be + ;; world-readable. + (mkdir-p/perms "/var/run/dbus" user #o755)) + + (unless (file-exists? "/etc/machine-id") + (format #t "creating /etc/machine-id...~%") + (invoke (string-append #$(dbus-configuration-dbus config) + "/bin/dbus-uuidgen") + "--ensure=/etc/machine-id"))))) (define dbus-shepherd-service (match-lambda diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index d4aefe6285..55211cb08f 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,6 +29,7 @@ #:use-module (guix packages) #:use-module (guix records) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -607,17 +609,14 @@ (shell (file-append shadow "/sbin/nologin"))))) (define (knot-activation config) - #~(begin - (use-modules (guix build utils)) - (define (mkdir-p/perms directory owner perms) - (mkdir-p directory) - (chown directory (passwd:uid owner) (passwd:gid owner)) - (chmod directory perms)) - (mkdir-p/perms #$(knot-configuration-run-directory config) - (getpwnam "knot") #o755) - (mkdir-p/perms "/var/lib/knot" (getpwnam "knot") #o755) - (mkdir-p/perms "/var/lib/knot/keys" (getpwnam "knot") #o755) - (mkdir-p/perms "/var/lib/knot/keys/keys" (getpwnam "knot") #o755))) + (with-imported-modules (source-module-closure '((gnu build activation))) + #~(begin + (use-modules (gnu build activation)) + (mkdir-p/perms #$(knot-configuration-run-directory config) + (getpwnam "knot") #o755) + (mkdir-p/perms "/var/lib/knot" (getpwnam "knot") #o755) + (mkdir-p/perms "/var/lib/knot/keys" (getpwnam "knot") #o755) + (mkdir-p/perms "/var/lib/knot/keys/keys" (getpwnam "knot") #o755)))) (define (knot-shepherd-service config) (let* ((config-file (knot-config-file config)) -- cgit 1.4.1 From 02e2e093e858e8a0ca7bd66c1f1f6fd0a1705edb Mon Sep 17 00:00:00 2001 From: Katherine Cox-Buday Date: Thu, 22 Oct 2020 19:40:17 -0500 Subject: import: Add Go importer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds a 'guix import go' command. * doc/guix.texi (Requirements): Mention Guile-Lib dependency. (Invoking guix import): Document 'guix import go'. * gnu/packages/package-management.scm (guix)[inputs, propagated-inputs]: Add GUILE-LIB. * guix/self.scm (compiled-guix)[guile-lib]: New variable. [dependencies]: Add it. (specification->package): Add "guile-lib". * guix/build-system/go.scm (go-version->git-ref): New procedure. * guix/import/go.scm, guix/scripts/import/go.scm, tests/go.scm: New files. * guix/scripts/import.scm: Declare subcommand guix import go * po/guix/POTFILES.in: Add 'guix/scripts/import/go.scm'. * Makefile.am (MODULES): Add 'guix/import/go.scm' and 'guix/scripts/import/go.scm'. (SCM_TESTS): Add 'tests/go.scm'. Co-Authored-By: Helio Machado <0x2b3bfa0@gmail.com> Co-Authored-By: Francois Joulaud Co-Authored-By: Maxim Cournoyer Co-Authored-by: Ludovic Courtès --- Makefile.am | 3 + doc/guix.texi | 26 ++ gnu/packages/package-management.scm | 3 + guix/build-system/go.scm | 35 ++- guix/import/go.scm | 501 ++++++++++++++++++++++++++++++++++++ guix/scripts/import.scm | 2 +- guix/scripts/import/go.scm | 118 +++++++++ guix/self.scm | 6 +- po/guix/POTFILES.in | 1 + tests/go.scm | 281 ++++++++++++++++++++ 10 files changed, 973 insertions(+), 3 deletions(-) create mode 100644 guix/import/go.scm create mode 100644 guix/scripts/import/go.scm create mode 100644 tests/go.scm (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index 0f87c958f7..f40d9509be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -251,6 +251,7 @@ MODULES = \ guix/import/github.scm \ guix/import/gnome.scm \ guix/import/gnu.scm \ + guix/import/go.scm \ guix/import/hackage.scm \ guix/import/json.scm \ guix/import/kde.scm \ @@ -294,6 +295,7 @@ MODULES = \ guix/scripts/import/elpa.scm \ guix/scripts/import/gem.scm \ guix/scripts/import/gnu.scm \ + guix/scripts/import/go.scm \ guix/scripts/import/hackage.scm \ guix/scripts/import/json.scm \ guix/scripts/import/nix.scm \ @@ -455,6 +457,7 @@ SCM_TESTS = \ tests/git-authenticate.scm \ tests/glob.scm \ tests/gnu-maintenance.scm \ + tests/go.scm \ tests/grafts.scm \ tests/graph.scm \ tests/gremlin.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index f01e7ca89d..77aafafd97 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -862,6 +862,10 @@ substitutes (@pxref{Invoking guix publish}). @uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for the @code{crate} importer (@pxref{Invoking guix import}). +@item +@uref{https://www.nongnu.org/guile-lib/doc/ref/htmlprag/, Guile-Lib} for +the @code{go} importer (@pxref{Invoking guix import}). + @item When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs. @@ -11494,6 +11498,28 @@ Select the given repository (a repository name). Possible values include: of coq packages. @end itemize @end table + +@item go +@cindex go +Import metadata for a Go module using +@uref{https://proxy.golang.org, proxy.golang.org}. + +This importer is highly experimental. See the source code for more info +about the current state. + +@example +guix import go gopkg.in/yaml.v2 +@end example + +Additional options include: + +@table @code +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. +@end table @end table The structure of the @command{guix import} code is modular. It would be diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 60aa3f8624..9bf24f8533 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -304,6 +304,7 @@ $(prefix)/etc/init.d\n"))) '((assoc-ref inputs "guile")))) (avahi (assoc-ref inputs "guile-avahi")) (gcrypt (assoc-ref inputs "guile-gcrypt")) + (guile-lib (assoc-ref inputs "guile-lib")) (json (assoc-ref inputs "guile-json")) (sqlite (assoc-ref inputs "guile-sqlite3")) (zlib (assoc-ref inputs "guile-zlib")) @@ -367,6 +368,7 @@ $(prefix)/etc/init.d\n"))) `(("guile-avahi" ,guile-avahi))) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) + ("guile-lib" ,guile-lib) ("guile-sqlite3" ,guile-sqlite3) ("guile-zlib" ,guile-zlib) ("guile-lzlib" ,guile-lzlib) @@ -422,6 +424,7 @@ $(prefix)/etc/init.d\n"))) `(("guile-avahi" ,guile-avahi))) ("guile-gcrypt" ,guile-gcrypt) ("guile-json" ,guile-json-4) + ("guile-lib" ,guile-lib) ("guile-sqlite3" ,guile-sqlite3) ("guile-ssh" ,guile-ssh) ("guile-git" ,guile-git) diff --git a/guix/build-system/go.scm b/guix/build-system/go.scm index f8ebaefb27..0e2c1cd2ee 100644 --- a/guix/build-system/go.scm +++ b/guix/build-system/go.scm @@ -26,9 +26,12 @@ #:use-module (guix build-system gnu) #:use-module (guix packages) #:use-module (ice-9 match) + #:use-module (ice-9 regex) #:export (%go-build-system-modules go-build - go-build-system)) + go-build-system + + go-version->git-ref)) ;; Commentary: ;; @@ -37,6 +40,36 @@ ;; ;; Code: +(define %go-version-rx + (make-regexp (string-append + "(v?[0-9]\\.[0-9]\\.[0-9])" ;"v" prefix can be omitted in version prefix + "(-|-pre\\.0\\.|-0\\.)" ;separator + "([0-9]{14})-" ;timestamp + "([0-9A-Fa-f]{12})"))) ;commit hash + +(define (go-version->git-ref version) + "Parse VERSION, a \"pseudo-version\" as defined at +, and extract the commit hash from +it, defaulting to full VERSION if a pseudo-version pattern is not recognized." + ;; A module version like v1.2.3 is introduced by tagging a revision in the + ;; underlying source repository. Untagged revisions can be referred to + ;; using a "pseudo-version" like v0.0.0-yyyymmddhhmmss-abcdefabcdef, where + ;; the time is the commit time in UTC and the final suffix is the prefix of + ;; the commit hash (see: https://golang.org/ref/mod#pseudo-versions). + (let* ((version + ;; If a source code repository has a v2.0.0 or later tag for a file + ;; tree with no go.mod, the version is considered to be part of the + ;; v1 module's available versions and is given an +incompatible + ;; suffix + ;; (see:https://golang.org/cmd/go/#hdr-Module_compatibility_and_semantic_versioning). + (if (string-suffix? "+incompatible" version) + (string-drop-right version 13) + version)) + (match (regexp-exec %go-version-rx version))) + (if match + (match:substring match 4) + version))) + (define %go-build-system-modules ;; Build-side modules imported and used by default. `((guix build go-build-system) diff --git a/guix/import/go.scm b/guix/import/go.scm new file mode 100644 index 0000000000..6b10c60dca --- /dev/null +++ b/guix/import/go.scm @@ -0,0 +1,501 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Katherine Cox-Buday +;;; Copyright © 2020 Helio Machado <0x2b3bfa0+guix@googlemail.com> +;;; Copyright © 2021 François Joulaud +;;; Copyright © 2021 Maxim Cournoyer +;;; +;;; 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 (guix import go) + #:use-module (guix build-system go) + #:use-module (guix git) + #:use-module (guix i18n) + #:use-module (guix diagnostics) + #:use-module (guix import utils) + #:use-module (guix import json) + #:use-module (guix packages) + #:use-module ((guix utils) #:select (string-replace-substring)) + #:use-module (guix http-client) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix memoization) + #:autoload (htmlprag) (html->sxml) ;from Guile-Lib + #:use-module (ice-9 match) + #:use-module (ice-9 rdelim) + #:use-module (ice-9 receive) + #:use-module (ice-9 regex) + #:use-module ((rnrs io ports) #:select (call-with-port)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-26) + #:use-module (sxml xpath) + #:use-module (web client) + #:use-module (web response) + #:use-module (web uri) + + #:export (go-path-escape + go-module->guix-package + go-module-recursive-import)) + +;;; Commentary: +;;; +;;; (guix import go) attempts to make it easier to create Guix package +;;; declarations for Go modules. +;;; +;;; Modules in Go are a "collection of related Go packages" which are "the +;;; unit of source code interchange and versioning". Modules are generally +;;; hosted in a repository. +;;; +;;; At this point it should handle correctly modules which have only Go +;;; dependencies and are accessible from proxy.golang.org (or configured via +;;; GOPROXY). +;;; +;;; We want it to work more or less this way: +;;; - get latest version for the module from GOPROXY +;;; - infer VCS root repo from which we will check-out source by +;;; + recognising known patterns (like github.com) +;;; + or recognizing .vcs suffix +;;; + or parsing meta tag in HTML served at the URL +;;; + or (TODO) if nothing else works by using zip file served by GOPROXY +;;; - get go.mod from GOPROXY (which is able to synthetize one if needed) +;;; - extract list of dependencies from this go.mod +;;; +;;; The Go module paths are translated to a Guix package name under the +;;; assumption that there will be no collision. + +;;; TODO list +;;; - get correct hash in vcs->origin +;;; - print partial result during recursive imports (need to catch +;;; exceptions) + +;;; Code: + +(define (go-path-escape path) + "Escape a module path by replacing every uppercase letter with an +exclamation mark followed with its lowercase equivalent, as per the module +Escaped Paths specification (see: +https://godoc.org/golang.org/x/mod/module#hdr-Escaped_Paths)." + (define (escape occurrence) + (string-append "!" (string-downcase (match:substring occurrence)))) + (regexp-substitute/global #f "[A-Z]" path 'pre escape 'post)) + +(define (go-module-latest-version goproxy-url module-path) + "Fetch the version number of the latest version for MODULE-PATH from the +given GOPROXY-URL server." + (assoc-ref (json-fetch (format #f "~a/~a/@latest" goproxy-url + (go-path-escape module-path))) + "Version")) + + +(define (go-package-licenses name) + "Retrieve the list of licenses that apply to NAME, a Go package or module +name (e.g. \"github.com/golang/protobuf/proto\"). The data is scraped from +the https://pkg.go.dev/ web site." + (let*-values (((url) (string-append "https://pkg.go.dev/" name + "?tab=licenses")) + ((response body) (http-get url)) + ;; Extract the text contained in a h2 child node of any + ;; element marked with a "License" class attribute. + ((select) (sxpath `(// (* (@ (equal? (class "License")))) + h2 // *text*)))) + (and (eq? (response-code response) 200) + (match (select (html->sxml body)) + (() #f) ;nothing selected + (licenses licenses))))) + +(define (go.pkg.dev-info name) + (http-get (string-append "https://pkg.go.dev/" name))) +(define go.pkg.dev-info* + (memoize go.pkg.dev-info)) + +(define (go-package-description name) + "Retrieve a short description for NAME, a Go package name, +e.g. \"google.golang.org/protobuf/proto\". The data is scraped from the +https://pkg.go.dev/ web site." + (let*-values (((response body) (go.pkg.dev-info* name)) + ;; Extract the text contained in a h2 child node of any + ;; element marked with a "License" class attribute. + ((select) (sxpath + `(// (section + (@ (equal? (class "Documentation-overview")))) + (p 1))))) + (and (eq? (response-code response) 200) + (match (select (html->sxml body)) + (() #f) ;nothing selected + (((p . strings)) + ;; The paragraph text is returned as a list of strings embedding + ;; newline characters. Join them and strip the newline + ;; characters. + (string-delete #\newline (string-join strings))))))) + +(define (go-package-synopsis module-name) + "Retrieve a short synopsis for a Go module named MODULE-NAME, +e.g. \"google.golang.org/protobuf\". The data is scraped from +the https://pkg.go.dev/ web site." + ;; Note: Only the *module* (rather than package) page has the README title + ;; used as a synopsis on the https://pkg.go.dev web site. + (let*-values (((response body) (go.pkg.dev-info* module-name)) + ;; Extract the text contained in a h2 child node of any + ;; element marked with a "License" class attribute. + ((select) (sxpath + `(// (div (@ (equal? (class "UnitReadme-content")))) + // h3 *text*)))) + (and (eq? (response-code response) 200) + (match (select (html->sxml body)) + (() #f) ;nothing selected + ((title more ...) ;title is the first string of the list + (string-trim-both title)))))) + +(define (list->licenses licenses) + "Given a list of LICENSES mostly following the SPDX conventions, return the +corresponding Guix license or 'unknown-license!" + (filter-map (lambda (license) + (and (not (string-null? license)) + (not (any (cut string=? <> license) + '("AND" "OR" "WITH"))) + ;; Adjust the license names scraped from + ;; https://pkg.go.dev to an equivalent SPDX identifier, + ;; if they differ (see: https://github.com/golang/pkgsite + ;; /internal/licenses/licenses.go#L174). + (or (spdx-string->license + (match license + ("BlueOak-1.0" "BlueOak-1.0.0") + ("BSD-0-Clause" "0BSD") + ("BSD-2-Clause" "BSD-2-Clause-FreeBSD") + ("GPL2" "GPL-2.0") + ("GPL3" "GPL-3.0") + ("NIST" "NIST-PD") + (_ license))) + 'unknown-license!))) + licenses)) + +(define (fetch-go.mod goproxy-url module-path version) + "Fetches go.mod from the given GOPROXY-URL server for the given MODULE-PATH +and VERSION." + (let ((url (format #f "~a/~a/@v/~a.mod" goproxy-url + (go-path-escape module-path) + (go-path-escape version)))) + (http-fetch url))) + +(define %go.mod-require-directive-rx + ;; A line in a require directive is composed of a module path and + ;; a version separated by whitespace and an optionnal '//' comment at + ;; the end. + (make-regexp + (string-append + "^[[:blank:]]*" + "([^[:blank:]]+)[[:blank:]]+([^[:blank:]]+)" + "([[:blank:]]+//.*)?"))) + +(define %go.mod-replace-directive-rx + ;; ReplaceSpec = ModulePath [ Version ] "=>" FilePath newline + ;; | ModulePath [ Version ] "=>" ModulePath Version newline . + (make-regexp + (string-append + "([^[:blank:]]+)([[:blank:]]+([^[:blank:]]+))?" + "[[:blank:]]+" "=>" "[[:blank:]]+" + "([^[:blank:]]+)([[:blank:]]+([^[:blank:]]+))?"))) + +(define (parse-go.mod port) + "Parse the go.mod file accessible via the input PORT, returning a list of +requirements." + (define-record-type + (make-results requirements replacements) + results? + (requirements results-requirements) + (replacements results-replacements)) + ;; We parse only a subset of https://golang.org/ref/mod#go-mod-file-grammar + ;; which we think necessary for our use case. + (define (toplevel results) + "Main parser, RESULTS is a pair of alist serving as accumulator for + all encountered requirements and replacements." + (let ((line (read-line port))) + (cond + ((eof-object? line) + ;; parsing ended, give back the result + results) + ((string=? line "require (") + ;; a require block begins, delegate parsing to IN-REQUIRE + (in-require results)) + ((string=? line "replace (") + ;; a replace block begins, delegate parsing to IN-REPLACE + (in-replace results)) + ((string-prefix? "require " line) + ;; a standalone require directive + (let* ((stripped-line (string-drop line 8)) + (new-results (require-directive results stripped-line))) + (toplevel new-results))) + ((string-prefix? "replace " line) + ;; a standalone replace directive + (let* ((stripped-line (string-drop line 8)) + (new-results (replace-directive results stripped-line))) + (toplevel new-results))) + (#t + ;; unrecognised line, ignore silently + (toplevel results))))) + + (define (in-require results) + (let ((line (read-line port))) + (cond + ((eof-object? line) + ;; this should never happen here but we ignore silently + results) + ((string=? line ")") + ;; end of block, coming back to toplevel + (toplevel results)) + (#t + (in-require (require-directive results line)))))) + + (define (in-replace results) + (let ((line (read-line port))) + (cond + ((eof-object? line) + ;; this should never happen here but we ignore silently + results) + ((string=? line ")") + ;; end of block, coming back to toplevel + (toplevel results)) + (#t + (in-replace (replace-directive results line)))))) + + (define (replace-directive results line) + "Extract replaced modules and new requirements from replace directive + in LINE and add to RESULTS." + (match results + (($ requirements replaced) + (let* ((rx-match (regexp-exec %go.mod-replace-directive-rx line)) + (module-path (match:substring rx-match 1)) + (version (match:substring rx-match 3)) + (new-module-path (match:substring rx-match 4)) + (new-version (match:substring rx-match 6)) + (new-replaced (alist-cons module-path version replaced)) + (new-requirements + (if (string-match "^\\.?\\./" new-module-path) + requirements + (alist-cons new-module-path new-version requirements)))) + (make-results new-requirements new-replaced))))) + (define (require-directive results line) + "Extract requirement from LINE and add it to RESULTS." + (let* ((rx-match (regexp-exec %go.mod-require-directive-rx line)) + (module-path (match:substring rx-match 1)) + ;; we saw double-quoted string in the wild without escape + ;; sequences so we just trim the quotes + (module-path (string-trim-both module-path #\")) + (version (match:substring rx-match 2))) + (match results + (($ requirements replaced) + (make-results (alist-cons module-path version requirements) replaced))))) + + (let ((results (toplevel (make-results '() '())))) + (match results + (($ requirements replaced) + ;; At last we remove replaced modules from the requirements list + (fold + (lambda (replacedelem requirements) + (alist-delete! (car replacedelem) requirements)) + requirements + replaced))))) + +;; Prevent inlining of this procedure, which is accessed by unit tests. +(set! parse-go.mod parse-go.mod) + +(define-record-type + (%make-vcs url-prefix root-regex type) + vcs? + (url-prefix vcs-url-prefix) + (root-regex vcs-root-regex) + (type vcs-type)) +(define (make-vcs prefix regexp type) + (%make-vcs prefix (make-regexp regexp) type)) +(define known-vcs + ;; See the following URL for the official Go equivalent: + ;; https://github.com/golang/go/blob/846dce9d05f19a1f53465e62a304dea21b99f910/src/cmd/go/internal/vcs/vcs.go#L1026-L1087 + (list + (make-vcs + "github.com" + "^(github\\.com/[A-Za-z0-9_.\\-]+/[A-Za-z0-9_.\\-]+)(/[A-Za-z0-9_.\\-]+)*$" + 'git) + (make-vcs + "bitbucket.org" + "^(bitbucket\\.org/([A-Za-z0-9_.\\-]+/[A-Za-z0-9_.\\-]+))(/[A-Za-z0-9_.\\-]+)*$" + 'unknown) + (make-vcs + "hub.jazz.net/git/" + "^(hub\\.jazz\\.net/git/[a-z0-9]+/[A-Za-z0-9_.\\-]+)(/[A-Za-z0-9_.\\-]+)*$" + 'git) + (make-vcs + "git.apache.org" + "^(git\\.apache\\.org/[a-z0-9_.\\-]+\\.git)(/[A-Za-z0-9_.\\-]+)*$" + 'git) + (make-vcs + "git.openstack.org" + "^(git\\.openstack\\.org/[A-Za-z0-9_.\\-]+/[A-Za-z0-9_.\\-]+)(\\.git)?\ +(/[A-Za-z0-9_.\\-]+)*$" + 'git))) + +(define (module-path->repository-root module-path) + "Infer the repository root from a module path. Go modules can be +defined at any level of a repository tree, but querying for the meta tag +usually can only be done from the web page at the root of the repository, +hence the need to derive this information." + + ;; For reference, see: https://golang.org/ref/mod#vcs-find. + (define vcs-qualifiers '(".bzr" ".fossil" ".git" ".hg" ".svn")) + + (define (vcs-qualified-module-path->root-repo-url module-path) + (let* ((vcs-qualifiers-group (string-join vcs-qualifiers "|")) + (pattern (format #f "^(.*(~a))(/|$)" vcs-qualifiers-group)) + (m (string-match pattern module-path))) + (and=> m (cut match:substring <> 1)))) + + (or (and=> (find (lambda (vcs) + (string-prefix? (vcs-url-prefix vcs) module-path)) + known-vcs) + (lambda (vcs) + (match:substring (regexp-exec (vcs-root-regex vcs) + module-path) 1))) + (vcs-qualified-module-path->root-repo-url module-path) + module-path)) + +(define (go-module->guix-package-name module-path) + "Converts a module's path to the canonical Guix format for Go packages." + (string-downcase (string-append "go-" (string-replace-substring + (string-replace-substring + module-path + "." "-") + "/" "-")))) + +(define-record-type + (make-module-meta import-prefix vcs repo-root) + module-meta? + (import-prefix module-meta-import-prefix) + (vcs module-meta-vcs) ;a symbol + (repo-root module-meta-repo-root)) + +(define (fetch-module-meta-data module-path) + "Retrieve the module meta-data from its landing page. This is necessary +because goproxy servers don't currently provide all the information needed to +build a package." + ;; + (let* ((port (http-fetch (format #f "https://~a?go-get=1" module-path))) + (select (sxpath `(// head (meta (@ (equal? (name "go-import")))) + // content)))) + (match (select (call-with-port port html->sxml)) + (() #f) ;nothing selected + (((content content-text)) + (match (string-split content-text #\space) + ((root-path vcs repo-url) + (make-module-meta root-path (string->symbol vcs) repo-url))))))) + +(define (module-meta-data-repo-url meta-data goproxy-url) + "Return the URL where the fetcher which will be used can download the +source." + (if (member (module-meta-vcs meta-data) '(fossil mod)) + goproxy-url + (module-meta-repo-root meta-data))) + +(define (vcs->origin vcs-type vcs-repo-url version) + "Generate the `origin' block of a package depending on what type of source +control system is being used." + (case vcs-type + ((git) + (let ((plain-version? (string=? version (go-version->git-ref version))) + (v-prefixed? (string-prefix? "v" version))) + `(origin + (method git-fetch) + (uri (git-reference + (url ,vcs-repo-url) + (commit ,(if (and plain-version? v-prefixed?) + '(string-append "v" version) + '(go-version->git-ref version))))) + (file-name (git-file-name name version)) + (sha256 + (base32 + ;; FIXME: populate hash for git repo checkout + "0000000000000000000000000000000000000000000000000000"))))) + ((hg) + `(origin + (method hg-fetch) + (uri (hg-reference + (url ,vcs-repo-url) + (changeset ,version))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + ;; FIXME: populate hash for hg repo checkout + "0000000000000000000000000000000000000000000000000000")))) + ((svn) + `(origin + (method svn-fetch) + (uri (svn-reference + (url ,vcs-repo-url) + (revision (string->number version)))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + ;; FIXME: populate hash for svn repo checkout + "0000000000000000000000000000000000000000000000000000")))) + (else + (raise + (formatted-message (G_ "unsupported vcs type '~a' for package '~a'") + vcs-type vcs-repo-url))))) + +(define* (go-module->guix-package module-path #:key + (goproxy-url "https://proxy.golang.org")) + (let* ((latest-version (go-module-latest-version goproxy-url module-path)) + (port (fetch-go.mod goproxy-url module-path latest-version)) + (dependencies (map car (call-with-port port parse-go.mod))) + (guix-name (go-module->guix-package-name module-path)) + (root-module-path (module-path->repository-root module-path)) + ;; The VCS type and URL are not included in goproxy information. For + ;; this we need to fetch it from the official module page. + (meta-data (fetch-module-meta-data root-module-path)) + (vcs-type (module-meta-vcs meta-data)) + (vcs-repo-url (module-meta-data-repo-url meta-data goproxy-url)) + (synopsis (go-package-synopsis root-module-path)) + (description (go-package-description module-path)) + (licenses (go-package-licenses module-path))) + (values + `(package + (name ,guix-name) + ;; Elide the "v" prefix Go uses + (version ,(string-trim latest-version #\v)) + (source + ,(vcs->origin vcs-type vcs-repo-url latest-version)) + (build-system go-build-system) + (arguments + '(#:import-path ,root-module-path)) + ,@(maybe-inputs (map go-module->guix-package-name dependencies)) + (home-page ,(format #f "https://~a" root-module-path)) + (synopsis ,synopsis) + (description ,description) + (license ,(match (and=> licenses list->licenses) + ((license) license) + ((licenses ...) `(list ,@licenses)) + (x x)))) + dependencies))) + +(define go-module->guix-package* (memoize go-module->guix-package)) + +(define* (go-module-recursive-import package-name + #:key (goproxy-url "https://proxy.golang.org")) + (recursive-import + package-name + #:repo->guix-package (lambda* (name . _) + (go-module->guix-package* + name + #:goproxy-url goproxy-url)) + #:guix-name go-module->guix-package-name)) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 0a3863f965..1d2b45d942 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -77,7 +77,7 @@ rather than \\n." ;;; (define importers '("gnu" "nix" "pypi" "cpan" "hackage" "stackage" "elpa" "gem" - "cran" "crate" "texlive" "json" "opam")) + "go" "cran" "crate" "texlive" "json" "opam")) (define (resolve-importer name) (let ((module (resolve-interface diff --git a/guix/scripts/import/go.scm b/guix/scripts/import/go.scm new file mode 100644 index 0000000000..afdba4e8f1 --- /dev/null +++ b/guix/scripts/import/go.scm @@ -0,0 +1,118 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright 2020 Katherine Cox-Buday +;;; +;;; 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 (guix scripts import go) + #:use-module (guix ui) + #:use-module (guix utils) + #:use-module (guix scripts) + #:use-module (guix import go) + #:use-module (guix scripts import) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-37) + #:use-module (ice-9 match) + #:use-module (ice-9 format) + #:export (guix-import-go)) + + +;;; +;;; Command-line options. +;;; + +(define %default-options + '()) + +(define (show-help) + (display (G_ "Usage: guix import go PACKAGE-PATH +Import and convert the Go module for PACKAGE-PATH.\n")) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (display (G_ " + -r, --recursive generate package expressions for all Go modules\ + that are not yet in Guix")) + (display (G_ " + -p, --goproxy=GOPROXY specify which goproxy server to use")) + (newline) + (show-bug-report-information)) + +(define %options + ;; Specification of the command-line options. + (cons* (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix import go"))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) + (option '(#\p "goproxy") #t #f + (lambda (opt name arg result) + (alist-cons 'goproxy + (string->symbol arg) + (alist-delete 'goproxy result)))) + %standard-import-options)) + + +;;; +;;; Entry point. +;;; + +(define (guix-import-go . args) + (define (parse-options) + ;; Return the alist of option values. + (args-fold* args %options + (lambda (opt name arg result) + (leave (G_ "~A: unrecognized option~%") name)) + (lambda (arg result) + (alist-cons 'argument arg result)) + %default-options)) + + (let* ((opts (parse-options)) + (args (filter-map (match-lambda + (('argument . value) + value) + (_ #f)) + (reverse opts)))) + (match args + ((module-name) + (if (assoc-ref opts 'recursive) + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (go-module-recursive-import module-name + #:goproxy-url + (or (assoc-ref opts 'goproxy) + "https://proxy.golang.org"))) + (let ((sexp (go-module->guix-package module-name + #:goproxy-url + (or (assoc-ref opts 'goproxy) + "https://proxy.golang.org")))) + (unless sexp + (leave (G_ "failed to download meta-data for module '~a'~%") + module-name)) + sexp))) + (() + (leave (G_ "too few arguments~%"))) + ((many ...) + (leave (G_ "too many arguments~%")))))) diff --git a/guix/self.scm b/guix/self.scm index 35fba1152d..3154d180ac 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -56,6 +56,7 @@ ("guile-ssh" (ref '(gnu packages ssh) 'guile-ssh)) ("guile-git" (ref '(gnu packages guile) 'guile-git)) ("guile-semver" (ref '(gnu packages guile-xyz) 'guile-semver)) + ("guile-lib" (ref '(gnu packages guile-xyz) 'guile-lib)) ("guile-sqlite3" (ref '(gnu packages guile) 'guile-sqlite3)) ("guile-zlib" (ref '(gnu packages guile) 'guile-zlib)) ("guile-lzlib" (ref '(gnu packages guile) 'guile-lzlib)) @@ -814,6 +815,9 @@ itself." (define guile-ssh (specification->package "guile-ssh")) + (define guile-lib + (specification->package "guile-lib")) + (define guile-git (specification->package "guile-git")) @@ -842,7 +846,7 @@ itself." (append-map transitive-package-dependencies (list guile-gcrypt gnutls guile-git guile-avahi guile-json guile-semver guile-ssh guile-sqlite3 - guile-zlib guile-lzlib guile-zstd))) + guile-lib guile-zlib guile-lzlib guile-zstd))) (define *core-modules* (scheme-node "guix-core" diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index 666e630adf..cbbfe1e76b 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -101,6 +101,7 @@ guix/scripts/import/cpan.scm guix/scripts/import/crate.scm guix/scripts/import/gem.scm guix/scripts/import/gnu.scm +guix/scripts/import/go.scm guix/scripts/import/hackage.scm guix/scripts/import/json.scm guix/scripts/import/nix.scm diff --git a/tests/go.scm b/tests/go.scm new file mode 100644 index 0000000000..1df5036838 --- /dev/null +++ b/tests/go.scm @@ -0,0 +1,281 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright 2021 Franois Joulaud +;;; +;;; 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 . + +;;; Summary +;; Tests for guix/import/go.scm + +(define-module (test-import-go) + #:use-module (guix base32) + #:use-module (guix build-system go) + #:use-module (guix import go) + #:use-module (guix tests) + #:use-module (ice-9 match) + #:use-module (srfi srfi-19) + #:use-module (srfi srfi-64) + #:use-module (web response)) + +(define parse-go.mod + (@@ (guix import go) parse-go.mod)) + +(define fixture-go-mod-simple + "module my/thing +go 1.12 +require other/thing v1.0.2 +require new/thing/v2 v2.3.4 +exclude old/thing v1.2.3 +replace bad/thing v1.4.5 => good/thing v1.4.5 +") + +(define fixture-go-mod-with-block + "module M + +require ( + A v1 + B v1.0.0 + C v1.0.0 + D v1.2.3 + E dev +) + +exclude D v1.2.3 +") + + +(define fixture-go-mod-complete + "module M + +go 1.13 + +replace github.com/myname/myproject/myapi => ./api + +replace github.com/mymname/myproject/thissdk => ../sdk + +replace launchpad.net/gocheck => github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a + +require ( + github.com/user/project v1.1.11 + github.com/user/project/sub/directory v1.1.12 + bitbucket.org/user/project v1.11.20 + bitbucket.org/user/project/sub/directory v1.11.21 + launchpad.net/project v1.1.13 + launchpad.net/project/series v1.1.14 + launchpad.net/project/series/sub/directory v1.1.15 + launchpad.net/~user/project/branch v1.1.16 + launchpad.net/~user/project/branch/sub/directory v1.1.17 + hub.jazz.net/git/user/project v1.1.18 + hub.jazz.net/git/user/project/sub/directory v1.1.19 + k8s.io/kubernetes/subproject v1.1.101 + one.example.com/abitrary/repo v1.1.111 + two.example.com/abitrary/repo v0.0.2 + \"quoted.example.com/abitrary/repo\" v0.0.2 +) + +replace two.example.com/abitrary/repo => github.com/corp/arbitrary-repo v0.0.2 + +replace ( + golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 + golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 +) + +") + + + +(define fixture-latest-for-go-check + "{\"Version\":\"v0.0.0-20201130134442-10cb98267c6c\",\"Time\":\"2020-11-30T13:44:42Z\"}") + + +(define fixtures-go-check-test + (let ((version + "{\"Version\":\"v0.0.0-20201130134442-10cb98267c6c\",\"Time\":\"2020-11-30T13:44:42Z\"}") + (go.mod + "module gopkg.in/check.v1 + +go 1.11 + +require github.com/kr/pretty v0.2.1 +") + (go-get + " + + + + + + + + GitHub - go-check/check: Rich testing for the Go language + + + + + + + + + + + + +") + (pkg.go.dev "\n\n\n \n\n\n
\n
\n
\n
\n
\n

\"\"README

\n
\n
\n

Instructions

\n

Install the package with:

\n 
go get gopkg.in/check.v1\n
\n
\n
\n
\n
\n
\n

\"\"Documentation

\n
\n
\n
\n

Overview

\n
\n
    \n
    \n

    Package check is a rich testing extension for Go's testing package.

    \n

    For details about the project, see:

    \n 
    http://labix.org/gocheck\n
    \n
    \n

    Constants

    \n
    \n
    \n
    \n
    \n
    \n
    \n
    \n\n\n") + (pkg.go.dev-licence "\n\n\n\n\n
    \n
    \n

    BSD-2-Clause

    \n

    This is not legal advice. Read disclaimer.

    \n 
    Gocheck - A rich testing framework for Go\n \nCopyright line\n\nAll rights reserved.\n\nRedistribution and use in source and binary forms, with or without\nmodification, are permitted provided that the following conditions are met: \n\n1. Redistributions of source code must retain the above copyright notice, this\n   list of conditions and the following disclaimer. \n2. Redistributions in binary form must reproduce the above copyright notice,\n   this list of conditions and the following disclaimer in the documentation\n   and/or other materials provided with the distribution. \n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND\nANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED\nWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\nDISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR\nANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES\n(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\nLOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND\nON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n
    \n
    \n
    Source: github.com/go-check/check@v0.0.0-20201128035030-22ab2dfb190c/LICENSE
    \n
    \n \n")) + `(("https://proxy.golang.org/github.com/go-check/check/@v/v0.0.0-20201130134442-10cb98267c6c.mod" + . ,go.mod) + ("https://proxy.golang.org/github.com/go-check/check/@latest" + . ,version) + ("https://github.com/go-check/check?go-get=1" + . ,go-get) + ("https://pkg.go.dev/github.com/go-check/check" + . ,pkg.go.dev) + ("https://pkg.go.dev/github.com/go-check/check?tab=licenses" + . ,pkg.go.dev-licence)))) + +(test-begin "go") + +;;; Unit tests for go build-system + +(test-equal "go-version basic" + "v1.0.2" + (go-version->git-ref "v1.0.2")) + +(test-equal "go-version omited 'v' character" + "v1.0.2" + (go-version->git-ref "v1.0.2")) + +(test-equal "go-version with embeded git-ref" + "65e3620a7ae7" + (go-version->git-ref "v0.0.0-20190821162956-65e3620a7ae7")) + +(test-equal "go-version with complex embeded git-ref" + "daa7c04131f5" + (go-version->git-ref "v1.2.4-0.20191109021931-daa7c04131f5")) + +;;; Unit tests for (guix import go) + +(test-equal "go-path-escape" + "github.com/!azure/!avere" + ((@@ (guix import go) go-path-escape) "github.com/Azure/Avere")) + + +;; We define a function for all similar tests with different go.mod files +(define (testing-parse-mod name expected input) + (define (inf? p1 p2) + (stringguix-package" + '(package + (name "go-github-com-go-check-check") + (version "0.0.0-20201130134442-10cb98267c6c") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-check/check.git") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))) + (build-system go-build-system) + (arguments + (quote (#:import-path "github.com/go-check/check"))) + (inputs + (quasiquote (("go-github-com-kr-pretty" + (unquote go-github-com-kr-pretty))))) + (home-page "https://github.com/go-check/check") + (synopsis "Instructions") + (description #f) + (license license:bsd-2)) + + ;; Replace network resources with sample data. + (mock ((web client) http-get + (mock-http-get fixtures-go-check-test)) + (mock ((guix http-client) http-fetch + (mock-http-fetch fixtures-go-check-test)) + (go-module->guix-package "github.com/go-check/check")))) + +(test-end "go") + -- cgit 1.4.1 From c3e53066bd512d7acd4a80fe3248296e10c56b06 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Mar 2021 17:52:54 +0100 Subject: gnu: sbcl-hu.dwim.defclass-star: Update to 20210309. * gnu/packages/lisp-xyz.scm (sbcl-hu.dwim.defclass-star): Update to 20210309. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index acef021314..673266b40a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12170,12 +12170,12 @@ hu.dwim systems.") (sbcl-package->ecl-package sbcl-hu.dwim.common)) (define-public sbcl-hu.dwim.defclass-star - (let ((commit "39d458f1b1bc830d1f5e18a6a35bf0e96a2cfd61")) + (let ((commit "3086878a485074f9b2913c58267a9b764cd632fd")) (package (name "sbcl-hu.dwim.defclass-star") ;; We used to set version from the date when it was a darcs repo, so we ;; keep the year so that package gets updated on previous installs. - (version (git-version "2021" "1" commit)) + (version (git-version "2021" "2" commit)) (source (origin (method git-fetch) @@ -12184,7 +12184,7 @@ hu.dwim systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0hfkq2wad98vkyxdg1wh18y86d9w9yqkm8lxkk96szvpwymm7lmq")))) + (base32 "19ipds9r71qymfdp4izg0l7zmvinp06adr8rdalhaq7v7mzpg83z")))) (build-system asdf-build-system/sbcl) (native-inputs `( ;; These 2 inputs are only needed tests which are disabled, see below. -- cgit 1.4.1 From 336088d5216da023983801201b7cecdafe31ff48 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Mar 2021 18:07:56 +0100 Subject: gnu: Add fof. * gnu/packages/lisp-xyz.scm (cl-fof, ecl-fof, sbcl-fof): New variables. --- gnu/packages/lisp-xyz.scm | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 673266b40a..eb84a9afdd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) + #:use-module (gnu packages video) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) @@ -15262,3 +15263,56 @@ line tool @code{df} and get disk space information using @code{statvfs}.") (define-public cl-diskspace (sbcl-package->cl-source-package sbcl-cl-diskspace)) + +(define-public sbcl-fof + (package + (name "sbcl-fof") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/ambrevar/fof") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xdnlqrjfmgdgw58avkci881iwarv4am2vq09b14pfifmpxpzv10")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ffprobe.lisp" + (("\\(defvar \\*ffprobe-command\\* \"ffprobe\"\\)") + (format #f "(defvar *ffprobe-command* \"~a/bin/ffprobe\")" + (assoc-ref inputs "ffmpeg") ))) + #t))))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star) + ("local-time" ,sbcl-local-time) + ("magicffi" ,sbcl-magicffi) + ("osicat" ,sbcl-osicat) + ("serapeum" ,sbcl-serapeum) + ("str" ,sbcl-cl-str) + ("trivia" ,sbcl-trivia) + ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames) + ;; Non-CL deps: + ("ffmpeg" ,ffmpeg))) + (home-page "https://gitlab.com/ambrevar/fof") + (synopsis "File object finder library for Common Lisp") + (description + "This library enable rapid file search, inspection and manipulation +straight from the REPL. +It aims at replacing Unix tools such as @code{find} or @code{du}. +It also offers a replacement to the @code{pathname} Common Lisp API. +Slot writers which commit changes to disk, e.g. permissions, modification +time, etc.") + (license license:gpl3+))) + +(define-public ecl-fof + (sbcl-package->ecl-package sbcl-fof)) + +(define-public cl-fof + (sbcl-package->cl-source-package sbcl-fof)) -- cgit 1.4.1 From 6e70211b20537b018e639b0114d3ccddd4924acb Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 10 Mar 2021 18:19:20 +0100 Subject: gnu: sbcl-quri: Update to 0.3.0. * gnu/packages/lisp-xyz.scm (sbcl-quri): Update to 0.3.0. --- gnu/packages/lisp-xyz.scm | 60 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index eb84a9afdd..e15185339b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4331,38 +4331,36 @@ addition, removal, and random selection.") (sbcl-package->ecl-package sbcl-map-set)) (define-public sbcl-quri - (let ((commit "d7f2720568146c6674187f625f115925e6364a7f") - (revision "4")) - (package - (name "sbcl-quri") - (version (git-version "0.1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fukamachi/quri") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0yrcvz5ksfr7x8yx741vp65il0fxxaskppq3iyk9bq895s1jn37w")))) - (build-system asdf-build-system/sbcl) - (arguments - ;; Test system must be loaded before, otherwise tests fail with: - ;; Component QURI-ASD::QURI-TEST not found, required by #. - '(#:asd-systems '("quri-test" - "quri"))) - (native-inputs `(("sbcl-prove" ,sbcl-prove))) - (inputs `(("sbcl-babel" ,sbcl-babel) - ("sbcl-split-sequence" ,sbcl-split-sequence) - ("sbcl-cl-utilities" ,sbcl-cl-utilities) - ("sbcl-alexandria" ,sbcl-alexandria))) - (home-page "https://github.com/fukamachi/quri") - (synopsis "Yet another URI library for Common Lisp") - (description - "QURI (pronounced \"Q-ree\") is yet another URI library for Common + (package + (name "sbcl-quri") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fukamachi/quri") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pkvpiwwhx2fcknr7x47h7036ypkg8xzsskqbl5z315ipfmi8s2m")))) + (build-system asdf-build-system/sbcl) + (arguments + ;; Test system must be loaded before, otherwise tests fail with: + ;; Component QURI-ASD::QURI-TEST not found, required by #. + '(#:asd-systems '("quri-test" + "quri"))) + (native-inputs `(("sbcl-prove" ,sbcl-prove))) + (inputs `(("sbcl-babel" ,sbcl-babel) + ("sbcl-split-sequence" ,sbcl-split-sequence) + ("sbcl-cl-utilities" ,sbcl-cl-utilities) + ("sbcl-alexandria" ,sbcl-alexandria))) + (home-page "https://github.com/fukamachi/quri") + (synopsis "Yet another URI library for Common Lisp") + (description + "QURI (pronounced \"Q-ree\") is yet another URI library for Common Lisp. It is intended to be a replacement of PURI.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public cl-quri (sbcl-package->cl-source-package sbcl-quri)) -- cgit 1.4.1 From 60174c9c8c307be43450af38ce7c4e268278e07c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 19:26:14 +0100 Subject: gnu: cuirass: Update to 0.0.1-77.88f3cf6. * gnu/packages/ci.scm (cuirass): Update to 0.0.1-77.88f3cf6. --- 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 6f874165d9..8b1bb2986f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "5f830da3e3fde58044f189a0dfc30fe6aa0d8db6") - (revision "76")) + (let ((commit "88f3cf65e0b5974c6525d498ebffc607bc62baf0") + (revision "77")) (package (name "cuirass") (version (git-version "0.0.1" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1wkrpxpf52pf37k1v1rnlscmnj64qvpqv3rgx46x4iah0jf57yyc")))) + "1mwi6i400kjdkfccvbc49fka18dhkcl0rbiqylgpb7lh0pzss9j7")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From b1eb7448370bbd4d494cf9f3fddae88dd0de2ca3 Mon Sep 17 00:00:00 2001 From: Taylan Kammer Date: Wed, 10 Mar 2021 19:55:35 +0100 Subject: gnu: guile-bytestructures: Update to 1.0.10. * gnu/packages/guile.scm (guile-bytestructures): Update to 1.0.10. Signed-off-by: Tobias Geerinckx-Rice See: --- 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 650fe1289a..8bf250a625 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -725,7 +725,7 @@ Guile's foreign function interface.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "1.0.9") + (version "1.0.10") (home-page "https://github.com/TaylanUB/scheme-bytestructures") (source (origin (method git-fetch) @@ -735,7 +735,7 @@ Guile's foreign function interface.") (file-name (git-file-name name version)) (sha256 (base32 - "0r59sqrvwbsknw21bf44bppi6wdhd2rl2v5dw9i2vij3v8w7pgkm")))) + "14k50jln32kkxv41hvsdgjkkfj6xlv06vc1caz01qkgk1fzh72nk")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings -- cgit 1.4.1 From 1997ded2f4b3a1e6f8a668edef505151b2d8a514 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 13:06:39 +0100 Subject: gnu: python-django: Update to 3.1.7 [security fixes]. * gnu/packages/django.scm (python-django): Update to 3.1.7. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index aa4411c5a2..ec967efdf1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -47,13 +47,13 @@ (define-public python-django (package (name "python-django") - (version "3.1.3") + (version "3.1.7") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "13rz3v0bwk8i3xcccn5awbafahab3cyk8wwv57v2xazdzxspgf0l")))) + "19v5lfijnjx18y9ax962z3gnbxy9k8i3w4j0qfzcp85nx4p7kkij")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 6c5d358cc25ca94d9c0c75a3a086e81b2d63d1b6 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 21:49:37 +0100 Subject: gnu: python-django-2.2: Update to 2.2.19 [security fixes]. * gnu/packages/django.scm (python-django-2.2): Update to 2.2.19. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index ec967efdf1..66287599f1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -132,13 +132,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (define-public python-django-2.2 (package (inherit python-django) - (version "2.2.17") + (version "2.2.19") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0qdq0h2gw45j0h9j22c2sdn49ybl7jsrcyraskb9snknsyj70lyg")))) + "0hysjf8bz4g8xrn2cdx6pmawimpyr6ag2fg3jxsnc1byr3g3bhih")))) (native-inputs `(;; XXX: In 2.2 and 3.0, selenium is required for the test suite. ("python-selenium" ,python-selenium) -- cgit 1.4.1 From b610e4b9a7d4423603cac1da4f16475fb1e03e83 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 22:22:04 +0100 Subject: gnu: lib3mf: Update to 2.1.1 [security fixes]. Non-exhaustively, fixes CVE-2021-21772. * gnu/packages/engineering.scm (lib3mf): Update to 2.1.1. [arguments]<#:phases>: Remove. [arguments]<#:configure-flags>: Do not use zlib, libzip, gtest and libressl vendored sources. [native-inputs]: Remove googletest-source, add googletest and pkg-config. [inputs]: Add libzip, libressl and zlib. --- gnu/packages/engineering.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f560a15aa9..b4ffc5f477 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2458,7 +2458,7 @@ engineers for reverse engineers.") (define-public lib3mf (package (name "lib3mf") - (version "1.8.1") + (version "2.1.1") (source (origin (method git-fetch) @@ -2467,20 +2467,21 @@ engineers for reverse engineers.") (file-name (git-file-name name version)) (sha256 (base32 - "11wpk6n9ga2p57h1dcrp37w77mii0r7r6mlrgmykf7rvii1rzgqd")))) + "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3")))) (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DUSE_INCLUDED_ZLIB=0" + "-DUSE_INCLUDED_LIBZIP=0" + "-DUSE_INCLUDED_GTEST=0" + "-DUSE_INCLUDED_SSL=0"))) (native-inputs - `(("googletest-source" ,(package-source googletest)))) + `(("googletest" ,googletest) + ("pkg-config" ,pkg-config))) (inputs - `(("libuuid" ,util-linux "lib"))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-googletest - (lambda* (#:key inputs #:allow-other-keys) - (copy-recursively (assoc-ref inputs "googletest-source") - "UnitTests/googletest") - #t))))) + `(("libuuid" ,util-linux "lib") + ("libzip" ,libzip) + ("libressl" ,libressl) + ("zlib" ,zlib))) (synopsis "Implementation of the 3D Manufacturing Format (3MF) file standard") (description "Lib3MF is a C++ implementation of the 3D Manufacturing Format (3MF) file -- cgit 1.4.1 From b665dd4a9902b5722b9e06fd89c203e2221b19e0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 10 Mar 2021 18:58:41 +0100 Subject: file-systems: 'mount-file-system' preserves the right mount flags. Fixes . Reported by Jelle Licht . Since commit dcb640f02b1f9590c3bd4301a22bf31bd60c56d4, we could end up applying the wrong mount flags because the (find ...) expression could pick the "wrong" mount point in the presence of bind mounts. * gnu/build/file-systems.scm (mount-file-system): Use 'statfs' to compute FLAGS whe FS is a bind mount. --- gnu/build/file-systems.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index aca4aad848..304805db62 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -920,14 +920,8 @@ corresponds to the symbols listed in FLAGS." ;; MS_REMOUNT call below fails with EPERM. ;; See (if (memq 'bind-mount (file-system-flags fs)) - (or (and=> (find (let ((devno (stat:dev - (lstat source)))) - (lambda (mount) - (= (mount-device-number mount) - devno))) - (mounts)) - mount-flags) - 0) + (statfs-flags->mount-flags + (file-system-mount-flags (statfs source))) 0))) (options (file-system-options fs))) (when (file-system-check? fs) -- cgit 1.4.1 From 83cda00bc62d665f05d37d07c78a1c4eab5297f0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 23:29:14 +0100 Subject: gnu: docker: Update to 19.03.15 [security fixes]. * gnu/packages/docker.scm (%docker-version): Bump to 19.03.15. (docker-libnetwork): Bump to 19.03-1.55e924b. (docker): [source]: Set git-reference url to 'https://github.com/moby/moby'. [arguments]<#:phases>: Modify 'delete-failing-tests phase to delete 'signal_linux_test.go'. --- gnu/packages/docker.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index eb092808f6..e9f3e04c8f 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -52,7 +52,7 @@ ;; Note - when changing Docker versions it is important to update the versions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.13") +(define %docker-version "19.03.15") (define-public python-docker (package @@ -252,7 +252,7 @@ network attachments.") ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that ;; this version is kept in sync with the version of Docker being used. ;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf. - (let ((commit "026aabaa659832804b01754aaadd2c0f420c68b6") + (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") (version (version-major+minor %docker-version)) (revision "1")) (package @@ -267,7 +267,7 @@ network attachments.") (file-name (git-file-name name version)) (sha256 (base32 - "0bli21vn5v7bssw3ydym4jfdjsldhb47fld88kng7d138wl70lkw")) + "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -316,11 +316,11 @@ built-in registry server of Docker.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/docker/engine") + (url "https://github.com/moby/moby") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mg3jjisdbqrqrrhyslj3715lslial2kcgjrpprb6q63i52963gj")) + (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) (patches (search-patches "docker-fix-tests.patch")))) (build-system gnu-build-system) @@ -517,6 +517,8 @@ built-in registry server of Docker.") (delete-file "runconfig/config_test.go") ;; This file uses /var. (delete-file "daemon/oci_linux_test.go") + ;; Signal tests fail in bizarre ways + (delete-file "pkg/signal/signal_linux_test.go") #t)) (replace 'configure (lambda _ -- cgit 1.4.1 From 9b52ae19b12dc0a0878a1c7012bc79b94876e1ab Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 23:37:12 +0100 Subject: gnu: containerd: Update to 1.3.10 [security fixes]. * gnu/packages/docker.scm (containerd): Update to 1.3.10. --- gnu/packages/docker.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index e9f3e04c8f..28bf2aff2b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -177,18 +177,16 @@ Python without keeping their credentials in a Docker configuration file.") (define-public containerd (package (name "containerd") - (version "1.2.5") + (version "1.3.10") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/containerd/containerd") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0npbzixf3c0jvzm159vygvkydrr8h36c9sq50yv0mdinrys2bvg0")) - (patches - (search-patches "containerd-test-with-go1.13.patch")))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/containerd") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10fz7359aydbz0yb01qkrsq2diypayfal618lvvb1x0gvgkp526i")))) (build-system go-build-system) (arguments `(#:import-path "github.com/containerd/containerd" -- cgit 1.4.1 From 00c1793ce8e2210e48b18422ea3e76da10541874 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 03:29:49 +0100 Subject: gnu: ungoogled-chromium: Add xdg-utils to PATH with wrapper. This will ensure that 'mailto:' links work out of the box, among others. * gnu/packages/chromium.scm (ungoogled-chromium): Modify replacement 'install phase to add xdg-utils to PATH with wrap-program. --- gnu/packages/chromium.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index f9ca357933..b81a773c3d 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -753,6 +753,7 @@ (resources (string-append lib "/resources")) (preferences (assoc-ref inputs "master-preferences")) (gtk+ (assoc-ref inputs "gtk+")) + (xdg-utils (assoc-ref inputs "xdg-utils")) (sh (which "sh"))) (substitute* '("chrome/app/resources/manpage.1.in" @@ -789,7 +790,8 @@ (wrap-program exe ;; Avoid file manager crash. See . - `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))) + `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))) + `("PATH" ":" prefix (,(string-append xdg-utils "/bin"))))) (with-directory-excursion "chrome/app/theme/chromium" (for-each @@ -874,7 +876,8 @@ ("udev" ,eudev) ("valgrind" ,valgrind) ("vulkan-headers" ,vulkan-headers) - ("wayland" ,wayland))) + ("wayland" ,wayland) + ("xdg-utils" ,xdg-utils))) (native-search-paths (list (search-path-specification (variable "CHROMIUM_EXTENSION_DIRECTORY") -- cgit 1.4.1 From 6cadf34d1fb11b327ca79c9bdf20398190524c67 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:13:41 +0100 Subject: gnu: Add rust-wasmparser-0.57. * gnu/packages/crates-io.scm (rust-wasmparser-0.57): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index abe4a937e5..99050a1def 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47250,6 +47250,26 @@ attribute that is not in the shared backend crate.") "Support for parsing WebIDL specific to wasm-bindgen.") (license (list license:expat license:asl2.0)))) +(define-public rust-wasmparser-0.57 + (package + (name "rust-wasmparser") + (version "0.57.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasmparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19kslk9pv1bcyp85w63dn1adbp13kz7kjha80abnwz27bmbxvz9j")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser") + (synopsis "Simple event-driven library for parsing WebAssembly binary files") + (description + "This package provides a simple event-driven library for parsing +WebAssembly binary files.") + (license license:asl2.0))) + (define-public rust-web-sys-0.3 (package (name "rust-web-sys") -- cgit 1.4.1 From b6a627e9c0beee3bc24044dfd5319f59c642a24d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:09:42 +0100 Subject: gnu: Add rust-object-0.23. * gnu/packages/crates-io.scm (rust-object-0.23): New variable. (rust-object-0.17): Inherit from above. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 99050a1def..4f62f719a4 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25756,8 +25756,38 @@ Foundation framework.") "This package provides utilities for testing Objective-C interop.") (license license:expat))) +(define-public rust-object-0.23 + (package + (name "rust-object") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "object" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m658q2ci9hk8csbl17zwcg1hpvcxm2sspjb9bzg0kc1cifsp9x9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-wasmparser" ,rust-wasmparser-0.57)))) + (home-page "https://github.com/gimli-rs/object") + (synopsis "Unified interface for reading and writing object file formats") + (description + "This package provides a unified interface for reading and writing object +file formats.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-object-0.17 (package + (inherit rust-object-0.23) (name "rust-object") (version "0.17.0") (source @@ -25769,7 +25799,6 @@ Foundation framework.") (sha256 (base32 "1bmgbg4k0725lchfy9j1wnpfmywh5qhs0k4k6j2g7c0acvys8i7a")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -25780,12 +25809,7 @@ Foundation framework.") ("rust-uuid" ,rust-uuid-0.8) ("rust-flate2" ,rust-flate2-1) ("rust-crc32fast" ,rust-crc32fast-1) - ("rust-indexmap" ,rust-indexmap-1)))) - (home-page "https://github.com/gimli-rs/object") - (synopsis "Unified interface for reading and writing object file formats") - (description "This package provides a unified interface for reading and -writing object file formats.") - (license (list license:asl2.0 license:expat)))) + ("rust-indexmap" ,rust-indexmap-1)))))) (define-public rust-object-0.12 (package -- cgit 1.4.1 From 8cc3a16cbb2521a737d9276d4de4fff3b4f2bd17 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:14:53 +0100 Subject: gnu: Add rust-object-0.22. * gnu/packages/crates-io.scm (rust-object-0.22): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4f62f719a4..ae96bcc03f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25785,6 +25785,29 @@ Foundation framework.") file formats.") (license (list license:asl2.0 license:expat)))) +(define-public rust-object-0.22 + (package + (inherit rust-object-0.23) + (name "rust-object") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "object" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15r383qxxwq08q3a5rfqhp971wd0nixd9ny22xw37jy31qv66fwd")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-wasmparser" ,rust-wasmparser-0.57)))))) + (define-public rust-object-0.17 (package (inherit rust-object-0.23) -- cgit 1.4.1 From 8e54e5243ba73d385e2aa2e4886ba87b7ada719a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:15:51 +0100 Subject: gnu: Add rust-gimli-0.23. * gnu/packages/crates-io.scm (rust-gimli-0.23): New variable. (rust-gimli-0.20): Inherit from above. --- gnu/packages/crates-io.scm | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae96bcc03f..a863c9c7ec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16048,8 +16048,37 @@ authenticated encryption cipher.") (("rust-polyval" ,rust-polyval-0.3) ("rust-zeroize" ,rust-zeroize-1)))))) +(define-public rust-gimli-0.23 + (package + (name "rust-gimli") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gimli" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1km657nwcrb0pnv7v0ldhgl9y8s889y2j9jckmws8k2i8bhkyl7n")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) + (home-page "https://github.com/gimli-rs/gimli") + (synopsis "Library for reading and writing the DWARF debugging format") + (description + "This package provides a library for reading and writing the DWARF +debugging format.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-gimli-0.20 (package + (inherit rust-gimli-0.23) (name "rust-gimli") (version "0.20.0") (source @@ -16061,7 +16090,6 @@ authenticated encryption cipher.") (sha256 (base32 "0cz6wg1niwfqf0mk28igsdnsm92cs57cai9jpzdmvw6hma863pc1")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -16072,12 +16100,7 @@ authenticated encryption cipher.") ,rust-stable-deref-trait-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-indexmap" ,rust-indexmap-1) - ("rust-byteorder" ,rust-byteorder-1)))) - (home-page "https://github.com/gimli-rs/gimli") - (synopsis "Library for reading and writing the DWARF debugging format") - (description - "This package provides a library for reading and writing the DWARF debugging format.") - (license (list license:asl2.0 license:expat)))) + ("rust-byteorder" ,rust-byteorder-1)))))) (define-public rust-gimli-0.18 (package -- cgit 1.4.1 From 406fe167e1f60a779a04ae97682169aca9d435c2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:16:57 +0100 Subject: gnu: Add rust-cpp-demangle-0.3. * gnu/packages/crates-io.scm (rust-cpp-demangle-0.3): New variable. (rust-cpp-demangle-0.2): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a863c9c7ec..ee1e58897c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -8521,8 +8521,33 @@ intrinsics.") ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-cpp-demangle-0.3 + (package + (name "rust-cpp-demangle") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpp_demangle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "142knq32bpa2hbp4z0bldjd1x869664l0ff2gdrqx7pryv59x4a4")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-afl" ,rust-afl-0.8) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-glob" ,rust-glob-0.3)))) + (home-page "https://github.com/gimli-rs/cpp_demangle") + (synopsis "Demangle C++ symbols") + (description + "This package provides a crate for demangling C++ symbols.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-cpp-demangle-0.2 (package + (inherit rust-cpp-demangle-0.3) (name "rust-cpp-demangle") (version "0.2.16") (source @@ -8534,7 +8559,6 @@ intrinsics.") (sha256 (base32 "0bamx2c78xzjhhvpg6p9bjarl6qm6j8npm6756kiqdh784w29j8k")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -8543,12 +8567,7 @@ intrinsics.") ("rust-glob" ,rust-glob-0.3)) #:cargo-development-inputs (("rust-clap" ,rust-clap-2) - ("rust-diff" ,rust-diff-0.1)))) - (home-page "https://github.com/gimli-rs/cpp_demangle") - (synopsis "Demangle C++ symbols") - (description - "This package provides a crate for demangling C++ symbols.") - (license (list license:expat license:asl2.0)))) + ("rust-diff" ,rust-diff-0.1)))))) (define-public rust-cpuid-bool-0.1 (package -- cgit 1.4.1 From fbc807f3b68d2a9c1e113b520d8364881b255596 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:18:16 +0100 Subject: gnu: Add rust-addr2line-0.14. * gnu/packages/crates-io.scm (rust-addr2line-0.14): New variable. (rust-addr2line-0.11): Inherit from above. --- gnu/packages/crates-io.scm | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ee1e58897c..1736aafa94 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -969,8 +969,40 @@ threads. This makes it robust in face of panics (it won't make your program deadlock, like the standard Barrier).") (license (list license:asl2.0 license:expat)))) +(define-public rust-addr2line-0.14 + (package + (name "rust-addr2line") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "addr2line" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xs5bsi40zpyxbbylyaysya5h36ykcbg91i82415sxw5wk7q4px5")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.3) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) + ("rust-gimli" ,rust-gimli-0.23) + ("rust-object" ,rust-object-0.22) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/gimli-rs/addr2line") + (synopsis "Symbolication library written in Rust, using gimli") + (description + "This package provides a cross-platform symbolication library written in +Rust, using gimli.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-addr2line-0.11 (package + (inherit rust-addr2line-0.14) (name "rust-addr2line") (version "0.11.0") (source @@ -982,7 +1014,6 @@ deadlock, like the standard Barrier).") (sha256 (base32 "0sk5g8cb2yynlcm0wcqff9l9c9ml69rqgfrrbii0ybgdc236jkhw")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all test files included. #:cargo-inputs @@ -998,13 +1029,7 @@ deadlock, like the standard Barrier).") ("rust-clap" ,rust-clap-2) ("rust-findshlibs" ,rust-findshlibs-0.5) ("rust-memmap" ,rust-memmap-0.7) - ("rust-rustc-test" ,rust-rustc-test-0.3)))) - (home-page "https://github.com/gimli-rs/addr2line") - (synopsis "Symbolication library written in Rust, using gimli") - (description - "This package provides a cross-platform symbolication library written in -Rust, using gimli.") - (license (list license:asl2.0 license:expat)))) + ("rust-rustc-test" ,rust-rustc-test-0.3)))))) (define-public rust-addr2line-0.9 (package -- cgit 1.4.1 From b950ff3dbf8d44d33de11a039c84647912503dbb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:19:16 +0100 Subject: gnu: rust-backtrace-0.3: Update to 0.3.56. * gnu/packages/crates-io.scm (rust-backtrace-0.3): Update to 0.3.56. --- gnu/packages/crates-io.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1736aafa94..a05654935b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3593,7 +3593,7 @@ built on the Actix ecosystem.") (define-public rust-backtrace-0.3 (package (name "rust-backtrace") - (version "0.3.46") + (version "0.3.56") (source (origin (method url-fetch) @@ -3602,28 +3602,24 @@ built on the Actix ecosystem.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17hh1vrhfd01qpjilrdpy7q0lf2j2qv36achpg37q92rff4r5rmi")))) + "1g716jmrik0fx29va3js4gw8hwk5jlsmvqaa9ryp1c9qyh07c4cx")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-addr2line" ,rust-addr2line-0.11) + (("rust-addr2line" ,rust-addr2line-0.14) ("rust-backtrace-sys" ,rust-backtrace-sys-0.1) - ("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) - ("rust-cpp-demangle" ,rust-cpp-demangle-0.2) - ("rust-findshlibs" ,rust-findshlibs-0.5) - ("rust-goblin" ,rust-goblin-0.2) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.3) ("rust-libc" ,rust-libc-0.2) - ("rust-memmap" ,rust-memmap-0.7) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.4) + ("rust-object" ,rust-object-0.23) ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) - ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-serde" ,rust-serde-1) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/rust-lang/backtrace-rs") - (synopsis - "Acquire a stack trace (backtrace) at runtime in a Rust program") + (synopsis "Acquire a stack trace (backtrace) at runtime in a Rust program") (description "This package provides a library to acquire a stack trace (backtrace) at runtime in a Rust program.") -- cgit 1.4.1 From 31be44a8aa81aa84e89129a41cb03f371900c15b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:22:41 +0100 Subject: gnu: rust-openssl-sys-0.9: Update to 0.9.60. * gnu/packages/crates-io.scm (rust-openssl-sys-0.9): Update to 0.9.60. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a05654935b..94d9f28bec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -26320,14 +26320,14 @@ system for OpenSSL.") (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.58") + (version "0.9.60") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pkq3x8w16kqvkg75g4w7nny56w9clssww0ibpzg015n153xnhm8")) + (base32 "1rpkfl0rmdcvxzyzp3n24g9clplh4avgzpi5c2a3hx96hcccf7wj")) (patches (search-patches "rust-openssl-sys-no-vendor.patch")))) (build-system cargo-build-system) (arguments -- cgit 1.4.1 From 3e6a0f19858856f057201286a3987c057b2ffe2d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:25:44 +0100 Subject: gnu: Add rust-trust-dns-proto-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-proto-0.20): New variable. (rust-trust-dns-proto-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 54 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 94d9f28bec..2ae6f4c3b0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44446,8 +44446,54 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.") (("rust-openssl" ,rust-openssl-0.10) ("rust-tokio" ,rust-tokio-0.1)))))) +(define-public rust-trust-dns-proto-0.20 + (package + (name "rust-trust-dns-proto") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-proto" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gdsxjl628h02dp0fhcjz6js79fc4dxprqgqny6rghk450dki84q")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-enum-as-inner" ,rust-enum-as-inner-0.3) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-idna" ,rust-idna-0.2) + ("rust-ipnet" ,rust-ipnet-2) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-ring" ,rust-ring-0.16) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-socket2" ,rust-socket2-0.3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-url" ,rust-url-2) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "Safe and secure DNS library") + (description + "Trust-DNS is a safe and secure DNS library. This is the foundational +DNS protocol library for all Trust-DNS projects.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-proto-0.19 (package + (inherit rust-trust-dns-proto-0.20) (name "rust-trust-dns-proto") (version "0.19.5") (source @@ -44458,7 +44504,6 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.") (sha256 (base32 "0a4zlv60kkbg1nvy3zh18fdg681z83yzppzy39rdkm7llqdhdmyd")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) @@ -44483,12 +44528,7 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.") #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) ("rust-futures" ,rust-futures-0.3) - ("rust-tokio" ,rust-tokio-0.2)))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "Safe and secure DNS library") - (description "Trust-DNS is a safe and secure DNS library. This is the -foundational DNS protocol library for all Trust-DNS projects.") - (license (list license:expat license:asl2.0)))) + ("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-trust-dns-proto-0.18 (package -- cgit 1.4.1 From ba777a3cc4646df9c1b361bab64fbc97b0554b29 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:07:25 +0100 Subject: gnu: Add rust-trust-dns-native-tls-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-native-tls-0.20): New variable. (rust-trust-dns-native-tls-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2ae6f4c3b0..ea8b1189b1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44291,8 +44291,36 @@ extension for the Trust-DNS client to use DNS over HTTPS.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.1)))))) +(define-public rust-trust-dns-native-tls-0.20 + (package + (name "rust-trust-dns-native-tls") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-native-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "129map2cvy9xcdjg6927xyzic48mq6hqmils0qrmigbr61djxkna")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "native-tls extension for the Trust-DNS client") + (description "Trust-DNS is a safe and secure DNS library. This is an +extension for the Trust-DNS client to use native-tls for TLS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-native-tls-0.19 (package + (inherit rust-trust-dns-native-tls-0.20) (name "rust-trust-dns-native-tls") (version "0.19.5") (source @@ -44303,7 +44331,6 @@ extension for the Trust-DNS client to use DNS over HTTPS.") (sha256 (base32 "173443yivsiyzvnai4h53v71br8jsz4zjwhp83q3x4hnh6306ymv")))) - (build-system cargo-build-system) (arguments `(#:tests? #false #:cargo-inputs @@ -44315,12 +44342,7 @@ extension for the Trust-DNS client to use DNS over HTTPS.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "native-tls extension for the Trust-DNS client") - (description "Trust-DNS is a safe and secure DNS library. This is an -extension for the Trust-DNS client to use native-tls for TLS.") - (license (list license:expat license:asl2.0)))) + `(("openssl" ,openssl))))) (define-public rust-trust-dns-native-tls-0.18 (package -- cgit 1.4.1 From 58e89cb0b946feea9108457fa402b36cbbce21b0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:06:11 +0100 Subject: gnu: Add rust-trust-dns-openssl-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-openssl-0.20): New variable. (rust-trust-dns-openssl-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ea8b1189b1..0c906dec60 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44389,8 +44389,36 @@ extension for the Trust-DNS client to use native-tls for TLS.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.1)))))) +(define-public rust-trust-dns-openssl-0.20 + (package + (name "rust-trust-dns-openssl") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-openssl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zd10g824qrs0yw2bmxphw43iylxlpgvnwb3l3hnwblp2ffhcx50")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "tokio-openssl extension for the Trust-DNS client") + (description "Trust-DNS is a safe and secure DNS library. This is an +extension for the Trust-DNS client to use tokio-openssl for TLS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-openssl-0.19 (package + (inherit rust-trust-dns-openssl-0.20) (name "rust-trust-dns-openssl") (version "0.19.5") (source @@ -44401,7 +44429,6 @@ extension for the Trust-DNS client to use native-tls for TLS.") (sha256 (base32 "0as4jzrscjlmgj04l2aa2lf09vpd0fg5v0vfz019ybxgiqn89g45")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures" ,rust-futures-0.3) @@ -44415,12 +44442,7 @@ extension for the Trust-DNS client to use native-tls for TLS.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "tokio-openssl extension for the Trust-DNS client") - (description "Trust-DNS is a safe and secure DNS library. This is an -extension for the Trust-DNS client to use tokio-openssl for TLS.") - (license (list license:expat license:asl2.0)))) + `(("openssl" ,openssl))))) (define-public rust-trust-dns-openssl-0.18 (package -- cgit 1.4.1 From 46f8eecb516fa1dc68419a118044e26e894d808c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:08:26 +0100 Subject: gnu: Add rust-trust-dns-rustls-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-rustls-0.20): New variable. (rust-trust-dns-rustls-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0c906dec60..5261b96e7a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44774,8 +44774,40 @@ other queries.") ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.6) ("rust-webpki-roots" ,rust-webpki-roots-0.16)))))) +(define-public rust-trust-dns-rustls-0.20 + (package + (name "rust-trust-dns-rustls") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-rustls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00i5jf6bkfxikna0093swl0yz246nabpm0xngdxb94wkr3rz0kq9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) + ("rust-webpki" ,rust-webpki-0.21)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "rustls extension for the Trust-DNS client") + (description + "Trust-DNS is a safe and secure DNS library. This is an extension for +the Trust-DNS client to use rustls for TLS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-rustls-0.19 (package + (inherit rust-trust-dns-rustls-0.20) (name "rust-trust-dns-rustls") (version "0.19.5") (source @@ -44786,7 +44818,6 @@ other queries.") (sha256 (base32 "1hj4fx2x4ncj7v8pf6bbn7634zq76hjigm1s2h6b6yjzzmz4yprn")))) - (build-system cargo-build-system) (arguments `(#:tests? #false ;missing file #:cargo-inputs @@ -44802,12 +44833,7 @@ other queries.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "rustls extension for the Trust-DNS client") - (description "Trust-DNS is a safe and secure DNS library. This is an -extension for the Trust-DNS client to use rustls for TLS.") - (license (list license:expat license:asl2.0)))) + `(("openssl" ,openssl))))) (define-public rust-trust-dns-rustls-0.18 (package -- cgit 1.4.1 From 43212fcaf6aa40efc1591f6673e37cc6331f58d2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:27:41 +0100 Subject: gnu: Add rust-trust-dns-https-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-https-0.20): New variable. (rust-trust-dns-https-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 46 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5261b96e7a..2a2cb8495c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44180,8 +44180,46 @@ recycle bin.") "This package provides a library for visualizing tree structured data.") (license license:expat))) +(define-public rust-trust-dns-https-0.20 + (package + (name "rust-trust-dns-https") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-https" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19f0l1illl69ycb97652rjrjppilz2pz7l9572lrjpkasffgcqr6")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-h2" ,rust-h2-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) + ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) + ("rust-webpki" ,rust-webpki-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "DNS over HTTPS extension for the Trust-DNS client") + (description + "Trust-DNS is a safe and secure DNS library. This is an extension for +the Trust-DNS client to use DNS over HTTPS.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-https-0.19 (package + (inherit rust-trust-dns-https-0.20) (name "rust-trust-dns-https") (version "0.19.5") (source @@ -44192,7 +44230,6 @@ recycle bin.") (sha256 (base32 "0s6yiqy98wddc2vid0dypj4cdnvycd4vrrj6l9s7yymq0iqpky5g")))) - (build-system cargo-build-system) (arguments `(#:tests? #false #:cargo-inputs @@ -44214,12 +44251,7 @@ recycle bin.") ("rust-webpki-roots" ,rust-webpki-roots-0.19)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-futures" ,rust-futures-0.3)))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "DNS over HTTPS extension for the Trust-DNS client") - (description "Trust-DNS is a safe and secure DNS library. This is an -extension for the Trust-DNS client to use DNS over HTTPS.") - (license (list license:expat license:asl2.0)))) + ("rust-futures" ,rust-futures-0.3)))))) (define-public rust-trust-dns-https-0.18 (package -- cgit 1.4.1 From 3843fc8fc84a0a7cf44717613fff8d7d119d8fc3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:28:48 +0100 Subject: gnu: Add rust-tokio-openssl-0.6. * gnu/packages/crates-io.scm (rust-tokio-openssl-0.6): New variable. (rust-tokio-openssl-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2a2cb8495c..bd5963fc51 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42664,8 +42664,35 @@ streams.") "This package provides the event loop that drives Tokio I/O resources.") (license license:expat))) +(define-public rust-tokio-openssl-0.6 + (package + (name "rust-tokio-openssl") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-openssl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0khjqv8wap79ki7h0l91rs8j0b4ix097lb40b4s1x9sa19ffq6xc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/alexcrichton/tokio-openssl") + (synopsis "SSL streams for Tokio backed by OpenSSL") + (description + "This package is an implementation of SSL streams for Tokio backed by +OpenSSL.") + (license (list license:expat license:asl2.0)))) + (define-public rust-tokio-openssl-0.4 (package + (inherit rust-tokio-openssl-0.6) (name "rust-tokio-openssl") (version "0.4.0") (source @@ -42676,7 +42703,6 @@ streams.") (sha256 (base32 "15751d47984ncvllagz35ldl10ifr8555wixvsg6k3i0yk2hhjrw")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ;require internet access #:cargo-inputs @@ -42688,12 +42714,7 @@ streams.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl))) - (home-page "https://github.com/alexcrichton/tokio-openssl") - (synopsis "SSL streams for Tokio backed by OpenSSL") - (description "This package is an implementation of SSL streams for Tokio -backed by OpenSSL.") - (license (list license:expat license:asl2.0)))) + `(("openssl" ,openssl))))) (define-public rust-tokio-openssl-0.3 (package -- cgit 1.4.1 From 785cbb09895e6f8db57bce2570e418a72fd3f9aa Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 16:30:50 +0100 Subject: gnu: Add rust-resolv-conf-0.7. * gnu/packages/crates-io.scm (rust-resolv-conf-0.7): New variable. (rust-resolv-conf-0.6): Inherit from above. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bd5963fc51..686b8355fd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32257,8 +32257,32 @@ uses finite automata and guarantees linear time matching on all inputs.") (("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-libflate" ,rust-libflate-0.1)))))) +(define-public rust-resolv-conf-0.7 + (package + (name "rust-resolv-conf") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "resolv-conf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "005sk8r1php2g41yn7fdf1sn8cafyaqm6jxia42h2v88saa47r2j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-hostname" ,rust-hostname-0.3) + ("rust-quick-error" ,rust-quick-error-1)))) + (home-page "http://github.com/tailhook/resolv-conf") + (synopsis "Parser for @file{/etc/resolv.conf}") + (description + "This package provides a parser for @file{/etc/resolv.conf} file.") + (license (list license:expat license:asl2.0)))) + (define-public rust-resolv-conf-0.6 (package + (inherit rust-resolv-conf-0.7) (name "rust-resolv-conf") (version "0.6.3") (source @@ -32269,18 +32293,11 @@ uses finite automata and guarantees linear time matching on all inputs.") (sha256 (base32 "0jlzifww1h7j23jnjj49xz8q0fpd9rqpd0ks8c4y651vgw9lx0qi")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all test files included. #:cargo-inputs (("rust-quick-error" ,rust-quick-error-1) - ("rust-hostname" ,rust-hostname-0.3)))) - (home-page "https://github.com/tailhook/resolv-conf") - (synopsis "Parser for /etc/resolv.conf") - (description - "An /etc/resolv.conf parser crate for Rust.") - (license (list license:asl2.0 - license:expat)))) + ("rust-hostname" ,rust-hostname-0.3)))))) (define-public rust-result-1 (package -- cgit 1.4.1 From 0d279640ceb8b14e8eaee6f89c38457dc9b03142 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 19:03:29 +0100 Subject: gnu: Add rust-trust-dns-resolver-0.20. * gnu/packages/crates-io.scm (rust-trust-dns-resolver-0.20): New variable. (rust-trust-dns-resolver-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 59 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 686b8355fd..4a5473f89e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44721,8 +44721,56 @@ DNS protocol library for all Trust-DNS projects.") (("rust-env-logger" ,rust-env-logger-0.6) ("rust-tokio" ,rust-tokio-0.1)))))) +(define-public rust-trust-dns-resolver-0.20 + (package + (name "rust-trust-dns-resolver") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trust-dns-resolver" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r2n933z9yrpdqv60c9mbhl64y2inpx9rm870nq1qqmx226d2wih")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-ipconfig" ,rust-ipconfig-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-lru-cache" ,rust-lru-cache-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-resolv-conf" ,rust-resolv-conf-0.7) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-trust-dns-https" ,rust-trust-dns-https-0.20) + ("rust-trust-dns-native-tls" ,rust-trust-dns-native-tls-0.20) + ("rust-trust-dns-openssl" ,rust-trust-dns-openssl-0.20) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.20) + ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.20) + ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) + (home-page "http://www.trust-dns.org/index.html") + (synopsis "Safe and secure DNS library") + (description + "Trust-DNS is a safe and secure DNS library. This Resolver library uses +the Client library to perform all DNS queries. The Resolver is intended to be +a high-level library for any DNS record resolution see Resolver and +AsyncResolver for supported resolution types. The Client can be used for +other queries.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trust-dns-resolver-0.19 (package + (inherit rust-trust-dns-resolver-0.20) (name "rust-trust-dns-resolver") (version "0.19.5") (source @@ -44733,7 +44781,6 @@ DNS protocol library for all Trust-DNS projects.") (sha256 (base32 "0xqv31gndybcrr5gi6jjp47qcvdxsc147s69a0y0nc6qqgyws8qg")))) - (build-system cargo-build-system) (arguments `(#:tests? #false ;network unreachable #:cargo-inputs @@ -44761,15 +44808,7 @@ DNS protocol library for all Trust-DNS projects.") ("rust-webpki-roots" ,rust-webpki-roots-0.19)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-futures" ,rust-futures-0.3)))) - (home-page "http://www.trust-dns.org/index.html") - (synopsis "Safe and secure DNS library") - (description "Trust-DNS is a safe and secure DNS library. This Resolver -library uses the Client library to perform all DNS queries. The Resolver is -intended to be a high-level library for any DNS record resolution see Resolver -and AsyncResolver for supported resolution types. The Client can be used for -other queries.") - (license (list license:expat license:asl2.0)))) + ("rust-futures" ,rust-futures-0.3)))))) (define-public rust-trust-dns-resolver-0.18 (package -- cgit 1.4.1 From 74efdfc4e90b93b14eb7752789361eeb2fafbc72 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 21:46:38 +0100 Subject: gnu: Add rust-test-cert-gen-0.1. * gnu/packages/crates-io.scm (rust-test-cert-gen-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4a5473f89e..57296e9a29 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41412,6 +41412,26 @@ attribute. Under the hood, all test cases that share same body are grouped into mod, giving clear and readable test results.") (license license:expat))) +(define-public rust-test-cert-gen-0.1 + (package + (name "rust-test-cert-gen") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "test-cert-gen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lrpirh863h9rq2iqp0kivshzwd909fgiy13a5684d685ap7c565")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://crates.io/crates/test-cert-gen") + (synopsis "Generate certificates for tests") + (description + "This package is an utility to generate certificates for tests (e.g., +for TLS).") + (license (list license:expat license:asl2.0)))) + (define-public rust-tester-0.5 (package (name "rust-tester") -- cgit 1.4.1 From aa0038b6409d28329a0654bed61738be943ae319 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 20:00:27 +0100 Subject: gnu: rust-native-tls-0.2: Update to 0.2.7. * gnu/packages/crates-io.scm (rust-native-tls-0.2): Update to 0.2.7. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57296e9a29..31f41a00d3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23975,14 +23975,14 @@ IO of Windows's named pipes.") (define-public rust-native-tls-0.2 (package (name "rust-native-tls") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (crate-uri "native-tls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0grsinsgq1pd70c6k9mif7wambwq2jxh8jhvdgwf9i7dnlwpkk3g")))) + (base32 "1m6v16xl8h4pm32pw6yhrvgwznf60bqhj2qhb1yrb8wd3hp6pndq")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; tests require network access @@ -23998,16 +23998,17 @@ IO of Windows's named pipes.") ("rust-security-framework-sys" ,rust-security-framework-sys-2) ("rust-tempfile" ,rust-tempfile-3)) #:cargo-development-inputs - (("rust-hex" ,rust-hex-0.4)))) + (("rust-hex" ,rust-hex-0.4) + ("rust-test-cert-gen" ,rust-test-cert-gen-0.1)))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("openssl" ,openssl))) (home-page "https://github.com/sfackler/rust-native-tls") - (synopsis - "Wrapper over a platform's native TLS implementation") + (synopsis "Wrapper over a platform's native TLS implementation") (description - "This package provides a wrapper over a platform's native TLS implementation.") + "This package provides a wrapper over a platform's native TLS +implementation.") (license (list license:expat license:asl2.0)))) (define-public rust-native-tls-0.1 -- cgit 1.4.1 From f8e2758ec466fb16c54d0e8e6c0c79215ecfa336 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 20:01:58 +0100 Subject: gnu: Add rust-tokio-socks-0.5. * gnu/packages/crates-io.scm (rust-tokio-socks-0.5): New variable. (rust-tokio-socks-0.3): Inherit from above. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 31f41a00d3..f814d46e89 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43108,8 +43108,35 @@ Rustls.") futures.") (license license:expat))) +(define-public rust-tokio-socks-0.5 + (package + (name "rust-tokio-socks") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-socks" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h6qixh17yjf98bjyw4q8i36pf2lyfbcr9hkjjb6aalx0bx5s5ji")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-either" ,rust-either-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/sticnarf/tokio-socks") + (synopsis "Asynchronous SOCKS proxy support for Rust") + (description + "This package provides asynchronous SOCKS proxy support for +Rust.") + (license license:expat))) + (define-public rust-tokio-socks-0.3 (package + (inherit rust-tokio-socks-0.5) (name "rust-tokio-socks") (version "0.3.0") (source @@ -43119,7 +43146,6 @@ futures.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0f95zcvllb5byz4acwbnlsk9a2rdql4x78x0a8nkfwhq4ifzs4fn")))) - (build-system cargo-build-system) (arguments `(#:tests? #false ;"tor_resolve_with_socket" not found #:cargo-inputs @@ -43131,13 +43157,7 @@ futures.") #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.13) ("rust-once-cell" ,rust-once-cell-1) - ("rust-tokio" ,rust-tokio-0.2)))) - (home-page "https://github.com/sticnarf/tokio-socks") - (synopsis "Asynchronous SOCKS proxy support for Rust") - (description - "This package provides asynchronous SOCKS proxy support for -Rust.") - (license license:expat))) + ("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-tokio-socks-0.2 (package -- cgit 1.4.1 From 7945e1611f5a549709d0203b252263944b6f6246 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 20:03:07 +0100 Subject: gnu: Add rust-tokio-native-tls-0.3. * gnu/packages/crates-io.scm (rust-tokio-native-tls-0.3): New variable. (rust-tokio-native-tls-0.1): Inherit from above. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f814d46e89..4eb46b5190 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42633,23 +42633,23 @@ applications backed by buffers.") Tokio.") (license (list license:expat license:asl2.0)))) -(define-public rust-tokio-native-tls-0.1 +(define-public rust-tokio-native-tls-0.3 (package (name "rust-tokio-native-tls") - (version "0.1.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-native-tls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sd0xmj7kwizybpsg8vh7a6sixj0bs4dzihzgmdf1a0rm69qaq6d")))) + (base32 "0yvikgmph2qjq0ni2h2wfaxkzhbnc09c2544av0zidyj1dk9bngp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-native-tls" ,rust-native-tls-0.2) - ("rust-tokio" ,rust-tokio-0.2)))) + ("rust-tokio" ,rust-tokio-1)))) (home-page "https://tokio.rs") (synopsis "TLS/SSL streams for Tokio") (description @@ -42658,6 +42658,24 @@ using native-tls giving an implementation of TLS for nonblocking I/O streams.") (license license:expat))) +(define-public rust-tokio-native-tls-0.1 + (package + (inherit rust-tokio-native-tls-0.3) + (name "rust-tokio-native-tls") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-native-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sd0xmj7kwizybpsg8vh7a6sixj0bs4dzihzgmdf1a0rm69qaq6d")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-native-tls" ,rust-native-tls-0.2) + ("rust-tokio" ,rust-tokio-0.2)))))) + (define-public rust-tokio-net-0.2 (package (name "rust-tokio-net") -- cgit 1.4.1 From d5249b02402d64c216ea5d053b7f88603b036e2a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 21:55:27 +0100 Subject: gnu: Add rust-hyper-tls-0.5. * gnu/packages/crates-io.scm (rust-hyper-tls-0.5): New variable. (rust-hyper-tls-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4eb46b5190..49cb92b715 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18490,8 +18490,35 @@ HTTPS.") "This package provides glue code for Rustls and synchronous Hyper.") (license (list license:expat license:asl2.0)))) +(define-public rust-hyper-tls-0.5 + (package + (name "rust-hyper-tls") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)))) + (home-page "https://hyper.rs") + (synopsis "Default TLS implementation for use with hyper") + (description "This package provides the default TLS implementation for use +with hyper.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hyper-tls-0.4 (package + (inherit rust-hyper-tls-0.5) (name "rust-hyper-tls") (version "0.4.3") (source @@ -18502,7 +18529,6 @@ HTTPS.") (sha256 (base32 "1vcfyz7dxavf4brns15afmj5fxz88lbn05rrpbfqsnybdp2sqyfr")))) - (build-system cargo-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs @@ -18515,12 +18541,7 @@ HTTPS.") ("rust-tokio" ,rust-tokio-0.2) ("rust-tokio-tls" ,rust-tokio-tls-0.3)) #:cargo-development-inputs - (("rust-tokio" ,rust-tokio-0.2)))) - (home-page "https://hyper.rs") - (synopsis "Default TLS implementation for use with hyper") - (description "This package provides the default TLS implementation for use -with hyper.") - (license (list license:expat license:asl2.0)))) + (("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-hyper-tls-0.3 (package -- cgit 1.4.1 From aab798976ad31912b6be7d07952d615bac3f0535 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 21:56:38 +0100 Subject: gnu: Add rust-webpki-roots-0.21. * gnu/packages/crates-io.scm (rust-webpki-roots-0.21): New variable. (rust-webpki-roots-0.20): Inherit from above. --- gnu/packages/crates-io.scm | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 49cb92b715..d4f505c552 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47773,21 +47773,21 @@ Verification.") #:cargo-development-inputs (("rust-base64" ,rust-base64-0.9)))))) -(define-public rust-webpki-roots-0.20 +(define-public rust-webpki-roots-0.21 (package (name "rust-webpki-roots") - (version "0.20.0") + (version "0.21.0") (source (origin (method url-fetch) (uri (crate-uri "webpki-roots" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "17qpmyym1lsi967b4nc3112nb13ism8731bhjqd9hlajafkxw80g")))) + (base32 "0xi3xjjx6brqh6hwa5jsrxvflsrhjcxa2x26k62q3bcb1dz5n0c2")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-webpki" ,rust-webpki-0.21)))) (home-page "https://github.com/ctz/webpki-roots") (synopsis "Mozilla's CA root certificates for use with webpki") @@ -47795,6 +47795,23 @@ Verification.") with webpki.") (license license:mpl2.0))) +(define-public rust-webpki-roots-0.20 + (package + (inherit rust-webpki-roots-0.21) + (name "rust-webpki-roots") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "webpki-roots" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17qpmyym1lsi967b4nc3112nb13ism8731bhjqd9hlajafkxw80g")))) + (arguments + `(#:cargo-inputs + (("rust-webpki" ,rust-webpki-0.21)))))) + (define-public rust-webpki-roots-0.19 (package (inherit rust-webpki-roots-0.20) -- cgit 1.4.1 From d08a4c776f1f55eb8cf4ad8e8a6ecbc4a74a7937 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 21:57:40 +0100 Subject: gnu: Add rust-rustls-native-certs-0.5. * gnu/packages/crates-io.scm (rust-rustls-native-certs-0.5): New variable. (rust-rustls-native-certs-0.4): Inherit from above. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d4f505c552..c32afd7464 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34369,8 +34369,35 @@ rustc compiler.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-webpki-roots" ,rust-webpki-roots-0.14)))))) +(define-public rust-rustls-native-certs-0.5 + (package + (name "rust-rustls-native-certs") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustls-native-certs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14i0bbbigk6r6262hvc51vz4dvqk1f3vg2f264wfvn2vi30vf1ss")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-openssl-probe" ,rust-openssl-probe-0.1) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-schannel" ,rust-schannel-0.1) + ("rust-security-framework" ,rust-security-framework-2)))) + (home-page "https://github.com/ctz/rustls-native-certs") + (synopsis "Use the platform native certificate store with rustls") + (description "@code{rustls-native-certs} allows rustls to use the platform +native certificate store.") + (license + (list license:asl2.0 license:isc license:expat)))) + (define-public rust-rustls-native-certs-0.4 (package + (inherit rust-rustls-native-certs-0.5) (name "rust-rustls-native-certs") (version "0.4.0") (source @@ -34381,7 +34408,6 @@ rustc compiler.") (sha256 (base32 "1f2rkvdkz92qcmwryyqiw9phkqkf95g4962ljpfq5nkjfsd477b2")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-openssl-probe" ,rust-openssl-probe-0.1) @@ -34393,13 +34419,7 @@ rustc compiler.") (("rust-ring" ,rust-ring-0.16) ("rust-untrusted" ,rust-untrusted-0.7) ("rust-webpki" ,rust-webpki-0.21) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) - (home-page "https://github.com/ctz/rustls-native-certs") - (synopsis "Use the platform native certificate store with rustls") - (description "@code{rustls-native-certs} allows rustls to use the platform -native certificate store.") - (license - (list license:asl2.0 license:isc license:expat)))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) (define-public rust-rusttype-0.9 (package -- cgit 1.4.1 From 4f2202bf30963e4009ad777a8dc211bdee00b703 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 21:58:42 +0100 Subject: gnu: Add rust-ct-logs-0.8. * gnu/packages/crates-io.scm (rust-ct-logs-0.8): New variable. (rust-ct-logs-0.7): Inherit from above. --- gnu/packages/crates-io.scm | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c32afd7464..b7caced1ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9828,27 +9828,45 @@ reallocations.") "Bare bones CSV parsing with no_std support.") (license (list license:unlicense license:expat)))) -(define-public rust-ct-logs-0.7 +(define-public rust-ct-logs-0.8 (package (name "rust-ct-logs") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (crate-uri "ct-logs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0bk7pbmkjm18cgccm4a76vyn3wkaf2z4bh0jy9fk3dl4188i73lc")))) + (base32 "1j5as2h789c2gazq3drl5i58xk8zzx6sxd1wdr19x3d6dwc1da61")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-sct" ,rust-sct-0.6)))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-sct" ,rust-sct-0.6)))) (home-page "https://github.com/ctz/ct-logs") (synopsis "Google's list of Certificate Transparency logs") - (description "This package contains Google's list of Certificate -Transparency logs for use with sct crate.") + (description + "This package contains Google's list of Certificate Transparency logs for +use with sct crate.") (license (list license:asl2.0 license:isc license:expat)))) +(define-public rust-ct-logs-0.7 + (package + (inherit rust-ct-logs-0.8) + (name "rust-ct-logs") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ct-logs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0bk7pbmkjm18cgccm4a76vyn3wkaf2z4bh0jy9fk3dl4188i73lc")))) + (arguments + `(#:cargo-inputs (("rust-sct" ,rust-sct-0.6)))))) + (define-public rust-ct-logs-0.6 (package (inherit rust-ct-logs-0.7) -- cgit 1.4.1 From ec64626f157357365b9b1940e78ac3a632734dd0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:00:11 +0100 Subject: gnu: Add rust-hyper-rustls-0.22. * gnu/packages/crates-io.scm (rust-hyper-rustls-0.22): New variable. (rust-hyper-rustls-0.21): Inherit from above. --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b7caced1ba..84958ef223 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18422,8 +18422,41 @@ SystemTime}}.") 0.11.x.") (license license:expat))) +(define-public rust-hyper-rustls-0.22 + (package + (name "rust-hyper-rustls") + (version "0.22.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-rustls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r2szp06nzqx6gblcw69kwx8afjp218fc083kfpw0i3d66bpm7sz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ct-logs" ,rust-ct-logs-0.8) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-webpki" ,rust-webpki-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) + (home-page "https://github.com/ctz/hyper-rustls") + (synopsis "Rustls+Hyper integration for pure Rust HTTPS") + (description + "This package provides Rustls+Hyper integration for pure Rust HTTPS.") + (license + (list license:asl2.0 license:isc license:expat)))) + (define-public rust-hyper-rustls-0.21 (package + (inherit rust-hyper-rustls-0.22) (name "rust-hyper-rustls") (version "0.21.0") (source @@ -18434,7 +18467,6 @@ SystemTime}}.") (sha256 (base32 "1dmbj15fx6qyg26hji2jm7q9y383090jy3z9zjn5xs4f7v43qx1p")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.5) @@ -18449,13 +18481,7 @@ SystemTime}}.") ("rust-webpki" ,rust-webpki-0.21) ("rust-webpki-roots" ,rust-webpki-roots-0.20)) #:cargo-development-inputs - (("rust-tokio" ,rust-tokio-0.2)))) - (home-page "https://github.com/ctz/hyper-rustls") - (synopsis "Rustls+hyper integration for pure rust HTTPS") - (description "This package provides Rustls+hyper integration for pure rust -HTTPS.") - (license - (list license:asl2.0 license:isc license:expat)))) + (("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-hyper-rustls-0.17 (package -- cgit 1.4.1 From 92075bd48d6d83bf92589f64c427ed6cde0557f6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:52:21 +0100 Subject: gnu: Add rust-httpdate-0.3. * gnu/packages/crates-io.scm (rust-httpdate-0.3): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 84958ef223..2fdf2bfebb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18134,6 +18134,25 @@ or response body.") "This package provides a tiny, safe, speedy, zero-copy HTTP/1.x parser.") (license (list license:asl2.0 license:expat)))) +(define-public rust-httpdate-0.3 + (package + (name "rust-httpdate") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "httpdate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0izbd3sf0625wm4rrfv85xa4xa8j4n1ldxhwlkgff4cm6rh4sjs9")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/pyfisch/httpdate") + (synopsis "HTTP date parsing and formatting") + (description + "This crates parses and formats HTTP datetime strings.") + (license (list license:expat license:asl2.0)))) + (define-public rust-humansize-1 (package (name "rust-humansize") -- cgit 1.4.1 From 50f7108957c8ce255d16975004b55e312febf800 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:53:11 +0100 Subject: gnu: Add rust-tokio-util-0.6. * gnu/packages/crates-io.scm (rust-tokio-util-0.6): New variable. (rust-tokio-util-0.3): Inherit from above. --- gnu/packages/crates-io.scm | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2fdf2bfebb..624cf277ed 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43734,8 +43734,39 @@ stream-based WebSocket implementation.") (description "Unix Domain sockets for Tokio.") (license license:expat))) +(define-public rust-tokio-util-0.6 + (package + (name "rust-tokio-util") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0agvfvvgh225vgb2z9w83lwqcqsy3pvkcbvnaz7m7rj6dg6facgc")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://tokio.rs") + (synopsis "Additional utilities for working with Tokio") + (description + "This package provides additional utilities for working with Tokio.") + (license license:expat))) + (define-public rust-tokio-util-0.3 (package + (inherit rust-tokio-util-0.6) (name "rust-tokio-util") (version "0.3.1") (source @@ -43746,7 +43777,6 @@ stream-based WebSocket implementation.") (sha256 (base32 "16b48dl6sbc9x944jgjvsd65ab1w2c2qcziddbrbwv1b3y4l50my")))) - (build-system cargo-build-system) (arguments `(#:tests? #f #:cargo-inputs @@ -43760,12 +43790,7 @@ stream-based WebSocket implementation.") #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3) ("rust-tokio" ,rust-tokio-0.2) - ("rust-tokio-test" ,rust-tokio-test-0.2)))) - (home-page "https://tokio.rs") - (synopsis "Additional utilities for working with Tokio") - (description "This package provides additional utilities for working with -Tokio.") - (license license:expat))) + ("rust-tokio-test" ,rust-tokio-test-0.2)))))) (define-public rust-tokio-util-0.2 (package -- cgit 1.4.1 From 0846ddb129f50fa20587dcd0896262b2a8703fac Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:54:12 +0100 Subject: gnu: Add rust-h2-0.3. * gnu/packages/crates-io.scm (rust-h2-0.3): New variable. (rust-h2-0.2): Inherit from above. --- gnu/packages/crates-io.scm | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 624cf277ed..6bbff19546 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16823,8 +16823,40 @@ standard printing of search results, similar to grep itself.") of gzip files based on the gzip header implementation in the @code{flate2} crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-h2-0.3 + (package + (name "rust-h2") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "h2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y5fxy3sy0s3j1h6p0c2xk5n2gs4jk1dvmk88lvgwm22ywfv0cnq")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.6) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/hyperium/h2") + (synopsis "HTTP/2.0 client and server") + (description "This package provides an HTTP/2.0 client and server.") + (license license:expat))) + (define-public rust-h2-0.2 (package + (inherit rust-h2-0.3) (name "rust-h2") (version "0.2.6") (source @@ -16835,7 +16867,6 @@ of gzip files based on the gzip header implementation in the @code{flate2} crate (sha256 (base32 "0lvdrzn43iikl521dlrb7z96lsmy7l6nnm35ylf00q7dmq5rwgwr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.5) @@ -16861,11 +16892,7 @@ of gzip files based on the gzip header implementation in the @code{flate2} crate ("rust-tokio-rustls" ,rust-tokio-rustls-0.12) ("rust-walkdir" ,rust-walkdir-1) ("rust-webpki" ,rust-webpki-0.21) - ("rust-webpki-roots" ,rust-webpki-roots-0.17)))) - (home-page "https://github.com/hyperium/h2") - (synopsis "HTTP/2.0 client and server") - (description "This package provides an HTTP/2.0 client and server.") - (license license:expat))) + ("rust-webpki-roots" ,rust-webpki-roots-0.17)))))) (define-public rust-h2-0.1 (package -- cgit 1.4.1 From b31d9a2fe644c974adb610b1b98307adb1aabfd7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:57:22 +0100 Subject: gnu: Add rust-http-body-0.4. * gnu/packages/crates-io.scm (rust-http-body-0.4): New variable. (rust-http-body-0.3): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6bbff19546..815f5f2733 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17999,28 +17999,47 @@ requests and responses.") ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))))) -(define-public rust-http-body-0.3 +(define-public rust-http-body-0.4 (package (name "rust-http-body") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "http-body" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06qi0ni45lb92w3ml260c0bxbq5zd4snjmz0a9k69xq6021zzm8k")))) + (base32 "150rkibhyrcmsyi0qzwx4hp02c4lga1kkdg8j7l5wkh7xqkvsq98")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-bytes" ,rust-bytes-0.5) + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) ("rust-http" ,rust-http-0.2)))) (home-page "https://github.com/hyperium/http-body") (synopsis "Asynchronous, streaming, HTTP request or response body") - (description "Trait representing an asynchronous, streaming, HTTP request -or response body.") + (description + "This crate provides a trait representing an asynchronous, streaming, +HTTP request or response body.") (license license:expat))) +(define-public rust-http-body-0.3 + (package + (inherit rust-http-body-0.4) + (name "rust-http-body") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "http-body" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06qi0ni45lb92w3ml260c0bxbq5zd4snjmz0a9k69xq6021zzm8k")))) + (arguments + `(#:cargo-inputs + (("rust-bytes" ,rust-bytes-0.5) + ("rust-http" ,rust-http-0.2)))))) + (define-public rust-http-body-0.1 (package/inherit rust-http-body-0.3 (name "rust-http-body") -- cgit 1.4.1 From 95b13ec6372cfdb57c09a4ebde7fd070a990f2d0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:55:21 +0100 Subject: gnu: Add rust-hyper-0.14. * gnu/packages/crates-io.scm (rust-hyper-0.14): New variable. (rust-hyper-0.13): Inherit from above. --- gnu/packages/crates-io.scm | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 815f5f2733..759c908454 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18268,8 +18268,46 @@ SystemTime}}.") ("rust-rand" ,rust-rand-0.4) ("rust-time" ,rust-time-0.1)))))) +(define-public rust-hyper-0.14 + (package + (name "rust-hyper") + (version "0.14.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ivaqbcvsws6svwykiq7fgma7wds72r83qianzh5b41ln714dsg8")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-h2" ,rust-h2-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-http-body" ,rust-http-body-0.4) + ("rust-httparse" ,rust-httparse-1) + ("rust-httpdate" ,rust-httpdate-0.3) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-socket2" ,rust-socket2-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-want" ,rust-want-0.3)))) + (home-page "https://hyper.rs") + (synopsis "Fast and correct HTTP library.") + (description "This package provides a fast and correct HTTP library.") + (license license:expat))) + (define-public rust-hyper-0.13 (package + (inherit rust-hyper-0.14) (name "rust-hyper") (version "0.13.7") (source @@ -18280,7 +18318,6 @@ SystemTime}}.") (sha256 (base32 "1symcnba2y03b8lj6xp2wd994lk3xyk3wizacjg5s60njzfshs1y")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.5) @@ -18312,11 +18349,7 @@ SystemTime}}.") ("rust-tokio-test" ,rust-tokio-test-0.2) ("rust-tokio-util" ,rust-tokio-util-0.3) ("rust-tower-util" ,rust-tower-util-0.3) - ("rust-url" ,rust-url-1)))) - (home-page "https://hyper.rs") - (synopsis "Fast and correct HTTP library.") - (description "This package provides a fast and correct HTTP library.") - (license license:expat))) + ("rust-url" ,rust-url-1)))))) (define-public rust-hyper-0.12 (package -- cgit 1.4.1 From 8a6c39e84886b62839d8aa5cf41de733559d5436 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 22:59:24 +0100 Subject: gnu: Add rust-bindgen-0.57. * gnu/packages/crates-io.scm (rust-bindgen-0.57): New variable. (rust-bindgen-0.55): Inherit from above. --- gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 759c908454..aef9f97393 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3985,8 +3985,45 @@ that uses Serde for transforming structs into bytes and vice versa!") (("rust-serde-bytes" ,rust-serde-bytes-0.10) ("rust-serde-derive" ,rust-serde-derive-1)))))) +(define-public rust-bindgen-0.57 + (package + (name "rust-bindgen") + (version "0.57.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0g96ypnck6n60p3cz9k3y3jnxi4z7jfv2pha5bxsm8269806aj7x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cexpr" ,rust-cexpr-0.4) + ("rust-clang-sys" ,rust-clang-sys-1) + ("rust-clap" ,rust-clap-2) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-shlex" ,rust-shlex-0.1) + ("rust-which" ,rust-which-3)))) + (home-page "https://rust-lang.github.io/rust-bindgen/") + (synopsis "Generate Rust FFI bindings to C and C++ libraries.") + (description "This package can be used to automatically generate Rust FFI +bindings to C and C++ libraries.") + (license license:bsd-3))) + (define-public rust-bindgen-0.55 (package + (inherit rust-bindgen-0.57) (name "rust-bindgen") (version "0.55.1") (source @@ -3997,7 +4034,6 @@ that uses Serde for transforming structs into bytes and vice versa!") (sha256 (base32 "0hxlvy9q9984rr3rqaxwmgxjrd9wh11mcc161hv3shz6b7jkrcbm")))) - (build-system cargo-build-system) (inputs `(("clang" ,clang))) (arguments @@ -4027,12 +4063,7 @@ that uses Serde for transforming structs into bytes and vice versa!") (add-after 'unpack 'enable-unstable-features (lambda _ (setenv "RUSTC_BOOTSTRAP" "1") - #t))))) - (home-page "https://rust-lang.github.io/rust-bindgen/") - (synopsis "Generate Rust FFI bindings to C and C++ libraries.") - (description "This package can be used to automatically generate Rust FFI -bindings to C and C++ libraries.") - (license license:bsd-3))) + #t))))))) (define-public rust-bindgen-0.54 (package -- cgit 1.4.1 From 1fa3b736186f4afae1e9fee337c4dd7cb84d2630 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:00:25 +0100 Subject: gnu: rust-zstd-sys-1: Update to 1.4.20+zstd.1.4.9. * gnu/packages/crates-io.scm (rust-zstd-sys-1): Update to 1.4.20+zstd.1.4.9. --- gnu/packages/crates-io.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aef9f97393..b1dc185ef6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49300,7 +49300,7 @@ compression library.") (define-public rust-zstd-sys-1 (package (name "rust-zstd-sys") - (version "1.4.17+zstd.1.4.5") + (version "1.4.20+zstd.1.4.9") (source (origin (method url-fetch) @@ -49309,15 +49309,13 @@ compression library.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06zhk1j5v1sm04xxrw72lgzyi1wcq7kvj6vbd4ibamph9mj4k4mq")))) + "13kc3crvqg021fya48jw0spfbxdli5anmry3w93r8bfgswrvgmgb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-bindgen" ,rust-bindgen-0.54) + (("rust-bindgen" ,rust-bindgen-0.57) ("rust-cc" ,rust-cc-1) - ("rust-glob" ,rust-glob-0.3) - ("rust-itertools" ,rust-itertools-0.9) + ("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3)))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Low-level bindings to the zstd compression library") -- cgit 1.4.1 From 7c0565dcb5fe9f346bc1c1fb8cb0555a80975432 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:02:23 +0100 Subject: gnu: Add rust-zstd-safe-3. * gnu/packages/crates-io.scm (rust-zstd-safe-3): New variable. (rust-zstd-safe-2): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b1dc185ef6..6b7becfbd3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49273,29 +49273,48 @@ implementation that works everywhere, even WASM!") library.") (license license:expat))) -(define-public rust-zstd-safe-2 +(define-public rust-zstd-safe-3 (package (name "rust-zstd-safe") - (version "2.0.5+zstd.1.4.5") + (version "3.0.1+zstd.1.4.9") (source (origin (method url-fetch) (uri (crate-uri "zstd-safe" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0m8h1x030cj5bj7zxxf6gdp91bp0ays2vi9rlqllgxi71lp69yqw")))) + (base32 "133gassn5zy4vf0hhgsff3gxv1q3nc0bzi3qrqq7n4iqv6ycm1qk")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-zstd-sys" ,rust-zstd-sys-1)))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Safe low-level bindings to the zstd compression library") - (description "This package provides safe low-level bindings to the zstd -compression library.") + (description + "This package provides safe low-level bindings to the zstd compression +library.") (license (list license:expat license:asl2.0)))) +(define-public rust-zstd-safe-2 + (package + (inherit rust-zstd-safe-3) + (name "rust-zstd-safe") + (version "2.0.5+zstd.1.4.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "zstd-safe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0m8h1x030cj5bj7zxxf6gdp91bp0ays2vi9rlqllgxi71lp69yqw")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-zstd-sys" ,rust-zstd-sys-1)))))) + ;; TODO: Unbundle zstd. (define-public rust-zstd-sys-1 (package -- cgit 1.4.1 From c2e511845206868c4781315d74e5281c71ef8a09 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:03:21 +0100 Subject: gnu: Add rust-zstd-0.6. * gnu/packages/crates-io.scm (rust-zstd-0.6): New variable. (rust-zstd-0.5): Inherit from above. --- gnu/packages/crates-io.scm | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b7becfbd3..c605a670dd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49243,8 +49243,33 @@ implementation that works everywhere, even WASM!") "This package provides a library for parsing compiled zoneinfo files.") (license license:expat))) +(define-public rust-zstd-0.6 + (package + (name "rust-zstd") + (version "0.6.1+zstd.1.4.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "zstd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18riavdrq4cy10ygvrxby87nxyxbazpy53qvavc0bwlqyxvmxrax")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-zstd-safe" ,rust-zstd-safe-3)))) + (home-page "https://github.com/gyscos/zstd-rs") + (synopsis "Binding to the zstd compression library") + (description + "This package provides a binding to the zstd compression library.") + (license license:expat))) + (define-public rust-zstd-0.5 (package + (inherit rust-zstd-0.6) (name "rust-zstd") (version "0.5.3+zstd.1.4.5") (source @@ -49255,7 +49280,6 @@ implementation that works everywhere, even WASM!") (sha256 (base32 "1n0cgj9i3dk90kn7jcahq5fligqrjfzmnq08hfg71yhyfypjxcq1")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures" ,rust-futures-0.1) @@ -49266,12 +49290,7 @@ implementation that works everywhere, even WASM!") ("rust-humansize" ,rust-humansize-1) ("rust-partial-io" ,rust-partial-io-0.3) ("rust-quickcheck" ,rust-quickcheck-0.6) - ("rust-walkdir" ,rust-walkdir-2)))) - (home-page "https://github.com/gyscos/zstd-rs") - (synopsis "Binding to the zstd compression library") - (description "This package provides a binding to the zstd compression -library.") - (license license:expat))) + ("rust-walkdir" ,rust-walkdir-2)))))) (define-public rust-zstd-safe-3 (package -- cgit 1.4.1 From 0d171198a2cee87cbc544eb82e235d8b144cfb74 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:06:32 +0100 Subject: gnu: rust-async-compression-0.3: Update to 0.3.7. * gnu/packages/crates-io.scm (rust-async-compression-0.3): Update to 0.3.7. [arguments]: Skip tests. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c605a670dd..2db93cf956 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2523,7 +2523,7 @@ Rust.") (define-public rust-async-compression-0.3 (package (name "rust-async-compression") - (version "0.3.5") + (version "0.3.7") (source (origin (method url-fetch) @@ -2531,24 +2531,30 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "164dfy1wrl9qbj95rvcpkfbrkpz3c1s7mk288sv9cwp7rj5pc8ch")))) + "0dwm5zgi560m1xy30k3a4sg96mlfkjdk8jl6a1dk4d72ah8iyb5p")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + ;; FIXME: Tests fail with "error[E0432]: unresolved import `syn::export`" + ;; when compiling ntest_test_cases v0.3.4. + `(#:tests? #false + #:cargo-inputs (("rust-brotli" ,rust-brotli-3) ("rust-bytes" ,rust-bytes-0.5) - ("rust-bzip2" ,rust-bzip2-0.3) + ("rust-bzip2" ,rust-bzip2-0.4) ("rust-flate2" ,rust-flate2-1) ("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-io" ,rust-futures-io-0.3) ("rust-memchr" ,rust-memchr-2) - ("rust-pin-project-lite" ,rust-pin-project-lite-0.1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-tokio" ,rust-tokio-0.2) + ("rust-tokio" ,rust-tokio-0.3) + ("rust-tokio" ,rust-tokio-1) ("rust-xz2" ,rust-xz2-0.1) - ("rust-zstd" ,rust-zstd-0.5) - ("rust-zstd-safe" ,rust-zstd-safe-2)) + ("rust-zstd" ,rust-zstd-0.6) + ("rust-zstd-safe" ,rust-zstd-safe-3)) #:cargo-development-inputs - (("rust-bytes" ,rust-bytes-0.5) + (("rust-bytes" ,rust-bytes-1) + ("rust-bytes" ,rust-bytes-0.5) ("rust-futures" ,rust-futures-0.3) ("rust-futures-test" ,rust-futures-test-0.3) ("rust-ntest" ,rust-ntest-0.3) @@ -2556,7 +2562,11 @@ Rust.") ("rust-proptest-derive" ,rust-proptest-derive-0.1) ("rust-rand" ,rust-rand-0.7) ("rust-timebomb" ,rust-timebomb-0.1) - ("rust-tokio" ,rust-tokio-0.2)))) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio" ,rust-tokio-0.2) + ("rust-tokio" ,rust-tokio-0.3) + ("rust-tokio-util" ,rust-tokio-util-0.4) + ("rust-tokio-util" ,rust-tokio-util-0.6)))) (home-page "https://github.com/Nemo157/async-compression") (synopsis "Adaptors between compression crates and Rust's modern asynchronous IO types") (description "This package provides adaptors between compression crates -- cgit 1.4.1 From 0f0451c6cb191a6ff0386033edd94b5612a765f1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:07:45 +0100 Subject: gnu: Add rust-tokio-util-0.4. * gnu/packages/crates-io.scm (rust-tokio-util-0.4): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2db93cf956..94b7892f2c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43884,6 +43884,30 @@ stream-based WebSocket implementation.") "This package provides additional utilities for working with Tokio.") (license license:expat))) +(define-public rust-tokio-util-0.4 + (package + (inherit rust-tokio-util-0.6) + (name "rust-tokio-util") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m4pdg2gciagc9c5psg4lm51mcg69xwxr1yjdr0s0nv6yjckcy94")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-0.5) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.1) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-0.3)))))) + (define-public rust-tokio-util-0.3 (package (inherit rust-tokio-util-0.6) -- cgit 1.4.1 From 59e0c9a439690b3b7a402326d6672fce363f7a9f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:14:08 +0100 Subject: gnu: Add rust-reqwest-0.11. * gnu/packages/crates-io.scm (rust-reqwest-0.11): New variable. (rust-reqwest-0.10): Inherit from above. --- gnu/packages/crates-io.scm | 68 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 94b7892f2c..cd54927742 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32331,8 +32331,69 @@ uses finite automata and guarantees linear time matching on all inputs.") (description "File reopening utility.") (license (list license:asl2.0 license:expat)))) +(define-public rust-reqwest-0.11 + (package + (name "rust-reqwest") + (version "0.11.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "reqwest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m12j00if0gj0alhad4r7w0air4j0gqlpiwiqpsxna4l51zha4mz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-async-compression" ,rust-async-compression-0.3) + ("rust-base64" ,rust-base64-0.13) + ("rust-bytes" ,rust-bytes-1) + ("rust-cookie" ,rust-cookie-0.14) + ("rust-cookie-store" ,rust-cookie-store-0.12) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-http-body" ,rust-http-body-0.4) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-rustls" ,rust-hyper-rustls-0.22) + ("rust-hyper-tls" ,rust-hyper-tls-0.5) + ("rust-ipnet" ,rust-ipnet-2) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-time" ,rust-time-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.22) + ("rust-tokio-socks" ,rust-tokio-socks-0.5) + ("rust-tokio-util" ,rust-tokio-util-0.6) + ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.20) + ("rust-url" ,rust-url-2) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-webpki-roots" ,rust-webpki-roots-0.21) + ("rust-winreg" ,rust-winreg-0.7)))) + (home-page "https://github.com/seanmonstar/reqwest") + (synopsis "High level HTTP client library") + (description "This package provides a high level HTTP client library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-reqwest-0.10 (package + (inherit rust-reqwest-0.11) (name "rust-reqwest") (version "0.10.10") (source @@ -32343,7 +32404,6 @@ uses finite automata and guarantees linear time matching on all inputs.") (sha256 (base32 "0z7l46m1mjnvncscaq61zq6qmazrmb33vwjcnfrxpi0liqdgh607")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" ;; These tests require internet access. @@ -32404,11 +32464,7 @@ uses finite automata and guarantees linear time matching on all inputs.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl))) - (home-page "https://github.com/seanmonstar/reqwest") - (synopsis "High level HTTP client library") - (description "This package provides a high level HTTP client library.") - (license (list license:expat license:asl2.0)))) + `(("openssl" ,openssl))))) (define-public rust-reqwest-0.9 (package -- cgit 1.4.1 From b1e4be8fea2e0f17ec2b6a918bdb0888b657f26d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:15:22 +0100 Subject: gnu: Add rust-cssparser-0.28. * gnu/packages/crates-io.scm (rust-cssparser-0.28): New variable. (rust-cssparser-0.27): Inherit from above. --- gnu/packages/crates-io.scm | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cd54927742..aa46a98b4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9675,8 +9675,40 @@ algorithms.") reallocations.") (license license:asl2.0))) +(define-public rust-cssparser-0.28 + (package + (name "rust-cssparser") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h924c5g2rwlmgk8hllciyky3ih3z9vf04xz3xsp3cv1jyd5kf0x")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Rust implementation of CSS Syntax Level 3") + (description + "This package contains a Rust implementation of CSS Syntax Level 3.") + (license license:mpl2.0))) + (define-public rust-cssparser-0.27 (package + (inherit rust-cssparser-0.28) (name "rust-cssparser") (version "0.27.2") (source @@ -9688,7 +9720,6 @@ reallocations.") (sha256 (base32 "02nbm690rmkaz1ca0383qq7mc1g066w3s85f17pdihnda79njjvm")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included in the tarball. #:cargo-inputs @@ -9705,12 +9736,7 @@ reallocations.") #:cargo-development-inputs (("rust-difference" ,rust-difference-2) ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/servo/rust-cssparser") - (synopsis "Rust implementation of CSS Syntax Level 3") - (description - "This package contains a Rust implementation of CSS Syntax Level 3.") - (license license:mpl2.0))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-cssparser-0.25 (package -- cgit 1.4.1 From a70216c3277c5c8caade56bef7b35a1404f7f897 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Mar 2021 23:18:28 +0100 Subject: gnu: monolith: Update to 2.4.1. * gnu/packages/web.scm (monolith): Update to 2.4.1. --- gnu/packages/web.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 836328d758..ed9273e683 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -242,7 +242,7 @@ Interface} specification.") (define-public monolith (package (name "monolith") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -251,17 +251,18 @@ Interface} specification.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18c6bsv9m3spiyfhqp08v807m93r6n9hrlv4qbfiqp4kw5aryb4h")))) + (base32 "1z0bcvk2cvx2cd0hs8addzcb070xvrkcxvg25691xw0ikiynpkwz")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-base64" ,rust-base64-0.13) + (("rust-atty" ,rust-atty-0.2) + ("rust-base64" ,rust-base64-0.13) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-2) - ("rust-cssparser" ,rust-cssparser-0.27) + ("rust-cssparser" ,rust-cssparser-0.28) ("rust-html5ever" ,rust-html5ever-0.24) ("rust-regex" ,rust-regex-1) - ("rust-reqwest" ,rust-reqwest-0.10) + ("rust-reqwest" ,rust-reqwest-0.11) ("rust-sha2" ,rust-sha2-0.9) ("rust-url" ,rust-url-2)) #:cargo-development-inputs -- cgit 1.4.1 From 6eea92e38bfe5e74eecbff4bb8885e5a64163eb5 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 23:57:16 +0100 Subject: gnu: librecad: Update to 2.2.0-rc2 [fixes CVE-2018-19105]. * gnu/packages/engineering.scm (librecad): Update to 2.2.0-rc2. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b4ffc5f477..9a10c21fc0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -127,7 +127,7 @@ (define-public librecad (package (name "librecad") - (version "2.1.3") + (version "2.2.0-rc2") (source (origin (method url-fetch) (uri (string-append @@ -136,7 +136,7 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "01nvc1g3si05r5np1pzn62ah9w84p8nxa32wqrjh6gdi17jfvi3l")))) + "0a7fzhxkkn2s3hkgqrw3s3wyspzfla3c5lgbsjyqzvlnrp3anxnm")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit 1.4.1 From a3926c82276831312abf5c7bab87550b4688ccea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:38:24 +0100 Subject: gnu: mutt: Update to 2.0.6. * gnu/packages/mail.scm (mutt): Update to 2.0.6. --- 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 d21c0e204d..f81674a5a2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -446,7 +446,7 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "2.0.5") + (version "2.0.6") (source (origin (method url-fetch) (uri (list @@ -456,7 +456,7 @@ aliasing facilities to work just as they would on normal mail.") version ".tar.gz"))) (sha256 (base32 - "0k80s27sf7djb7zxj81ihksr8jkr71mfaa8976fzh41i1pn5l7g2")) + "165mpivdhvhavglykwlz0hss2akxd6i6l40rgxs29mjzi52irqw1")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From 6900105334c3dce5c8ccee716b0da767b5c9acc6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:38:34 +0100 Subject: gnu: os-prober: Update to 1.78. * gnu/packages/bootloaders.scm (os-prober): Update to 1.78. --- gnu/packages/bootloaders.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 99281b2cc6..c9a3d2c217 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -1027,15 +1027,14 @@ tools, and more.") (define-public os-prober (package (name "os-prober") - (version "1.77") + (version "1.78") (source (origin (method url-fetch) (uri (string-append "mirror://debian/pool/main/o/os-prober/os-prober_" version ".tar.xz")) (sha256 - (base32 - "0pvhrw4h05n21zw7ig3a3bi8aqdh6zxs0x1znz4g7vhspsps93ld")))) + (base32 "1sahk72blsrlirly4xlwa8jfxrpwagyn7b81p92q2s9m218rz43f")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 5929668ee8b24d23a0d59b6380201bd634631226 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:39:05 +0100 Subject: gnu: weechat: Update to 3.1. * gnu/packages/irc.scm (weechat): Update to 3.1. --- gnu/packages/irc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 718853d897..a595b40594 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Jakub Kądziołka @@ -186,14 +186,14 @@ SILC and ICB protocols via plugins.") (define-public weechat (package (name "weechat") - (version "3.0") + (version "3.1") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1yziv4cbcy61c9mb81c5sg3rmw6nh0srzwmry4svhriv6rdd5dvc")))) + "1xx4fx7785yw3ml3k1z08h3qvrizvcypwl0j6jc7d7qim9sjjnm5")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From f4618b13d85b3f24dd66655b313ec85b3336beb5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:39:24 +0100 Subject: gnu: bindfs: Update to 1.15.1. * gnu/packages/file-systems.scm (bindfs): Update to 1.15.1. --- 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 32f0db91d8..18d7aaffce 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -151,14 +151,14 @@ large and/or frequently changing (network) environment.") (define-public bindfs (package (name "bindfs") - (version "1.14.8") + (version "1.15.1") (source (origin (method url-fetch) (uri (string-append "https://bindfs.org/downloads/bindfs-" version ".tar.gz")) (sha256 (base32 - "15y4brlcrqhxl6z73785m0dr1vp2q3wc6xss08x9jjr0apzmmjp5")))) + "1av8dj9i1g0105fs5r9srqqsp7yahlhwc0yl8i1szyfdls23bp84")))) (build-system gnu-build-system) (arguments ;; XXX: The tests have no hope of passing until there is a "nogroup" -- cgit 1.4.1 From 4c144b27d85b0583877ab665a4be306374e1e382 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:45:00 +0100 Subject: gnu: sooperlooper: Update to 1.7.6. * gnu/packages/music.scm (sooperlooper): Update to 1.7.6. --- 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 4fb5049ac7..1e12bbe1a2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3786,14 +3786,14 @@ with a number of bugfixes and changes to improve IT playback.") (define-public sooperlooper (package (name "sooperlooper") - (version "1.7.4") + (version "1.7.6") (source (origin (method url-fetch) (uri (string-append "http://essej.net/sooperlooper/sooperlooper-" version ".tar.gz")) (sha256 - (base32 "1jjvq4aflbyr3nr8b318k1vkad16xfa1jkqn9ckzw4419qc6c1k5")))) + (base32 "0kbb1pj62rl32c88j6p7dg823kvs0gb5s42qy3bl6yg0wn10dksj")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 24f0bb21ab338994187456eacb69d1162fdd1af5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 00:45:26 +0100 Subject: gnu: qca: Update to 2.3.2. * gnu/packages/kde.scm (qca): Update to 2.3.2. --- gnu/packages/kde.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 3e05b26ea9..213def42e3 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -616,15 +616,14 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.3.1") + (version "2.3.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/qca/" version "/qca-" version ".tar.xz")) (sha256 - (base32 - "0jsfjwz84fc5jnl16aiwrcd6pgs5lzizm2896wildz5yk8852f61")))) + (base32 "0vb0kwm4vpf71vczadg6h1ib09sgca0crll7ksbkmg646w1615s6")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From c35f87bb1a300c6bde538eaa927a0f7311fb09a0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 01:10:29 +0100 Subject: gnu: evolution-data-server: Fix CVE-2020-14928 and CVE-2020-16117. * gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch, gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/gnome.scm (evolution-data-server): Apply them. --- gnu/local.mk | 2 + gnu/packages/gnome.scm | 4 +- .../evolution-data-server-CVE-2020-14928.patch | 115 +++++++++++++++++++++ .../evolution-data-server-CVE-2020-16117.patch | 28 +++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch create mode 100644 gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 39037d3499..e24cee8ecf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,6 +973,8 @@ dist_patch_DATA = \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/evolution-data-server-CVE-2020-14928.patch \ + %D%/packages/patches/evolution-data-server-CVE-2020-16117.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ %D%/packages/patches/evolution-data-server-libical-compat.patch \ %D%/packages/patches/exercism-disable-self-update.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c6d247471..1db2de4751 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7479,7 +7479,9 @@ Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") (version-major+minor version) "/" name "-" version ".tar.xz")) (patches (search-patches "evolution-data-server-locales.patch" - "evolution-data-server-libical-compat.patch")) + "evolution-data-server-libical-compat.patch" + "evolution-data-server-CVE-2020-14928.patch" + "evolution-data-server-CVE-2020-16117.patch")) (sha256 (base32 "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y")))) diff --git a/gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch b/gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch new file mode 100644 index 0000000000..421f292c9d --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-CVE-2020-14928.patch @@ -0,0 +1,115 @@ +From ba82be72cfd427b5d72ff21f929b3a6d8529c4df Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Mon, 22 Jun 2020 13:40:17 +0200 +Subject: [PATCH] I#226 - CVE-2020-14928: Response Injection via STARTTLS in + SMTP and POP3 + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/226 +--- + src/camel/camel-stream-buffer.c | 19 +++++++++++++++++++ + src/camel/camel-stream-buffer.h | 1 + + src/camel/providers/pop3/camel-pop3-store.c | 2 ++ + src/camel/providers/pop3/camel-pop3-stream.c | 11 +++++++++++ + src/camel/providers/pop3/camel-pop3-stream.h | 1 + + .../providers/smtp/camel-smtp-transport.c | 2 ++ + 6 files changed, 36 insertions(+) + +diff --git a/src/camel/camel-stream-buffer.c b/src/camel/camel-stream-buffer.c +index 3e2e0dd36..a6f605ae5 100644 +--- a/src/camel/camel-stream-buffer.c ++++ b/src/camel/camel-stream-buffer.c +@@ -518,3 +518,22 @@ camel_stream_buffer_read_line (CamelStreamBuffer *sbf, + + return g_strdup ((gchar *) sbf->priv->linebuf); + } ++ ++/** ++ * camel_stream_buffer_discard_cache: ++ * @sbf: a #CamelStreamBuffer ++ * ++ * Discards any cached data in the @sbf. The next read reads ++ * from the stream. ++ * ++ * Since: 3.38 ++ **/ ++void ++camel_stream_buffer_discard_cache (CamelStreamBuffer *sbf) ++{ ++ g_return_if_fail (CAMEL_IS_STREAM_BUFFER (sbf)); ++ ++ sbf->priv->ptr = sbf->priv->buf; ++ sbf->priv->end = sbf->priv->buf; ++ sbf->priv->ptr[0] = '\0'; ++} +diff --git a/src/camel/camel-stream-buffer.h b/src/camel/camel-stream-buffer.h +index ef92cfd8e..094e9926b 100644 +--- a/src/camel/camel-stream-buffer.h ++++ b/src/camel/camel-stream-buffer.h +@@ -93,6 +93,7 @@ gint camel_stream_buffer_gets (CamelStreamBuffer *sbf, + gchar * camel_stream_buffer_read_line (CamelStreamBuffer *sbf, + GCancellable *cancellable, + GError **error); ++void camel_stream_buffer_discard_cache (CamelStreamBuffer *sbf); + + G_END_DECLS + +diff --git a/src/camel/providers/pop3/camel-pop3-store.c b/src/camel/providers/pop3/camel-pop3-store.c +index 81c370f0a..5c9eb1eaa 100644 +--- a/src/camel/providers/pop3/camel-pop3-store.c ++++ b/src/camel/providers/pop3/camel-pop3-store.c +@@ -205,6 +205,8 @@ connect_to_server (CamelService *service, + + if (tls_stream != NULL) { + camel_stream_set_base_stream (stream, tls_stream); ++ /* Truncate any left cached input from the insecure part of the session */ ++ camel_pop3_stream_discard_cache (pop3_engine->stream); + g_object_unref (tls_stream); + } else { + g_prefix_error ( +diff --git a/src/camel/providers/pop3/camel-pop3-stream.c b/src/camel/providers/pop3/camel-pop3-stream.c +index 74bb11e61..c485b9bd6 100644 +--- a/src/camel/providers/pop3/camel-pop3-stream.c ++++ b/src/camel/providers/pop3/camel-pop3-stream.c +@@ -457,3 +457,14 @@ camel_pop3_stream_getd (CamelPOP3Stream *is, + + return 1; + } ++ ++void ++camel_pop3_stream_discard_cache (CamelPOP3Stream *is) ++{ ++ if (is) { ++ is->ptr = is->end = is->buf; ++ is->lineptr = is->linebuf; ++ is->lineend = is->linebuf + CAMEL_POP3_STREAM_LINE_SIZE; ++ is->ptr[0] = '\n'; ++ } ++} +diff --git a/src/camel/providers/pop3/camel-pop3-stream.h b/src/camel/providers/pop3/camel-pop3-stream.h +index bb6dbb903..128c8c45a 100644 +--- a/src/camel/providers/pop3/camel-pop3-stream.h ++++ b/src/camel/providers/pop3/camel-pop3-stream.h +@@ -87,6 +87,7 @@ gint camel_pop3_stream_getd (CamelPOP3Stream *is, + guint *len, + GCancellable *cancellable, + GError **error); ++void camel_pop3_stream_discard_cache (CamelPOP3Stream *is); + + G_END_DECLS + +diff --git a/src/camel/providers/smtp/camel-smtp-transport.c b/src/camel/providers/smtp/camel-smtp-transport.c +index 035baf367..1fc0f3206 100644 +--- a/src/camel/providers/smtp/camel-smtp-transport.c ++++ b/src/camel/providers/smtp/camel-smtp-transport.c +@@ -323,6 +323,8 @@ connect_to_server (CamelService *service, + + if (tls_stream != NULL) { + camel_stream_set_base_stream (stream, tls_stream); ++ /* Truncate any left cached input from the insecure part of the session */ ++ camel_stream_buffer_discard_cache (transport->istream); + g_object_unref (tls_stream); + } else { + g_prefix_error ( +-- +GitLab + diff --git a/gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch b/gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch new file mode 100644 index 0000000000..b2c0622a90 --- /dev/null +++ b/gnu/packages/patches/evolution-data-server-CVE-2020-16117.patch @@ -0,0 +1,28 @@ +From 2cc39592b532cf0dc994fd3694b8e6bf924c9ab5 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Mon, 10 Feb 2020 10:00:32 +0100 +Subject: [PATCH] I#189 - Crash on malformed server response with minimal + capabilities + +Closes https://gitlab.gnome.org/GNOME/evolution-data-server/issues/189 +--- + src/camel/providers/imapx/camel-imapx-server.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c +index 3c38fb1e9..3883321ec 100644 +--- a/src/camel/providers/imapx/camel-imapx-server.c ++++ b/src/camel/providers/imapx/camel-imapx-server.c +@@ -3045,7 +3045,8 @@ connected: + + /* See if we got new capabilities + * in the STARTTLS response. */ +- imapx_free_capability (is->priv->cinfo); ++ if (is->priv->cinfo) ++ imapx_free_capability (is->priv->cinfo); + is->priv->cinfo = NULL; + if (ic->status->condition == IMAPX_CAPABILITY) { + is->priv->cinfo = ic->status->u.cinfo; +-- +GitLab + -- cgit 1.4.1 From a2943e36c7c6309e955708552a72d532844576a8 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 01:18:35 +0100 Subject: gnu: evolution: Fix CVE-2020-11879. * gnu/packages/patches/evolution-CVE-2020-11879.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (evolution): Apply it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- .../patches/evolution-CVE-2020-11879.patch | 122 +++++++++++++++++++++ 3 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/evolution-CVE-2020-11879.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e24cee8ecf..9e20260ec3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,6 +973,7 @@ dist_patch_DATA = \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/eudev-rules-directory.patch \ %D%/packages/patches/evilwm-lost-focus-bug.patch \ + %D%/packages/patches/evolution-CVE-2020-11879.patch \ %D%/packages/patches/evolution-data-server-CVE-2020-14928.patch \ %D%/packages/patches/evolution-data-server-CVE-2020-16117.patch \ %D%/packages/patches/evolution-data-server-locales.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1db2de4751..5ee28eec03 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10711,7 +10711,8 @@ generic enough to work for everyone.") "evolution-" version ".tar.xz")) (sha256 (base32 - "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c")))) + "164vy8h432pjglafn8y2ms4gsvk3kbgc63h5qp0mk5dv4smsp29c")) + (patches (search-patches "evolution-CVE-2020-11879.patch")))) (build-system cmake-build-system) (arguments `(#:imported-modules (,@%cmake-build-system-modules diff --git a/gnu/packages/patches/evolution-CVE-2020-11879.patch b/gnu/packages/patches/evolution-CVE-2020-11879.patch new file mode 100644 index 0000000000..8c85895aab --- /dev/null +++ b/gnu/packages/patches/evolution-CVE-2020-11879.patch @@ -0,0 +1,122 @@ +From 6489f20d6905cc797e2b2581c415e558c457caa7 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Wed, 12 Feb 2020 18:59:52 +0100 +Subject: [PATCH] I#784 - Warn about and limit what can be attached using + mailto: URI + +Closes https://gitlab.gnome.org/GNOME/evolution/issues/784 +--- + src/composer/e-msg-composer.c | 58 +++++++++++++++++++++++++++++------ + src/e-util/e-system.error.xml | 7 ++++- + 2 files changed, 54 insertions(+), 11 deletions(-) + +diff --git a/src/composer/e-msg-composer.c b/src/composer/e-msg-composer.c +index e4c9ac095e..cd3168d882 100644 +--- a/src/composer/e-msg-composer.c ++++ b/src/composer/e-msg-composer.c +@@ -4761,7 +4761,8 @@ handle_mailto (EMsgComposer *composer, + gchar *header, *content, *buf; + gsize nread, nwritten; + const gchar *p; +- gint len, clen; ++ gint len, clen, has_attachments = 0; ++ gboolean has_blacklisted_attachment = FALSE; + + table = e_msg_composer_get_header_table (composer); + view = e_msg_composer_get_attachment_view (composer); +@@ -4844,22 +4845,36 @@ handle_mailto (EMsgComposer *composer, + } else if (!g_ascii_strcasecmp (header, "attach") || + !g_ascii_strcasecmp (header, "attachment")) { + EAttachment *attachment; ++ GFile *file; + + camel_url_decode (content); +- if (file_is_blacklisted (content)) +- e_alert_submit ( +- E_ALERT_SINK (e_msg_composer_get_editor (composer)), +- "mail:blacklisted-file", +- content, NULL); + if (g_ascii_strncasecmp (content, "file:", 5) == 0) + attachment = e_attachment_new_for_uri (content); + else + attachment = e_attachment_new_for_path (content); +- e_attachment_store_add_attachment (store, attachment); +- e_attachment_load_async ( +- attachment, (GAsyncReadyCallback) +- e_attachment_load_handle_error, composer); ++ file = e_attachment_ref_file (attachment); ++ if (!file || !g_file_peek_path (file) || ++ !g_file_test (g_file_peek_path (file), G_FILE_TEST_EXISTS) || ++ g_file_test (g_file_peek_path (file), G_FILE_TEST_IS_DIR)) { ++ /* Do nothing, simply ignore the attachment request */ ++ } else { ++ has_attachments++; ++ ++ if (file_is_blacklisted (content)) { ++ has_blacklisted_attachment = TRUE; ++ e_alert_submit ( ++ E_ALERT_SINK (e_msg_composer_get_editor (composer)), ++ "mail:blacklisted-file", ++ content, NULL); ++ } ++ ++ e_attachment_store_add_attachment (store, attachment); ++ e_attachment_load_async ( ++ attachment, (GAsyncReadyCallback) ++ e_attachment_load_handle_error, composer); ++ } + g_object_unref (attachment); ++ g_clear_object (&file); + } else if (!g_ascii_strcasecmp (header, "from")) { + /* Ignore */ + } else if (!g_ascii_strcasecmp (header, "reply-to")) { +@@ -4883,6 +4898,29 @@ handle_mailto (EMsgComposer *composer, + + g_free (buf); + ++ if (has_attachments && !has_blacklisted_attachment) { ++ const gchar *primary; ++ gchar *secondary; ++ ++ primary = g_dngettext (GETTEXT_PACKAGE, ++ "Review attachment before sending.", ++ "Review attachments before sending.", ++ has_attachments); ++ ++ secondary = g_strdup_printf (g_dngettext (GETTEXT_PACKAGE, ++ "There had been added %d attachment. Make sure it does not contain any sensitive information before sending the message.", ++ "There had been added %d attachments. Make sure they do not contain any sensitive information before sending the message.", ++ has_attachments), ++ has_attachments); ++ ++ e_alert_submit ( ++ E_ALERT_SINK (e_msg_composer_get_editor (composer)), ++ "system:generic-warning", ++ primary, secondary, NULL); ++ ++ g_free (secondary); ++ } ++ + merge_always_cc_and_bcc (table, to, &cc, &bcc); + + tov = destination_list_to_vector (to); +diff --git a/src/e-util/e-system.error.xml b/src/e-util/e-system.error.xml +index ddcf989fda..02facb7d26 100644 +--- a/src/e-util/e-system.error.xml ++++ b/src/e-util/e-system.error.xml +@@ -1,6 +1,11 @@ + + +- ++ ++ {0} ++ {1} ++ ++ ++ + {0} + {1} + +-- +GitLab + -- cgit 1.4.1 From e940f6d80193dd70ecd28b93e8d85042aa33a7c8 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 02:02:24 +0100 Subject: gnu: libcroco: Fix CVE-2020-12825. * gnu/packages/patches/libcroco-CVE-2020-12825.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (libcroco/fixed): New variable. Apply patch. (libcroco)[replacement]: Graft. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 16 ++ gnu/packages/patches/libcroco-CVE-2020-12825.patch | 187 +++++++++++++++++++++ 3 files changed, 204 insertions(+) create mode 100644 gnu/packages/patches/libcroco-CVE-2020-12825.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 9e20260ec3..eae602a01e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1275,6 +1275,7 @@ dist_patch_DATA = \ %D%/packages/patches/libcaca-CVE-2021-3410-pt2.patch \ %D%/packages/patches/libcanberra-sound-theme-freedesktop.patch \ %D%/packages/patches/libcanberra-wayland-crash.patch \ + %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-nofetch.patch \ %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5ee28eec03..a0796b0115 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3227,6 +3227,7 @@ the GNOME desktop environment.") (sha256 (base32 "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")))) + (replacement libcroco/fixed) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3245,6 +3246,21 @@ XML/CSS rendering engine.") ;; LGPLv2.1-only. (license license:lgpl2.1))) +(define-public libcroco/fixed + (package + (inherit libcroco) + (name "libcroco") + (version "0.6.13") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn")) + (patches (search-patches "libcroco-CVE-2020-12825.patch")))))) + (define-public libgsf (package (name "libgsf") diff --git a/gnu/packages/patches/libcroco-CVE-2020-12825.patch b/gnu/packages/patches/libcroco-CVE-2020-12825.patch new file mode 100644 index 0000000000..35005a6a19 --- /dev/null +++ b/gnu/packages/patches/libcroco-CVE-2020-12825.patch @@ -0,0 +1,187 @@ +From 7b64eb285dd937b34df71c95188301be50dd1409 Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Wed, 12 Aug 2020 13:54:15 -0500 +Subject: [PATCH] libcroco: Limit recursion in block and any productions + (CVE-2020-12825) + +If we don't have any limits, we can recurse forever and overflow the +stack. + +This is per https://gitlab.gnome.org/Archive/libcroco/-/issues/8 + +https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1404 +--- + src/st/croco/cr-parser.c | 44 ++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 15 deletions(-) + +diff --git a/src/st/croco/cr-parser.c b/src/st/croco/cr-parser.c +index 07f4ed9e8b..8304b75614 100644 +--- a/src/cr-parser.c ++++ b/src/cr-parser.c +@@ -136,6 +136,8 @@ struct _CRParserPriv { + + #define CHARS_TAB_SIZE 12 + ++#define RECURSIVE_CALLERS_LIMIT 100 ++ + /** + * IS_NUM: + *@a_char: the char to test. +@@ -343,9 +345,11 @@ static enum CRStatus cr_parser_parse_selector_core (CRParser * a_this); + + static enum CRStatus cr_parser_parse_declaration_core (CRParser * a_this); + +-static enum CRStatus cr_parser_parse_any_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls); + +-static enum CRStatus cr_parser_parse_block_core (CRParser * a_this); ++static enum CRStatus cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls); + + static enum CRStatus cr_parser_parse_value_core (CRParser * a_this); + +@@ -783,7 +787,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_parser_try_to_skip_spaces_and_comments (a_this); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + } while (status == CR_OK); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, +@@ -794,7 +798,7 @@ cr_parser_parse_atrule_core (CRParser * a_this) + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, + FALSE); + goto done; +@@ -929,11 +933,11 @@ cr_parser_parse_selector_core (CRParser * a_this) + + RECORD_INITIAL_POS (a_this, &init_pos); + +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + + } while (status == CR_OK); + +@@ -955,10 +959,12 @@ cr_parser_parse_selector_core (CRParser * a_this) + *in chapter 4.1 of the css2 spec. + *block ::= '{' S* [ any | block | ATKEYWORD S* | ';' ]* '}' S*; + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *FIXME: code this function. + */ + static enum CRStatus +-cr_parser_parse_block_core (CRParser * a_this) ++cr_parser_parse_block_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token = NULL; + CRInputPos init_pos; +@@ -966,6 +972,9 @@ cr_parser_parse_block_core (CRParser * a_this) + + g_return_val_if_fail (a_this && PRIVATE (a_this), CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token); +@@ -995,13 +1004,13 @@ cr_parser_parse_block_core (CRParser * a_this) + } else if (token->type == CBO_TK) { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } else { + cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + CHECK_PARSING_STATUS (status, FALSE); + goto parse_block_content; + } +@@ -1108,7 +1117,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_block_core (a_this); ++ status = cr_parser_parse_block_core (a_this, 0); + CHECK_PARSING_STATUS (status, FALSE); + ref++; + goto continue_parsing; +@@ -1122,7 +1131,7 @@ cr_parser_parse_value_core (CRParser * a_this) + status = cr_tknzr_unget_token (PRIVATE (a_this)->tknzr, + token); + token = NULL; +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, 0); + if (status == CR_OK) { + ref++; + goto continue_parsing; +@@ -1161,10 +1170,12 @@ cr_parser_parse_value_core (CRParser * a_this) + * | FUNCTION | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*; + * + *@param a_this the current instance of #CRParser. ++ *@param n_calls used to limit recursion depth + *@return CR_OK upon successfull completion, an error code otherwise. + */ + static enum CRStatus +-cr_parser_parse_any_core (CRParser * a_this) ++cr_parser_parse_any_core (CRParser * a_this, ++ guint n_calls) + { + CRToken *token1 = NULL, + *token2 = NULL; +@@ -1173,6 +1184,9 @@ cr_parser_parse_any_core (CRParser * a_this) + + g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR); + ++ if (n_calls > RECURSIVE_CALLERS_LIMIT) ++ return CR_ERROR; ++ + RECORD_INITIAL_POS (a_this, &init_pos); + + status = cr_tknzr_get_next_token (PRIVATE (a_this)->tknzr, &token1); +@@ -1211,7 +1225,7 @@ cr_parser_parse_any_core (CRParser * a_this) + *We consider parameter as being an "any*" production. + */ + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1236,7 +1250,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +@@ -1264,7 +1278,7 @@ cr_parser_parse_any_core (CRParser * a_this) + } + + do { +- status = cr_parser_parse_any_core (a_this); ++ status = cr_parser_parse_any_core (a_this, n_calls + 1); + } while (status == CR_OK); + + ENSURE_PARSING_COND (status == CR_PARSING_ERROR); +-- +GitLab + -- cgit 1.4.1 From be31314638e2f42c706b4865274ffbb86d6aca87 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 02:19:53 +0100 Subject: gnu: gthumb: Update to 3.10.2 [security fixes]. Non-exhaustively, fixes CVE-2019-20326. * gnu/packages/gnome.scm (gthumb): Update to 3.10.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 a0796b0115..50edf9ebd9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10791,7 +10791,7 @@ functionality.") (define-public gthumb (package (name "gthumb") - (version "3.8.2") + (version "3.10.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -10799,7 +10799,7 @@ functionality.") "gthumb-" version ".tar.xz")) (sha256 (base32 - "15wqks35ks5dm7zj046dfd45vvrilan2ayfy2sxiprv7q74cip2q")))) + "14sw8d37g1lkp44dwsgyxjjsgh5pnpp4wq00mcy9p3rp30lf9spx")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit 1.4.1 From 1acfda2f949fe61631c7602c865964453ece85e0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 02:32:19 +0100 Subject: gnu: geary: Fix CVE-2020-24661. * gnu/packages/patches/geary-CVE-2020-24661.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/gnome.scm (geary): Apply it. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- gnu/packages/patches/geary-CVE-2020-24661.patch | 133 ++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/geary-CVE-2020-24661.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index eae602a01e..a68981e48d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1057,6 +1057,7 @@ dist_patch_DATA = \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ %D%/packages/patches/gdm-default-session.patch \ + %D%/packages/patches/geary-CVE-2020-24661.patch \ %D%/packages/patches/genimage-signedness.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 50edf9ebd9..d58aa9956b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11339,7 +11339,8 @@ these services on the Guix System.") (file-name (git-file-name name version)) (sha256 (base32 - "01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7")))) + "01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7")) + (patches (search-patches "geary-CVE-2020-24661.patch")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/geary-CVE-2020-24661.patch b/gnu/packages/patches/geary-CVE-2020-24661.patch new file mode 100644 index 0000000000..6cbc224786 --- /dev/null +++ b/gnu/packages/patches/geary-CVE-2020-24661.patch @@ -0,0 +1,133 @@ +From d4e86dc91e1d8a940dc40872fe94ef9ac0fed1b5 Mon Sep 17 00:00:00 2001 +From: Michael Gratton +Date: Tue, 25 Aug 2020 03:54:09 +0000 +Subject: [PATCH] Merge branch 'mjog/866-self-signed-certificates' into + 'mainline' + +Fix invalid certificate pinning when GCR support is unavailable + +Closes #866 + +See merge request GNOME/geary!529 + +(cherry picked from commit 423a55b00f1dc6bee9dc17e67c0aea6f42387a77) + +5088adfe Application.CertificateManager: Rename some methods for clarity +0d957559 Application.CertificateManager: Check locally pinned certs for equality +--- + .../application-certificate-manager.vala | 44 +++++++++---------- + 1 file changed, 22 insertions(+), 22 deletions(-) + +diff --git a/src/client/application/application-certificate-manager.vala b/src/client/application/application-certificate-manager.vala +index 4881d73c0..65f6af4fa 100644 +--- a/src/client/application/application-certificate-manager.vala ++++ b/src/client/application/application-certificate-manager.vala +@@ -381,8 +381,8 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + GLib.TlsCertificateFlags ret = this.parent.verify_chain( + chain, purpose, identity, interaction, flags, cancellable + ); +- if (should_verify(ret, purpose, identity) && +- verify(chain, identity, cancellable)) { ++ if (check_pinned(ret, purpose, identity) && ++ is_pinned(chain, identity, cancellable)) { + ret = 0; + } + return ret; +@@ -399,16 +399,16 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + GLib.TlsCertificateFlags ret = yield this.parent.verify_chain_async( + chain, purpose, identity, interaction, flags, cancellable + ); +- if (should_verify(ret, purpose, identity) && +- yield verify_async(chain, identity, cancellable)) { ++ if (check_pinned(ret, purpose, identity) && ++ yield is_pinned_async(chain, identity, cancellable)) { + ret = 0; + } + return ret; + } + +- private inline bool should_verify(GLib.TlsCertificateFlags parent_ret, +- string purpose, +- GLib.SocketConnectable? identity) { ++ private inline bool check_pinned(GLib.TlsCertificateFlags parent_ret, ++ string purpose, ++ GLib.SocketConnectable? identity) { + // If the parent didn't verify, check for a locally pinned + // cert if it looks like we should, but always reject revoked + // certs +@@ -420,22 +420,22 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + ); + } + +- private bool verify(GLib.TlsCertificate chain, +- GLib.SocketConnectable identity, +- GLib.Cancellable? cancellable) ++ private bool is_pinned(GLib.TlsCertificate chain, ++ GLib.SocketConnectable identity, ++ GLib.Cancellable? cancellable) + throws GLib.Error { +- bool is_verified = false; ++ bool is_pinned = false; + string id = to_name(identity); + TrustContext? context = null; + lock (this.pinned_certs) { + context = this.pinned_certs.get(id); + if (context != null) { +- is_verified = true; ++ is_pinned = context.certificate.is_same(chain); + } else { + // Cert not found in memory, check with GCR if + // enabled. + if (this.use_gcr) { +- is_verified = gcr_trust_is_certificate_pinned( ++ is_pinned = gcr_trust_is_certificate_pinned( + new Gcr.SimpleCertificate(chain.certificate.data), + GLib.TlsDatabase.PURPOSE_AUTHENTICATE_SERVER, + id, +@@ -443,7 +443,7 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + ); + } + +- if (!is_verified) { ++ if (!is_pinned) { + // Cert is not pinned in memory or in GCR, so look + // for it on disk. Do this even if GCR support is + // enabled, since if the cert was previously saved +@@ -453,7 +453,7 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + this.store_dir, id, cancellable + ); + this.pinned_certs.set(id, context); +- is_verified = true; ++ is_pinned = context.certificate.is_same(chain); + } catch (GLib.IOError.NOT_FOUND err) { + // Cert was not found saved, so it not pinned + } catch (GLib.Error err) { +@@ -465,18 +465,18 @@ private class Application.TlsDatabase : GLib.TlsDatabase { + } + } + } +- return is_verified; ++ return is_pinned; + } + +- private async bool verify_async(GLib.TlsCertificate chain, +- GLib.SocketConnectable identity, +- GLib.Cancellable? cancellable) ++ private async bool is_pinned_async(GLib.TlsCertificate chain, ++ GLib.SocketConnectable identity, ++ GLib.Cancellable? cancellable) + throws GLib.Error { +- bool is_valid = false; ++ bool pinned = false; + yield Geary.Nonblocking.Concurrent.global.schedule_async(() => { +- is_valid = verify(chain, identity, cancellable); ++ pinned = is_pinned(chain, identity, cancellable); + }, cancellable); +- return is_valid; ++ return pinned; + } + + private TrustContext? lookup_id(string id) { +-- +GitLab + -- cgit 1.4.1 From 2bcfb944bdd2f476ef8d34802fed436e4fdda0ab Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 02:58:28 +0100 Subject: gnu: zstd-1.4.9: Fix i686-linux and arm/aarch64-linux builds. It's only a graft added for security so disabling tests on there seems acceptable. See: . * gnu/packages/compression.scm (zstd-1.4.9)[arguments]: Substitute keyword arguments of 'zstd' to disable tests. --- gnu/packages/compression.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 571088dcbc..8e2a3a78f1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1513,7 +1513,10 @@ speed.") (uri (string-append "https://github.com/facebook/zstd/releases/download/" "v" version "/zstd-" version ".tar.gz")) (sha256 - (base32 "14yj7309gsvg39rki4xqnd6w5idmqi0655v1fc0mk1m2kvhp9b19")))))) + (base32 "14yj7309gsvg39rki4xqnd6w5idmqi0655v1fc0mk1m2kvhp9b19")))) + (arguments + (substitute-keyword-arguments (package-arguments zstd) + ((#:tests? _ #t) #f))))) (define-public pzstd (package -- cgit 1.4.1 From 46a7f828820c03c9c74f12f4fbd3cfe2777f3b84 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 04:00:50 +0100 Subject: gnu: gnome-autoar: Update to 0.3.0 [fixes CVE-2020-36241]. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.3.0. --- 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 d58aa9956b..5a8b6b30e8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8647,7 +8647,7 @@ core C library, and bindings for Python (PyGTK).") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.2.4") + (version "0.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8655,7 +8655,7 @@ core C library, and bindings for Python (PyGTK).") name "-" version ".tar.xz")) (sha256 (base32 - "0yk56ch46n3wfy633mq31kif9n7v06rlij4vqbsbn6l4z1vw6d0a")))) + "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From 9d74b66de78686e5affaf6d7882becd003d3c49a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 04:36:22 +0100 Subject: gnu: docker-cli: Fix source hash. This is a follow-up to commit 83cda00bc62d665f05d37d07c78a1c4eab5297f0. * gnu/packages/docker.scm (docker-cli): Fix source hash caused by cascading %docker-version variable changes. --- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 28bf2aff2b..5c6292c122 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -611,7 +611,7 @@ provisioning etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0wm5x8b8jll78h2zzncfdpxj0y3gv571z0nd39f036wsy7r23dsi")))) + (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" -- cgit 1.4.1 From 826428ab5bd347954ee6be70a6a6596000f8583e Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 05:25:43 +0100 Subject: gnu: libx11: Update to 1.6.12 [fixes CVE-2020-14363]. * gnu/packages/xorg.scm (libx11/fixed): New variable. (libx11)[replacement]: Graft. --- gnu/packages/xorg.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 92ae6a824b..3f16f2c8b1 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5468,6 +5468,7 @@ draggable titlebars and borders.") (sha256 (base32 "09k2pqmqbn2m1bpgl7jfxyqxaaxsnzbnp2bp8ycmqldqi5ln4j5g")))) + (replacement libx11/fixed) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5495,6 +5496,21 @@ draggable titlebars and borders.") (description "Xorg Core X11 protocol client library.") (license license:x11))) +(define-public libx11/fixed + (package + (inherit libx11) + (version "1.6.12") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://xorg/individual/lib/libX11-" + version + ".tar.bz2")) + (sha256 + (base32 + "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i")))))) + ;; packages of height 5 in the propagated-inputs tree (define-public libxcursor -- cgit 1.4.1 From ee8e4ba7aa39289746fe7ffb129d448e6cca78b4 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 05:31:54 +0100 Subject: gnu: openvpn: Update to 2.5.1 [security fixes]. Non-exhaustively, fixes CVE-2020-7224. * gnu/packages/vpn.scm (openvpn): Update to 2.5.1. --- 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 76af7582fc..f18dc6760c 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -388,7 +388,7 @@ this process. It is compatible with Fortinet VPNs.") (define-public openvpn (package (name "openvpn") - (version "2.4.10") + (version "2.5.1") (source (origin (method url-fetch) (uri (string-append @@ -396,7 +396,7 @@ this process. It is compatible with Fortinet VPNs.") version ".tar.xz")) (sha256 (base32 - "0xx378ja2rdfaayc257z0z5ddsp8h0jcpqnd1a6bdw3rlsam6a6g")))) + "157ikzap2bbkzx34hkh33bpk2i14xjx1x3pkadhmzh1pr24h94s0")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-iproute2=yes"))) -- cgit 1.4.1 From 4a8b529ce15ddc69a9dd701e450fc85a0ed65910 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 05:38:57 +0100 Subject: gnu: openssl: Update to 1.1.1j [security fixes]. * gnu/packages/tls.scm (openssl/fixed): New variable. (openssl)[replacement]: Graft. --- gnu/packages/tls.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c6228f7fd2..acabca5df3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -301,6 +301,7 @@ required structures.") (sha256 (base32 "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8")))) + (replacement openssl/fixed) (build-system gnu-build-system) (outputs '("out" "doc" ;6.8 MiB of man3 pages and full HTML documentation @@ -419,6 +420,24 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) +(define-public openssl/fixed + (package + (inherit openssl) + (version "1.1.1j") + (source (origin + (method url-fetch) + (uri (list (string-append "https://www.openssl.org/source/openssl-" + version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/" + "openssl-" version ".tar.gz") + (string-append "ftp://ftp.openssl.org/source/old/" + (string-trim-right version char-set:letter) + "/openssl-" version ".tar.gz"))) + (patches (search-patches "openssl-1.1-c-rehash-in.patch")) + (sha256 + (base32 + "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))))) + (define-public openssl-1.0 (package (inherit openssl) -- cgit 1.4.1 From fd2751f89f04669227bbd71243bb100e3742a3fd Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Wed, 10 Mar 2021 09:12:02 +0000 Subject: gnu: emacs-password-store: 2.1.4-1.918992c [security fix]. Includes a fix to no longer store clear passwords in a temporary file, see commit 7aa17d099577730d2d65332896b74d5865b22abf for details. * gnu/packages/emacs-xyz.scm (emacs-password-store): Update to 2.1.4-1.918992c. [propagated-inputs]: Remove emacs-f, add emacs-auth-source-pass. --- gnu/packages/emacs-xyz.scm | 70 +++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b5785505a5..de3ef6d648 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15041,39 +15041,45 @@ close, copy, cut, paste, undo, redo.") (license license:gpl3+)))) (define-public emacs-password-store - (package - (name "emacs-password-store") - (version "1.7.3") - (source (origin - (method url-fetch) - (uri - (string-append "https://git.zx2c4.com/password-store/snapshot/" - "password-store-" version ".tar.xz")) - (sha256 - (base32 - "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'extract-el-file - (lambda _ - (copy-file "contrib/emacs/password-store.el" "password-store.el") - (delete-file-recursively "contrib") - (delete-file-recursively "man") - (delete-file-recursively "src") - (delete-file-recursively "tests")))))) - (propagated-inputs - `(("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s) - ("emacs-with-editor" ,emacs-with-editor) - ("password-store" ,password-store))) - (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") - (synopsis "Password store (pass) support for Emacs") - (description - "This package provides functions for working with pass (\"the + (let ((commit "918992c19231b33b3d4a3288a7288a620e608cb4") + (revision "1")) + (package + (name "emacs-password-store") + ;; The emacs package version does not match the password-store version, + ;; even though it is part of the same repository. When updating, look + ;; at the version declared in password-store.el. + (version (git-version "2.1.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.zx2c4.com/password-store") + (commit commit))) + (sha256 + (base32 + "0ni62f4pq96g0i0q66bch1dl9k4zqwhg7xaf746k3gbbqxcdh3vi")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'extract-el-file + (lambda _ + (copy-file "contrib/emacs/password-store.el" "password-store.el") + (delete-file-recursively "contrib") + (delete-file-recursively "man") + (delete-file-recursively "src") + (delete-file-recursively "tests")))))) + (propagated-inputs + `(("emacs-auth-source-pass" ,emacs-auth-source-pass) + ("emacs-s" ,emacs-s) + ("emacs-with-editor" ,emacs-with-editor) + ("password-store" ,password-store))) + (home-page "https://git.zx2c4.com/password-store/tree/contrib/emacs") + (synopsis "Password store (pass) support for Emacs") + (description + "This package provides functions for working with pass (\"the standard Unix password manager\").") - (license license:gpl2+))) + (license license:gpl2+)))) (define-public emacs-auth-source-pass (let ((commit "847a1f54ed48856b4dfaaa184583ef2c84173edf") -- cgit 1.4.1 From 500189b4d2f1e3a2d4ee8ab73d889e3d8ac70632 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 10:53:00 +0100 Subject: gnu: go: Update to 1.14.15 [security fixes]. This update will cause more than 300 packages to be rebuilt but due to how Go works we can't graft to fix the issue since we actually need to rebuild dependents so they include a newer version of the Go standard library. Considering the CVEs that this fixes are in great part in the Go standard library we can only proceed and push directly to master. * gnu/packages/golang.scm (go): Update to 1.14.15. [arguments]: Remove more cgo-related failing tests. --- gnu/packages/golang.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index dd50da1c8e..849227d693 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -235,7 +235,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (package (inherit go-1.4) (name "go") - (version "1.14.10") + (version "1.14.15") (source (origin (method git-fetch) @@ -245,7 +245,7 @@ in the style of communicating sequential processes (@dfn{CSP}).") (file-name (git-file-name name version)) (sha256 (base32 - "0h1nmqzjc0xxpn6n2hjq7692gdqkznagzdmiq9490yzkrrii2lgk")))) + "1crh90qkvhlx23hwsi4wxy3l3h8973lr18135y6h1nnzzwr3n3ps")))) (arguments (substitute-keyword-arguments (package-arguments go-1.4) ((#:system system) @@ -285,7 +285,10 @@ in the style of communicating sequential processes (@dfn{CSP}).") "cmd/go/testdata/script/cover_cgo.txt" "cmd/go/testdata/script/cover_cgo_xtest.txt" "cmd/go/testdata/script/cover_cgo_extra_test.txt" - "cmd/go/testdata/script/cover_cgo_extra_file.txt")) + "cmd/go/testdata/script/cover_cgo_extra_file.txt" + "cmd/go/testdata/script/cgo_path_space.txt" + "cmd/go/testdata/script/ldflag.txt" + "cmd/go/testdata/script/cgo_path.txt")) (for-each make-file-writable (find-files ".")) -- cgit 1.4.1 From 21b3b755151028647081fe96d2992b3743531d71 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 11 Mar 2021 05:34:28 -0500 Subject: gnu: glib: Fix CVE-2021-27218 and CVE-2021-27219. * gnu/packages/patches/glib-CVE-2021-27218.patch, gnu/packages/patches/glib-CVE-2021-27219-01.patch, gnu/packages/patches/glib-CVE-2021-27219-02.patch, gnu/packages/patches/glib-CVE-2021-27219-03.patch, gnu/packages/patches/glib-CVE-2021-27219-04.patch, gnu/packages/patches/glib-CVE-2021-27219-05.patch, gnu/packages/patches/glib-CVE-2021-27219-06.patch, gnu/packages/patches/glib-CVE-2021-27219-07.patch, gnu/packages/patches/glib-CVE-2021-27219-08.patch, gnu/packages/patches/glib-CVE-2021-27219-09.patch, gnu/packages/patches/glib-CVE-2021-27219-10.patch, gnu/packages/patches/glib-CVE-2021-27219-11.patch, gnu/packages/patches/glib-CVE-2021-27219-12.patch, gnu/packages/patches/glib-CVE-2021-27219-13.patch, gnu/packages/patches/glib-CVE-2021-27219-14.patch, gnu/packages/patches/glib-CVE-2021-27219-15.patch, gnu/packages/patches/glib-CVE-2021-27219-16.patch, gnu/packages/patches/glib-CVE-2021-27219-17.patch, gnu/packages/patches/glib-CVE-2021-27219-18.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/glib.scm (glib)[replacement]: New field. (glib/fixed): New variable. --- gnu/local.mk | 21 +- gnu/packages/glib.scm | 30 ++- gnu/packages/patches/glib-CVE-2021-27218.patch | 132 ++++++++++ gnu/packages/patches/glib-CVE-2021-27219-01.patch | 176 +++++++++++++ gnu/packages/patches/glib-CVE-2021-27219-02.patch | 264 +++++++++++++++++++ gnu/packages/patches/glib-CVE-2021-27219-03.patch | 136 ++++++++++ gnu/packages/patches/glib-CVE-2021-27219-04.patch | 308 ++++++++++++++++++++++ gnu/packages/patches/glib-CVE-2021-27219-05.patch | 47 ++++ gnu/packages/patches/glib-CVE-2021-27219-06.patch | 94 +++++++ gnu/packages/patches/glib-CVE-2021-27219-07.patch | 118 +++++++++ gnu/packages/patches/glib-CVE-2021-27219-08.patch | 94 +++++++ gnu/packages/patches/glib-CVE-2021-27219-09.patch | 98 +++++++ gnu/packages/patches/glib-CVE-2021-27219-10.patch | 52 ++++ gnu/packages/patches/glib-CVE-2021-27219-11.patch | 57 ++++ gnu/packages/patches/glib-CVE-2021-27219-12.patch | 30 +++ gnu/packages/patches/glib-CVE-2021-27219-13.patch | 32 +++ gnu/packages/patches/glib-CVE-2021-27219-14.patch | 32 +++ gnu/packages/patches/glib-CVE-2021-27219-15.patch | 95 +++++++ gnu/packages/patches/glib-CVE-2021-27219-16.patch | 43 +++ gnu/packages/patches/glib-CVE-2021-27219-17.patch | 37 +++ gnu/packages/patches/glib-CVE-2021-27219-18.patch | 232 ++++++++++++++++ 21 files changed, 2126 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glib-CVE-2021-27218.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-01.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-02.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-03.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-04.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-05.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-06.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-07.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-08.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-09.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-10.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-11.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-12.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-13.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-14.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-15.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-16.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-17.patch create mode 100644 gnu/packages/patches/glib-CVE-2021-27219-18.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a68981e48d..c2637926ee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2,7 +2,7 @@ # Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Andreas Enge # Copyright © 2016 Mathieu Lirzin -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver # Copyright © 2016 Chris Marusich # Copyright © 2016, 2017, 2018 Kei Kebreau # Copyright © 2016, 2017 Rene Saavedra @@ -1076,6 +1076,25 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-tests-timer.patch \ + %D%/packages/patches/glib-CVE-2021-27218.patch \ + %D%/packages/patches/glib-CVE-2021-27219-01.patch \ + %D%/packages/patches/glib-CVE-2021-27219-02.patch \ + %D%/packages/patches/glib-CVE-2021-27219-03.patch \ + %D%/packages/patches/glib-CVE-2021-27219-04.patch \ + %D%/packages/patches/glib-CVE-2021-27219-05.patch \ + %D%/packages/patches/glib-CVE-2021-27219-06.patch \ + %D%/packages/patches/glib-CVE-2021-27219-07.patch \ + %D%/packages/patches/glib-CVE-2021-27219-08.patch \ + %D%/packages/patches/glib-CVE-2021-27219-09.patch \ + %D%/packages/patches/glib-CVE-2021-27219-10.patch \ + %D%/packages/patches/glib-CVE-2021-27219-11.patch \ + %D%/packages/patches/glib-CVE-2021-27219-12.patch \ + %D%/packages/patches/glib-CVE-2021-27219-13.patch \ + %D%/packages/patches/glib-CVE-2021-27219-14.patch \ + %D%/packages/patches/glib-CVE-2021-27219-15.patch \ + %D%/packages/patches/glib-CVE-2021-27219-16.patch \ + %D%/packages/patches/glib-CVE-2021-27219-17.patch \ + %D%/packages/patches/glib-CVE-2021-27219-18.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9cc2b1b69e..520b723722 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2016, 2020 Efraim Flashner ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus @@ -172,6 +172,7 @@ shared NFS home directories.") (package (name "glib") (version "2.62.6") + (replacement glib/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" @@ -390,6 +391,33 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) +(define glib/fixed + (package + (inherit glib) + (source (origin + (inherit (package-source glib)) + (patches + (append (search-patches "glib-CVE-2021-27218.patch" + "glib-CVE-2021-27219-01.patch" + "glib-CVE-2021-27219-02.patch" + "glib-CVE-2021-27219-03.patch" + "glib-CVE-2021-27219-04.patch" + "glib-CVE-2021-27219-05.patch" + "glib-CVE-2021-27219-06.patch" + "glib-CVE-2021-27219-07.patch" + "glib-CVE-2021-27219-08.patch" + "glib-CVE-2021-27219-09.patch" + "glib-CVE-2021-27219-10.patch" + "glib-CVE-2021-27219-11.patch" + "glib-CVE-2021-27219-12.patch" + "glib-CVE-2021-27219-13.patch" + "glib-CVE-2021-27219-14.patch" + "glib-CVE-2021-27219-15.patch" + "glib-CVE-2021-27219-16.patch" + "glib-CVE-2021-27219-17.patch" + "glib-CVE-2021-27219-18.patch") + (origin-patches (package-source glib)))))))) + (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. diff --git a/gnu/packages/patches/glib-CVE-2021-27218.patch b/gnu/packages/patches/glib-CVE-2021-27218.patch new file mode 100644 index 0000000000..00fa5ebf79 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27218.patch @@ -0,0 +1,132 @@ +Backport of: + +From 0f384c88a241bbbd884487b1c40b7b75f1e638d3 Mon Sep 17 00:00:00 2001 +From: Krzesimir Nowak +Date: Wed, 10 Feb 2021 23:51:07 +0100 +Subject: [PATCH] gbytearray: Do not accept too large byte arrays + +GByteArray uses guint for storing the length of the byte array, but it +also has a constructor (g_byte_array_new_take) that takes length as a +gsize. gsize may be larger than guint (64 bits for gsize vs 32 bits +for guint). It is possible to call the function with a value greater +than G_MAXUINT, which will result in silent length truncation. This +may happen as a result of unreffing GBytes into GByteArray, so rather +be loud about it. + +(Test case tweaked by Philip Withnall.) + +(Backport 2.66: Add #include gstrfuncsprivate.h in the test case for +`g_memdup2()`.) +--- + glib/garray.c | 6 ++++++ + glib/gbytes.c | 4 ++++ + glib/tests/bytes.c | 35 ++++++++++++++++++++++++++++++++++- + 3 files changed, 44 insertions(+), 1 deletion(-) + +diff --git a/glib/garray.c b/glib/garray.c +index 942e74c9f..fb1a42aaf 100644 +--- a/glib/garray.c ++++ b/glib/garray.c +@@ -2013,6 +2013,10 @@ g_byte_array_new (void) + * Create byte array containing the data. The data will be owned by the array + * and will be freed with g_free(), i.e. it could be allocated using g_strdup(). + * ++ * Do not use it if @len is greater than %G_MAXUINT. #GByteArray ++ * stores the length of its data in #guint, which may be shorter than ++ * #gsize. ++ * + * Since: 2.32 + * + * Returns: (transfer full): a new #GByteArray +@@ -2024,6 +2028,8 @@ g_byte_array_new_take (guint8 *data, + GByteArray *array; + GRealArray *real; + ++ g_return_val_if_fail (len <= G_MAXUINT, NULL); ++ + array = g_byte_array_new (); + real = (GRealArray *)array; + g_assert (real->data == NULL); +diff --git a/glib/gbytes.c b/glib/gbytes.c +index 7b72886e5..d56abe6c3 100644 +--- a/glib/gbytes.c ++++ b/glib/gbytes.c +@@ -519,6 +519,10 @@ g_bytes_unref_to_data (GBytes *bytes, + * g_bytes_new(), g_bytes_new_take() or g_byte_array_free_to_bytes(). In all + * other cases the data is copied. + * ++ * Do not use it if @bytes contains more than %G_MAXUINT ++ * bytes. #GByteArray stores the length of its data in #guint, which ++ * may be shorter than #gsize, that @bytes is using. ++ * + * Returns: (transfer full): a new mutable #GByteArray containing the same byte data + * + * Since: 2.32 +diff --git a/glib/tests/bytes.c b/glib/tests/bytes.c +index 5ea5c2b35..15a6aaad6 100644 +--- a/glib/tests/bytes.c ++++ b/glib/tests/bytes.c +@@ -10,12 +10,12 @@ + */ + + #undef G_DISABLE_ASSERT +-#undef G_LOG_DOMAIN + + #include + #include + #include + #include "glib.h" ++#include "glib/gstrfuncsprivate.h" + + /* Keep in sync with glib/gbytes.c */ + struct _GBytes +@@ -333,6 +333,38 @@ test_to_array_transferred (void) + g_byte_array_unref (array); + } + ++static void ++test_to_array_transferred_oversize (void) ++{ ++ g_test_message ("g_bytes_unref_to_array() can only take GBytes up to " ++ "G_MAXUINT in length; test that longer ones are rejected"); ++ ++ if (sizeof (guint) >= sizeof (gsize)) ++ { ++ g_test_skip ("Skipping test as guint is not smaller than gsize"); ++ } ++ else if (g_test_undefined ()) ++ { ++ GByteArray *array = NULL; ++ GBytes *bytes = NULL; ++ gpointer data = g_memdup2 (NYAN, N_NYAN); ++ gsize len = ((gsize) G_MAXUINT) + 1; ++ ++ bytes = g_bytes_new_take (data, len); ++ g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, ++ "g_byte_array_new_take: assertion 'len <= G_MAXUINT' failed"); ++ array = g_bytes_unref_to_array (g_steal_pointer (&bytes)); ++ g_test_assert_expected_messages (); ++ g_assert_null (array); ++ ++ g_free (data); ++ } ++ else ++ { ++ g_test_skip ("Skipping test as testing undefined behaviour is disabled"); ++ } ++} ++ + static void + test_to_array_two_refs (void) + { +@@ -410,6 +442,7 @@ main (int argc, char *argv[]) + g_test_add_func ("/bytes/to-array/transfered", test_to_array_transferred); + g_test_add_func ("/bytes/to-array/two-refs", test_to_array_two_refs); + g_test_add_func ("/bytes/to-array/non-malloc", test_to_array_non_malloc); ++ g_test_add_func ("/bytes/to-array/transferred/oversize", test_to_array_transferred_oversize); + g_test_add_func ("/bytes/null", test_null); + + return g_test_run (); +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-01.patch b/gnu/packages/patches/glib-CVE-2021-27219-01.patch new file mode 100644 index 0000000000..5db360d468 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-01.patch @@ -0,0 +1,176 @@ +Backport of: + +From 5e5f75a77e399c638be66d74e5daa8caeb433e00 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:30:52 +0000 +Subject: [PATCH 01/11] gstrfuncs: Add internal g_memdup2() function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This will replace the existing `g_memdup()` function for use within +GLib. It has an unavoidable security flaw of taking its `byte_size` +argument as a `guint` rather than as a `gsize`. Most callers will +expect it to be a `gsize`, and may pass in large values which could +silently be truncated, resulting in an undersize allocation compared +to what the caller expects. + +This could lead to a classic buffer overflow vulnerability for many +callers of `g_memdup()`. + +`g_memdup2()`, in comparison, takes its `byte_size` as a `gsize`. + +Spotted by Kevin Backhouse of GHSL. + +In GLib 2.68, `g_memdup2()` will be a new public API. In this version +for backport to older stable releases, it’s a new `static inline` API +in a private header, so that use of `g_memdup()` within GLib can be +fixed without adding a new API in a stable release series. + +Signed-off-by: Philip Withnall +Helps: GHSL-2021-045 +Helps: #2319 +--- + docs/reference/glib/meson.build | 1 + + glib/gstrfuncsprivate.h | 55 +++++++++++++++++++++++++++++++++ + glib/meson.build | 1 + + glib/tests/strfuncs.c | 23 ++++++++++++++ + 4 files changed, 80 insertions(+) + create mode 100644 glib/gstrfuncsprivate.h + +diff --git a/docs/reference/glib/meson.build b/docs/reference/glib/meson.build +index bba7649f0..ee39f6d04 100644 +--- a/docs/reference/glib/meson.build ++++ b/docs/reference/glib/meson.build +@@ -22,6 +22,7 @@ if get_option('gtk_doc') + 'gprintfint.h', + 'gmirroringtable.h', + 'gscripttable.h', ++ 'gstrfuncsprivate.h', + 'glib-mirroring-tab', + 'gnulib', + 'pcre', +diff --git a/glib/gstrfuncsprivate.h b/glib/gstrfuncsprivate.h +new file mode 100644 +index 000000000..85c88328a +--- /dev/null ++++ b/glib/gstrfuncsprivate.h +@@ -0,0 +1,55 @@ ++/* GLIB - Library of useful routines for C programming ++ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, see . ++ */ ++ ++#include ++#include ++ ++/* ++ * g_memdup2: ++ * @mem: (nullable): the memory to copy. ++ * @byte_size: the number of bytes to copy. ++ * ++ * Allocates @byte_size bytes of memory, and copies @byte_size bytes into it ++ * from @mem. If @mem is %NULL it returns %NULL. ++ * ++ * This replaces g_memdup(), which was prone to integer overflows when ++ * converting the argument from a #gsize to a #guint. ++ * ++ * This static inline version is a backport of the new public API from ++ * GLib 2.68, kept internal to GLib for backport to older stable releases. ++ * See https://gitlab.gnome.org/GNOME/glib/-/issues/2319. ++ * ++ * Returns: (nullable): a pointer to the newly-allocated copy of the memory, ++ * or %NULL if @mem is %NULL. ++ * Since: 2.68 ++ */ ++static inline gpointer ++g_memdup2 (gconstpointer mem, ++ gsize byte_size) ++{ ++ gpointer new_mem; ++ ++ if (mem && byte_size != 0) ++ { ++ new_mem = g_malloc (byte_size); ++ memcpy (new_mem, mem, byte_size); ++ } ++ else ++ new_mem = NULL; ++ ++ return new_mem; ++} +diff --git a/glib/meson.build b/glib/meson.build +index aaf5f00f5..5a6eea397 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -268,6 +268,7 @@ glib_sources = files( + 'gslist.c', + 'gstdio.c', + 'gstrfuncs.c', ++ 'gstrfuncsprivate.h', + 'gstring.c', + 'gstringchunk.c', + 'gtestutils.c', +diff --git a/glib/tests/strfuncs.c b/glib/tests/strfuncs.c +index e1f9619c7..d968afff9 100644 +--- a/glib/tests/strfuncs.c ++++ b/glib/tests/strfuncs.c +@@ -32,6 +32,8 @@ + #include + #include "glib.h" + ++#include "gstrfuncsprivate.h" ++ + #if defined (_MSC_VER) && (_MSC_VER <= 1800) + #define isnan(x) _isnan(x) + +@@ -219,6 +221,26 @@ test_memdup (void) + g_free (str_dup); + } + ++/* Testing g_memdup2() function with various positive and negative cases */ ++static void ++test_memdup2 (void) ++{ ++ gchar *str_dup = NULL; ++ const gchar *str = "The quick brown fox jumps over the lazy dog"; ++ ++ /* Testing negative cases */ ++ g_assert_null (g_memdup2 (NULL, 1024)); ++ g_assert_null (g_memdup2 (str, 0)); ++ g_assert_null (g_memdup2 (NULL, 0)); ++ ++ /* Testing normal usage cases */ ++ str_dup = g_memdup2 (str, strlen (str) + 1); ++ g_assert_nonnull (str_dup); ++ g_assert_cmpstr (str, ==, str_dup); ++ ++ g_free (str_dup); ++} ++ + /* Testing g_strpcpy() function with various positive and negative cases */ + static void + test_stpcpy (void) +@@ -2523,6 +2545,7 @@ main (int argc, + g_test_add_func ("/strfuncs/has-prefix", test_has_prefix); + g_test_add_func ("/strfuncs/has-suffix", test_has_suffix); + g_test_add_func ("/strfuncs/memdup", test_memdup); ++ g_test_add_func ("/strfuncs/memdup2", test_memdup2); + g_test_add_func ("/strfuncs/stpcpy", test_stpcpy); + g_test_add_func ("/strfuncs/str_match_string", test_str_match_string); + g_test_add_func ("/strfuncs/str_tokenize_and_fold", test_str_tokenize_and_fold); +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-02.patch b/gnu/packages/patches/glib-CVE-2021-27219-02.patch new file mode 100644 index 0000000000..431959fa8f --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-02.patch @@ -0,0 +1,264 @@ +Backport of: + +From be8834340a2d928ece82025463ae23dee2c333d0 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:37:56 +0000 +Subject: [PATCH 02/11] gio: Use g_memdup2() instead of g_memdup() in obvious + places +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Convert all the call sites which use `g_memdup()`’s length argument +trivially (for example, by passing a `sizeof()`), so that they use +`g_memdup2()` instead. + +In almost all of these cases the use of `g_memdup()` would not have +caused problems, but it will soon be deprecated, so best port away from +it. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gdbusconnection.c | 5 +++-- + gio/gdbusinterfaceskeleton.c | 3 ++- + gio/gfile.c | 7 ++++--- + gio/gsettingsschema.c | 5 +++-- + gio/gwin32registrykey.c | 8 +++++--- + gio/tests/async-close-output-stream.c | 6 ++++-- + gio/tests/gdbus-export.c | 5 +++-- + gio/win32/gwinhttpfile.c | 9 +++++---- + 8 files changed, 29 insertions(+), 19 deletions(-) + +diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c +index f1f0921d4..d56453486 100644 +--- a/gio/gdbusconnection.c ++++ b/gio/gdbusconnection.c +@@ -110,6 +110,7 @@ + #include "gasyncinitable.h" + #include "giostream.h" + #include "gasyncresult.h" ++#include "gstrfuncsprivate.h" + #include "gtask.h" + #include "gmarshal-internal.h" + +@@ -3997,7 +3998,7 @@ _g_dbus_interface_vtable_copy (const GDBusInterfaceVTable *vtable) + /* Don't waste memory by copying padding - remember to update this + * when changing struct _GDBusInterfaceVTable in gdbusconnection.h + */ +- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); ++ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); + } + + static void +@@ -4014,7 +4015,7 @@ _g_dbus_subtree_vtable_copy (const GDBusSubtreeVTable *vtable) + /* Don't waste memory by copying padding - remember to update this + * when changing struct _GDBusSubtreeVTable in gdbusconnection.h + */ +- return g_memdup ((gconstpointer) vtable, 3 * sizeof (gpointer)); ++ return g_memdup2 ((gconstpointer) vtable, 3 * sizeof (gpointer)); + } + + static void +diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c +index 4a06516c1..4a4b719a5 100644 +--- a/gio/gdbusinterfaceskeleton.c ++++ b/gio/gdbusinterfaceskeleton.c +@@ -28,6 +28,7 @@ + #include "gdbusmethodinvocation.h" + #include "gdbusconnection.h" + #include "gmarshal-internal.h" ++#include "gstrfuncsprivate.h" + #include "gtask.h" + #include "gioerror.h" + +@@ -701,7 +702,7 @@ add_connection_locked (GDBusInterfaceSkeleton *interface_, + * properly before building the hooked_vtable, so we create it + * once at the last minute. + */ +- interface_->priv->hooked_vtable = g_memdup (g_dbus_interface_skeleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); ++ interface_->priv->hooked_vtable = g_memdup2 (g_dbus_interface_skeleton_get_vtable (interface_), sizeof (GDBusInterfaceVTable)); + interface_->priv->hooked_vtable->method_call = skeleton_intercept_handle_method_call; + } + +diff --git a/gio/gfile.c b/gio/gfile.c +index ba93f7c75..88b341e7d 100644 +--- a/gio/gfile.c ++++ b/gio/gfile.c +@@ -60,6 +60,7 @@ + #include "gasyncresult.h" + #include "gioerror.h" + #include "glibintl.h" ++#include "gstrfuncsprivate.h" + + + /** +@@ -7884,7 +7885,7 @@ measure_disk_usage_progress (gboolean reporting, + g_main_context_invoke_full (g_task_get_context (task), + g_task_get_priority (task), + measure_disk_usage_invoke_progress, +- g_memdup (&progress, sizeof progress), ++ g_memdup2 (&progress, sizeof progress), + g_free); + } + +@@ -7902,7 +7903,7 @@ measure_disk_usage_thread (GTask *task, + data->progress_callback ? measure_disk_usage_progress : NULL, task, + &result.disk_usage, &result.num_dirs, &result.num_files, + &error)) +- g_task_return_pointer (task, g_memdup (&result, sizeof result), g_free); ++ g_task_return_pointer (task, g_memdup2 (&result, sizeof result), g_free); + else + g_task_return_error (task, error); + } +@@ -7926,7 +7927,7 @@ g_file_real_measure_disk_usage_async (GFile *file, + + task = g_task_new (file, cancellable, callback, user_data); + g_task_set_source_tag (task, g_file_real_measure_disk_usage_async); +- g_task_set_task_data (task, g_memdup (&data, sizeof data), g_free); ++ g_task_set_task_data (task, g_memdup2 (&data, sizeof data), g_free); + g_task_set_priority (task, io_priority); + + g_task_run_in_thread (task, measure_disk_usage_thread); +diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c +index 3a60b8c64..dded9b1ca 100644 +--- a/gio/gsettingsschema.c ++++ b/gio/gsettingsschema.c +@@ -20,6 +20,7 @@ + + #include "gsettingsschema-internal.h" + #include "gsettings.h" ++#include "gstrfuncsprivate.h" + + #include "gvdb/gvdb-reader.h" + #include "strinfo.c" +@@ -1058,9 +1059,9 @@ g_settings_schema_list_children (GSettingsSchema *schema) + + if (g_str_has_suffix (key, "/")) + { +- gint length = strlen (key); ++ gsize length = strlen (key); + +- strv[j] = g_memdup (key, length); ++ strv[j] = g_memdup2 (key, length); + strv[j][length - 1] = '\0'; + j++; + } +diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c +index c19fede4e..619fd48af 100644 +--- a/gio/gwin32registrykey.c ++++ b/gio/gwin32registrykey.c +@@ -28,6 +28,8 @@ + #include + #include + ++#include "gstrfuncsprivate.h" ++ + #ifndef _WDMDDK_ + typedef enum _KEY_INFORMATION_CLASS { + KeyBasicInformation, +@@ -247,7 +249,7 @@ g_win32_registry_value_iter_copy (const GWin32RegistryValueIter *iter) + new_iter->value_name_size = iter->value_name_size; + + if (iter->value_data != NULL) +- new_iter->value_data = g_memdup (iter->value_data, iter->value_data_size); ++ new_iter->value_data = g_memdup2 (iter->value_data, iter->value_data_size); + + new_iter->value_data_size = iter->value_data_size; + +@@ -268,8 +270,8 @@ g_win32_registry_value_iter_copy (const GWin32RegistryValueIter *iter) + new_iter->value_data_expanded_charsize = iter->value_data_expanded_charsize; + + if (iter->value_data_expanded_u8 != NULL) +- new_iter->value_data_expanded_u8 = g_memdup (iter->value_data_expanded_u8, +- iter->value_data_expanded_charsize); ++ new_iter->value_data_expanded_u8 = g_memdup2 (iter->value_data_expanded_u8, ++ iter->value_data_expanded_charsize); + + new_iter->value_data_expanded_u8_size = iter->value_data_expanded_charsize; + +diff --git a/gio/tests/async-close-output-stream.c b/gio/tests/async-close-output-stream.c +index 5f6620275..d3f97a119 100644 +--- a/gio/tests/async-close-output-stream.c ++++ b/gio/tests/async-close-output-stream.c +@@ -24,6 +24,8 @@ + #include + #include + ++#include "gstrfuncsprivate.h" ++ + #define DATA_TO_WRITE "Hello world\n" + + typedef struct +@@ -147,9 +149,9 @@ prepare_data (SetupData *data, + + data->expected_size = g_memory_output_stream_get_data_size (G_MEMORY_OUTPUT_STREAM (data->data_stream)); + +- g_assert_cmpint (data->expected_size, >, 0); ++ g_assert_cmpuint (data->expected_size, >, 0); + +- data->expected_output = g_memdup (written, (guint)data->expected_size); ++ data->expected_output = g_memdup2 (written, data->expected_size); + + /* then recreate the streams and prepare them for the asynchronous close */ + destroy_streams (data); +diff --git a/gio/tests/gdbus-export.c b/gio/tests/gdbus-export.c +index 506c7458a..5513306f8 100644 +--- a/gio/tests/gdbus-export.c ++++ b/gio/tests/gdbus-export.c +@@ -23,6 +23,7 @@ + #include + + #include "gdbus-tests.h" ++#include "gstrfuncsprivate.h" + + /* all tests rely on a shared mainloop */ + static GMainLoop *loop = NULL; +@@ -671,7 +672,7 @@ subtree_introspect (GDBusConnection *connection, + g_assert_not_reached (); + } + +- return g_memdup (interfaces, 2 * sizeof (void *)); ++ return g_memdup2 (interfaces, 2 * sizeof (void *)); + } + + static const GDBusInterfaceVTable * +@@ -727,7 +728,7 @@ dynamic_subtree_introspect (GDBusConnection *connection, + { + const GDBusInterfaceInfo *interfaces[2] = { &dyna_interface_info, NULL }; + +- return g_memdup (interfaces, 2 * sizeof (void *)); ++ return g_memdup2 (interfaces, 2 * sizeof (void *)); + } + + static const GDBusInterfaceVTable * +diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c +index cf5eed31d..040ee8564 100644 +--- a/gio/win32/gwinhttpfile.c ++++ b/gio/win32/gwinhttpfile.c +@@ -29,6 +29,7 @@ + #include "gio/gfile.h" + #include "gio/gfileattribute.h" + #include "gio/gfileinfo.h" ++#include "gstrfuncsprivate.h" + #include "gwinhttpfile.h" + #include "gwinhttpfileinputstream.h" + #include "gwinhttpfileoutputstream.h" +@@ -393,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *file, + child = g_object_new (G_TYPE_WINHTTP_FILE, NULL); + child->vfs = winhttp_file->vfs; + child->url = winhttp_file->url; +- child->url.lpszScheme = g_memdup (winhttp_file->url.lpszScheme, (winhttp_file->url.dwSchemeLength+1)*2); +- child->url.lpszHostName = g_memdup (winhttp_file->url.lpszHostName, (winhttp_file->url.dwHostNameLength+1)*2); +- child->url.lpszUserName = g_memdup (winhttp_file->url.lpszUserName, (winhttp_file->url.dwUserNameLength+1)*2); +- child->url.lpszPassword = g_memdup (winhttp_file->url.lpszPassword, (winhttp_file->url.dwPasswordLength+1)*2); ++ child->url.lpszScheme = g_memdup2 (winhttp_file->url.lpszScheme, (winhttp_file->url.dwSchemeLength+1)*2); ++ child->url.lpszHostName = g_memdup2 (winhttp_file->url.lpszHostName, (winhttp_file->url.dwHostNameLength+1)*2); ++ child->url.lpszUserName = g_memdup2 (winhttp_file->url.lpszUserName, (winhttp_file->url.dwUserNameLength+1)*2); ++ child->url.lpszPassword = g_memdup2 (winhttp_file->url.lpszPassword, (winhttp_file->url.dwPasswordLength+1)*2); + child->url.lpszUrlPath = wnew_path; + child->url.dwUrlPathLength = wcslen (wnew_path); + child->url.lpszExtraInfo = NULL; +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-03.patch b/gnu/packages/patches/glib-CVE-2021-27219-03.patch new file mode 100644 index 0000000000..99e849c43c --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-03.patch @@ -0,0 +1,136 @@ +From 6110caea45b235420b98cd41d845cc92238f6781 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:39:25 +0000 +Subject: [PATCH 03/11] gobject: Use g_memdup2() instead of g_memdup() in + obvious places +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Convert all the call sites which use `g_memdup()`’s length argument +trivially (for example, by passing a `sizeof()`), so that they use +`g_memdup2()` instead. + +In almost all of these cases the use of `g_memdup()` would not have +caused problems, but it will soon be deprecated, so best port away from +it. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gobject/gsignal.c | 3 ++- + gobject/gtype.c | 9 +++++---- + gobject/gtypemodule.c | 3 ++- + gobject/tests/param.c | 4 +++- + 4 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/gobject/gsignal.c b/gobject/gsignal.c +index 77d8f211e..41c54ab57 100644 +--- a/gobject/gsignal.c ++++ b/gobject/gsignal.c +@@ -28,6 +28,7 @@ + #include + + #include "gsignal.h" ++#include "gstrfuncsprivate.h" + #include "gtype-private.h" + #include "gbsearcharray.h" + #include "gvaluecollector.h" +@@ -1730,7 +1731,7 @@ g_signal_newv (const gchar *signal_name, + node->single_va_closure_is_valid = FALSE; + node->flags = signal_flags & G_SIGNAL_FLAGS_MASK; + node->n_params = n_params; +- node->param_types = g_memdup (param_types, sizeof (GType) * n_params); ++ node->param_types = g_memdup2 (param_types, sizeof (GType) * n_params); + node->return_type = return_type; + node->class_closure_bsa = NULL; + if (accumulator) +diff --git a/gobject/gtype.c b/gobject/gtype.c +index 7d3789400..8441b90e9 100644 +--- a/gobject/gtype.c ++++ b/gobject/gtype.c +@@ -33,6 +33,7 @@ + + #include "glib-private.h" + #include "gconstructor.h" ++#include "gstrfuncsprivate.h" + + #ifdef G_OS_WIN32 + #include +@@ -1470,7 +1471,7 @@ type_add_interface_Wm (TypeNode *node, + iholder->next = iface_node_get_holders_L (iface); + iface_node_set_holders_W (iface, iholder); + iholder->instance_type = NODE_TYPE (node); +- iholder->info = info ? g_memdup (info, sizeof (*info)) : NULL; ++ iholder->info = info ? g_memdup2 (info, sizeof (*info)) : NULL; + iholder->plugin = plugin; + + /* create an iface entry for this type */ +@@ -1731,7 +1732,7 @@ type_iface_retrieve_holder_info_Wm (TypeNode *iface, + INVALID_RECURSION ("g_type_plugin_*", iholder->plugin, NODE_NAME (iface)); + + check_interface_info_I (iface, instance_type, &tmp_info); +- iholder->info = g_memdup (&tmp_info, sizeof (tmp_info)); ++ iholder->info = g_memdup2 (&tmp_info, sizeof (tmp_info)); + } + + return iholder; /* we don't modify write lock upon returning NULL */ +@@ -2016,10 +2017,10 @@ type_iface_vtable_base_init_Wm (TypeNode *iface, + IFaceEntry *pentry = type_lookup_iface_entry_L (pnode, iface); + + if (pentry) +- vtable = g_memdup (pentry->vtable, iface->data->iface.vtable_size); ++ vtable = g_memdup2 (pentry->vtable, iface->data->iface.vtable_size); + } + if (!vtable) +- vtable = g_memdup (iface->data->iface.dflt_vtable, iface->data->iface.vtable_size); ++ vtable = g_memdup2 (iface->data->iface.dflt_vtable, iface->data->iface.vtable_size); + entry->vtable = vtable; + vtable->g_type = NODE_TYPE (iface); + vtable->g_instance_type = NODE_TYPE (node); +diff --git a/gobject/gtypemodule.c b/gobject/gtypemodule.c +index 4ecaf8c88..20911fafd 100644 +--- a/gobject/gtypemodule.c ++++ b/gobject/gtypemodule.c +@@ -19,6 +19,7 @@ + + #include + ++#include "gstrfuncsprivate.h" + #include "gtypeplugin.h" + #include "gtypemodule.h" + +@@ -436,7 +437,7 @@ g_type_module_register_type (GTypeModule *module, + module_type_info->loaded = TRUE; + module_type_info->info = *type_info; + if (type_info->value_table) +- module_type_info->info.value_table = g_memdup (type_info->value_table, ++ module_type_info->info.value_table = g_memdup2 (type_info->value_table, + sizeof (GTypeValueTable)); + + return module_type_info->type; +diff --git a/gobject/tests/param.c b/gobject/tests/param.c +index 758289bf8..971cff162 100644 +--- a/gobject/tests/param.c ++++ b/gobject/tests/param.c +@@ -2,6 +2,8 @@ + #include + #include + ++#include "gstrfuncsprivate.h" ++ + static void + test_param_value (void) + { +@@ -851,7 +853,7 @@ main (int argc, char *argv[]) + test_path = g_strdup_printf ("/param/implement/subprocess/%d-%d-%d-%d", + data.change_this_flag, data.change_this_type, + data.use_this_flag, data.use_this_type); +- test_data = g_memdup (&data, sizeof (TestParamImplementData)); ++ test_data = g_memdup2 (&data, sizeof (TestParamImplementData)); + g_test_add_data_func_full (test_path, test_data, test_param_implement_child, g_free); + g_free (test_path); + } +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-04.patch b/gnu/packages/patches/glib-CVE-2021-27219-04.patch new file mode 100644 index 0000000000..3ae01f34b1 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-04.patch @@ -0,0 +1,308 @@ +Backport of: + +From 0736b7c1e7cf4232c5d7eb2b0fbfe9be81bd3baa Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:41:21 +0000 +Subject: [PATCH 04/11] glib: Use g_memdup2() instead of g_memdup() in obvious + places +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Convert all the call sites which use `g_memdup()`’s length argument +trivially (for example, by passing a `sizeof()` or an existing `gsize` +variable), so that they use `g_memdup2()` instead. + +In almost all of these cases the use of `g_memdup()` would not have +caused problems, but it will soon be deprecated, so best port away from +it + +In particular, this fixes an overflow within `g_bytes_new()`, identified +as GHSL-2021-045 by GHSL team member Kevin Backhouse. + +Signed-off-by: Philip Withnall +Fixes: GHSL-2021-045 +Helps: #2319 +--- + glib/gbytes.c | 6 ++++-- + glib/gdir.c | 3 ++- + glib/ghash.c | 7 ++++--- + glib/giochannel.c | 3 ++- + glib/gslice.c | 3 ++- + glib/gtestutils.c | 3 ++- + glib/gvariant.c | 7 ++++--- + glib/gvarianttype.c | 3 ++- + glib/tests/array-test.c | 4 +++- + glib/tests/option-context.c | 6 ++++-- + 10 files changed, 29 insertions(+), 16 deletions(-) + +diff --git a/glib/gbytes.c b/glib/gbytes.c +index d56abe6c3..dee494820 100644 +--- a/glib/gbytes.c ++++ b/glib/gbytes.c +@@ -34,6 +34,8 @@ + + #include + ++#include "gstrfuncsprivate.h" ++ + /** + * GBytes: + * +@@ -95,7 +97,7 @@ g_bytes_new (gconstpointer data, + { + g_return_val_if_fail (data != NULL || size == 0, NULL); + +- return g_bytes_new_take (g_memdup (data, size), size); ++ return g_bytes_new_take (g_memdup2 (data, size), size); + } + + /** +@@ -499,7 +501,7 @@ g_bytes_unref_to_data (GBytes *bytes, + * Copy: Non g_malloc (or compatible) allocator, or static memory, + * so we have to copy, and then unref. + */ +- result = g_memdup (bytes->data, bytes->size); ++ result = g_memdup2 (bytes->data, bytes->size); + *size = bytes->size; + g_bytes_unref (bytes); + } +diff --git a/glib/gdir.c b/glib/gdir.c +index 6b85e99c8..6747a8c6f 100644 +--- a/glib/gdir.c ++++ b/glib/gdir.c +@@ -37,6 +37,7 @@ + #include "gconvert.h" + #include "gfileutils.h" + #include "gstrfuncs.h" ++#include "gstrfuncsprivate.h" + #include "gtestutils.h" + #include "glibintl.h" + +@@ -112,7 +113,7 @@ g_dir_open_with_errno (const gchar *path, + return NULL; + #endif + +- return g_memdup (&dir, sizeof dir); ++ return g_memdup2 (&dir, sizeof dir); + } + + /** +diff --git a/glib/ghash.c b/glib/ghash.c +index e61b03788..26f26062b 100644 +--- a/glib/ghash.c ++++ b/glib/ghash.c +@@ -34,6 +34,7 @@ + #include "gmacros.h" + #include "glib-private.h" + #include "gstrfuncs.h" ++#include "gstrfuncsprivate.h" + #include "gatomic.h" + #include "gtestutils.h" + #include "gslice.h" +@@ -964,7 +965,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_table, gpointer key, gpointer + if (hash_table->have_big_keys) + { + if (key != value) +- hash_table->values = g_memdup (hash_table->keys, sizeof (gpointer) * hash_table->size); ++ hash_table->values = g_memdup2 (hash_table->keys, sizeof (gpointer) * hash_table->size); + /* Keys and values are both big now, so no need for further checks */ + return; + } +@@ -972,7 +973,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_table, gpointer key, gpointer + { + if (key != value) + { +- hash_table->values = g_memdup (hash_table->keys, sizeof (guint) * hash_table->size); ++ hash_table->values = g_memdup2 (hash_table->keys, sizeof (guint) * hash_table->size); + is_a_set = FALSE; + } + } +@@ -1000,7 +1001,7 @@ g_hash_table_ensure_keyval_fits (GHashTable *hash_table, gpointer key, gpointer + + /* Just split if necessary */ + if (is_a_set && key != value) +- hash_table->values = g_memdup (hash_table->keys, sizeof (gpointer) * hash_table->size); ++ hash_table->values = g_memdup2 (hash_table->keys, sizeof (gpointer) * hash_table->size); + + #endif + } +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 1956e9dc6..15927c391 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -37,6 +37,7 @@ + #include "giochannel.h" + + #include "gstrfuncs.h" ++#include "gstrfuncsprivate.h" + #include "gtestutils.h" + #include "glibintl.h" + +@@ -892,7 +893,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + length = strlen (line_term); + + g_free (channel->line_term); +- channel->line_term = line_term ? g_memdup (line_term, length) : NULL; ++ channel->line_term = line_term ? g_memdup2 (line_term, length) : NULL; + channel->line_term_len = length; + } + +diff --git a/glib/gslice.c b/glib/gslice.c +index 4c758c3be..bcdbb8853 100644 +--- a/glib/gslice.c ++++ b/glib/gslice.c +@@ -41,6 +41,7 @@ + #include "gmain.h" + #include "gmem.h" /* gslice.h */ + #include "gstrfuncs.h" ++#include "gstrfuncsprivate.h" + #include "gutils.h" + #include "gtrashstack.h" + #include "gtestutils.h" +@@ -350,7 +351,7 @@ g_slice_get_config_state (GSliceConfig ckey, + array[i++] = allocator->contention_counters[address]; + array[i++] = allocator_get_magazine_threshold (allocator, address); + *n_values = i; +- return g_memdup (array, sizeof (array[0]) * *n_values); ++ return g_memdup2 (array, sizeof (array[0]) * *n_values); + default: + return NULL; + } +diff --git a/glib/gtestutils.c b/glib/gtestutils.c +index dd789482f..5887ecc36 100644 +--- a/glib/gtestutils.c ++++ b/glib/gtestutils.c +@@ -49,6 +49,7 @@ + #include "gpattern.h" + #include "grand.h" + #include "gstrfuncs.h" ++#include "gstrfuncsprivate.h" + #include "gtimer.h" + #include "gslice.h" + #include "gspawn.h" +@@ -3798,7 +3799,7 @@ g_test_log_extract (GTestLogBuffer *tbuffer) + if (p <= tbuffer->data->str + mlength) + { + g_string_erase (tbuffer->data, 0, mlength); +- tbuffer->msgs = g_slist_prepend (tbuffer->msgs, g_memdup (&msg, sizeof (msg))); ++ tbuffer->msgs = g_slist_prepend (tbuffer->msgs, g_memdup2 (&msg, sizeof (msg))); + return TRUE; + } + +diff --git a/glib/gvariant.c b/glib/gvariant.c +index b61bf7278..d6f68a9ea 100644 +--- a/glib/gvariant.c ++++ b/glib/gvariant.c +@@ -33,6 +33,7 @@ + + #include + ++#include "gstrfuncsprivate.h" + + /** + * SECTION:gvariant +@@ -725,7 +726,7 @@ g_variant_new_variant (GVariant *value) + g_variant_ref_sink (value); + + return g_variant_new_from_children (G_VARIANT_TYPE_VARIANT, +- g_memdup (&value, sizeof value), ++ g_memdup2 (&value, sizeof value), + 1, g_variant_is_trusted (value)); + } + +@@ -1229,7 +1230,7 @@ g_variant_new_fixed_array (const GVariantType *element_type, + return NULL; + } + +- data = g_memdup (elements, n_elements * element_size); ++ data = g_memdup2 (elements, n_elements * element_size); + value = g_variant_new_from_data (array_type, data, + n_elements * element_size, + FALSE, g_free, data); +@@ -1908,7 +1909,7 @@ g_variant_dup_bytestring (GVariant *value, + if (length) + *length = size; + +- return g_memdup (original, size + 1); ++ return g_memdup2 (original, size + 1); + } + + /** +diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c +index 1a228f73b..07659ff12 100644 +--- a/glib/gvarianttype.c ++++ b/glib/gvarianttype.c +@@ -28,6 +28,7 @@ + + #include + ++#include "gstrfuncsprivate.h" + + /** + * SECTION:gvarianttype +@@ -1181,7 +1182,7 @@ g_variant_type_new_tuple (const GVariantType * const *items, + g_assert (offset < sizeof buffer); + buffer[offset++] = ')'; + +- return (GVariantType *) g_memdup (buffer, offset); ++ return (GVariantType *) g_memdup2 (buffer, offset); + } + + /** +diff --git a/glib/tests/array-test.c b/glib/tests/array-test.c +index 3fcf1136a..11982f822 100644 +--- a/glib/tests/array-test.c ++++ b/glib/tests/array-test.c +@@ -29,6 +29,8 @@ + #include + #include "glib.h" + ++#include "gstrfuncsprivate.h" ++ + /* Test data to be passed to any function which calls g_array_new(), providing + * the parameters for that call. Most #GArray tests should be repeated for all + * possible values of #ArrayTestData. */ +@@ -1642,7 +1644,7 @@ byte_array_new_take (void) + GByteArray *gbarray; + guint8 *data; + +- data = g_memdup ("woooweeewow", 11); ++ data = g_memdup2 ("woooweeewow", 11); + gbarray = g_byte_array_new_take (data, 11); + g_assert (gbarray->data == data); + g_assert_cmpuint (gbarray->len, ==, 11); +diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c +index 149d22353..88d2b80d1 100644 +--- a/glib/tests/option-context.c ++++ b/glib/tests/option-context.c +@@ -27,6 +27,8 @@ + #include + #include + ++#include "gstrfuncsprivate.h" ++ + static GOptionEntry main_entries[] = { + { "main-switch", 0, 0, + G_OPTION_ARG_NONE, NULL, +@@ -256,7 +258,7 @@ join_stringv (int argc, char **argv) + static char ** + copy_stringv (char **argv, int argc) + { +- return g_memdup (argv, sizeof (char *) * (argc + 1)); ++ return g_memdup2 (argv, sizeof (char *) * (argc + 1)); + } + + static void +@@ -2323,7 +2325,7 @@ test_group_parse (void) + g_option_context_add_group (context, group); + + argv = split_string ("program --test arg1 -f arg2 --group-test arg3 --frob arg4 -z arg5", &argc); +- orig_argv = g_memdup (argv, (argc + 1) * sizeof (char *)); ++ orig_argv = g_memdup2 (argv, (argc + 1) * sizeof (char *)); + + retval = g_option_context_parse (context, &argc, &argv, &error); + +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-05.patch b/gnu/packages/patches/glib-CVE-2021-27219-05.patch new file mode 100644 index 0000000000..62bce1b188 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-05.patch @@ -0,0 +1,47 @@ +From 0cbad673215ec8a049b7fe2ff44b0beed31b376e Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 16:12:24 +0000 +Subject: [PATCH 05/11] gwinhttpfile: Avoid arithmetic overflow when + calculating a size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The members of `URL_COMPONENTS` (`winhttp_file->url`) are `DWORD`s, i.e. +32-bit unsigned integers. Adding to and multiplying them may cause them +to overflow the unsigned integer bounds, even if the result is passed to +`g_memdup2()` which accepts a `gsize`. + +Cast the `URL_COMPONENTS` members to `gsize` first to ensure that the +arithmetic is done in terms of `gsize`s rather than unsigned integers. + +Spotted by Sebastian Dröge. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/win32/gwinhttpfile.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gio/win32/gwinhttpfile.c b/gio/win32/gwinhttpfile.c +index 040ee8564..246ec0578 100644 +--- a/gio/win32/gwinhttpfile.c ++++ b/gio/win32/gwinhttpfile.c +@@ -394,10 +394,10 @@ g_winhttp_file_resolve_relative_path (GFile *file, + child = g_object_new (G_TYPE_WINHTTP_FILE, NULL); + child->vfs = winhttp_file->vfs; + child->url = winhttp_file->url; +- child->url.lpszScheme = g_memdup2 (winhttp_file->url.lpszScheme, (winhttp_file->url.dwSchemeLength+1)*2); +- child->url.lpszHostName = g_memdup2 (winhttp_file->url.lpszHostName, (winhttp_file->url.dwHostNameLength+1)*2); +- child->url.lpszUserName = g_memdup2 (winhttp_file->url.lpszUserName, (winhttp_file->url.dwUserNameLength+1)*2); +- child->url.lpszPassword = g_memdup2 (winhttp_file->url.lpszPassword, (winhttp_file->url.dwPasswordLength+1)*2); ++ child->url.lpszScheme = g_memdup2 (winhttp_file->url.lpszScheme, ((gsize) winhttp_file->url.dwSchemeLength + 1) * 2); ++ child->url.lpszHostName = g_memdup2 (winhttp_file->url.lpszHostName, ((gsize) winhttp_file->url.dwHostNameLength + 1) * 2); ++ child->url.lpszUserName = g_memdup2 (winhttp_file->url.lpszUserName, ((gsize) winhttp_file->url.dwUserNameLength + 1) * 2); ++ child->url.lpszPassword = g_memdup2 (winhttp_file->url.lpszPassword, ((gsize) winhttp_file->url.dwPasswordLength + 1) * 2); + child->url.lpszUrlPath = wnew_path; + child->url.dwUrlPathLength = wcslen (wnew_path); + child->url.lpszExtraInfo = NULL; +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-06.patch b/gnu/packages/patches/glib-CVE-2021-27219-06.patch new file mode 100644 index 0000000000..4e2435f5fd --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-06.patch @@ -0,0 +1,94 @@ +From f9ee2275cbc312c0b4cdbc338a4fbb76eb36fb9a Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:49:00 +0000 +Subject: [PATCH 06/11] gdatainputstream: Handle stop_chars_len internally as + gsize + +Previously it was handled as a `gssize`, which meant that if the +`stop_chars` string was longer than `G_MAXSSIZE` there would be an +overflow. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gdatainputstream.c | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c +index 2e7750cb5..2cdcbda19 100644 +--- a/gio/gdatainputstream.c ++++ b/gio/gdatainputstream.c +@@ -27,6 +27,7 @@ + #include "gioenumtypes.h" + #include "gioerror.h" + #include "glibintl.h" ++#include "gstrfuncsprivate.h" + + #include + +@@ -856,7 +857,7 @@ static gssize + scan_for_chars (GDataInputStream *stream, + gsize *checked_out, + const char *stop_chars, +- gssize stop_chars_len) ++ gsize stop_chars_len) + { + GBufferedInputStream *bstream; + const char *buffer; +@@ -952,7 +953,7 @@ typedef struct + gsize checked; + + gchar *stop_chars; +- gssize stop_chars_len; ++ gsize stop_chars_len; + gsize length; + } GDataInputStreamReadData; + +@@ -1078,12 +1079,17 @@ g_data_input_stream_read_async (GDataInputStream *stream, + { + GDataInputStreamReadData *data; + GTask *task; ++ gsize stop_chars_len_unsigned; + + data = g_slice_new0 (GDataInputStreamReadData); +- if (stop_chars_len == -1) +- stop_chars_len = strlen (stop_chars); +- data->stop_chars = g_memdup (stop_chars, stop_chars_len); +- data->stop_chars_len = stop_chars_len; ++ ++ if (stop_chars_len < 0) ++ stop_chars_len_unsigned = strlen (stop_chars); ++ else ++ stop_chars_len_unsigned = (gsize) stop_chars_len; ++ ++ data->stop_chars = g_memdup2 (stop_chars, stop_chars_len_unsigned); ++ data->stop_chars_len = stop_chars_len_unsigned; + data->last_saw_cr = FALSE; + + task = g_task_new (stream, cancellable, callback, user_data); +@@ -1338,17 +1344,20 @@ g_data_input_stream_read_upto (GDataInputStream *stream, + gssize found_pos; + gssize res; + char *data_until; ++ gsize stop_chars_len_unsigned; + + g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (stream), NULL); + + if (stop_chars_len < 0) +- stop_chars_len = strlen (stop_chars); ++ stop_chars_len_unsigned = strlen (stop_chars); ++ else ++ stop_chars_len_unsigned = (gsize) stop_chars_len; + + bstream = G_BUFFERED_INPUT_STREAM (stream); + + checked = 0; + +- while ((found_pos = scan_for_chars (stream, &checked, stop_chars, stop_chars_len)) == -1) ++ while ((found_pos = scan_for_chars (stream, &checked, stop_chars, stop_chars_len_unsigned)) == -1) + { + if (g_buffered_input_stream_get_available (bstream) == + g_buffered_input_stream_get_buffer_size (bstream)) +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-07.patch b/gnu/packages/patches/glib-CVE-2021-27219-07.patch new file mode 100644 index 0000000000..dad3d285f4 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-07.patch @@ -0,0 +1,118 @@ +Backport of: + +From 2aaf593a9eb96d84fe3be740aca2810a97d95592 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:50:37 +0000 +Subject: [PATCH 07/11] gwin32: Use gsize internally in g_wcsdup() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This allows it to handle strings up to length `G_MAXSIZE` — previously +it would overflow with such strings. + +Update the several copies of it identically. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gwin32appinfo.c | 33 ++++++++++++++++++++++++++------- + gio/gwin32registrykey.c | 34 ++++++++++++++++++++++++++-------- + 2 files changed, 52 insertions(+), 15 deletions(-) + +diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c +index 9f335b370..dd7a96a4a 100644 +--- a/gio/gwin32appinfo.c ++++ b/gio/gwin32appinfo.c +@@ -464,15 +464,34 @@ static GWin32RegistryKey *applications_key; + /* Watch this key */ + static GWin32RegistryKey *classes_root_key; + ++static gsize ++g_utf16_len (const gunichar2 *str) ++{ ++ gsize result; ++ ++ for (result = 0; str[0] != 0; str++, result++) ++ ; ++ ++ return result; ++} ++ + static gunichar2 * +-g_wcsdup (const gunichar2 *str, gssize str_size) ++g_wcsdup (const gunichar2 *str, gssize str_len) + { +- if (str_size == -1) +- { +- str_size = wcslen (str) + 1; +- str_size *= sizeof (gunichar2); +- } +- return g_memdup (str, str_size); ++ gsize str_len_unsigned; ++ gsize str_size; ++ ++ g_return_val_if_fail (str != NULL, NULL); ++ ++ if (str_len < 0) ++ str_len_unsigned = g_utf16_len (str); ++ else ++ str_len_unsigned = (gsize) str_len; ++ ++ g_assert (str_len_unsigned <= G_MAXSIZE / sizeof (gunichar2) - 1); ++ str_size = (str_len_unsigned + 1) * sizeof (gunichar2); ++ ++ return g_memdup2 (str, str_size); + } + + #define URL_ASSOCIATIONS L"HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations\\" +diff --git a/gio/gwin32registrykey.c b/gio/gwin32registrykey.c +index 619fd48af..fbd65311a 100644 +--- a/gio/gwin32registrykey.c ++++ b/gio/gwin32registrykey.c +@@ -127,16 +127,34 @@ typedef enum + G_WIN32_REGISTRY_UPDATED_PATH = 1, + } GWin32RegistryKeyUpdateFlag; + ++static gsize ++g_utf16_len (const gunichar2 *str) ++{ ++ gsize result; ++ ++ for (result = 0; str[0] != 0; str++, result++) ++ ; ++ ++ return result; ++} ++ + static gunichar2 * +-g_wcsdup (const gunichar2 *str, +- gssize str_size) ++g_wcsdup (const gunichar2 *str, gssize str_len) + { +- if (str_size == -1) +- { +- str_size = wcslen (str) + 1; +- str_size *= sizeof (gunichar2); +- } +- return g_memdup (str, str_size); ++ gsize str_len_unsigned; ++ gsize str_size; ++ ++ g_return_val_if_fail (str != NULL, NULL); ++ ++ if (str_len < 0) ++ str_len_unsigned = g_utf16_len (str); ++ else ++ str_len_unsigned = (gsize) str_len; ++ ++ g_assert (str_len_unsigned <= G_MAXSIZE / sizeof (gunichar2) - 1); ++ str_size = (str_len_unsigned + 1) * sizeof (gunichar2); ++ ++ return g_memdup2 (str, str_size); + } + + /** +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-08.patch b/gnu/packages/patches/glib-CVE-2021-27219-08.patch new file mode 100644 index 0000000000..2c021ad317 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-08.patch @@ -0,0 +1,94 @@ +From ba8ca443051f93a74c0d03d62e70402036f967a5 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 13:58:32 +0000 +Subject: [PATCH 08/11] gkeyfilesettingsbackend: Handle long keys when + converting paths + +Previously, the code in `convert_path()` could not handle keys longer +than `G_MAXINT`, and would overflow if that was exceeded. + +Convert the code to use `gsize` and `g_memdup2()` throughout, and +change from identifying the position of the final slash in the string +using a signed offset `i`, to using a pointer to the character (and +`strrchr()`). This allows the slash to be at any position in a +`G_MAXSIZE`-long string, without sacrificing a bit of the offset for +indicating whether a slash was found. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gkeyfilesettingsbackend.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c +index cd5765afd..25b057672 100644 +--- a/gio/gkeyfilesettingsbackend.c ++++ b/gio/gkeyfilesettingsbackend.c +@@ -33,6 +33,7 @@ + #include "gfilemonitor.h" + #include "gsimplepermission.h" + #include "gsettingsbackendinternal.h" ++#include "gstrfuncsprivate.h" + #include "giomodule-priv.h" + #include "gportalsupport.h" + +@@ -145,8 +146,8 @@ convert_path (GKeyfileSettingsBackend *kfsb, + gchar **group, + gchar **basename) + { +- gint key_len = strlen (key); +- gint i; ++ gsize key_len = strlen (key); ++ const gchar *last_slash; + + if (key_len < kfsb->prefix_len || + memcmp (key, kfsb->prefix, kfsb->prefix_len) != 0) +@@ -155,38 +156,36 @@ convert_path (GKeyfileSettingsBackend *kfsb, + key_len -= kfsb->prefix_len; + key += kfsb->prefix_len; + +- for (i = key_len; i >= 0; i--) +- if (key[i] == '/') +- break; ++ last_slash = strrchr (key, '/'); + + if (kfsb->root_group) + { + /* if a root_group was specified, make sure the user hasn't given + * a path that ghosts that group name + */ +- if (i == kfsb->root_group_len && memcmp (key, kfsb->root_group, i) == 0) ++ if (last_slash != NULL && (last_slash - key) == kfsb->root_group_len && memcmp (key, kfsb->root_group, last_slash - key) == 0) + return FALSE; + } + else + { + /* if no root_group was given, ensure that the user gave a path */ +- if (i == -1) ++ if (last_slash == NULL) + return FALSE; + } + + if (group) + { +- if (i >= 0) ++ if (last_slash != NULL) + { +- *group = g_memdup (key, i + 1); +- (*group)[i] = '\0'; ++ *group = g_memdup2 (key, (last_slash - key) + 1); ++ (*group)[(last_slash - key)] = '\0'; + } + else + *group = g_strdup (kfsb->root_group); + } + + if (basename) +- *basename = g_memdup (key + i + 1, key_len - i); ++ *basename = g_memdup2 (last_slash + 1, key_len - (last_slash - key)); + + return TRUE; + } +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-09.patch b/gnu/packages/patches/glib-CVE-2021-27219-09.patch new file mode 100644 index 0000000000..4de0c1b349 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-09.patch @@ -0,0 +1,98 @@ +From 65ec7f4d6e8832c481f6e00e2eb007b9a60024ce Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 14:00:53 +0000 +Subject: [PATCH 09/11] gsocket: Use gsize to track native sockaddr's size +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Don’t use an `int`, that’s potentially too small. In practical terms, +this is not a problem, since no socket address is going to be that big. + +By making these changes we can use `g_memdup2()` without warnings, +though. Fewer warnings is good. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gsocket.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/gio/gsocket.c b/gio/gsocket.c +index 66073af83..a3af149e8 100644 +--- a/gio/gsocket.c ++++ b/gio/gsocket.c +@@ -75,6 +75,7 @@ + #include "gcredentialsprivate.h" + #include "glibintl.h" + #include "gioprivate.h" ++#include "gstrfuncsprivate.h" + + #ifdef G_OS_WIN32 + /* For Windows XP runtime compatibility, but use the system's if_nametoindex() if available */ +@@ -174,7 +175,7 @@ static gboolean g_socket_datagram_based_condition_wait (GDatagramBased + GError **error); + + static GSocketAddress * +-cache_recv_address (GSocket *socket, struct sockaddr *native, int native_len); ++cache_recv_address (GSocket *socket, struct sockaddr *native, size_t native_len); + + static gssize + g_socket_receive_message_with_timeout (GSocket *socket, +@@ -260,7 +261,7 @@ struct _GSocketPrivate + struct { + GSocketAddress *addr; + struct sockaddr *native; +- gint native_len; ++ gsize native_len; + guint64 last_used; + } recv_addr_cache[RECV_ADDR_CACHE_SIZE]; + }; +@@ -5211,14 +5212,14 @@ g_socket_send_messages_with_timeout (GSocket *socket, + } + + static GSocketAddress * +-cache_recv_address (GSocket *socket, struct sockaddr *native, int native_len) ++cache_recv_address (GSocket *socket, struct sockaddr *native, size_t native_len) + { + GSocketAddress *saddr; + gint i; + guint64 oldest_time = G_MAXUINT64; + gint oldest_index = 0; + +- if (native_len <= 0) ++ if (native_len == 0) + return NULL; + + saddr = NULL; +@@ -5226,7 +5227,7 @@ cache_recv_address (GSocket *socket, struct sockaddr *native, int native_len) + { + GSocketAddress *tmp = socket->priv->recv_addr_cache[i].addr; + gpointer tmp_native = socket->priv->recv_addr_cache[i].native; +- gint tmp_native_len = socket->priv->recv_addr_cache[i].native_len; ++ gsize tmp_native_len = socket->priv->recv_addr_cache[i].native_len; + + if (!tmp) + continue; +@@ -5256,7 +5257,7 @@ cache_recv_address (GSocket *socket, struct sockaddr *native, int native_len) + g_free (socket->priv->recv_addr_cache[oldest_index].native); + } + +- socket->priv->recv_addr_cache[oldest_index].native = g_memdup (native, native_len); ++ socket->priv->recv_addr_cache[oldest_index].native = g_memdup2 (native, native_len); + socket->priv->recv_addr_cache[oldest_index].native_len = native_len; + socket->priv->recv_addr_cache[oldest_index].addr = g_object_ref (saddr); + socket->priv->recv_addr_cache[oldest_index].last_used = g_get_monotonic_time (); +@@ -5404,6 +5405,9 @@ g_socket_receive_message_with_timeout (GSocket *socket, + /* do it */ + while (1) + { ++ /* addrlen has to be of type int because that’s how WSARecvFrom() is defined */ ++ G_STATIC_ASSERT (sizeof addr <= G_MAXINT); ++ + addrlen = sizeof addr; + if (address) + result = WSARecvFrom (socket->priv->fd, +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-10.patch b/gnu/packages/patches/glib-CVE-2021-27219-10.patch new file mode 100644 index 0000000000..36198b8eef --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-10.patch @@ -0,0 +1,52 @@ +From 777b95a88f006d39d9fe6d3321db17e7b0d4b9a4 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 14:07:39 +0000 +Subject: [PATCH 10/11] gtlspassword: Forbid very long TLS passwords +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The public API `g_tls_password_set_value_full()` (and the vfunc it +invokes) can only accept a `gssize` length. Ensure that nul-terminated +strings passed to `g_tls_password_set_value()` can’t exceed that length. +Use `g_memdup2()` to avoid an overflow if they’re longer than +`G_MAXUINT` similarly. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + gio/gtlspassword.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c +index 1e437a7b6..dbcec41a8 100644 +--- a/gio/gtlspassword.c ++++ b/gio/gtlspassword.c +@@ -23,6 +23,7 @@ + #include "glibintl.h" + + #include "gioenumtypes.h" ++#include "gstrfuncsprivate.h" + #include "gtlspassword.h" + + #include +@@ -287,9 +288,14 @@ g_tls_password_set_value (GTlsPassword *password, + g_return_if_fail (G_IS_TLS_PASSWORD (password)); + + if (length < 0) +- length = strlen ((gchar *)value); ++ { ++ /* FIXME: g_tls_password_set_value_full() doesn’t support unsigned gsize */ ++ gsize length_unsigned = strlen ((gchar *) value); ++ g_return_if_fail (length_unsigned > G_MAXSSIZE); ++ length = (gssize) length_unsigned; ++ } + +- g_tls_password_set_value_full (password, g_memdup (value, length), length, g_free); ++ g_tls_password_set_value_full (password, g_memdup2 (value, (gsize) length), length, g_free); + } + + /** +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-11.patch b/gnu/packages/patches/glib-CVE-2021-27219-11.patch new file mode 100644 index 0000000000..4413cb9827 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-11.patch @@ -0,0 +1,57 @@ +From ecdf91400e9a538695a0895b95ad7e8abcdf1749 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 4 Feb 2021 14:09:40 +0000 +Subject: [PATCH 11/11] giochannel: Forbid very long line terminator strings +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The public API `GIOChannel.line_term_len` is only a `guint`. Ensure that +nul-terminated strings passed to `g_io_channel_set_line_term()` can’t +exceed that length. Use `g_memdup2()` to avoid a warning (`g_memdup()` +is due to be deprecated), but not to avoid a bug, since it’s also +limited to `G_MAXUINT`. + +Signed-off-by: Philip Withnall +Helps: #2319 +--- + glib/giochannel.c | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 15927c391..66c6591f0 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -884,16 +884,25 @@ g_io_channel_set_line_term (GIOChannel *channel, + const gchar *line_term, + gint length) + { ++ guint length_unsigned; ++ + g_return_if_fail (channel != NULL); + g_return_if_fail (line_term == NULL || length != 0); /* Disallow "" */ + + if (line_term == NULL) +- length = 0; +- else if (length < 0) +- length = strlen (line_term); ++ length_unsigned = 0; ++ else if (length >= 0) ++ length_unsigned = (guint) length; ++ else ++ { ++ /* FIXME: We’re constrained by line_term_len being a guint here */ ++ gsize length_size = strlen (line_term); ++ g_return_if_fail (length_size > G_MAXUINT); ++ length_unsigned = (guint) length_size; ++ } + + g_free (channel->line_term); +- channel->line_term = line_term ? g_memdup2 (line_term, length) : NULL; ++ channel->line_term = line_term ? g_memdup2 (line_term, length_unsigned) : NULL; + channel->line_term_len = length; + } + +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-12.patch b/gnu/packages/patches/glib-CVE-2021-27219-12.patch new file mode 100644 index 0000000000..4fdbb81750 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-12.patch @@ -0,0 +1,30 @@ +From f8273b9aded135fe07094faebd527e43851aaf6e Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 7 Feb 2021 23:32:40 +0100 +Subject: [PATCH 1/5] giochannel: Fix length_size bounds check + +The inverted condition is an obvious error introduced by ecdf91400e9a. + +Fixes https://gitlab.gnome.org/GNOME/glib/-/issues/2323 + +(cherry picked from commit a149bf2f9030168051942124536e303af8ba6176) +--- + glib/giochannel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 66c6591f0..0d9d5f223 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -897,7 +897,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + { + /* FIXME: We’re constrained by line_term_len being a guint here */ + gsize length_size = strlen (line_term); +- g_return_if_fail (length_size > G_MAXUINT); ++ g_return_if_fail (length_size <= G_MAXUINT); + length_unsigned = (guint) length_size; + } + +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-13.patch b/gnu/packages/patches/glib-CVE-2021-27219-13.patch new file mode 100644 index 0000000000..6a287cc3a2 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-13.patch @@ -0,0 +1,32 @@ +From e069c50467712e6d607822afd6b6c15c2c343dff Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 8 Feb 2021 10:34:50 +0000 +Subject: [PATCH 2/5] giochannel: Don't store negative line_term_len in + GIOChannel struct + +Adding test coverage indicated that this was another bug in 0cc11f74. + +Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings" +Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2323 +Signed-off-by: Simon McVittie +(cherry picked from commit 5dc8b0014c03e7491d93b90275ab442e888a9628) +--- + glib/giochannel.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/glib/giochannel.c b/glib/giochannel.c +index 0d9d5f223..4c39b9dc0 100644 +--- a/glib/giochannel.c ++++ b/glib/giochannel.c +@@ -903,7 +903,7 @@ g_io_channel_set_line_term (GIOChannel *channel, + + g_free (channel->line_term); + channel->line_term = line_term ? g_memdup2 (line_term, length_unsigned) : NULL; +- channel->line_term_len = length; ++ channel->line_term_len = length_unsigned; + } + + /** +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-14.patch b/gnu/packages/patches/glib-CVE-2021-27219-14.patch new file mode 100644 index 0000000000..78de2846da --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-14.patch @@ -0,0 +1,32 @@ +From 4506d1859a863087598c8d122740bae25b65b099 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 8 Feb 2021 10:04:48 +0000 +Subject: [PATCH 4/5] gtlspassword: Fix inverted assertion + +The intention here was to assert that the length of the password fits +in a gssize. Passwords more than half the size of virtual memory are +probably excessive. + +Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords" +Signed-off-by: Simon McVittie +(cherry picked from commit 61bb52ec42de1082bfb06ce1c737fc295bfe60b8) +--- + gio/gtlspassword.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gio/gtlspassword.c b/gio/gtlspassword.c +index dbcec41a8..bd86a6dfe 100644 +--- a/gio/gtlspassword.c ++++ b/gio/gtlspassword.c +@@ -291,7 +291,7 @@ g_tls_password_set_value (GTlsPassword *password, + { + /* FIXME: g_tls_password_set_value_full() doesn’t support unsigned gsize */ + gsize length_unsigned = strlen ((gchar *) value); +- g_return_if_fail (length_unsigned > G_MAXSSIZE); ++ g_return_if_fail (length_unsigned <= G_MAXSSIZE); + length = (gssize) length_unsigned; + } + +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-15.patch b/gnu/packages/patches/glib-CVE-2021-27219-15.patch new file mode 100644 index 0000000000..37ef85b4fa --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-15.patch @@ -0,0 +1,95 @@ +From 3d1550354c3c6a8491c39881752d51cb7515f2c2 Mon Sep 17 00:00:00 2001 +From: Simon McVittie +Date: Mon, 8 Feb 2021 10:22:39 +0000 +Subject: [PATCH 5/5] tls-interaction: Add test coverage for various ways to + set the password + +Signed-off-by: Simon McVittie +(cherry picked from commit df4501316ca3903072400504a5ea76498db19538) +--- + gio/tests/tls-interaction.c | 55 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 55 insertions(+) + +diff --git a/gio/tests/tls-interaction.c b/gio/tests/tls-interaction.c +index 4f0737d7e..5661e8e0d 100644 +--- a/gio/tests/tls-interaction.c ++++ b/gio/tests/tls-interaction.c +@@ -174,6 +174,38 @@ test_interaction_ask_password_finish_failure (GTlsInteraction *interaction, + } + + ++/* Return a copy of @str that is allocated in a silly way, to exercise ++ * custom free-functions. The returned pointer points to a copy of @str ++ * in a buffer of the form "BEFORE \0 str \0 AFTER". */ ++static guchar * ++special_dup (const char *str) ++{ ++ GString *buf = g_string_new ("BEFORE"); ++ guchar *ret; ++ ++ g_string_append_c (buf, '\0'); ++ g_string_append (buf, str); ++ g_string_append_c (buf, '\0'); ++ g_string_append (buf, "AFTER"); ++ ret = (guchar *) g_string_free (buf, FALSE); ++ return ret + strlen ("BEFORE") + 1; ++} ++ ++ ++/* Free a copy of @str that was made with special_dup(), after asserting ++ * that it has not been corrupted. */ ++static void ++special_free (gpointer p) ++{ ++ gchar *s = p; ++ gchar *buf = s - strlen ("BEFORE") - 1; ++ ++ g_assert_cmpstr (buf, ==, "BEFORE"); ++ g_assert_cmpstr (s + strlen (s) + 1, ==, "AFTER"); ++ g_free (buf); ++} ++ ++ + static GTlsInteractionResult + test_interaction_ask_password_sync_success (GTlsInteraction *interaction, + GTlsPassword *password, +@@ -181,6 +213,8 @@ test_interaction_ask_password_sync_success (GTlsInteraction *interaction, + GError **error) + { + TestInteraction *self; ++ const guchar *value; ++ gsize len; + + g_assert (TEST_IS_INTERACTION (interaction)); + self = TEST_INTERACTION (interaction); +@@ -192,6 +226,27 @@ test_interaction_ask_password_sync_success (GTlsInteraction *interaction, + g_assert (error != NULL); + g_assert (*error == NULL); + ++ /* Exercise different ways to set the value */ ++ g_tls_password_set_value (password, (const guchar *) "foo", 4); ++ len = 0; ++ value = g_tls_password_get_value (password, &len); ++ g_assert_cmpmem (value, len, "foo", 4); ++ ++ g_tls_password_set_value (password, (const guchar *) "bar", -1); ++ len = 0; ++ value = g_tls_password_get_value (password, &len); ++ g_assert_cmpmem (value, len, "bar", 3); ++ ++ g_tls_password_set_value_full (password, special_dup ("baa"), 4, special_free); ++ len = 0; ++ value = g_tls_password_get_value (password, &len); ++ g_assert_cmpmem (value, len, "baa", 4); ++ ++ g_tls_password_set_value_full (password, special_dup ("baz"), -1, special_free); ++ len = 0; ++ value = g_tls_password_get_value (password, &len); ++ g_assert_cmpmem (value, len, "baz", 3); ++ + /* Don't do this in real life. Include a null terminator for testing */ + g_tls_password_set_value (password, (const guchar *)"the password", 13); + return G_TLS_INTERACTION_HANDLED; +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-16.patch b/gnu/packages/patches/glib-CVE-2021-27219-16.patch new file mode 100644 index 0000000000..43635e72ed --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-16.patch @@ -0,0 +1,43 @@ +From cb9ee701ef46c1819eed4e2a4dc181682bdfc176 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Wed, 10 Feb 2021 21:16:39 +0000 +Subject: [PATCH 1/3] gkeyfilesettingsbackend: Fix basename handling when group + is unset + +Fix an effective regression in commit +7781a9cbd2fd0aa84bee0f4eee88470640ff6706, which happens when +`convert_path()` is called with a `key` which contains no slashes. In +that case, the `key` is entirely the `basename`. + +Prior to commit 7781a9cb, the code worked through a fluke of `i == -1` +cancelling out with the various additions in the `g_memdup()` call, and +effectively resulting in `g_strdup (key)`. + +Spotted by Guido Berhoerster. + +Signed-off-by: Philip Withnall +--- + gio/gkeyfilesettingsbackend.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c +index 25b057672..861c3a661 100644 +--- a/gio/gkeyfilesettingsbackend.c ++++ b/gio/gkeyfilesettingsbackend.c +@@ -185,7 +185,12 @@ convert_path (GKeyfileSettingsBackend *kfsb, + } + + if (basename) +- *basename = g_memdup2 (last_slash + 1, key_len - (last_slash - key)); ++ { ++ if (last_slash != NULL) ++ *basename = g_memdup2 (last_slash + 1, key_len - (last_slash - key)); ++ else ++ *basename = g_strdup (key); ++ } + + return TRUE; + } +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-17.patch b/gnu/packages/patches/glib-CVE-2021-27219-17.patch new file mode 100644 index 0000000000..3153979071 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-17.patch @@ -0,0 +1,37 @@ +From 31e0d403ba635dbbacbfbff74295e5db02558d76 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Wed, 10 Feb 2021 21:19:30 +0000 +Subject: [PATCH 2/3] gkeyfilesettingsbackend: Disallow empty key or group + names + +These should never have been allowed; they will result in precondition +failures from the `GKeyFile` later on in the code. + +A test will be added for this shortly. + +Signed-off-by: Philip Withnall +--- + gio/gkeyfilesettingsbackend.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c +index 861c3a661..de216e615 100644 +--- a/gio/gkeyfilesettingsbackend.c ++++ b/gio/gkeyfilesettingsbackend.c +@@ -158,6 +158,13 @@ convert_path (GKeyfileSettingsBackend *kfsb, + + last_slash = strrchr (key, '/'); + ++ /* Disallow empty group names or key names */ ++ if (key_len == 0 || ++ (last_slash != NULL && ++ (*(last_slash + 1) == '\0' || ++ last_slash == key))) ++ return FALSE; ++ + if (kfsb->root_group) + { + /* if a root_group was specified, make sure the user hasn't given +-- +2.30.1 + diff --git a/gnu/packages/patches/glib-CVE-2021-27219-18.patch b/gnu/packages/patches/glib-CVE-2021-27219-18.patch new file mode 100644 index 0000000000..c18d44ddeb --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-27219-18.patch @@ -0,0 +1,232 @@ +Backport of: + +From 221c26685354dea2b2732df94404e8e5e77a1591 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Wed, 10 Feb 2021 21:21:36 +0000 +Subject: [PATCH 3/3] tests: Add tests for key name handling in the keyfile + backend + +This tests the two recent commits. + +Signed-off-by: Philip Withnall +--- + gio/tests/gsettings.c | 171 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 170 insertions(+), 1 deletion(-) + +diff --git a/gio/tests/gsettings.c b/gio/tests/gsettings.c +index baadca8f5..afe594a23 100644 +--- a/gio/tests/gsettings.c ++++ b/gio/tests/gsettings.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +@@ -1740,6 +1741,14 @@ key_changed_cb (GSettings *settings, const gchar *key, gpointer data) + (*b) = TRUE; + } + ++typedef struct ++{ ++ const gchar *path; ++ const gchar *root_group; ++ const gchar *keyfile_group; ++ const gchar *root_path; ++} KeyfileTestData; ++ + /* + * Test that using a keyfile works + */ +@@ -1834,7 +1843,11 @@ test_keyfile (Fixture *fixture, + g_free (str); + + g_settings_set (settings, "farewell", "s", "cheerio"); +- ++ ++ /* Check that empty keys/groups are not allowed. */ ++ g_assert_false (g_settings_is_writable (settings, "")); ++ g_assert_false (g_settings_is_writable (settings, "/")); ++ + /* When executing as root, changing the mode of the keyfile will have + * no effect on the writability of the settings. + */ +@@ -1866,6 +1879,149 @@ test_keyfile (Fixture *fixture, + g_free (keyfile_path); + } + ++/* ++ * Test that using a keyfile works with a schema with no path set. ++ */ ++static void ++test_keyfile_no_path (Fixture *fixture, ++ gconstpointer user_data) ++{ ++ const KeyfileTestData *test_data = user_data; ++ GSettingsBackend *kf_backend; ++ GSettings *settings; ++ GKeyFile *keyfile; ++ gboolean writable; ++ gchar *key = NULL; ++ GError *error = NULL; ++ gchar *keyfile_path = NULL, *store_path = NULL; ++ ++ keyfile_path = g_build_filename (fixture->tmp_dir, "keyfile", NULL); ++ store_path = g_build_filename (keyfile_path, "gsettings.store", NULL); ++ kf_backend = g_keyfile_settings_backend_new (store_path, test_data->root_path, test_data->root_group); ++ settings = g_settings_new_with_backend_and_path ("org.gtk.test.no-path", kf_backend, test_data->path); ++ g_object_unref (kf_backend); ++ ++ g_settings_reset (settings, "test-boolean"); ++ g_assert_true (g_settings_get_boolean (settings, "test-boolean")); ++ ++ writable = g_settings_is_writable (settings, "test-boolean"); ++ g_assert_true (writable); ++ g_settings_set (settings, "test-boolean", "b", FALSE); ++ ++ g_assert_false (g_settings_get_boolean (settings, "test-boolean")); ++ ++ g_settings_delay (settings); ++ g_settings_set (settings, "test-boolean", "b", TRUE); ++ g_settings_apply (settings); ++ ++ keyfile = g_key_file_new (); ++ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NULL)); ++ ++ g_assert_true (g_key_file_get_boolean (keyfile, test_data->keyfile_group, "test-boolean", NULL)); ++ ++ g_key_file_free (keyfile); ++ ++ g_settings_reset (settings, "test-boolean"); ++ g_settings_apply (settings); ++ keyfile = g_key_file_new (); ++ g_assert_true (g_key_file_load_from_file (keyfile, store_path, 0, NULL)); ++ ++ g_assert_false (g_key_file_get_string (keyfile, test_data->keyfile_group, "test-boolean", &error)); ++ g_assert_error (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND); ++ g_clear_error (&error); ++ ++ /* Check that empty keys/groups are not allowed. */ ++ g_assert_false (g_settings_is_writable (settings, "")); ++ g_assert_false (g_settings_is_writable (settings, "/")); ++ ++ /* Keys which ghost the root group name are not allowed. This can only be ++ * tested when the path is `/` as otherwise it acts as a prefix and prevents ++ * any ghosting. */ ++ if (g_str_equal (test_data->path, "/")) ++ { ++ key = g_strdup_printf ("%s/%s", test_data->root_group, ""); ++ g_assert_false (g_settings_is_writable (settings, key)); ++ g_free (key); ++ ++ key = g_strdup_printf ("%s/%s", test_data->root_group, "/"); ++ g_assert_false (g_settings_is_writable (settings, key)); ++ g_free (key); ++ ++ key = g_strdup_printf ("%s/%s", test_data->root_group, "test-boolean"); ++ g_assert_false (g_settings_is_writable (settings, key)); ++ g_free (key); ++ } ++ ++ g_key_file_free (keyfile); ++ g_object_unref (settings); ++ ++ /* Clean up the temporary directory. */ ++ g_assert_cmpint (g_chmod (keyfile_path, 0777) == 0 ? 0 : errno, ==, 0); ++ g_assert_cmpint (g_remove (store_path) == 0 ? 0 : errno, ==, 0); ++ g_assert_cmpint (g_rmdir (keyfile_path) == 0 ? 0 : errno, ==, 0); ++ g_free (store_path); ++ g_free (keyfile_path); ++} ++ ++/* ++ * Test that a keyfile rejects writes to keys outside its root path. ++ */ ++static void ++test_keyfile_outside_root_path (Fixture *fixture, ++ gconstpointer user_data) ++{ ++ GSettingsBackend *kf_backend; ++ GSettings *settings; ++ gchar *keyfile_path = NULL, *store_path = NULL; ++ ++ keyfile_path = g_build_filename (fixture->tmp_dir, "keyfile", NULL); ++ store_path = g_build_filename (keyfile_path, "gsettings.store", NULL); ++ kf_backend = g_keyfile_settings_backend_new (store_path, "/tests/basic-types/", "root"); ++ settings = g_settings_new_with_backend_and_path ("org.gtk.test.no-path", kf_backend, "/tests/"); ++ g_object_unref (kf_backend); ++ ++ g_assert_false (g_settings_is_writable (settings, "test-boolean")); ++ ++ g_object_unref (settings); ++ ++ /* Clean up the temporary directory. The keyfile probably doesn’t exist, so ++ * don’t error on failure. */ ++ g_remove (store_path); ++ g_assert_cmpint (g_rmdir (keyfile_path) == 0 ? 0 : errno, ==, 0); ++ g_free (store_path); ++ g_free (keyfile_path); ++} ++ ++/* ++ * Test that a keyfile rejects writes to keys in the root if no root group is set. ++ */ ++static void ++test_keyfile_no_root_group (Fixture *fixture, ++ gconstpointer user_data) ++{ ++ GSettingsBackend *kf_backend; ++ GSettings *settings; ++ gchar *keyfile_path = NULL, *store_path = NULL; ++ ++ keyfile_path = g_build_filename (fixture->tmp_dir, "keyfile", NULL); ++ store_path = g_build_filename (keyfile_path, "gsettings.store", NULL); ++ kf_backend = g_keyfile_settings_backend_new (store_path, "/", NULL); ++ settings = g_settings_new_with_backend_and_path ("org.gtk.test.no-path", kf_backend, "/"); ++ g_object_unref (kf_backend); ++ ++ g_assert_false (g_settings_is_writable (settings, "test-boolean")); ++ g_assert_true (g_settings_is_writable (settings, "child/test-boolean")); ++ ++ g_object_unref (settings); ++ ++ /* Clean up the temporary directory. The keyfile probably doesn’t exist, so ++ * don’t error on failure. */ ++ g_remove (store_path); ++ g_assert_cmpint (g_rmdir (keyfile_path) == 0 ? 0 : errno, ==, 0); ++ g_free (store_path); ++ g_free (keyfile_path); ++} ++ + /* Test that getting child schemas works + */ + static void +@@ -2844,6 +3000,14 @@ main (int argc, char *argv[]) + gchar *override_text; + gchar *enums; + gint result; ++ const KeyfileTestData keyfile_test_data_explicit_path = { "/tests/", "root", "tests", "/" }; ++ const KeyfileTestData keyfile_test_data_empty_path = { "/", "root", "root", "/" }; ++ const KeyfileTestData keyfile_test_data_long_path = { ++ "/tests/path/is/very/long/and/this/makes/some/comparisons/take/a/different/branch/", ++ "root", ++ "tests/path/is/very/long/and/this/makes/some/comparisons/take/a/different/branch", ++ "/" ++ }; + + /* Meson build sets this */ + #ifdef TEST_LOCALE_PATH +@@ -2967,6 +3131,11 @@ main (int argc, char *argv[]) + } + + g_test_add ("/gsettings/keyfile", Fixture, NULL, setup, test_keyfile, teardown); ++ g_test_add ("/gsettings/keyfile/explicit-path", Fixture, &keyfile_test_data_explicit_path, setup, test_keyfile_no_path, teardown); ++ g_test_add ("/gsettings/keyfile/empty-path", Fixture, &keyfile_test_data_empty_path, setup, test_keyfile_no_path, teardown); ++ g_test_add ("/gsettings/keyfile/long-path", Fixture, &keyfile_test_data_long_path, setup, test_keyfile_no_path, teardown); ++ g_test_add ("/gsettings/keyfile/outside-root-path", Fixture, NULL, setup, test_keyfile_outside_root_path, teardown); ++ g_test_add ("/gsettings/keyfile/no-root-group", Fixture, NULL, setup, test_keyfile_no_root_group, teardown); + g_test_add_func ("/gsettings/child-schema", test_child_schema); + g_test_add_func ("/gsettings/strinfo", test_strinfo); + g_test_add_func ("/gsettings/enums", test_enums); +-- +2.30.1 + -- cgit 1.4.1 From feff80cec3c97a3df2c20d300be12d67f79d4f22 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Mar 2021 15:13:55 +0200 Subject: Revert "gnu: mongodb: Update to 3.4.24 [security fixes]." This reverts commit e5f89570c1d72c4b674fad6b6ad5591ead02d419. After this version mongodb switched to the Server Side Public License (https://www.mongodb.com/licensing/server-side-public-license) which is not a FOSS license. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 13 +++-- ...ngodb-support-unknown-linux-distributions.patch | 55 ++++++++++++++++++++++ 3 files changed, 64 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c2637926ee..a39c5d8592 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1396,6 +1396,7 @@ dist_patch_DATA = \ %D%/packages/patches/mpc123-initialize-ao.patch \ %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 \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 03d01b582a..8bb248fa1d 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -664,24 +664,27 @@ replacement for the code@{python-memcached} library.") (define-public mongodb (package (name "mongodb") - (version "3.4.24") + (version "3.4.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/mongodb/mongo/archive/r" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0y1669sqj8wyf0y0njhxs4qhn1qzjhrs2h2qllya5samxrlrjhkg")) + (base32 "0676lvkljj7a5hdhv78dbykqnqrj9lbn9799mi84b8vbnzsq961r")) (modules '((guix build utils))) (snippet '(begin (for-each (lambda (dir) (delete-file-recursively (string-append "src/third_party/" dir))) - '("pcre-8.42" "scons-2.5.0" "snappy-1.1.3" + '("pcre-8.41" "scons-2.5.0" "snappy-1.1.3" "valgrind-3.11.0" "wiredtiger" - "yaml-cpp-0.6.2" "zlib-1.2.11")) - #t)))) + "yaml-cpp-0.5.3" "zlib-1.2.8")) + #t)) + (patches + (list + (search-patch "mongodb-support-unknown-linux-distributions.patch"))))) (build-system scons-build-system) (inputs `(("openssl" ,openssl-1.0) diff --git a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch b/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch new file mode 100644 index 0000000000..6057ebeb08 --- /dev/null +++ b/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch @@ -0,0 +1,55 @@ +From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001 +From: Mark Benvenuto +Date: Wed, 20 Sep 2017 11:50:02 -0400 +Subject: [PATCH] SERVER-30857 Support unknown Linux distributions + +--- + src/mongo/rpc/metadata/client_metadata.cpp | 6 ------ + src/mongo/util/processinfo_linux.cpp | 9 ++++++--- + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp +index 845a315dd74..a959a4e31e9 100644 +--- a/src/mongo/rpc/metadata/client_metadata.cpp ++++ b/src/mongo/rpc/metadata/client_metadata.cpp +@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData driverName, + StringData osArchitecture, + StringData osVersion, + BSONObjBuilder* builder) { +- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && +- !osArchitecture.empty() && !osVersion.empty()); +- + BSONObjBuilder metaObjBuilder(builder->subobjStart(kMetadataDocumentName)); + + { +@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData driverName, + StringData osVersion, + StringData appName, + BSONObjBuilder* builder) { +- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && +- !osArchitecture.empty() && !osVersion.empty()); +- + if (appName.size() > kMaxApplicationNameByteLength) { + return Status(ErrorCodes::ClientMetadataAppNameTooLarge, + str::stream() << "The '" << kApplication << "." << kName +diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp +index c3debf377bd..c2813b026b0 100644 +--- a/src/mongo/util/processinfo_linux.cpp ++++ b/src/mongo/util/processinfo_linux.cpp +@@ -376,10 +376,13 @@ class LinuxSysHelper { + if ((nl = name.find('\n', nl)) != string::npos) + // stop at first newline + name.erase(nl); +- // no standard format for name and version. use kernel version +- version = "Kernel "; +- version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); ++ } else { ++ name = "unknown"; + } ++ ++ // There is no standard format for name and version so use the kernel version. ++ version = "Kernel "; ++ version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); + } + + /** -- cgit 1.4.1 From f19796468974d5e2295144e670a099b223a782e9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Mar 2021 15:17:26 +0200 Subject: gnu: mongodb: Add comment about future package versions. * gnu/packages/databases.scm (mongodb): Add comment that the license of the package changed after the packaged version and that it shouldn't be updated. --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8bb248fa1d..29270ce2be 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -661,6 +661,9 @@ replacement for the code@{python-memcached} library.") (define-public python2-pylibmc (package-with-python2 python-pylibmc)) +;; This is the last version of mongodb before they switched to the Server Side +;; Public License (SSPL), which is not a FOSS license. As such, this package +;; cannot be updated. (define-public mongodb (package (name "mongodb") -- cgit 1.4.1 From 5ae7414860eb6a6bd93ed30e962b257627d79ec9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Mar 2021 16:53:45 +0200 Subject: gnu: Add bandage. * gnu/packages/bioinformatics.scm (bandage): New variable. --- 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 8b38c7ce0d..b258b796f7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -52,6 +52,7 @@ #:use-module (guix build-system ocaml) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system r) #:use-module (guix build-system ruby) #:use-module (guix build-system scons) @@ -125,6 +126,7 @@ #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages qt) #:use-module (gnu packages rdf) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) @@ -13187,6 +13189,64 @@ concatenates pieces of read sequences to generate the final unitig sequences. Thus the per-base error rate is similar to the raw input reads.") (license license:expat))) +(define-public bandage + (package + (name "bandage") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rrwick/Bandage") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bbsn5f5x8wlspg4pbibqz6m5vin8c19nl224f3z3km0pkc97rwv")))) + (build-system qt-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "qmake" "Bandage.pro"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* "tests/bandage_command_line_tests.sh" + (("^bandagepath=.*") + (string-append "bandagepath=" (getcwd) "/Bandage\n"))) + (with-directory-excursion "tests" + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (invoke "./bandage_command_line_tests.sh"))) + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "Bandage" (string-append out "/bin")) + #t)))))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (native-inputs + `(("imagemagick" ,imagemagick))) + (home-page "https://rrwick.github.io/Bandage/") + (synopsis + "Bioinformatics Application for Navigating De novo Assembly Graphs Easily") + (description "Bandage is a program for visualising de novo assembly graphs. +It allows users to interact with the assembly graphs made by de novo assemblers +such as Velvet, SPAdes, MEGAHIT and others. De novo assembly graphs contain not +only assembled contigs but also the connections between those contigs, which +were previously not easily accessible. Bandage visualises assembly graphs, with +connections, using graph layout algorithms. Nodes in the drawn graph, which +represent contigs, can be automatically labelled with their ID, length or depth. +Users can interact with the graph by moving, labelling and colouring nodes. +Sequence information can also be extracted directly from the graph viewer. By +displaying connections between contigs, Bandage opens up new possibilities for +analysing and improving de novo assemblies that are not possible by looking at +contigs alone.") + (license (list license:gpl2+ ; bundled ogdf + license:gpl3+)))) + (define-public r-circus (package (name "r-circus") -- cgit 1.4.1 From b814228c8b8b144f794ed7ab221e3abb76b60cb7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 16:42:52 +0100 Subject: gnu: emacs-posframe: Update to 0.8.8. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.8.8. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index de3ef6d648..b196831e40 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12416,14 +12416,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.7") + (version "0.8.8") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "0n6r06fz51jwh2k67xdwwbxij7igwfihhmkp6r3a758bck9hhwxi")))) + (base32 "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From 8960f23de86e9c6707860562f1215ec6dddea8f5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 16:44:09 +0100 Subject: gnu: emacs-project: Update to 0.5.4. * gnu/packages/emacs-xyz.scm (emacs-project): Update to 0.5.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b196831e40..128d9a2ef8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -390,14 +390,14 @@ when typing parentheses directly or commenting out code line by line.") (define-public emacs-project (package (name "emacs-project") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "project-" version ".el")) (sha256 - (base32 "0cpf69m41h8gfcqnq72h11925zdk35b7hw7bfy83xm83xwp12rxx")))) + (base32 "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xref" ,emacs-xref))) (home-page "http://elpa.gnu.org/packages/project.html") -- cgit 1.4.1 From e55d35899f977f524ed5e102a21a2310cc322bad Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 16:45:39 +0100 Subject: gnu: emacs-map: Update to 3.0. * gnu/packages/emacs-xyz.scm (emacs-map): Update to 3.0. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 128d9a2ef8..33403c06ed 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26961,15 +26961,15 @@ s-expression.") (define-public emacs-map (package (name "emacs-map") - (version "2.1") + (version "3.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/map-" - version ".el")) + version ".tar")) (sha256 (base32 - "0ydz5w1n4vwhhzxxj003s7jv8n1wjijwfryk5z93bwhnr0cak0i0")))) + "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls")))) (build-system emacs-build-system) (home-page "http://elpa.gnu.org/packages/map.html") (synopsis "Map manipulation functions") -- cgit 1.4.1 From 752843d92349372454a9a6e6afc024a2c7d914f2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 16:46:11 +0100 Subject: gnu: emacs-project: Fix build. * gnu/packages/emacs-xyz.scm (emacs-project)[source]: Fix URI. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 33403c06ed..5f732dad4b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -394,8 +394,7 @@ when typing parentheses directly or commenting out code line by line.") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/" - "project-" version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/project-" version ".tar")) (sha256 (base32 "0arjvhzzcf8b80w94yvpgfdlhsjwf5jk1r7vcai5a4dg3bi9cxyb")))) (build-system emacs-build-system) -- cgit 1.4.1 From 49a8f88fe1e44b94dea64bc4a6a8162f61caf726 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 17:02:05 +0100 Subject: gnu: emacs-ivy: Update to 0.13.4. * gnu/packages/emacs-xyz.scm (emacs-ivy): Update to 0.13.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5f732dad4b..bf45e8e141 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7802,13 +7802,13 @@ hydras with one column per group of heads."))) (define-public emacs-ivy (package (name "emacs-ivy") - (version "0.13.1") + (version "0.13.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ivy-" version ".tar")) (sha256 - (base32 "0n0ixhdykbdpis4krkqq6zncbby28p34742q96n0l91w0p19slcx")))) + (base32 "0qpza1c45mr8fcpnm32cck4v22fnzz1yb7kww05rzgq1k9iivx5v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-hydra" ,emacs-hydra))) -- cgit 1.4.1 From db5eb8c38f7492a531d9f8f7bde0bc2c843fc8fe Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 17:03:02 +0100 Subject: gnu: emacs-swiper: Update to 0.13.4. * gnu/packages/emacs-xyz.scm (emacs-swiper): Update to 0.13.4. [source]: Update URI. --- gnu/packages/emacs-xyz.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bf45e8e141..2da2a94165 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7859,14 +7859,13 @@ The following completions are currently available: (define-public emacs-swiper (package (name "emacs-swiper") - (version "0.13.1") + (version "0.13.4") (source (origin (method url-fetch) - (uri (string-append "https://elpa.gnu.org/packages/" - "swiper-" version ".el")) + (uri (string-append "https://elpa.gnu.org/packages/swiper-" version ".tar")) (sha256 - (base32 "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y")))) + (base32 "197pq2cvvskib87aky907wv2am55vilr7y5dabmmm07a8vr9py0v")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-ivy" ,emacs-ivy))) -- cgit 1.4.1 From 54d4b7f3abb1728067dff957a1260f624d97eac5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 17:04:48 +0100 Subject: gnu: emacs-counsel: Update to 0.13.4. * gnu/packages/emacs-xyz.scm (emacs-counsel): Update to 0.13.4. [source]: Update URI. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2da2a94165..0bf744e1cf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7826,14 +7826,14 @@ expression.") (define-public emacs-counsel (package (name "emacs-counsel") - (version "0.13.1") + (version "0.13.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" - "counsel-" version ".el")) + "counsel-" version ".tar")) (sha256 - (base32 "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli")))) + (base32 "094zfapfn1l8wjf3djkipk0d9nks0g77sbk107pfsbr3skkzh031")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-swiper" ,emacs-swiper))) -- cgit 1.4.1 From f0971dfd619870efb03f08a73442708052d5dd56 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Mar 2021 17:25:54 +0100 Subject: gnu: Add java-openjfx-controls. * gnu/packages/java.scm (java-openjfx-controls): New variable. --- gnu/packages/java.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7ba8b46226..09c5506fd7 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2721,6 +2721,33 @@ modern, efficient, and fully featured toolkit for developing rich client applications. This package contains media-related classes for the OpenJFX distribution."))) +(define-public java-openjfx-controls + (package (inherit java-openjfx-build) + (name "java-openjfx-controls") + (propagated-inputs + `(("java-openjxf-graphics" ,java-openjfx-graphics))) + (arguments + `(#:jar-name "java-openjfx-controls.jar" + #:source-dir "modules/controls/src/main/java" + #:test-dir "modules/controls/src/test" + ;; TODO: tests require com.sun.javafx.pgstub, + ;; javafx.collections.MockSetObserver, and + ;; com.sun.javafx.binding.ExpressionHelperUtility + #:tests? #false + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-resources + (lambda _ + (copy-recursively "modules/controls/src/test/resources" + "build/test-classes") + (copy-recursively "modules/controls/src/main/resources" + "build/classes")))))) + (description "OpenJFX is a client application platform for desktop, +mobile and embedded systems built on Java. Its goal is to produce a +modern, efficient, and fully featured toolkit for developing rich client +applications. This package contains UI control classes for the +OpenJFX distribution."))) + (define-public javacc-4 (package (name "javacc") -- cgit 1.4.1 From 828b4a9156cb4b4914416185738b884034217370 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 17:25:24 +0100 Subject: gnu: fio: Update to 3.26. * gnu/packages/benchmark.scm (fio): Update to 3.26. --- 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 cb97c9c7a5..5fd393ee8e 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017 Marius Bakke ;;; Copyright © 2017 Dave Love -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Eric Bavier ;;; Copyright © 2019 Gábor Boskovits @@ -51,14 +51,14 @@ (define-public fio (package (name "fio") - (version "3.25") + (version "3.26") (source (origin (method url-fetch) (uri (string-append "https://brick.kernel.dk/snaps/" "fio-" version ".tar.bz2")) (sha256 (base32 - "16r734an459cz1ax3jyhxc269i3syzdkll4qbv18wqaxpm5y34v6")))) + "1114h60vw63bim872an33xpvjfib6sc9dwj9xvk0yw41xjzfpp06")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit 1.4.1 From 495a68e8e53b5f72c370c8a58a3ec5df892b17cb Mon Sep 17 00:00:00 2001 From: raid5atemyhomework via Guix-patches via Date: Thu, 11 Mar 2021 12:56:48 +0000 Subject: gnu: Update zfs to 2.0.4. Mostly FreeBSD fixes, some documentation changes and corrections, and a few small bugfixes. Tested with `guix build` only, no in-depth testing done. From 6037ac6f797f37abb579278a0d30cd16e6876ec6 Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Thu, 11 Mar 2021 12:43:58 +0000 Subject: [PATCH] gnu: Update zfs to 2.0.4. * gnu/packages/file-systems.scm (zfs): Update to 2.0.4, rename to OpenZFS. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/file-systems.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 18d7aaffce..a6c7969638 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -849,7 +849,7 @@ APFS.") (define-public zfs (package (name "zfs") - (version "2.0.3") + (version "2.0.4") (outputs '("out" "module" "src")) (source (origin @@ -858,7 +858,7 @@ APFS.") "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "0fg5hz1yy2z5ah0hzjv3xy5vcg1c214rps90dr80lfkalx5gd506")))) + (base32 "0v2zshimz5miyj8mbskb52pnzyl1s4rhpr6208zq549v8g2l84vx")))) (build-system linux-module-build-system) (arguments `(;; The ZFS kernel module should not be downloaded since the license @@ -968,9 +968,9 @@ APFS.") ("util-linux:lib" ,util-linux "lib") ("zlib" ,zlib))) (home-page "https://zfsonlinux.org/") - (synopsis "Native ZFS on Linux") + (synopsis "OpenZFS on Linux") (description - "ZFS on Linux is an advanced file system and volume manager which was + "OpenZFS is an advanced file system and volume manager which was originally developed for Solaris and is now maintained by the OpenZFS community.") (license license:cddl1.0))) -- cgit 1.4.1 From 36c716e1c5b1d6ec1cc4cc34af0734acc8289f58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 17:39:05 +0100 Subject: gnu: memkind: Update to 1.11.0. * gnu/packages/disk.scm (memkind): Update to 1.11.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 7ad57f1bbb..26abe8d66a 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1119,7 +1119,7 @@ that support this feature).") (define-public memkind (package (name "memkind") - (version "1.10.1") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -1128,7 +1128,7 @@ that support this feature).") (file-name (git-file-name name version)) (sha256 (base32 - "11iz887f3cp5pzf1bzm644wzab8gkbhz3b7x1w6pcps71yd94ylj")))) + "0w5hws12l167mbr4n6a6fl0mhf8mci61fsn55lh2cxz33f7q8n2x")))) (build-system gnu-build-system) (inputs `(;; memkind patched jemalloc to add je_arenalookupx, -- cgit 1.4.1 From 444a38b99134a8cf1bf2c0d5c3b91f40cd193433 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 17:43:37 +0100 Subject: gnu: memkind: Remove duplicate COPYING file. * gnu/packages/disk.scm (memkind)[arguments]: Add the standard "--docdir=" location to #:configure-flags. --- gnu/packages/disk.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 26abe8d66a..ed112f2ec2 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1141,7 +1141,10 @@ that support this feature).") ("automake" ,automake) ("libtool" ,libtool))) (arguments - `(#:tests? #f ; Tests require a NUMA-enabled system. + `(#:configure-flags + (list (string-append "--docdir=" (assoc-ref %outputs "out") + "/share/doc/" ,name "-" ,version)) + #:tests? #f ; Tests require a NUMA-enabled system. #:phases (modify-phases %standard-phases (add-before 'build 'autogen-jemalloc -- cgit 1.4.1 From affeb3def70023a277b66f44d6d0ec9663f8dd54 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 17:54:57 +0100 Subject: gnu: jetring: Update to 0.30. * gnu/packages/gnupg.scm (jetring): Update to 0.30. --- gnu/packages/gnupg.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 18fc76ef35..f97dd6c4a7 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1144,17 +1144,16 @@ over.") (define-public jetring (package (name "jetring") - (version "0.29") + (version "0.30") (source (origin (method git-fetch) (uri (git-reference (url "https://salsa.debian.org/debian/jetring") - (commit (string-append "debian/" version)))) + (commit "535380166eb1b222ba34864af07f3e36f4fb52c9"))) (file-name (git-file-name name version)) (sha256 - (base32 - "1acbx2vnbkms1c0wgcnh05d4g359sg5z0aiw541vx2qq9sgdhlv6")))) + (base32 "19m7rj446pr4nql44khwq0cfxfrm8cslj5v9jll08p7nk6glq5px")))) (build-system gnu-build-system) (arguments '(#:phases -- cgit 1.4.1 From b8f0d11f769ed1e74733cd3e2d5207fb5c8f5e41 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 18:05:13 +0100 Subject: gnu: doctest: Update to 2.4.5. * gnu/packages/check.scm (doctest): Update to 2.4.5. --- 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 524cc1874d..cfda247d67 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Arun Isaac @@ -561,7 +561,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.4.4") + (version "2.4.5") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -569,7 +569,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "0xldd6cr1w3bn33rdb7yc6p57w143cgnjb48ig1b99iwvvkw599n")))) + "1pc34dvpgdzx3paqdf0khgs87kvjncx27yn434f5ic33r1lwr9r4")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit 1.4.1 From 2e2a3b248b5fb2435bfcf2726c5c6b1b44f4a760 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 18:05:21 +0100 Subject: gnu: thermald: Update to 2.4.3. * gnu/packages/admin.scm (thermald): Update to 2.4.3. --- 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 edcd1097a3..8b3568e48e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3545,7 +3545,7 @@ make it a perfect utility on modern distros.") (define-public thermald (package (name "thermald") - (version "2.4.2") + (version "2.4.3") (source (origin (method git-fetch) @@ -3554,7 +3554,7 @@ make it a perfect utility on modern distros.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nzjfiis4d3ml765s65bywk5dhx5x2fb3hpiixpxzzrs50ajwasj")))) + (base32 "1ibihgpmx038xci0k2h471scs5ssn7z5kcvjrfz63qf2ppdf9yh8")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From c47f0dea8c522d14c2054951fb81d9600095cc9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 18:05:30 +0100 Subject: gnu: jasper: Update to 2.0.26. * gnu/packages/image.scm (jasper): Update to 2.0.26. --- 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 94d5e4d358..29e88af231 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1406,7 +1406,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.25") + (version "2.0.26") (source (origin (method git-fetch) (uri (git-reference @@ -1415,7 +1415,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (git-file-name name version)) (sha256 (base32 - "06s6z7qrcnbi9mbj2d0a6k7lxbjdh3ppjpx8bcdv73lxhm4z7pzr")))) + "0zh239v6gj1ndrsk4ds5faiiyakpddmbpcy4v6p6shicfbr04snf")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo))) -- cgit 1.4.1 From ce2637c003be486596fc96d6f7da3c6cc999c163 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 10 Mar 2021 06:43:09 -0500 Subject: gnu: Add python-betamax-serializers. * gnu/packages/python-web.scm (python-betamax-serializers): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index edfff0c6a3..ab90092762 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3228,6 +3228,26 @@ Betamax.") (define-public python2-betamax-matchers (package-with-python2 python-betamax-matchers)) +(define-public python-betamax-serializers + (package + (name "python-betamax-serializers") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "betamax-serializers" version)) + (sha256 + (base32 "0ja9isbjmzzhxdj69s0kdsvw8nkp073w6an6a4liy5vk3fdl2p1l")))) + (build-system python-build-system) + (propagated-inputs + `(("python-betamax" ,python-betamax) + ("python-pyyaml" ,python-pyyaml))) + (synopsis "Set of third-party serializers for Betamax") + (description "Betamax-Serializers are an experimental set of Serializers for +Betamax that may possibly end up in the main package.") + (home-page "https://gitlab.com/betamax/serializers") + (license license:asl2.0))) + (define-public python-s3transfer (package (name "python-s3transfer") -- cgit 1.4.1 From cfa564bcef30cb0018a63c7c33b62b865b9fc731 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 10 Mar 2021 06:49:48 -0500 Subject: gnu: Add python-testfixtures. * gnu/packages/python-check.scm (python-testfixtures): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-check.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 3eb561c89a..2f449bf0eb 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -29,7 +29,9 @@ (define-module (gnu packages python-check) #:use-module (gnu packages) #:use-module (gnu packages check) + #:use-module (gnu packages django) #:use-module (gnu packages openstack) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages web) @@ -41,6 +43,31 @@ #:use-module (guix download) #:use-module (guix build-system python)) +(define-public python-testfixtures + (package + (name "python-testfixtures") + (version "6.17.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "testfixtures" version)) + (sha256 + (base32 "1nlv2hz20czjp4a811ichl5kwg99rh84l0mw9wq4rk3idzfs1hsy")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; PyTest-Django fails to build in master + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ;;("python-pytest-django" ,python-pytest-django) + ("python-twine" ,python-twine) + ("python-wheel" ,python-wheel))) + (synopsis "Tests components for Python") + (description "Testfixtures is a collection of helpers and mock objects that +are useful when writing automated tests in Python.") + (home-page "https://testfixtures.readthedocs.io/en/latest/") + (license license:expat))) + (define-public python-coveralls (package (name "python-coveralls") -- cgit 1.4.1 From 532fc2fbaf8f3b13eb1bfc1024a31e957a68cffd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 1 Mar 2021 15:37:23 -0500 Subject: gnu: Add python-prawcore. * gnu/packages/python-web.scm (python-prawcore): New variable. Signed-off-by: Efraim Flashner --- 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 ab90092762..9415b8cee9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -91,6 +91,31 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (srfi srfi-1)) +(define-public python-prawcore + (package + (name "python-prawcore") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "prawcore" version)) + (sha256 + (base32 "1l9nrn4s03xl8fvkyybdk86bm9cyyk43alkxf9g014a9ynvdk65l")))) + (build-system python-build-system) + (native-inputs + `(("python-betamax" ,python-betamax) + ("python-betamax-matchers" ,python-betamax-matchers) + ("python-betamax-serializers" ,python-betamax-serializers) + ("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-testfixtures" ,python-testfixtures))) + (propagated-inputs + `(("python-requests" ,python-requests))) + (synopsis "Core component of PRAW") + (description "PRAWcore is a low-level communication layer used by PRAW.") + (home-page "https://praw.readthedocs.io/en/latest/") + (license license:bsd-2))) + (define-public python-aiohttp (package (name "python-aiohttp") -- cgit 1.4.1 From 340e6dd51b42f03e7370eeda417197a23f49402f Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 1 Mar 2021 16:01:21 -0500 Subject: gnu: Add python-praw. * gnu/packages/python-web.scm (python-raw): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9415b8cee9..8cfddcdfac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -116,6 +116,49 @@ (home-page "https://praw.readthedocs.io/en/latest/") (license license:bsd-2))) +(define-public python-praw + (package + (name "python-praw") + (version "7.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "praw" version)) + (sha256 + (base32 "0ll1a0n8xs8gykizdsfrw63jp6bc39ab0pk3yzwcak96fyxh0ij3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (with-directory-excursion "tests" + ;; Require networking. + (for-each delete-file-recursively + '("integration/models" "unit/models")) + ;; https://github.com/praw-dev/praw/issues/1699 + ;; #issuecomment-795336704 + (delete-file "unit/test_config.py")) + #t)) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")) + #t))))) + (native-inputs + `(("python-betamax" ,python-betamax) + ("python-betamax-matchers" ,python-betamax-matchers) + ("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-prawcore" ,python-prawcore) + ("python-websocket-client" ,python-websocket-client))) + (synopsis "Python Reddit API Wrapper") + (description "PRAW is a Python package that allows for simple access to +Reddit’s API. It aims to be easy to use and internally follows all of Reddit’s +API rules.") + (home-page "https://praw.readthedocs.io/en/latest/") + (license license:bsd-2))) + (define-public python-aiohttp (package (name "python-aiohttp") -- cgit 1.4.1 From 6dda22363166bc67e8846714cc947918692202c5 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 11 Mar 2021 21:11:51 +0100 Subject: gnu: Add computable-reals. * gnu/packages/lisp-xyz.scm (cl-computable-reals, ecl-computable-reals, sbcl-computable-reals): New variables. --- gnu/packages/lisp-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e15185339b..5682daee3f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15314,3 +15314,31 @@ time, etc.") (define-public cl-fof (sbcl-package->cl-source-package sbcl-fof)) + +(define-public sbcl-computable-reals + (let ((commit "fdc73d75e79d0a4ce6d01c822c950ae2eb137d39")) + (package + (name "sbcl-computable-reals") + (version (git-version "1.1.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stylewarning/computable-reals") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0f12axi53x14l12dgf4a1lfq3p1fx7fh7sjfc0db3lk88ph9qfwl")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/stylewarning/computable-reals") + (synopsis "Arbitrary-precision, re-computing real-numbers in Common Lisp") + (description + "This library provides arbitrary precision (floating point) real +numbers in Common Lisp.") + (license license:bsd-3)))) + +(define-public ecl-computable-reals + (sbcl-package->ecl-package sbcl-computable-reals)) + +(define-public cl-computable-reals + (sbcl-package->cl-source-package sbcl-computable-reals)) -- cgit 1.4.1 From 2f9132e2e0b1e01398a01a32972e87f45ec2f7a6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Mar 2021 23:23:00 +0200 Subject: Revert "Revert "gnu: mongodb: Update to 3.4.24 [security fixes]."" This reverts commit feff80cec3c97a3df2c20d300be12d67f79d4f22. I was mistaken, there are still branches of mongodb which are still licensed under the AGPL3 --- gnu/local.mk | 1 - gnu/packages/databases.scm | 13 ++--- ...ngodb-support-unknown-linux-distributions.patch | 55 ---------------------- 3 files changed, 5 insertions(+), 64 deletions(-) delete mode 100644 gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a39c5d8592..c2637926ee 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1396,7 +1396,6 @@ dist_patch_DATA = \ %D%/packages/patches/mpc123-initialize-ao.patch \ %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 \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 29270ce2be..aa64507b00 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -667,27 +667,24 @@ replacement for the code@{python-memcached} library.") (define-public mongodb (package (name "mongodb") - (version "3.4.10") + (version "3.4.24") (source (origin (method url-fetch) (uri (string-append "https://github.com/mongodb/mongo/archive/r" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0676lvkljj7a5hdhv78dbykqnqrj9lbn9799mi84b8vbnzsq961r")) + (base32 "0y1669sqj8wyf0y0njhxs4qhn1qzjhrs2h2qllya5samxrlrjhkg")) (modules '((guix build utils))) (snippet '(begin (for-each (lambda (dir) (delete-file-recursively (string-append "src/third_party/" dir))) - '("pcre-8.41" "scons-2.5.0" "snappy-1.1.3" + '("pcre-8.42" "scons-2.5.0" "snappy-1.1.3" "valgrind-3.11.0" "wiredtiger" - "yaml-cpp-0.5.3" "zlib-1.2.8")) - #t)) - (patches - (list - (search-patch "mongodb-support-unknown-linux-distributions.patch"))))) + "yaml-cpp-0.6.2" "zlib-1.2.11")) + #t)))) (build-system scons-build-system) (inputs `(("openssl" ,openssl-1.0) diff --git a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch b/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch deleted file mode 100644 index 6057ebeb08..0000000000 --- a/gnu/packages/patches/mongodb-support-unknown-linux-distributions.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e724bb7018a482640c4f194f88b554af2c59d76e Mon Sep 17 00:00:00 2001 -From: Mark Benvenuto -Date: Wed, 20 Sep 2017 11:50:02 -0400 -Subject: [PATCH] SERVER-30857 Support unknown Linux distributions - ---- - src/mongo/rpc/metadata/client_metadata.cpp | 6 ------ - src/mongo/util/processinfo_linux.cpp | 9 ++++++--- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/mongo/rpc/metadata/client_metadata.cpp b/src/mongo/rpc/metadata/client_metadata.cpp -index 845a315dd74..a959a4e31e9 100644 ---- a/src/mongo/rpc/metadata/client_metadata.cpp -+++ b/src/mongo/rpc/metadata/client_metadata.cpp -@@ -302,9 +302,6 @@ void ClientMetadata::serializePrivate(StringData driverName, - StringData osArchitecture, - StringData osVersion, - BSONObjBuilder* builder) { -- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && -- !osArchitecture.empty() && !osVersion.empty()); -- - BSONObjBuilder metaObjBuilder(builder->subobjStart(kMetadataDocumentName)); - - { -@@ -347,9 +344,6 @@ Status ClientMetadata::serializePrivate(StringData driverName, - StringData osVersion, - StringData appName, - BSONObjBuilder* builder) { -- invariant(!driverName.empty() && !driverVersion.empty() && !osType.empty() && !osName.empty() && -- !osArchitecture.empty() && !osVersion.empty()); -- - if (appName.size() > kMaxApplicationNameByteLength) { - return Status(ErrorCodes::ClientMetadataAppNameTooLarge, - str::stream() << "The '" << kApplication << "." << kName -diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp -index c3debf377bd..c2813b026b0 100644 ---- a/src/mongo/util/processinfo_linux.cpp -+++ b/src/mongo/util/processinfo_linux.cpp -@@ -376,10 +376,13 @@ class LinuxSysHelper { - if ((nl = name.find('\n', nl)) != string::npos) - // stop at first newline - name.erase(nl); -- // no standard format for name and version. use kernel version -- version = "Kernel "; -- version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); -+ } else { -+ name = "unknown"; - } -+ -+ // There is no standard format for name and version so use the kernel version. -+ version = "Kernel "; -+ version += LinuxSysHelper::readLineFromFile("/proc/sys/kernel/osrelease"); - } - - /** -- cgit 1.4.1 From aa983626a2df71022c04a3367884d2d5c17fceea Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Mar 2021 23:26:01 +0200 Subject: gnu: mongodb: Update comment about package license. * gnu/packages/databases.scm (mongodb): Adjust the comment about the licensing status of the package, there are still older branches receiving updates under the AGPL license. --- 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 aa64507b00..8705cd2be4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -661,9 +661,9 @@ replacement for the code@{python-memcached} library.") (define-public python2-pylibmc (package-with-python2 python-pylibmc)) -;; This is the last version of mongodb before they switched to the Server Side -;; Public License (SSPL), which is not a FOSS license. As such, this package -;; cannot be updated. +;; There is a point at which mongodb switched to the Server Side Public +;; License (SSPL), which is not a FOSS license. As such, be careful +;; when updating this package. (define-public mongodb (package (name "mongodb") -- cgit 1.4.1 From 0aaac779d4eeda13d26f56ff68b45bb8290d6ef2 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 11 Mar 2021 22:58:05 +0100 Subject: gnu: flatpak: Update to 1.10.2 [fixes CVE-2021-21381]. * gnu/packages/package-management.scm (flatpak): Update to 1.10.2. --- 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 9bf24f8533..d16b0fbc67 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1380,14 +1380,14 @@ the boot loader configuration.") (define-public flatpak (package (name "flatpak") - (version "1.10.1") + (version "1.10.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/flatpak/releases/download/" version "/flatpak-" version ".tar.xz")) (sha256 - (base32 "1dywvfpmszvp2wy5hvpzy8z6gz2gzmi9p302njp52p9vpx14ydf1")))) + (base32 "1r6xw7r3ir2vaa30n3mily6m7d51cf4qv22fkqlzzy3js0wjf5fv")))) ;; Wrap 'flatpak' so that GIO_EXTRA_MODULES is set, thereby allowing GIO to ;; find the TLS backend in glib-networking. -- cgit 1.4.1 From ed6900f9748ad9fb42be6ba064b67a1dbca893b8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 22:37:00 +0100 Subject: gnu: libinih: Update to 53. * gnu/packages/linux.scm (libinih): Update to 53. --- 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 e1527ad4b2..a0db0f28b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7149,7 +7149,7 @@ IP addresses and routes, and configure IPsec.") (define-public libinih (package (name "libinih") - (version "52") + (version "53") (source (origin (method git-fetch) (uri (git-reference @@ -7158,7 +7158,7 @@ IP addresses and routes, and configure IPsec.") (file-name (git-file-name name version)) (sha256 (base32 - "0lsvm34zabvi1xlximybzvgc58zb90mm3b9babwxlqs05jy871m4")))) + "0dqf5j2sw4hq68rqvxbrsf44ygfzx9ypiyzipk4cvp9aimbvsbc6")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Ddistro_install=true" "-Ddefault_library=shared"))) -- cgit 1.4.1 From 8a9d3e9420e1bade71767446d80543b215c547f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 22:37:09 +0100 Subject: gnu: libdatrie: Update to 0.2.13. * gnu/packages/gtk.scm (libdatrie): Update to 0.2.13. --- 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 34876ddd8f..b9e81c9650 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -236,7 +236,7 @@ affine transformation (scale, rotation, shear, etc.).") (define-public libdatrie (package (name "libdatrie") - (version "0.2.12") + (version "0.2.13") (source (origin (method url-fetch) @@ -244,7 +244,7 @@ affine transformation (scale, rotation, shear, etc.).") (string-append "https://linux.thai.net/pub/ThaiLinux/software/" "libthai/libdatrie-" version ".tar.xz")) (sha256 - (base32 "0jdi01pcxv0b24zbjy7zahawsqqqw4mv94f2yy01zh4n796wqba5")))) + (base32 "1gplcx9ddglpxmqm10qn38kjmvdh4hnhj14rzgqag095psr1n8qj")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From c51892539115f996635a5c079b9bf373add88b21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 22:37:18 +0100 Subject: gnu: btrfs-progs: Update to 5.11. * gnu/packages/linux.scm (btrfs-progs): Update to 5.11. --- 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 a0db0f28b6..8b96c333fc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4938,7 +4938,7 @@ and copy/paste text in the console and in xterm.") (define-public btrfs-progs (package (name "btrfs-progs") - (version "5.10.1") + (version "5.11") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" @@ -4946,7 +4946,7 @@ and copy/paste text in the console and in xterm.") "btrfs-progs-v" version ".tar.xz")) (sha256 (base32 - "0i03vajakg1glbql1cv7xy0k71zvpd2whdwymmrz9rza3xrwqy8k")))) + "0dq1ryji9hmq10zbyk083lp9r212524a3naai47whq11m6q626fl")))) (build-system gnu-build-system) (outputs '("out" "static")) ; static versions of the binaries in "out" -- cgit 1.4.1 From 47093ca4cd403d95962c5ba8ce744a1848bbb4e3 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Wed, 3 Mar 2021 14:57:19 +0000 Subject: gnu: fmt: Update to 7.1.3. * gnu/packages/pretty-print.scm (fmt): Update to 7.1.3. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/pretty-print.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 88dff5c7b4..af02fd91a9 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,14 +167,14 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "7.0.3") + (version "7.1.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" version "/fmt-" version ".zip")) (sha256 - (base32 "0kgajl3qsrdyj0csqsz8b8h84kasdy0pnh16byl0y1vlsaddzkyy")))) + (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) -- cgit 1.4.1 From d3e2ad740f0a9dbfdbb9361d8c4e94e350caaec5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 22:54:53 +0100 Subject: gnu: hangups: Update to 0.4.13. * gnu/packages/messaging.scm (hangups): Update to 0.4.13. --- 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 d8eae12645..7ab6d028a3 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2440,13 +2440,13 @@ QMatrixClient project.") (define-public hangups (package (name "hangups") - (version "0.4.11") + (version "0.4.13") (source (origin (method url-fetch) (uri (pypi-uri "hangups" version)) (sha256 - (base32 "165lravvlsgkv6pp3vgg785ihycvs43qzqxw2d2yygrc6pbhqlyv")))) + (base32 "015g635vnrxk5lf9n80rdcmh6chv8kmla1k2j7m1iijijs519ngn")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From ebd500026389afc913fb5a246d6d5a47425f4288 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 11 Mar 2021 22:58:14 +0100 Subject: gnu: wireshark: Update to 3.4.4. * gnu/packages/networking.scm (wireshark): Update to 3.4.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 0e99cd1cc0..f3f48321a9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1357,14 +1357,14 @@ of the same name.") (define-public wireshark (package (name "wireshark") - (version "3.4.3") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append "https://www.wireshark.org/download/src/wireshark-" version ".tar.xz")) (sha256 - (base32 "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl")))) + (base32 "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit 1.4.1 From 42d5efc001f0122877cd3b8024ea4b6f7c45ee30 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 26 Feb 2021 12:52:35 +0100 Subject: gnu: guile-curl: Update to 0.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/curl.scm (guile-curl): Update to 0.9. [#:phases]: Update path to module. Signed-off-by: Ludovic Courtès --- gnu/packages/curl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 52c2be2f80..730676875c 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -198,14 +198,14 @@ not offer a replacement for libcurl.") (define-public guile-curl (package (name "guile-curl") - (version "0.7") + (version "0.9") (source (origin (method url-fetch) (uri (string-append "http://www.lonelycactus.com/tarball/" "guile_curl-" version ".tar.gz")) (sha256 (base32 - "1zk0ijx6bj212k0j0ma84cpvpvn0x6raaxnby3wdx3w4wnhnscn7")))) + "0y7wfhilfm6vzs0wyifrrc2pj9nsxfas905c7qa5cw4i6s74ypmi")))) (build-system gnu-build-system) (arguments `(#:modules (((guix build guile-build-system) @@ -230,7 +230,7 @@ not offer a replacement for libcurl.") (modify-phases %standard-phases (add-after 'unpack 'patch-undefined-references (lambda* _ - (substitute* "src/curl.scm" + (substitute* "module/curl.scm" ;; The following #defines are missing from our curl package ;; and therefore result in the evaluation of undefined symbols. ((",CURLOPT_HAPROXYPROTOCOL") "#f") -- cgit 1.4.1 From c39d8a11c0cdece6206b4b5a5ffb8c34025745c9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:17:45 -0500 Subject: gnu: linux-libre: Update to 5.11.6. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.6. (linux-libre-5.11-pristine-source): 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 8b96c333fc..35cccd9ca5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.5") +(define-public linux-libre-5.11-version "5.11.6") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212"))) + (hash (base32 "02dcq7cqll5c39z8dh9f0xy68hh4a8jsab5k4n9calfldrm7jw79"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 234aa6c9645e31429da2adf75c144947f94ce245 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:18:13 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.23. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.23. (linux-libre-5.10-pristine-source): 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 35cccd9ca5..c871eb301a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.22") +(define-public linux-libre-5.10-version "5.10.23") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1pv3661d1gvkdl2jg6wx95lr5lcp6q77jrmx0m4a6z6n6asicnr4"))) + (hash (base32 "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From a4905b424eab889206f1837a5894610113aaeba6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:18:33 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.105. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.105. (linux-libre-5.4-pristine-source): 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 c871eb301a..df57a51a90 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.104") +(define-public linux-libre-5.4-version "5.4.105") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1p8459plp3a6xw7cib34p7bddjs0dlv2m34dy4z6bbsvgfg51m74"))) + (hash (base32 "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 129db4f10455dffc1ed754eab7ca0fc853aca45c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:19:04 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.180. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.180. (linux-libre-4.19-pristine-source): 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 df57a51a90..222c92ed3a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.179") +(define-public linux-libre-4.19-version "4.19.180") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9"))) + (hash (base32 "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 0988cbaeab1c20c4e8df80bf8155c22341936c73 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:19:24 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.225. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.225. (linux-libre-4.14-pristine-source): 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 222c92ed3a..8b4f6dd211 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.224") +(define-public linux-libre-4.14-version "4.14.225") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq"))) + (hash (base32 "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 2c5aff6160583762532c17a9f57087c05fd2d2c1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:19:44 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.261. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.261. (linux-libre-4.9-pristine-source): 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 8b4f6dd211..066f1a6537 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.260") +(define-public linux-libre-4.9-version "4.9.261") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq"))) + (hash (base32 "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From df632e322501ac200659d2bdf259aca13e1717e4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 16:20:02 -0500 Subject: gnu: linux-libre 4.4: Update to 4.4.261. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.261. (linux-libre-4.4-pristine-source): 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 066f1a6537..80168c8ae9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.260") +(define-public linux-libre-4.4-version "4.4.261") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6"))) + (hash (base32 "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 09c05fde523f3186d9e12ce3310139ecb69b78d7 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 10 Mar 2021 21:13:41 -0500 Subject: gnu: git-annex: Update to 8.20210310. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210310. Signed-off-by: Leo Famulari --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index a0a708a79c..d7d5a0223a 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -342,14 +342,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20210223") + (version "8.20210310") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "07wxf44pdh9d1pxqympgyfbkk8vk0pqbgxma0mkadlkdr6c9z832")))) + (base32 "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From c3a7537396f11af7dd04c294714eb20980946083 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 11 Mar 2021 18:32:07 -0500 Subject: gnu: certbot, python-acme: Update to 1.13.0. * gnu/packages/tls.scm (python-acme): Update to 1.13.0. [native-inputs]: Remove python-mock. [propagated-inputs]: Remove python-six. (certbot): Update to 1.13.0. [propagated-inputs]: Remove python-six. [arguments]: Remove 'build-documentation' phase. --- gnu/packages/tls.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index acabca5df3..4572b39aa1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -576,13 +576,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "1wn2jvkg18z31nd060hfcp2yqvxjxykim2ybgaidv7qfsms38dma")))) + "1260a7bcgmha19drqzn6syz3cy61482b3w6lihgg1md6svgmfhkb")))) (build-system python-build-system) (arguments `(#:phases @@ -599,8 +599,7 @@ netcat implementation that supports TLS.") (install-file "docs/_build/man/acme-python.1" man) #t)))))) (native-inputs - `(("python-mock" ,python-mock) - ("python-pytest" ,python-pytest) + `(("python-pytest" ,python-pytest) ;; For documentation ("python-sphinx" ,python-sphinx) ("python-sphinxcontrib-programoutput" ,python-sphinxcontrib-programoutput) @@ -608,7 +607,6 @@ netcat implementation that supports TLS.") ("texinfo" ,texinfo))) (propagated-inputs `(("python-josepy" ,python-josepy) - ("python-six" ,python-six) ("python-requests" ,python-requests) ("python-requests-toolbelt" ,python-requests-toolbelt) ("python-pytz" ,python-pytz) @@ -632,20 +630,12 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0nfzk6fzyfqy8lgs5lmxfndrdh5c2ljdvzj39rwvgg3r6ivkirsy")))) + "0n7lwajmlypkqgsd2cv74j41f5ag381skjlzhjfpsrppgnsl3kv4")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) ((#:phases phases) `(modify-phases ,phases - (replace 'build-documentation - (lambda _ - ;; Fix building the manual page in 1.12.0: - ;; https://github.com/certbot/certbot/issues/8633 - ;; TODO Remove the substitution in later releases. - (substitute* "docs/conf.py" - (("'man',") "")) - (invoke "make" "-C" "docs" "man" "info"))) (replace 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -676,7 +666,6 @@ netcat implementation that supports TLS.") ("python-distro" ,python-distro) ("python-zope-component" ,python-zope-component) ("python-parsedatetime" ,python-parsedatetime) - ("python-six" ,python-six) ("python-psutil" ,python-psutil) ("python-requests" ,python-requests) ("python-pytz" ,python-pytz))) -- cgit 1.4.1 From 5a06b83fc92710c5846a83bbf49f0ea84c8ecec2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 00:48:58 -0500 Subject: gnu: glib: Fix CVE-2021-28153. * gnu/packages/patches/glib-CVE-2021-28153.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/glib.scm (glib/fixed): Add the new patch. --- gnu/local.mk | 1 + gnu/packages/glib.scm | 3 +- gnu/packages/patches/glib-CVE-2021-28153.patch | 283 +++++++++++++++++++++++++ 3 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/glib-CVE-2021-28153.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c2637926ee..ce30d1db1c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1095,6 +1095,7 @@ dist_patch_DATA = \ %D%/packages/patches/glib-CVE-2021-27219-16.patch \ %D%/packages/patches/glib-CVE-2021-27219-17.patch \ %D%/packages/patches/glib-CVE-2021-27219-18.patch \ + %D%/packages/patches/glib-CVE-2021-28153.patch \ %D%/packages/patches/glibc-CVE-2018-11236.patch \ %D%/packages/patches/glibc-CVE-2018-11237.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 520b723722..eaa319a2ff 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -415,7 +415,8 @@ dynamic loading, and an object system.") "glib-CVE-2021-27219-15.patch" "glib-CVE-2021-27219-16.patch" "glib-CVE-2021-27219-17.patch" - "glib-CVE-2021-27219-18.patch") + "glib-CVE-2021-27219-18.patch" + "glib-CVE-2021-28153.patch") (origin-patches (package-source glib)))))))) (define-public glib-with-documentation diff --git a/gnu/packages/patches/glib-CVE-2021-28153.patch b/gnu/packages/patches/glib-CVE-2021-28153.patch new file mode 100644 index 0000000000..54443186d9 --- /dev/null +++ b/gnu/packages/patches/glib-CVE-2021-28153.patch @@ -0,0 +1,283 @@ +Backport of: + +From 317b3b587058a05dca95d56dac26568c5b098d33 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Wed, 24 Feb 2021 17:35:40 +0000 +Subject: [PATCH] glocalfileoutputstream: Fix CREATE_REPLACE_DESTINATION + with symlinks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The `G_FILE_CREATE_REPLACE_DESTINATION` flag is equivalent to unlinking +the destination file and re-creating it from scratch. That did +previously work, but in the process the code would call `open(O_CREAT)` +on the file. If the file was a dangling symlink, this would create the +destination file (empty). That’s not an intended side-effect, and has +security implications if the symlink is controlled by a lower-privileged +process. + +Fix that by not opening the destination file if it’s a symlink, and +adjusting the rest of the code to cope with + - the fact that `fd == -1` is not an error iff `is_symlink` is true, + - and that `original_stat` will contain the `lstat()` results for the + symlink now, rather than the `stat()` results for its target (again, + iff `is_symlink` is true). + +This means that the target of the dangling symlink is no longer created, +which was the bug. The symlink itself continues to be replaced (as +before) with the new file — this is the intended behaviour of +`g_file_replace()`. + +The behaviour for non-symlink cases, or cases where the symlink was not +dangling, should be unchanged. + +Includes a unit test. + +Signed-off-by: Philip Withnall + +Fixes: #2325 +--- + gio/glocalfileoutputstream.c | 70 ++++++++++++++++------- + gio/tests/file.c | 108 +++++++++++++++++++++++++++++++++++ + 2 files changed, 158 insertions(+), 20 deletions(-) + +diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c +index a3dd62172..553fcbbae 100644 +--- a/gio/glocalfileoutputstream.c ++++ b/gio/glocalfileoutputstream.c +@@ -874,16 +874,22 @@ handle_overwrite_open (const char *filename, + /* Could be a symlink, or it could be a regular ELOOP error, + * but then the next open will fail too. */ + is_symlink = TRUE; +- fd = g_open (filename, open_flags, mode); ++ if (!(flags & G_FILE_CREATE_REPLACE_DESTINATION)) ++ fd = g_open (filename, open_flags, mode); + } +-#else +- fd = g_open (filename, open_flags, mode); +- errsv = errno; ++#else /* if !O_NOFOLLOW */ + /* This is racy, but we do it as soon as possible to minimize the race */ + is_symlink = g_file_test (filename, G_FILE_TEST_IS_SYMLINK); ++ ++ if (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION)) ++ { ++ fd = g_open (filename, open_flags, mode); ++ errsv = errno; ++ } + #endif + +- if (fd == -1) ++ if (fd == -1 && ++ (!is_symlink || !(flags & G_FILE_CREATE_REPLACE_DESTINATION))) + { + char *display_name = g_filename_display_name (filename); + g_set_error (error, G_IO_ERROR, +@@ -893,13 +899,25 @@ handle_overwrite_open (const char *filename, + g_free (display_name); + return -1; + } +- ++ ++ if (!is_symlink) ++ { + #ifdef G_OS_WIN32 +- res = GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); ++ res = GLIB_PRIVATE_CALL (g_win32_fstat) (fd, &original_stat); + #else +- res = fstat (fd, &original_stat); ++ res = fstat (fd, &original_stat); + #endif +- errsv = errno; ++ errsv = errno; ++ } ++ else ++ { ++#ifdef G_OS_WIN32 ++ res = GLIB_PRIVATE_CALL (g_win32_lstat_utf8) (filename, &original_stat); ++#else ++ res = g_lstat (filename, &original_stat); ++#endif ++ errsv = errno; ++ } + + if (res != 0) + { +@@ -916,16 +934,27 @@ handle_overwrite_open (const char *filename, + if (!S_ISREG (original_stat.st_mode)) + { + if (S_ISDIR (original_stat.st_mode)) +- g_set_error_literal (error, +- G_IO_ERROR, +- G_IO_ERROR_IS_DIRECTORY, +- _("Target file is a directory")); +- else +- g_set_error_literal (error, +- G_IO_ERROR, +- G_IO_ERROR_NOT_REGULAR_FILE, +- _("Target file is not a regular file")); +- goto err_out; ++ { ++ g_set_error_literal (error, ++ G_IO_ERROR, ++ G_IO_ERROR_IS_DIRECTORY, ++ _("Target file is a directory")); ++ goto err_out; ++ } ++ else if (!is_symlink || ++#ifdef S_ISLNK ++ !S_ISLNK (original_stat.st_mode) ++#else ++ FALSE ++#endif ++ ) ++ { ++ g_set_error_literal (error, ++ G_IO_ERROR, ++ G_IO_ERROR_NOT_REGULAR_FILE, ++ _("Target file is not a regular file")); ++ goto err_out; ++ } + } + + if (etag != NULL) +@@ -1006,7 +1035,8 @@ handle_overwrite_open (const char *filename, + } + } + +- g_close (fd, NULL); ++ if (fd >= 0) ++ g_close (fd, NULL); + *temp_filename = tmp_filename; + return tmpfd; + } +diff --git a/gio/tests/file.c b/gio/tests/file.c +index efb2eaadd..bc55f3af4 100644 +--- a/gio/tests/file.c ++++ b/gio/tests/file.c +@@ -804,6 +804,113 @@ test_replace_cancel (void) + g_object_unref (tmpdir); + } + ++static void ++test_replace_symlink (void) ++{ ++#ifdef G_OS_UNIX ++ gchar *tmpdir_path = NULL; ++ GFile *tmpdir = NULL, *source_file = NULL, *target_file = NULL; ++ GFileOutputStream *stream = NULL; ++ const gchar *new_contents = "this is a test message which should be written to source and not target"; ++ gsize n_written; ++ GFileEnumerator *enumerator = NULL; ++ GFileInfo *info = NULL; ++ gchar *contents = NULL; ++ gsize length = 0; ++ GError *local_error = NULL; ++ ++ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2325"); ++ g_test_summary ("Test that G_FILE_CREATE_REPLACE_DESTINATION doesn’t follow symlinks"); ++ ++ /* Create a fresh, empty working directory. */ ++ tmpdir_path = g_dir_make_tmp ("g_file_replace_symlink_XXXXXX", &local_error); ++ g_assert_no_error (local_error); ++ tmpdir = g_file_new_for_path (tmpdir_path); ++ ++ g_test_message ("Using temporary directory %s", tmpdir_path); ++ g_free (tmpdir_path); ++ ++ /* Create symlink `source` which points to `target`. */ ++ source_file = g_file_get_child (tmpdir, "source"); ++ target_file = g_file_get_child (tmpdir, "target"); ++ g_file_make_symbolic_link (source_file, "target", NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ /* Ensure that `target` doesn’t exist */ ++ g_assert_false (g_file_query_exists (target_file, NULL)); ++ ++ /* Replace the `source` symlink with a regular file using ++ * %G_FILE_CREATE_REPLACE_DESTINATION, which should replace it *without* ++ * following the symlink */ ++ stream = g_file_replace (source_file, NULL, FALSE /* no backup */, ++ G_FILE_CREATE_REPLACE_DESTINATION, NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ g_output_stream_write_all (G_OUTPUT_STREAM (stream), new_contents, strlen (new_contents), ++ &n_written, NULL, &local_error); ++ g_assert_no_error (local_error); ++ g_assert_cmpint (n_written, ==, strlen (new_contents)); ++ ++ g_output_stream_close (G_OUTPUT_STREAM (stream), NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ g_clear_object (&stream); ++ ++ /* At this point, there should still only be one file: `source`. It should ++ * now be a regular file. `target` should not exist. */ ++ enumerator = g_file_enumerate_children (tmpdir, ++ G_FILE_ATTRIBUTE_STANDARD_NAME "," ++ G_FILE_ATTRIBUTE_STANDARD_TYPE, ++ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ info = g_file_enumerator_next_file (enumerator, NULL, &local_error); ++ g_assert_no_error (local_error); ++ g_assert_nonnull (info); ++ ++ g_assert_cmpstr (g_file_info_get_name (info), ==, "source"); ++ g_assert_cmpint (g_file_info_get_file_type (info), ==, G_FILE_TYPE_REGULAR); ++ ++ g_clear_object (&info); ++ ++ info = g_file_enumerator_next_file (enumerator, NULL, &local_error); ++ g_assert_no_error (local_error); ++ g_assert_null (info); ++ ++ g_file_enumerator_close (enumerator, NULL, &local_error); ++ g_assert_no_error (local_error); ++ g_clear_object (&enumerator); ++ ++ /* Double-check that `target` doesn’t exist */ ++ g_assert_false (g_file_query_exists (target_file, NULL)); ++ ++ /* Check the content of `source`. */ ++ g_file_load_contents (source_file, ++ NULL, ++ &contents, ++ &length, ++ NULL, ++ &local_error); ++ g_assert_no_error (local_error); ++ g_assert_cmpstr (contents, ==, new_contents); ++ g_assert_cmpuint (length, ==, strlen (new_contents)); ++ g_free (contents); ++ ++ /* Tidy up. */ ++ g_file_delete (source_file, NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ g_file_delete (tmpdir, NULL, &local_error); ++ g_assert_no_error (local_error); ++ ++ g_clear_object (&target_file); ++ g_clear_object (&source_file); ++ g_clear_object (&tmpdir); ++#else /* if !G_OS_UNIX */ ++ g_test_skip ("Symlink replacement tests can only be run on Unix") ++#endif ++} ++ + static void + on_file_deleted (GObject *object, + GAsyncResult *result, +@@ -1754,6 +1861,7 @@ main (int argc, char *argv[]) + g_test_add_data_func ("/file/async-create-delete/4096", GINT_TO_POINTER (4096), test_create_delete); + g_test_add_func ("/file/replace-load", test_replace_load); + g_test_add_func ("/file/replace-cancel", test_replace_cancel); ++ g_test_add_func ("/file/replace-symlink", test_replace_symlink); + g_test_add_func ("/file/async-delete", test_async_delete); + #ifdef G_OS_UNIX + g_test_add_func ("/file/copy-preserve-mode", test_copy_preserve_mode); +-- +2.30.1 + -- cgit 1.4.1 From 57853d69fe14ea97ea1eb084a74944c44998a4bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Mar 2021 10:31:00 +0100 Subject: gnu: java-openjfx-graphics: Install native libraries. * gnu/packages/java.scm (java-openjfx-graphics)[arguments]: Add phase copy-missing-file and build-native. [native-inputs]: Add missing source file. --- gnu/packages/java.scm | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 09c5506fd7..37716e01d5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2696,10 +2696,101 @@ distribution."))) `(#:jar-name "java-openjfx-graphics.jar" #:source-dir "modules/graphics/src/main/java" #:tests? #f; require X - #:test-dir "modules/graphics/src/test")) + #:test-dir "modules/graphics/src/test" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-missing-file + (lambda* (#:key inputs #:allow-other-keys) + (let ((target "modules/graphics/src/main/native-prism-sw/JNativeSurface.c")) + (copy-file (assoc-ref inputs "JNativeSurface.c") target) + ;; XXX: looks like the missing file we found isn't *quite* + ;; compatible... + (substitute* target + (("case TYPE_INT_ARGB:") ""))))) + (add-after 'build 'build-native + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((jdk (assoc-ref inputs "jdk")) + (class-file->class-name + (lambda (class-file) + (string-map (lambda (c) + (if (char=? c #\/) #\. c)) + (string-drop-right class-file + (string-length ".class")))))) + (setenv "CPPFLAGS" + (string-append "-DINLINE=inline " + "-DLINUX " + "-I" jdk "/include " + "-I" jdk "/include/linux " + "-I " (getcwd) "/build/classes/include " + "-I " (getcwd) "/modules/graphics/src/main/native-prism-sw")) + + ;; Instructions have been adapted from buildSrc/linux.gradle + (with-directory-excursion "build/classes" + ;; Build prism + (mkdir-p "include") + + ;; Generate headers for prism + (apply invoke "javah" "-d" "include" "-cp" "." + (map class-file->class-name + (append (find-files "com/sun/prism/impl" "\\.class$") + (find-files "com/sun/prism" "PresentableState.*\\.class$")))) + + ;; ...then for prism_sw + (apply invoke "javah" "-d" "include" "-cp" "." + (map class-file->class-name + (find-files "com/sun/pisces" "\\.class$"))) + + ;; ...and for prism_es2 + (apply invoke "javah" "-d" "include" "-cp" "." + (map class-file->class-name + (find-files "com/sun/prism/es2" "\\.class$"))))) + + (with-directory-excursion "netbeans/native-prism" + (invoke "make" "CONF=Release")) + (with-directory-excursion "netbeans/native-prism-sw" + (invoke "make" "CONF=Release")) + ;; TODO: This fails due to unknown EGL procedure names + #; + (with-directory-excursion "netbeans/native-prism-es2" + (invoke "make" "CONF=Release")) + + (let* ((out (assoc-ref outputs "out")) + (dir ,(match (%current-system) + ("i686-linux" + "i386") + ((or "armhf-linux" "aarch64-linux") + "arm") + ((or "x86_64-linux") + "amd64") + (_ "unknown"))) + (target (string-append out "/share/" dir "/"))) + (mkdir-p target) + (for-each (lambda (file) + (let ((new-name + (string-append "lib" + (string-map + (lambda (c) + (if (char=? c #\-) #\_ c)) + (string-drop (basename file) + (string-length "libnative-")))))) + (copy-file file + (string-append target new-name)))) + (find-files "netbeans" "\\.so$")))))))) (propagated-inputs `(("java-openjfx-base" ,java-openjfx-base) ("java-swt" ,java-swt))) + ;; XXX: for unknown reasons + ;; modules/graphics/src/main/native-prism-sw/JNativeSurface.c is missing + ;; in this revision. + (native-inputs + `(("JNativeSurface.c" + ,(origin + (method url-fetch) + (uri "https://raw.githubusercontent.com/openjdk/jfx/8u20-b02\ +/modules/graphics/src/main/native-prism-sw/JNativeSurface.c") + (sha256 + (base32 + "1kp15wbnd6rn0nciczp5ibq0ikby2yysvx1gnz5fa05vl2mm8mbm")))))) (description "OpenJFX is a client application platform for desktop, mobile and embedded systems built on Java. Its goal is to produce a modern, efficient, and fully featured toolkit for developing rich client -- cgit 1.4.1 From 453e101fc3f7dac9aabcd6122cf05fb7925103c7 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 03:51:45 -0500 Subject: gnu: gdk-pixbuf: Fix CVE-2020-29385. * gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gtk.scm (gdk-pixbuf)[replacement]: New field. (gdk-pixbuf/fixed): New variable. (gdk-pixbuf+svg): Use package/inherit. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 14 +++++- .../patches/gdk-pixbuf-CVE-2020-29385.patch | 53 ++++++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ce30d1db1c..c0020fad41 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1056,6 +1056,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdb-hurd.patch \ %D%/packages/patches/gd-fix-tests-on-i686.patch \ %D%/packages/patches/gd-brect-bounds.patch \ + %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geary-CVE-2020-24661.patch \ %D%/packages/patches/genimage-signedness.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9e81c9650..ee2c91264f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès -;;; Copyright © 2014, 2015, 2017, 2018, 2019 Mark H Weaver +;;; Copyright © 2014, 2015, 2017, 2018, 2019, 2021 Mark H Weaver ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2015 Paul van der Walt @@ -557,6 +557,7 @@ highlighting and other features typical of a source code editor.") (package (name "gdk-pixbuf") (version "2.40.0") + (replacement gdk-pixbuf/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -613,11 +614,20 @@ in the GNOME project.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/gdk-pixbuf/"))) +(define gdk-pixbuf/fixed + (package + (inherit gdk-pixbuf) + (source (origin + (inherit (package-source gdk-pixbuf)) + (patches + (append (search-patches "gdk-pixbuf-CVE-2020-29385.patch") + (origin-patches (package-source gdk-pixbuf)))))))) + ;; To build gdk-pixbuf with SVG support, we need librsvg, and librsvg depends ;; on gdk-pixbuf, so this new varibale. Also, librsvg adds 90MiB to the ;; closure size. (define-public gdk-pixbuf+svg - (package (inherit gdk-pixbuf) + (package/inherit gdk-pixbuf (name "gdk-pixbuf+svg") (inputs `(("librsvg" ,librsvg) diff --git a/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch b/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch new file mode 100644 index 0000000000..e6ac4de00b --- /dev/null +++ b/gnu/packages/patches/gdk-pixbuf-CVE-2020-29385.patch @@ -0,0 +1,53 @@ +Fix CVE-2020-29385. Note that we omit the binary test file +tests/test-images/fail/hang_114.gif from the following commit, to avoid +requiring 'git' to apply the patch. + + +From bdd3acbd48a575d418ba6bf1b32d7bda2fae1c81 Mon Sep 17 00:00:00 2001 +From: Robert Ancell +Date: Mon, 30 Nov 2020 12:26:12 +1300 +Subject: [PATCH] gif: Fix LZW decoder accepting invalid LZW code. + +The code value after a reset wasn't being validated, which means we would +accept invalid codes. This could cause an infinite loop in the decoder. + +Fixes CVE-2020-29385 + +Fixes https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/164 +--- + gdk-pixbuf/lzw.c | 13 +++++++------ + tests/test-images/fail/hang_114.gif | Bin 0 -> 5561 bytes + 2 files changed, 7 insertions(+), 6 deletions(-) + create mode 100644 tests/test-images/fail/hang_114.gif + +diff --git a/gdk-pixbuf/lzw.c b/gdk-pixbuf/lzw.c +index 9e052a6f7..105daf2b1 100644 +--- a/gdk-pixbuf/lzw.c ++++ b/gdk-pixbuf/lzw.c +@@ -195,19 +195,20 @@ lzw_decoder_feed (LZWDecoder *self, + if (self->last_code != self->clear_code && self->code_table_size < MAX_CODES) { + if (self->code < self->code_table_size) + add_code (self, self->code); +- else if (self->code == self->code_table_size) ++ else + add_code (self, self->last_code); +- else { +- /* Invalid code received - just stop here */ +- self->last_code = self->eoi_code; +- return output_length; +- } + + /* When table is full increase code size */ + if (self->code_table_size == (1 << self->code_size) && self->code_size < LZW_CODE_MAX) + self->code_size++; + } + ++ /* Invalid code received - just stop here */ ++ if (self->code >= self->code_table_size) { ++ self->last_code = self->eoi_code; ++ return output_length; ++ } ++ + /* Convert codeword into indexes */ + n_written += write_indexes (self, output + n_written, output_length - n_written); + } -- cgit 1.4.1 From bc16eacc99e801ac30cbe2aa649a2be3ca5c102a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 05:24:36 -0500 Subject: gnu: cairo: Fix CVE-2018-19876 and CVE-2020-35492. * gnu/packages/patches/cairo-CVE-2018-19876.patch, gnu/packages/patches/cairo-CVE-2020-35492.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/gtk.scm (cairo)[replacement]: New field. (cairo/fixed): New variable. (cairo-xcb): Use package/inherit. --- gnu/local.mk | 2 + gnu/packages/gtk.scm | 13 ++++++- gnu/packages/patches/cairo-CVE-2018-19876.patch | 37 +++++++++++++++++++ gnu/packages/patches/cairo-CVE-2020-35492.patch | 49 +++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/cairo-CVE-2018-19876.patch create mode 100644 gnu/packages/patches/cairo-CVE-2020-35492.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c0020fad41..fd070d6791 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,6 +871,8 @@ dist_patch_DATA = \ %D%/packages/patches/blender-2.79-python-3.8-fix.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ %D%/packages/patches/byobu-writable-status.patch \ + %D%/packages/patches/cairo-CVE-2018-19876.patch \ + %D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index ee2c91264f..9fc4967181 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -124,6 +124,7 @@ tools have full access to view and control running applications.") (package (name "cairo") (version "1.16.0") + (replacement cairo/fixed) (source (origin (method url-fetch) (uri (string-append "https://cairographics.org/releases/cairo-" @@ -174,6 +175,15 @@ affine transformation (scale, rotation, shear, etc.).") (license license:lgpl2.1) ; or Mozilla Public License 1.1 (home-page "https://cairographics.org/"))) +(define cairo/fixed + (package + (inherit cairo) + (source (origin + (inherit (package-source cairo)) + (patches (append (search-patches "cairo-CVE-2018-19876.patch" + "cairo-CVE-2020-35492.patch") + (origin-patches (package-source cairo)))))))) + (define-public cairo-sans-poppler ;; Variant used to break the dependency cycle between Poppler and Cairo. (package/inherit cairo @@ -181,8 +191,7 @@ affine transformation (scale, rotation, shear, etc.).") (properties `((hidden? . #t))))) (define-public cairo-xcb - (package - (inherit cairo) + (package/inherit cairo (name "cairo-xcb") (inputs `(("mesa" ,mesa) diff --git a/gnu/packages/patches/cairo-CVE-2018-19876.patch b/gnu/packages/patches/cairo-CVE-2018-19876.patch new file mode 100644 index 0000000000..c0fba2ecaa --- /dev/null +++ b/gnu/packages/patches/cairo-CVE-2018-19876.patch @@ -0,0 +1,37 @@ +Copied from Debian. + +From: Carlos Garcia Campos +Date: Mon, 19 Nov 2018 12:33:07 +0100 +Subject: ft: Use FT_Done_MM_Var instead of free when available in + cairo_ft_apply_variations + +Fixes a crash when using freetype >= 2.9 + +[This is considered to be security-sensitive because WebKitGTK+ sets its +own memory allocator, which is not compatible with system free(), making +this a remotely triggerable denial of service or memory corruption.] + +Origin: upstream, commit:90e85c2493fdfa3551f202ff10282463f1e36645 +Bug: https://gitlab.freedesktop.org/cairo/cairo/merge_requests/5 +Bug-Debian: https://bugs.debian.org/916389 +Bug-CVE: CVE-2018-19876 +--- + src/cairo-ft-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c +index 325dd61..981973f 100644 +--- a/src/cairo-ft-font.c ++++ b/src/cairo-ft-font.c +@@ -2393,7 +2393,11 @@ skip: + done: + free (coords); + free (current_coords); ++#if HAVE_FT_DONE_MM_VAR ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var); ++#else + free (ft_mm_var); ++#endif + } + } + diff --git a/gnu/packages/patches/cairo-CVE-2020-35492.patch b/gnu/packages/patches/cairo-CVE-2020-35492.patch new file mode 100644 index 0000000000..e8b90fa5c5 --- /dev/null +++ b/gnu/packages/patches/cairo-CVE-2020-35492.patch @@ -0,0 +1,49 @@ +Copied from Debian. + +From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 +From: Heiko Lewin +Date: Tue, 15 Dec 2020 16:48:19 +0100 +Subject: [PATCH] Fix mask usage in image-compositor + +[trimmed test case, since not used in Debian build] + +--- + src/cairo-image-compositor.c | 8 ++-- + +--- cairo-1.16.0.orig/src/cairo-image-compositor.c ++++ cairo-1.16.0/src/cairo-image-compositor.c +@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_rende + unsigned num_spans) + { + cairo_image_span_renderer_t *r = abstract_renderer; +- uint8_t *m; ++ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); + int x0; + + if (num_spans == 0) + return CAIRO_STATUS_SUCCESS; + + x0 = spans[0].x; +- m = r->_buf; ++ m = base; + do { + int len = spans[1].x - spans[0].x; + if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { +@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_rende + spans[0].x, y, + spans[1].x - spans[0].x, h); + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else if (spans[0].coverage == 0x0) { + if (spans[0].x != x0) { +@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_rende + #endif + } + +- m = r->_buf; ++ m = base; + x0 = spans[1].x; + } else { + *m++ = spans[0].coverage; -- cgit 1.4.1 From f5e1909d9f7de91f6e257a877b4805c1b0747997 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 04:16:03 -0500 Subject: gnu: gvfs: Update to 1.40.2 [security fixes]. Includes fixes for CVE-2019-12447, CVE-2019-12448, CVE-2019-12449, and CVE-2019-12795. * gnu/packages/gnome.scm (gvfs): Update to 1.40.2. --- 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 5a8b6b30e8..9849611892 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus -;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Rene Saavedra @@ -6459,7 +6459,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (define-public gvfs (package (name "gvfs") - (version "1.40.1") + (version "1.40.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gvfs/" @@ -6467,7 +6467,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") "gvfs-" version ".tar.xz")) (sha256 (base32 - "1cfnzamr4mvgpf6yhm28lh9cafy9z6842s8jpbqnfizfxybg8ylj")) + "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx")) ;; This patch may be removed when upgrading to version 1.46.x. (patches (search-patches "gvfs-add-support-for-libplist-2.2.patch")))) -- cgit 1.4.1 From db7c3410d58a5730c0a4a33e94fa1a2b832fe20a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 04:54:19 -0500 Subject: gnu: gnome-shell: Update to 3.34.5. * gnu/packages/gnome.scm (gnome-shell): Update to 3.34.5. --- 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 9849611892..f38401f726 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8440,7 +8440,7 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "3.34.2") + (version "3.34.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8448,7 +8448,7 @@ properties, screen resolution, and other GNOME parameters.") name "-" version ".tar.xz")) (sha256 (base32 - "0k9vq2gh1nhdd6fpp7jnwx37qxaakawiqw1xnlfjvq5g5zdn8ckh")) + "0l3mdn7g2c22mdhrqkxvvc1pk2w0v32f2v4a6n1phvaalwcg75nj")) (patches (search-patches "gnome-shell-theme.patch" "gnome-shell-disable-test.patch")) (modules '((guix build utils))) -- cgit 1.4.1 From 825cc7e0d4bc7f052831f905a92945678441fb55 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 12 Mar 2021 05:36:54 -0500 Subject: gnu: gnome-shell: Fix CVE-2020-17489. * gnu/packages/patches/gnome-shell-CVE-2020-17489.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/gnome.scm (gnome-shell)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 3 +- .../patches/gnome-shell-CVE-2020-17489.patch | 46 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/gnome-shell-CVE-2020-17489.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index fd070d6791..46f76c16cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1134,6 +1134,7 @@ dist_patch_DATA = \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-shell-disable-test.patch \ + %D%/packages/patches/gnome-shell-CVE-2020-17489.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-todo-delete-esource-duplicate.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f38401f726..d2881dbec6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8449,7 +8449,8 @@ properties, screen resolution, and other GNOME parameters.") (sha256 (base32 "0l3mdn7g2c22mdhrqkxvvc1pk2w0v32f2v4a6n1phvaalwcg75nj")) - (patches (search-patches "gnome-shell-theme.patch" + (patches (search-patches "gnome-shell-CVE-2020-17489.patch" + "gnome-shell-theme.patch" "gnome-shell-disable-test.patch")) (modules '((guix build utils))) (snippet diff --git a/gnu/packages/patches/gnome-shell-CVE-2020-17489.patch b/gnu/packages/patches/gnome-shell-CVE-2020-17489.patch new file mode 100644 index 0000000000..4b7748950e --- /dev/null +++ b/gnu/packages/patches/gnome-shell-CVE-2020-17489.patch @@ -0,0 +1,46 @@ +From 05b7aec747282f62212b605249d518280ff80059 Mon Sep 17 00:00:00 2001 +From: Ray Strode +Date: Mon, 27 Jul 2020 10:58:22 -0400 +Subject: [PATCH] loginDialog: Reset auth prompt on vt switch before fade in + +At the moment, if a user switches to the login screen vt, +the login screen fades in whatever was on screen prior, and +then does a reset. + +It makes more sense to reset first, so we fade in what the +user is going to interact with instead of what they interacted +with before. + +Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2997 +--- + js/gdm/loginDialog.js | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js +index c3f90dc58..6b35ebb16 100644 +--- a/js/gdm/loginDialog.js ++++ b/js/gdm/loginDialog.js +@@ -920,16 +920,15 @@ var LoginDialog = GObject.registerClass({ + if (this.opacity == 255 && this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING) + return; + ++ if (this._authPrompt.verificationStatus !== AuthPrompt.AuthPromptStatus.NOT_VERIFYING) ++ this._authPrompt.reset(); ++ + this._bindOpacity(); + this.ease({ + opacity: 255, + duration: _FADE_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, +- onComplete: () => { +- if (this._authPrompt.verificationStatus != AuthPrompt.AuthPromptStatus.NOT_VERIFYING) +- this._authPrompt.reset(); +- this._unbindOpacity(); +- } ++ onComplete: () => this._unbindOpacity(), + }); + } + +-- +2.30.1 + -- cgit 1.4.1 From ddc1cddded1c643368023175d141ba80d87fd32e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Mar 2021 12:58:28 +0100 Subject: gnu: snakemake: Update to 5.32.2. * gnu/packages/python-xyz.scm (snakemake): Update to 5.32.2. [arguments]: Adjust patch in call-wrapper-not-wrapped-snakemake. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4dae9eee9e..361626a128 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7942,13 +7942,13 @@ Python.") (define-public snakemake (package (name "snakemake") - (version "5.7.1") + (version "5.32.2") (source (origin (method url-fetch) (uri (pypi-uri "snakemake" version)) (sha256 - (base32 "1pnpvvn8n2a78cg360wz3ldmpqrsm2wzi0c0dmvki9fnsw6fxdas")))) + (base32 "13013gdavwvyj1qr9xfi9fpwhb3km8c3z53bja5b7ic3sb2z6dgz")))) (build-system python-build-system) (arguments ;; TODO: Package missing test dependencies. @@ -7960,7 +7960,7 @@ Python.") ;; this by calling the snakemake wrapper instead. (add-after 'unpack 'call-wrapper-not-wrapped-snakemake (lambda* (#:key outputs #:allow-other-keys) - (substitute* "snakemake/executors.py" + (substitute* "snakemake/executors/__init__.py" (("\\{sys.executable\\} -m snakemake") (string-append (assoc-ref outputs "out") "/bin/snakemake"))) -- cgit 1.4.1 From 5fa4814b4f12b82a7a7747bfacfb45b0348eae1e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 12 Mar 2021 13:09:26 +0100 Subject: gnu: lisp-repl-core-dumper: Update to 0.7.0. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Update to 0.7.0. --- 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 a60f49a04a..c91bf55ac5 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1090,7 +1090,7 @@ assembler, PEG) is less than 1MB.") (define-public lisp-repl-core-dumper (package (name "lisp-repl-core-dumper") - (version "0.6.0") + (version "0.7.0") (source (origin (method git-fetch) @@ -1099,7 +1099,7 @@ assembler, PEG) is less than 1MB.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0f9rfi8lszm0v35f9vfxxdvwm8fc5909qdsrwj7c2jvl6iaa9n6p")))) + (base32 "0yfsyxj462yi3bx587yssp4gwb54jdm6fjk9q93gjrfv8a65ilp7")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit 1.4.1 From 4d0fdde344509c4fa37bc7e5dd1e391fd50a8b2e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Mar 2021 13:34:13 +0100 Subject: gnu: Add python-statannot. * gnu/packages/python-science.scm (python-statannot): New variable. --- gnu/packages/python-science.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index a1e2b57669..5221f41af7 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2020 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Hartmut Goebel @@ -531,3 +531,29 @@ serialization and deserialization of numerical and array data types provided by numpy using the highly efficient @code{msgpack} format. Serialization of Python's native complex data types is also supported.") (license license:bsd-3))) + +(define-public python-statannot + (package + (name "python-statannot") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "statannot" version)) + (sha256 + (base32 + "1f8c2sylzr7lpjbyqxsqlp9xi8rj3d8c9hfh98x4jbb83zxc4026")))) + (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy) + ("python-seaborn" ,python-seaborn) + ("python-matplotlib" ,python-matplotlib) + ("python-pandas" ,python-pandas) + ("python-scipy" ,python-scipy))) + (home-page + "https://github.com/webermarcolivier/statannot") + (synopsis "Add annotations to existing plots generated by seaborn") + (description + "This is a Python package to compute statistical test and add statistical +annotations on an existing boxplots and barplots generated by seaborn.") + (license license:expat))) -- cgit 1.4.1 From 456355c2538be4288b407ace7d0d769fb16a2076 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Mar 2021 13:56:12 +0100 Subject: gnu: Add python-upsetplot. * gnu/packages/python-science.scm (python-upsetplot): New variable. --- gnu/packages/python-science.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 5221f41af7..391d37dcce 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -557,3 +557,40 @@ Python's native complex data types is also supported.") "This is a Python package to compute statistical test and add statistical annotations on an existing boxplots and barplots generated by seaborn.") (license license:expat))) + +(define-public python-upsetplot + (package + (name "python-upsetplot") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "UpSetPlot" version)) + (sha256 + (base32 + "0kwljcmsvrxm33y3ssham2bwv4a5m31mv96y9h18va0cv7s3mqn1")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-versioning + (lambda _ + (substitute* "setup.py" + (("pytest-cov<2.6") "pytest-cov")))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "-v" "--doctest-modules")))))) + (propagated-inputs + `(("python-matplotlib" ,python-matplotlib) + ("python-pandas" ,python-pandas))) + (native-inputs + `(("python-pytest-runner" ,python-pytest-runner) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://upsetplot.readthedocs.io") + (synopsis "Draw UpSet plots with Pandas and Matplotlib") + (description + "This is a Python implementation of UpSet plots by Lex et al. +UpSet plots are used to visualize set overlaps; like Venn diagrams but more +readable.") + (license license:bsd-3))) -- cgit 1.4.1 From 8a51be3cddf2b829e4234a23aad347fb2381281a Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 12 Mar 2021 14:06:18 +0100 Subject: gnu: Add r-prereg. * gnu/packages/cran.scm (r-prereg): New variable. --- gnu/packages/cran.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9ec0d952c0..b65288390b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2020 Eric Brown ;;; Copyright © 2020 Peter Lo ;;; Copyright © 2020 Rafael Luque Leiva -;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020, 2021 Lars-Dominik Braun ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2020 Arun Isaac @@ -27290,3 +27290,26 @@ from a source package. @code{pkgdown} converts your documentation, vignettes, README file, and more to HTML making it easy to share information about your package online.") (license license:expat))) + +(define-public r-prereg + (package + (name "r-prereg") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "prereg" version)) + (sha256 + (base32 + "0bck13iiaxwpqh0rd45mp1s5d8z62ggg0wa7rmyi8a65aywiypsi")))) + (properties `((upstream-name . "prereg"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rmarkdown" ,r-rmarkdown))) + (home-page "https://github.com/crsh/prereg") + (synopsis + "R Markdown Templates to preregister Scientific Studies") + (description + "This package provides a collection of templates to author +preregistration documents for scientific studies in PDF format.") + (license license:gpl3))) -- cgit 1.4.1 From 23bfd152c286b7b6fd9ca6921ec9f78474e973db Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 12 Mar 2021 14:09:45 +0100 Subject: gnu: Add r-ez. * gnu/packages/cran.scm (r-ez): New variable. --- 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 b65288390b..e6b205077b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27313,3 +27313,43 @@ package online.") "This package provides a collection of templates to author preregistration documents for scientific studies in PDF format.") (license license:gpl3))) + +(define-public r-ez + (package + (name "r-ez") + (version "4.4-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ez" version)) + (sha256 + (base32 + "0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq")))) + (properties `((upstream-name . "ez"))) + (build-system r-build-system) + (propagated-inputs + `(("r-car" ,r-car) + ("r-ggplot2" ,r-ggplot2) + ("r-lme4" ,r-lme4) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-mgcv" ,r-mgcv) + ("r-plyr" ,r-plyr) + ("r-reshape2" ,r-reshape2) + ("r-scales" ,r-scales) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/mike-lawrence/ez") + (synopsis "Easy Analysis and Visualization of Factorial Experiments") + (description + "Facilitates easy analysis of factorial experiments, including purely +within-Ss designs (a.k.a. \"repeated measures\"), purely between-Ss designs, +and mixed within-and-between-Ss designs. The functions in this package aim to +provide simple, intuitive and consistent specification of data analysis and +visualization. Visualization functions also include design visualization for +pre-analysis data auditing, and correlation matrix visualization. Finally, +this package includes functions for non-parametric analysis, including +permutation tests and bootstrap resampling. The bootstrap function obtains +predictions either by cell means or by more advanced/powerful mixed effects +models, yielding predictions and confidence intervals that may be easily +visualized at any level of the experiment's design.") + (license license:gpl2+))) -- cgit 1.4.1 From 3a82f1fba2acdcaacd40d4730f3f84ccf0717392 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 12 Mar 2021 14:22:17 +0100 Subject: gnu: Add r-quantpsyc. * gnu/packages/statistics.scm (r-quantpsyc): New variable. --- gnu/packages/statistics.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6ef89185f1..65a210a63b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5931,3 +5931,24 @@ popular stats packages like SAS, Stata and SPSS.") (home-page "https://github.com/WizardMac/ReadStat") (license license:expat))) +(define-public r-quantpsyc + (package + (name "r-quantpsyc") + (version "1.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "QuantPsyc" version)) + (sha256 + (base32 + "1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93")))) + (properties `((upstream-name . "QuantPsyc"))) + (build-system r-build-system) + (propagated-inputs + `(("r-boot" ,r-boot) ("r-mass" ,r-mass))) + (home-page "https://cran.r-project.org/web/packages/QuantPsyc/") + (synopsis "Quantitative Psychology Tools") + (description + "Contains functions useful for data screening, testing moderation, +mediation and estimating power.") + (license license:gpl2+))) -- cgit 1.4.1 From 28df54d77675a2247de17a8e45f57a0c613fb152 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 12 Mar 2021 14:26:13 +0100 Subject: gnu: Add r-clubsandwich. * gnu/packages/statistics.scm (r-clubsandwich): New variable. --- gnu/packages/statistics.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 65a210a63b..3f3c4e3912 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5952,3 +5952,41 @@ popular stats packages like SAS, Stata and SPSS.") "Contains functions useful for data screening, testing moderation, mediation and estimating power.") (license license:gpl2+))) + +(define-public r-clubsandwich + (package + (name "r-clubsandwich") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "clubSandwich" version)) + (sha256 + (base32 + "0jazgka18bb5n58d5sn94q7rc9sac82qrpl2i5b4rkx9q2pb39cn")))) + (properties `((upstream-name . "clubSandwich"))) + (build-system r-build-system) + (propagated-inputs + `(("r-sandwich" ,r-sandwich))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/jepusto/clubSandwich") + (synopsis "Cluster-Robust (Sandwich) Variance Estimators with Small-Sample +Corrections") + (description + "Provides several cluster-robust variance estimators (i.e., +sandwich estimators) for ordinary and weighted least squares linear regression +models, including the bias-reduced linearization estimator introduced by Bell +and McCaffrey (2002) +@url{http://www.statcan.gc.ca/pub/12-001-x/2002002/article/9058-eng.pdf} and +developed further by Pustejovsky and Tipton (2017) +@url{doi:10.1080/07350015.2016.1247004}. The package includes functions for estimating +the variance- covariance matrix and for testing single- and multiple- +contrast hypotheses based on Wald test statistics. Tests of single regression +coefficients use Satterthwaite or saddle-point corrections. Tests of multiple- +contrast hypotheses use an approximation to Hotelling's T-squared distribution. +Methods are provided for a variety of fitted models, including @code{lm()} and +@code{mlm} objects, @code{glm()}, ivreg (from package @code{AER}), @code{plm()} +(from package @code{plm}), @code{gls()} and @code{lme()} (from @code{nlme}), +@code{robu()} (from @code{robumeta}), and @code{rma.uni()} and @code{rma.mv()} +(from @code{metafor}).") + (license license:gpl3))) -- cgit 1.4.1 From 8a8e8198ec4ebedd0400c8adcd85e15da3d43ca0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 12 Mar 2021 14:29:07 +0100 Subject: gnu: Add r-puniform. * gnu/packages/statistics.scm (r-puniform): New variable. --- gnu/packages/statistics.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 3f3c4e3912..9761b9ceaf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5990,3 +5990,71 @@ Methods are provided for a variety of fitted models, including @code{lm()} and @code{robu()} (from @code{robumeta}), and @code{rma.uni()} and @code{rma.mv()} (from @code{metafor}).") (license license:gpl3))) + +(define-public r-puniform + (package + (name "r-puniform") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "puniform" version)) + (sha256 + (base32 + "0v2977y9cwjx74xk0ig745g09wn7nrcsrg4f6v315sglsm18iaa8")))) + (properties `((upstream-name . "puniform"))) + (build-system r-build-system) + (propagated-inputs + `(("r-adgoftest" ,r-adgoftest) + ("r-metafor" ,r-metafor) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo))) + (home-page + "https://github.com/RobbievanAert/puniform") + (synopsis + "Meta-Analysis Methods Correcting for Publication Bias") + (description + "This package provides meta-analysis methods that correct for publication +bias and outcome reporting bias. Four methods and a visual tool are currently +included in the package. + +@enumerate +@item The p-uniform method as described in van Assen, van Aert, and Wicherts +(2015) @url{doi:10.1037/met0000025} can be used for estimating the average +effect size, testing the null hypothesis of no effect, and testing for +publication bias using only the statistically significant effect sizes of +primary studies. + +@item The p-uniform* method as described in van Aert and van Assen (2019) +@url{doi:10.31222/osf.io/zqjr9}. This method is an extension of the p-uniform +method that allows for estimation of the average effect size and the +between-study variance in a meta-analysis, and uses both the statistically +significant and nonsignificant effect sizes. + +@item The hybrid method as described in van Aert and van Assen (2017) +@url{doi:10.3758/s13428-017-0967-6}. The hybrid method is a meta-analysis +method for combining an original study and replication and while taking into +account statistical significance of the original study. The p-uniform and +hybrid method are based on the statistical theory that the distribution of +p-values is uniform conditional on the population effect size. + +@item +The fourth method in the package is the Snapshot Bayesian Hybrid Meta-Analysis +Method as described in van Aert and van Assen (2018) +@url{doi:10.1371/journal.pone.0175302}. This method computes posterior +probabilities for four true effect sizes (no, small, medium, and large) based +on an original study and replication while taking into account publication bias +in the original study. The method can also be used for computing the required +sample size of the replication akin to power analysis in null hypothesis +significance testing. +@end enumerate + +The meta-plot is a visual tool for meta-analysis that +provides information on the primary studies in the meta-analysis, the results +of the meta-analysis, and characteristics of the research on the effect under +study (van Assen and others, 2020). + +Helper functions to apply the Correcting for Outcome Reporting Bias (CORB) +method to correct for outcome reporting bias in a meta-analysis (van Aert & +Wicherts, 2020).") + (license license:gpl2+))) -- cgit 1.4.1 From 4f617bfb8ee04df9bd572928ba13dda265f4366f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 11 Mar 2021 15:46:59 +0100 Subject: gnu: r-circrnaprofiler: Update to 1.4.2. * gnu/packages/bioconductor.scm (r-circrnaprofiler): Update to 1.4.2. --- 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 0899a013d5..04778e668a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Simon Tournier +;;; Copyright © 2019, 2020, 2021 Simon Tournier ;;; Copyright © 2020 Peter Lo ;;; Copyright © 2020, 2021 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka @@ -6813,14 +6813,14 @@ accessibility data.") (define-public r-circrnaprofiler (package (name "r-circrnaprofiler") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "circRNAprofiler" version)) (sha256 (base32 - "1rwpl9a5p5242aiapik0vf4ywqh7m6phzl8z8qmzcy0imbx7mpbn")))) + "0r1hfm3pc7c71irzmxmdwc27ns9hkymz4vhb4pqbli4xn37q7cg8")))) (properties `((upstream-name . "circRNAprofiler"))) (build-system r-build-system) -- cgit 1.4.1 From 8c8d365ca32987ce0a80369b6e195b81918a22d2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 11 Mar 2021 15:47:00 +0100 Subject: gnu: r-chemminer: Update to 3.42.2. * gnu/packages/bioconductor.scm (r-chemminer): Update to 3.42.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 04778e668a..35dab51595 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7915,14 +7915,14 @@ visualizing RNA-sequencing datasets and differentially expressed genes.") (define-public r-chemminer (package (name "r-chemminer") - (version "3.42.1") + (version "3.42.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChemmineR" version)) (sha256 (base32 - "1853w19042c53whdnrfg1v8f07wpswf2si8q4613yrcamzg2zjkx")))) + "10d8h6w24h4s7l02zzv6q46w3yiqsjizip7mf11cvkmd6p7qxfl9")))) (properties `((upstream-name . "ChemmineR"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 2528cad4510d871f56f88e3fb2b35c22d3113855 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 11 Mar 2021 15:47:01 +0100 Subject: gnu: r-bioassayr: Update to 1.28.2. * gnu/packages/bioconductor.scm (r-bioassayr): Update to 1.28.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 35dab51595..0c8d448a67 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7956,14 +7956,14 @@ structures.") (define-public r-bioassayr (package (name "r-bioassayr") - (version "1.28.0") + (version "1.28.2") (source (origin (method url-fetch) (uri (bioconductor-uri "bioassayR" version)) (sha256 (base32 - "0vxnd8wnhjdfqh47nc6y1ffiy5r9a6n3g2hyk1r9bv6vhrd0ns3f")))) + "0ylnnm31jkmi8zz78kngqv36yn6i5lvjp1i27v59svw13m4r03g5")))) (properties `((upstream-name . "bioassayR"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 323aec6ad970c0028e43912130c4615fe1e0e537 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Mar 2021 14:40:06 +0100 Subject: gnu: r-bioassayr: Update home page. * gnu/packages/bioconductor.scm (r-bioassayr)[home-page]: Follow permanent redirect. --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0c8d448a67..ae8bae4bd9 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7976,7 +7976,7 @@ structures.") ("r-xml" ,r-xml))) (native-inputs `(("r-knitr" ,r-knitr))) - (home-page "https://github.com/TylerBackman/bioassayR") + (home-page "https://github.com/girke-lab/bioassayR") (synopsis "Cross-target analysis of small molecule bioactivity") (description "bioassayR is a computational tool that enables simultaneous analysis of -- cgit 1.4.1 From a35ea5fed953df46cb33e517487e0eac528ec027 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:54 +0100 Subject: gnu: r-genefilter: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-genefilter): Move from here... * gnu/packages/bioconductor.scm (r-genefilter): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/bioinformatics.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 ae8bae4bd9..f6f7766b49 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1487,6 +1487,34 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-genefilter + (package + (name "r-genefilter") + (version "1.72.1") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "genefilter" version)) + (sha256 + (base32 + "1c6h3qnjvphs977qhv5vafvsb108r0q7xhaayly6qv6adqfn94rn")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran) + ("r-knitr" ,r-knitr))) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-survival" ,r-survival))) + (home-page "https://bioconductor.org/packages/genefilter") + (synopsis "Filter genes from high-throughput experiments") + (description + "This package provides basic functions for filtering genes from +high-throughput sequencing experiments.") + (license license:artistic2.0))) + (define-public r-hpar (package (name "r-hpar") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b258b796f7..557961b664 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,34 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-genefilter - (package - (name "r-genefilter") - (version "1.72.1") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "genefilter" version)) - (sha256 - (base32 - "1c6h3qnjvphs977qhv5vafvsb108r0q7xhaayly6qv6adqfn94rn")))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran) - ("r-knitr" ,r-knitr))) - (propagated-inputs - `(("r-annotate" ,r-annotate) - ("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-survival" ,r-survival))) - (home-page "https://bioconductor.org/packages/genefilter") - (synopsis "Filter genes from high-throughput experiments") - (description - "This package provides basic functions for filtering genes from -high-throughput sequencing experiments.") - (license license:artistic2.0))) - (define-public r-deseq2 (package (name "r-deseq2") -- cgit 1.4.1 From 373545855dd8434add9523d3cd51be66d60e8503 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:55 +0100 Subject: gnu: r-deseq2: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-deseq2): Move from here... * gnu/packages/bioconductor.scm (r-deseq2): ...to here. --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 38 -------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index f6f7766b49..685ce10d6a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1487,6 +1487,44 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-deseq2 + (package + (name "r-deseq2") + (version "1.30.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DESeq2" version)) + (sha256 + (base32 + "0q2f9cywrcmp1p7ii8f45g4dk4hsnjflq3yqhsxgnpv9fw338qpp")))) + (properties `((upstream-name . "DESeq2"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-genefilter" ,r-genefilter) + ("r-geneplotter" ,r-geneplotter) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-iranges" ,r-iranges) + ("r-locfit" ,r-locfit) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-s4vectors" ,r-s4vectors) + ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DESeq2") + (synopsis "Differential gene expression analysis") + (description + "This package provides functions to estimate variance-mean dependence in +count data from high-throughput nucleotide sequencing assays and test for +differential expression based on a model using the negative binomial +distribution.") + (license license:lgpl3+))) + (define-public r-genefilter (package (name "r-genefilter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 557961b664..8f3e3f996b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,44 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-deseq2 - (package - (name "r-deseq2") - (version "1.30.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "DESeq2" version)) - (sha256 - (base32 - "0q2f9cywrcmp1p7ii8f45g4dk4hsnjflq3yqhsxgnpv9fw338qpp")))) - (properties `((upstream-name . "DESeq2"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-genefilter" ,r-genefilter) - ("r-geneplotter" ,r-geneplotter) - ("r-genomicranges" ,r-genomicranges) - ("r-ggplot2" ,r-ggplot2) - ("r-iranges" ,r-iranges) - ("r-locfit" ,r-locfit) - ("r-rcpp" ,r-rcpp) - ("r-rcpparmadillo" ,r-rcpparmadillo) - ("r-s4vectors" ,r-s4vectors) - ("r-summarizedexperiment" ,r-summarizedexperiment))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DESeq2") - (synopsis "Differential gene expression analysis") - (description - "This package provides functions to estimate variance-mean dependence in -count data from high-throughput nucleotide sequencing assays and test for -differential expression based on a model using the negative binomial -distribution.") - (license license:lgpl3+))) - (define-public r-dexseq (package (name "r-dexseq") -- cgit 1.4.1 From d769b10714ba4ab96a27933b6840265cf6e06f37 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:56 +0100 Subject: gnu: r-dexseq: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-dexseq): Move from here... * gnu/packages/bioconductor.scm (r-dexseq): ...to here. --- gnu/packages/bioconductor.scm | 45 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 45 ----------------------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 685ce10d6a..0c36b01545 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1525,6 +1525,51 @@ differential expression based on a model using the negative binomial distribution.") (license license:lgpl3+))) +(define-public r-dexseq + (package + (name "r-dexseq") + (version "1.36.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "DEXSeq" version)) + (sha256 + (base32 + "0wfjb42xcr4wjy8a654b74411dky8hp6sp8xdwf0sxqgsxy106qi")))) + (properties `((upstream-name . "DEXSeq"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biomart" ,r-biomart) + ("r-deseq2" ,r-deseq2) + ("r-genefilter" ,r-genefilter) + ("r-geneplotter" ,r-geneplotter) + ("r-genomicranges" ,r-genomicranges) + ("r-hwriter" ,r-hwriter) + ("r-iranges" ,r-iranges) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-statmod" ,r-statmod) + ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DEXSeq") + (synopsis "Inference of differential exon usage in RNA-Seq") + (description + "This package is focused on finding differential exon usage using RNA-seq +exon counts between samples with different experimental designs. It provides +functions that allows the user to make the necessary statistical tests based +on a model that uses the negative binomial distribution to estimate the +variance between biological replicates and generalized linear models for +testing. The package also provides functions for the visualization and +exploration of the results.") + (license license:gpl3+))) + (define-public r-genefilter (package (name "r-genefilter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8f3e3f996b..41372879fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,51 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-dexseq - (package - (name "r-dexseq") - (version "1.36.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "DEXSeq" version)) - (sha256 - (base32 - "0wfjb42xcr4wjy8a654b74411dky8hp6sp8xdwf0sxqgsxy106qi")))) - (properties `((upstream-name . "DEXSeq"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biomart" ,r-biomart) - ("r-deseq2" ,r-deseq2) - ("r-genefilter" ,r-genefilter) - ("r-geneplotter" ,r-geneplotter) - ("r-genomicranges" ,r-genomicranges) - ("r-hwriter" ,r-hwriter) - ("r-iranges" ,r-iranges) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rsamtools" ,r-rsamtools) - ("r-s4vectors" ,r-s4vectors) - ("r-statmod" ,r-statmod) - ("r-stringr" ,r-stringr) - ("r-summarizedexperiment" ,r-summarizedexperiment))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DEXSeq") - (synopsis "Inference of differential exon usage in RNA-Seq") - (description - "This package is focused on finding differential exon usage using RNA-seq -exon counts between samples with different experimental designs. It provides -functions that allows the user to make the necessary statistical tests based -on a model that uses the negative binomial distribution to estimate the -variance between biological replicates and generalized linear models for -testing. The package also provides functions for the visualization and -exploration of the results.") - (license license:gpl3+))) - (define-public r-annotationforge (package (name "r-annotationforge") -- cgit 1.4.1 From ff92c2873c0c8ab9fa6e90020d656aac47dfb088 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:57 +0100 Subject: gnu: r-annotationforge: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-annotationforge): Move from here... * gnu/packages/bioconductor.scm (r-annotationforge): ...to here. --- gnu/packages/bioconductor.scm | 32 ++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 32 -------------------------------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0c36b01545..c698178067 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1487,6 +1487,38 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-annotationforge + (package + (name "r-annotationforge") + (version "1.32.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "AnnotationForge" version)) + (sha256 + (base32 + "0y3820dkvwz09wlmz9drx6gqpsr9cwppaiz40zafwfxbz65y8px7")))) + (properties + `((upstream-name . "AnnotationForge"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-dbi" ,r-dbi) + ("r-rcurl" ,r-rcurl) + ("r-rsqlite" ,r-rsqlite) + ("r-s4vectors" ,r-s4vectors) + ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/AnnotationForge") + (synopsis "Code for building annotation database packages") + (description + "This package provides code for generating Annotation packages and their +databases. Packages produced are intended to be used with AnnotationDbi.") + (license license:artistic2.0))) + (define-public r-deseq2 (package (name "r-deseq2") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 41372879fe..575158577c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,38 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-annotationforge - (package - (name "r-annotationforge") - (version "1.32.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "AnnotationForge" version)) - (sha256 - (base32 - "0y3820dkvwz09wlmz9drx6gqpsr9cwppaiz40zafwfxbz65y8px7")))) - (properties - `((upstream-name . "AnnotationForge"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-dbi" ,r-dbi) - ("r-rcurl" ,r-rcurl) - ("r-rsqlite" ,r-rsqlite) - ("r-s4vectors" ,r-s4vectors) - ("r-xml" ,r-xml))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/AnnotationForge") - (synopsis "Code for building annotation database packages") - (description - "This package provides code for generating Annotation packages and their -databases. Packages produced are intended to be used with AnnotationDbi.") - (license license:artistic2.0))) - (define-public r-rbgl (package (name "r-rbgl") -- cgit 1.4.1 From f44079bc2151979cde33704fec73f1da1726a2f5 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:58 +0100 Subject: gnu: r-rbgl: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-rbgl): Move from here... * gnu/packages/bioconductor.scm (r-rbgl): ...to here. --- gnu/packages/bioconductor.scm | 23 +++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 23 ----------------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c698178067..1c298d61cf 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1650,6 +1650,29 @@ high-throughput sequencing experiments.") the Human Protein Atlas project.") (license license:artistic2.0))) +(define-public r-rbgl + (package + (name "r-rbgl") + (version "1.66.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "RBGL" version)) + (sha256 + (base32 + "016vyzgixb3gjpzi21rbs6ngnnqcxr77krwjjf1ldnzzj8vqrqsz")))) + (properties `((upstream-name . "RBGL"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bh" ,r-bh) + ("r-graph" ,r-graph))) + (home-page "https://www.bioconductor.org/packages/RBGL") + (synopsis "Interface to the Boost graph library") + (description + "This package provides a fairly extensive and comprehensive interface to +the graph algorithms contained in the Boost library.") + (license license:artistic2.0))) + (define-public r-regioner (package (name "r-regioner") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 575158577c..788f780f8d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,29 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-rbgl - (package - (name "r-rbgl") - (version "1.66.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "RBGL" version)) - (sha256 - (base32 - "016vyzgixb3gjpzi21rbs6ngnnqcxr77krwjjf1ldnzzj8vqrqsz")))) - (properties `((upstream-name . "RBGL"))) - (build-system r-build-system) - (propagated-inputs - `(("r-bh" ,r-bh) - ("r-graph" ,r-graph))) - (home-page "https://www.bioconductor.org/packages/RBGL") - (synopsis "Interface to the Boost graph library") - (description - "This package provides a fairly extensive and comprehensive interface to -the graph algorithms contained in the Boost library.") - (license license:artistic2.0))) - (define-public r-gseabase (package (name "r-gseabase") -- cgit 1.4.1 From 031fdda47af642d4316e128f9ca0c3fe2cf8b4bb Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:57:59 +0100 Subject: gnu: r-gseabase: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-gseabase): Move from here... * gnu/packages/bioconductor.scm (r-gseabase): ...to here. --- gnu/packages/bioconductor.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1c298d61cf..a89797adc8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1630,6 +1630,35 @@ exploration of the results.") high-throughput sequencing experiments.") (license license:artistic2.0))) +(define-public r-gseabase + (package + (name "r-gseabase") + (version "1.52.1") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "GSEABase" version)) + (sha256 + (base32 + "0dawh1kjmf6921jm77j2s2phrq5237pjc4sdh8fkln89gf48zx6i")))) + (properties `((upstream-name . "GSEABase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-graph" ,r-graph) + ("r-xml" ,r-xml))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GSEABase") + (synopsis "Gene set enrichment data structures and methods") + (description + "This package provides classes and methods to support @dfn{Gene Set +Enrichment Analysis} (GSEA).") + (license license:artistic2.0))) + (define-public r-hpar (package (name "r-hpar") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 788f780f8d..4daaacd0cc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,35 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-gseabase - (package - (name "r-gseabase") - (version "1.52.1") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "GSEABase" version)) - (sha256 - (base32 - "0dawh1kjmf6921jm77j2s2phrq5237pjc4sdh8fkln89gf48zx6i")))) - (properties `((upstream-name . "GSEABase"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotate" ,r-annotate) - ("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-graph" ,r-graph) - ("r-xml" ,r-xml))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GSEABase") - (synopsis "Gene set enrichment data structures and methods") - (description - "This package provides classes and methods to support @dfn{Gene Set -Enrichment Analysis} (GSEA).") - (license license:artistic2.0))) - (define-public r-category (package (name "r-category") -- cgit 1.4.1 From 4e7cf96c9f12c31152f4c67a1ce4d7d2ad9b2461 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:58:00 +0100 Subject: gnu: r-category: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-category): Move from here... * gnu/packages/bioconductor.scm (r-category): ...to here. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a89797adc8..aa172c5244 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1519,6 +1519,37 @@ microarrays.") databases. Packages produced are intended to be used with AnnotationDbi.") (license license:artistic2.0))) +(define-public r-category + (package + (name "r-category") + (version "2.56.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "Category" version)) + (sha256 + (base32 + "0m77wpnica0h2ia9ajdaiga4plgz1s9wls6pdnxzk7kwl8a68wkr")))) + (properties `((upstream-name . "Category"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-genefilter" ,r-genefilter) + ("r-graph" ,r-graph) + ("r-gseabase" ,r-gseabase) + ("r-matrix" ,r-matrix) + ("r-rbgl" ,r-rbgl) + ("r-dbi" ,r-dbi))) + (home-page "https://bioconductor.org/packages/Category") + (synopsis "Category analysis") + (description + "This package provides a collection of tools for performing category +analysis.") + (license license:artistic2.0))) + (define-public r-deseq2 (package (name "r-deseq2") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4daaacd0cc..ae3a8013f0 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,37 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-category - (package - (name "r-category") - (version "2.56.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "Category" version)) - (sha256 - (base32 - "0m77wpnica0h2ia9ajdaiga4plgz1s9wls6pdnxzk7kwl8a68wkr")))) - (properties `((upstream-name . "Category"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotate" ,r-annotate) - ("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-genefilter" ,r-genefilter) - ("r-graph" ,r-graph) - ("r-gseabase" ,r-gseabase) - ("r-matrix" ,r-matrix) - ("r-rbgl" ,r-rbgl) - ("r-dbi" ,r-dbi))) - (home-page "https://bioconductor.org/packages/Category") - (synopsis "Category analysis") - (description - "This package provides a collection of tools for performing category -analysis.") - (license license:artistic2.0))) - (define-public r-gostats (package (name "r-gostats") -- cgit 1.4.1 From 2a9705768808ff8b76bf38a7ae9445b2c756ba46 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:58:01 +0100 Subject: gnu: r-gostats: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-gostats): Move from here... * gnu/packages/bioconductor.scm (r-gostats): ...to here. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index aa172c5244..a4618ec90a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1661,6 +1661,37 @@ exploration of the results.") high-throughput sequencing experiments.") (license license:artistic2.0))) +(define-public r-gostats + (package + (name "r-gostats") + (version "2.56.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "GOstats" version)) + (sha256 + (base32 + "18q8p0fv9fl2r6zjxknfjwqxr69dlyxy6c8amzn6c6dwjq1cxk6j")))) + (properties `((upstream-name . "GOstats"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-annotationdbi" ,r-annotationdbi) + ("r-annotationforge" ,r-annotationforge) + ("r-biobase" ,r-biobase) + ("r-category" ,r-category) + ("r-go-db" ,r-go-db) + ("r-graph" ,r-graph) + ("r-rgraphviz" ,r-rgraphviz) + ("r-rbgl" ,r-rbgl))) + (home-page "https://bioconductor.org/packages/GOstats") + (synopsis "Tools for manipulating GO and microarrays") + (description + "This package provides a set of tools for interacting with GO and +microarray data. A variety of basic manipulation tools for graphs, hypothesis +testing and other simple calculations.") + (license license:artistic2.0))) + (define-public r-gseabase (package (name "r-gseabase") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ae3a8013f0..c4713fc5cf 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,37 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-gostats - (package - (name "r-gostats") - (version "2.56.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "GOstats" version)) - (sha256 - (base32 - "18q8p0fv9fl2r6zjxknfjwqxr69dlyxy6c8amzn6c6dwjq1cxk6j")))) - (properties `((upstream-name . "GOstats"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotate" ,r-annotate) - ("r-annotationdbi" ,r-annotationdbi) - ("r-annotationforge" ,r-annotationforge) - ("r-biobase" ,r-biobase) - ("r-category" ,r-category) - ("r-go-db" ,r-go-db) - ("r-graph" ,r-graph) - ("r-rgraphviz" ,r-rgraphviz) - ("r-rbgl" ,r-rbgl))) - (home-page "https://bioconductor.org/packages/GOstats") - (synopsis "Tools for manipulating GO and microarrays") - (description - "This package provides a set of tools for interacting with GO and -microarray data. A variety of basic manipulation tools for graphs, hypothesis -testing and other simple calculations.") - (license license:artistic2.0))) - (define-public r-shortread (package (name "r-shortread") -- cgit 1.4.1 From 8957efa8ef940685811b9e55eb7178ecd33abb40 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:58:02 +0100 Subject: gnu: r-shortread: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-shortread): Move from here... * gnu/packages/bioconductor.scm (r-shortread): ...to here. --- gnu/packages/bioconductor.scm | 43 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 43 ----------------------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index a4618ec90a..283ae7adf8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1845,6 +1845,49 @@ reports together for a particular project that can be viewed in a web browser.") (license license:artistic2.0))) +(define-public r-shortread + (package + (name "r-shortread") + (version "1.48.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "ShortRead" version)) + (sha256 + (base32 + "0w4m8d3h660mmr2ymp206r1n4aqssxmkv8yxkbr5y1swrahxzfk9")))) + (properties `((upstream-name . "ShortRead"))) + (build-system r-build-system) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("r-rhtslib" ,r-rhtslib) + ("r-hwriter" ,r-hwriter) + ("r-iranges" ,r-iranges) + ("r-lattice" ,r-lattice) + ("r-latticeextra" ,r-latticeextra) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector) + ("r-zlibbioc" ,r-zlibbioc))) + (home-page "https://bioconductor.org/packages/ShortRead") + (synopsis "FASTQ input and manipulation tools") + (description + "This package implements sampling, iteration, and input of FASTQ files. +It includes functions for filtering and trimming reads, and for generating a +quality assessment report. Data are represented as +@code{DNAStringSet}-derived objects, and easily manipulated for a diversity of +purposes. The package also contains legacy support for early single-end, +ungapped alignment formats.") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c4713fc5cf..f363d64550 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,49 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-shortread - (package - (name "r-shortread") - (version "1.48.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "ShortRead" version)) - (sha256 - (base32 - "0w4m8d3h660mmr2ymp206r1n4aqssxmkv8yxkbr5y1swrahxzfk9")))) - (properties `((upstream-name . "ShortRead"))) - (build-system r-build-system) - (inputs - `(("zlib" ,zlib))) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biostrings" ,r-biostrings) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicalignments" ,r-genomicalignments) - ("r-genomicranges" ,r-genomicranges) - ("r-rhtslib" ,r-rhtslib) - ("r-hwriter" ,r-hwriter) - ("r-iranges" ,r-iranges) - ("r-lattice" ,r-lattice) - ("r-latticeextra" ,r-latticeextra) - ("r-rsamtools" ,r-rsamtools) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector) - ("r-zlibbioc" ,r-zlibbioc))) - (home-page "https://bioconductor.org/packages/ShortRead") - (synopsis "FASTQ input and manipulation tools") - (description - "This package implements sampling, iteration, and input of FASTQ files. -It includes functions for filtering and trimming reads, and for generating a -quality assessment report. Data are represented as -@code{DNAStringSet}-derived objects, and easily manipulated for a diversity of -purposes. The package also contains legacy support for early single-end, -ungapped alignment formats.") - (license license:artistic2.0))) - (define-public r-systempiper (package (name "r-systempiper") -- cgit 1.4.1 From df6b3c25bbaabd5153c2472a5082c24934e16492 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 8 Mar 2021 18:58:28 +0100 Subject: gnu: r-systempiper: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-systempiper): Move from here... * gnu/packages/bioconductor.scm (r-systempiper): ...to here. --- gnu/packages/bioconductor.scm | 54 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 54 ----------------------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 283ae7adf8..526c2eecbb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1888,6 +1888,60 @@ purposes. The package also contains legacy support for early single-end, ungapped alignment formats.") (license license:artistic2.0))) +(define-public r-systempiper + (package + (name "r-systempiper") + (version "1.24.3") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "systemPipeR" version)) + (sha256 + (base32 + "0ffazyl2q9plbhwlxi04s3fvnli6qj95n7bkjc21535bbi08xfki")))) + (properties `((upstream-name . "systemPipeR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotate" ,r-annotate) + ("r-assertthat" ,r-assertthat) + ("r-batchtools" ,r-batchtools) + ("r-biostrings" ,r-biostrings) + ("r-deseq2" ,r-deseq2) + ("r-dot" ,r-dot) + ("r-edger" ,r-edger) + ("r-genomicfeatures" ,r-genomicfeatures) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-go-db" ,r-go-db) + ("r-gostats" ,r-gostats) + ("r-iranges" ,r-iranges) + ("r-limma" ,r-limma) + ("r-magrittr" ,r-magrittr) + ("r-pheatmap" ,r-pheatmap) + ("r-rjson" ,r-rjson) + ("r-rsamtools" ,r-rsamtools) + ("r-rsvg" ,r-rsvg) + ("r-shortread" ,r-shortread) + ("r-stringr" ,r-stringr) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-yaml" ,r-yaml) + ("r-variantannotation" ,r-variantannotation))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/tgirke/systemPipeR") + (synopsis "Next generation sequencing workflow and reporting environment") + (description + "This R package provides tools for building and running automated +end-to-end analysis workflows for a wide range of @dfn{next generation +sequence} (NGS) applications such as RNA-Seq, ChIP-Seq, VAR-Seq and Ribo-Seq. +Important features include a uniform workflow interface across different NGS +applications, automated report generation, and support for running both R and +command-line software, such as NGS aligners or peak/variant callers, on local +computers or compute clusters. Efficient handling of complex sample sets and +experimental designs is facilitated by a consistently implemented sample +annotation infrastructure.") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f363d64550..b2d10457fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,60 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-systempiper - (package - (name "r-systempiper") - (version "1.24.3") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "systemPipeR" version)) - (sha256 - (base32 - "0ffazyl2q9plbhwlxi04s3fvnli6qj95n7bkjc21535bbi08xfki")))) - (properties `((upstream-name . "systemPipeR"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotate" ,r-annotate) - ("r-assertthat" ,r-assertthat) - ("r-batchtools" ,r-batchtools) - ("r-biostrings" ,r-biostrings) - ("r-deseq2" ,r-deseq2) - ("r-dot" ,r-dot) - ("r-edger" ,r-edger) - ("r-genomicfeatures" ,r-genomicfeatures) - ("r-genomicranges" ,r-genomicranges) - ("r-ggplot2" ,r-ggplot2) - ("r-go-db" ,r-go-db) - ("r-gostats" ,r-gostats) - ("r-iranges" ,r-iranges) - ("r-limma" ,r-limma) - ("r-magrittr" ,r-magrittr) - ("r-pheatmap" ,r-pheatmap) - ("r-rjson" ,r-rjson) - ("r-rsamtools" ,r-rsamtools) - ("r-rsvg" ,r-rsvg) - ("r-shortread" ,r-shortread) - ("r-stringr" ,r-stringr) - ("r-summarizedexperiment" ,r-summarizedexperiment) - ("r-yaml" ,r-yaml) - ("r-variantannotation" ,r-variantannotation))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://github.com/tgirke/systemPipeR") - (synopsis "Next generation sequencing workflow and reporting environment") - (description - "This R package provides tools for building and running automated -end-to-end analysis workflows for a wide range of @dfn{next generation -sequence} (NGS) applications such as RNA-Seq, ChIP-Seq, VAR-Seq and Ribo-Seq. -Important features include a uniform workflow interface across different NGS -applications, automated report generation, and support for running both R and -command-line software, such as NGS aligners or peak/variant callers, on local -computers or compute clusters. Efficient handling of complex sample sets and -experimental designs is facilitated by a consistently implemented sample -annotation infrastructure.") - (license license:artistic2.0))) - (define-public r-grohmm (package (name "r-grohmm") -- cgit 1.4.1 From a56b331e07f5bc44b8d2474578d295e290c9ba76 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 12 Mar 2021 14:00:41 +0100 Subject: gnu: Add gnuais. * gnu/packages/radio.scm (gnuais): New variable. --- gnu/packages/radio.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index b7a546eb53..32a642f8f8 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -35,14 +35,18 @@ #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages curl) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages engineering) #:use-module (gnu packages fltk) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) + #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -1311,3 +1315,44 @@ methods: programs using the library: cw, cwgen, cwcp and xcwcp. The programs are intended for people who want to learn receiving and sending morse code.") (license license:gpl2+))) + +(define-public gnuais + (package + (name "gnuais") + (version "0.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubund/gnuais") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rik5fdfslszdn3yvj769jzmnv9pirzf76ki33bjjzk7nkabbnlm")))) + (build-system cmake-build-system) + (native-inputs + `(("mariadb-dev" ,mariadb "dev") + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("curl" ,curl) + ("gtk+" ,gtk+) + ("libsoup" ,libsoup-minimal) + ("mariadb-lib" ,mariadb "lib") + ("osm-gps-map" ,osm-gps-map) + ("pulseaudio" ,pulseaudio))) + (arguments + `(#:tests? #f ; No test suite + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "src/cfgfile.c" + (("/usr/share/") + (string-append (assoc-ref outputs "out") "/share/")))))))) + (home-page "http://gnuais.sourceforge.net/") + (synopsis "AIS message demodulator and decoder") + (description + "This program contains algorithms to demodulate and decode AIS (Automatic +Identification System) messages sent by ships and coast stations.") + (license license:gpl2+))) -- cgit 1.4.1 From 77ee8af58cbf9225961b891071e1f6838cb7fc65 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 11 Mar 2021 21:18:32 +0000 Subject: gnu: stumpwm-contrib: Update to 0.0.1-3.a7dc1c. * gnu/packages/wm.scm (stumpwm-contrib): Update to 0.0.1-3.a7dc1c. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/wm.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5d2b36f312..d6a967bece 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -39,9 +39,10 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 B. Wilson -;; Copyright © 2020 Niklas Eklund +;;; Copyright © 2020 Niklas Eklund ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1783,8 +1784,8 @@ productive, customizable lisp based systems.") (delete 'cleanup))))))) (define stumpwm-contrib - (let ((commit "920f8fc1488f7953f205e1dda4c2ecbbbda56d63") - (revision "2")) + (let ((commit "a7dc1c663d04e6c73a4772c8a6ad56a34381096a") + (revision "3")) (package (name "stumpwm-contrib") (version (git-version "0.0.1" revision commit)) ;no upstream release @@ -1796,7 +1797,7 @@ productive, customizable lisp based systems.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0giac390bq95ag41xkxqp8jjrhfx1wpgglz7jg5rkm0wjhcwmyml")))) + (base32 "09akdaaya7lga5lzbq1aj1filsyjwvflghkidpmr0nk0jz5xx1g7")))) (build-system asdf-build-system/sbcl) (inputs `(("stumpwm" ,stumpwm "lib"))) -- cgit 1.4.1 From 2e5ac371e799cb91354ffafaf8af2da37d11fa3f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 11 Mar 2021 21:25:21 +0000 Subject: gnu: Add sbcl-stumpwm-disk. * gnu/packages/wm.scm: (sbcl-stumpwm-disk): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/wm.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d6a967bece..9cab0cb3db 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2020,6 +2020,26 @@ layouts in StumpWM.") (description "Modeline support for CPU info.") (license license:gpl3+))) +(define-public sbcl-stumpwm-disk + (package + (inherit stumpwm-contrib) + (name "sbcl-stumpwm-disk") + (arguments + '(#:asd-systems '("disk") + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "modeline/disk") #t))))) + (inputs + `(("stumpwm" ,stumpwm "lib") + ("cl-diskspace" ,sbcl-cl-diskspace) + ("cl-mount-info" ,sbcl-cl-mount-info))) + (home-page "https://github.com/stumpwm/stumpwm-contrib") + (synopsis "StumpWM modeline support to show disk usage") + (description "StumpWM modeline support to show disk usage") + (license (list license:gpl2+ license:gpl3+)))) + (define-public sbcl-stumpwm-mem (package (inherit stumpwm-contrib) -- cgit 1.4.1 From 97b45977f49470d70070b2ae4c66c5b802b172a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Mar 2021 14:35:51 +0100 Subject: gnu: guile-zlib: Update to 0.1.0. * gnu/packages/guile.scm (guile-zlib): Update to 0.1.0. --- gnu/packages/guile.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8bf250a625..0dad390275 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -815,7 +815,7 @@ manipulate repositories of the Git version control system.") (define-public guile-zlib (package (name "guile-zlib") - (version "0.0.1") + (version "0.1.0") (source (origin ;; XXX: Do not use "git-fetch" method here that would create and @@ -823,12 +823,13 @@ manipulate repositories of the Git version control system.") ;; in the same method. (method url-fetch) (uri - (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/" + (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 + ;; content hash: 1ip18nzwnczqyhn9cpzxkm9vzpi5fz5sy96cgjhmp7cwhnkmv6zv (base32 - "1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i")))) + "1safz7rrbdf1d98x3lgx5v74kivpyf9n1v6pdyy22vd0f2sjdir5")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit 1.4.1 From b89714b40aed8e94f5bee33ea7e6ff98a5166355 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 22:56:21 +0100 Subject: gnu: rust-url-2: Update to 2.2.1. * gnu/packages/crates-io.scm (rust-url-2): Update to 2.2.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa46a98b4d..3497a608e9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46522,7 +46522,7 @@ untrusted inputs in Rust.") (define-public rust-url-2 (package (name "rust-url") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) @@ -46531,7 +46531,7 @@ untrusted inputs in Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0vlpd0c7y9yv4x5vmb6qlnkxkj63r20wv2rysyg48l3kh6qg42ar")))) + "12qzdzgcvmc5l1fk4psldiipx80423mikb6g4a9qwb322d0rdkcw")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 0f0589b8cd9d1c572cb45c9d2811f84efd6183e0 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 22:57:53 +0100 Subject: gnu: Add rust-deadpool-0.7. * gnu/packages/crates-io.scm (rust-deadpool-0.7): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3497a608e9..a001d9ca96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10629,6 +10629,34 @@ GF(2^n). This trait is implemented for 64, 128 and 256 bit block sizes. Big-endian order is used. WARNING: Block must be aligned!") (license (list license:expat license:asl2.0)))) +(define-public rust-deadpool-0.7 + (package + (name "rust-deadpool") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "deadpool" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vb18xvhmyg6gvvq5vrcqmy4x26ryrmkqpsgwmb4bvkav1wn24ix")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-config" ,rust-config-0.10) + ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/bikeshedder/deadpool") + (synopsis "Dead simple async pool") + (description + "Deadpool is a dead simple async pool for connections and objects of any +type.") + (license (list license:expat license:asl2.0)))) + (define-public rust-decimal-2 (package (name "rust-decimal") -- cgit 1.4.1 From a7c80603607bf08110ffc8500208165ce1f71f0e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 23:02:52 +0100 Subject: gnu: rust-ring-0.16: Update to 0.16.20. * gnu/packages/crates-io.scm (rust-ring-0.16): Update to 0.16.20. [arguments]: Skip tests. --- gnu/packages/crates-io.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a001d9ca96..9773b10382 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32657,19 +32657,20 @@ functionality as retain but gives mutable borrow to the predicate.") (define-public rust-ring-0.16 (package (name "rust-ring") - (version "0.16.12") + (version "0.16.20") (source (origin (method url-fetch) (uri (crate-uri "ring" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "033sb54dlmiqdivc8v9ykkq3v08lzy0syjf5k1nag2gfcknai98v")))) + (base32 "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) + `(#:tests? #false ;missing file + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) ("rust-spin" ,rust-spin-0.5) ("rust-untrusted" ,rust-untrusted-0.7) ("rust-web-sys" ,rust-web-sys-0.3) @@ -32678,7 +32679,7 @@ functionality as retain but gives mutable borrow to the predicate.") ("rust-cc" ,rust-cc-1)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/briansmith/ring") (synopsis "Safe, fast, small crypto using Rust") (description "This package provided safe, fast, small crypto using Rust.") -- cgit 1.4.1 From 6fe6ab50bdd0d3306c2d22a6e7acfe92d7aea95f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 23:05:16 +0100 Subject: gnu: rust-webpki-0.21: Update to 0.21.4. * gnu/packages/crates-io.scm (rust-webpki-0.21): Update to 0.21.4. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9773b10382..540159abe7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48073,14 +48073,14 @@ WebAssembly binary files.") (define-public rust-webpki-0.21 (package (name "rust-webpki") - (version "0.21.2") + (version "0.21.4") (source (origin (method url-fetch) (uri (crate-uri "webpki" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vv3x2alvczfy6jhx79c9h00d1nliqf7s5jlvcd6npc6f8chxxgi")))) + (base32 "1sm4i8c5bw3bdhi7mjk0wpvwx55hvsmyn0k2lpa4cb161038rqxq")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;; tests fail to build "missing file tests/ed25519/ee.der" -- cgit 1.4.1 From 10a1ab0d26216a877aae3b3f625092a873c8f970 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 11 Mar 2021 23:09:01 +0100 Subject: gnu: Add rust-async-tls-0.10. * gnu/packages/crates-io.scm (rust-async-tls-0.10): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 540159abe7..9d55aa9671 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3251,6 +3251,32 @@ crate.") (("rust-crossbeam" ,rust-crossbeam-0.7) ("rust-futures" ,rust-futures-0.3)))))) +(define-public rust-async-tls-0.10 + (package + (name "rust-async-tls") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "126by0la2wvfadazfnmw7b6ch07dk9ggny94a3vvzgk2qdpqn3fx")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-rustls" ,rust-rustls-0.19) + ("rust-webpki" ,rust-webpki-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.21)))) + (home-page "https://github.com/async-std/async-tls") + (synopsis "Asynchronous TLS/SSL streams using Rustls") + (description + "This package provides asynchronous TLS/SSL streams using Rustls.") + (license (list license:expat license:asl2.0)))) + (define-public rust-async-trait-0.1 (package (name "rust-async-trait") -- cgit 1.4.1 From 7d29bfd56714c7994e77ed553c9ed0fcf2a48b6f Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Mar 2021 15:17:55 +0100 Subject: gnu: rust-http-client-6: Update to 6.3.4. * gnu/packages/crates-io.scm (rust-http-client-6): Update to 6.3.4. --- gnu/packages/crates-io.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9d55aa9671..f2f5ae1001 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -18183,14 +18183,14 @@ HTTP request or response body.") (define-public rust-http-client-6 (package (name "rust-http-client") - (version "6.2.0") + (version "6.3.4") (source (origin (method url-fetch) (uri (crate-uri "http-client" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "077jw39npmjgm27hij4r825qnxq7lvkmqqlm74llkvll3fvr4001")))) + (base32 "1i0mys38gsih9kkrdbfsmd8p9lnb2nd5wch76cpkjmqk8mm2mhcq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -18198,7 +18198,11 @@ HTTP request or response body.") (("rust-async-h1" ,rust-async-h1-2) ("rust-async-native-tls" ,rust-async-native-tls-0.3) ("rust-async-std" ,rust-async-std-1) + ("rust-async-tls" ,rust-async-tls-0.10) ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-dashmap" ,rust-dashmap-4) + ("rust-deadpool" ,rust-deadpool-0.7) ("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) ("rust-http-types" ,rust-http-types-2) -- cgit 1.4.1 From 1fcaac794170629093f9b34aa99af4ddff479d1a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Mar 2021 15:18:39 +0100 Subject: gnu: rust-surf-2: Update to 2.2.0. * gnu/packages/crates-io.scm (rust-surf-2): Update to 2.2.0. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f2f5ae1001..3e386aed2a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40063,21 +40063,21 @@ cryptographic implementations.") (define-public rust-surf-2 (package (name "rust-surf") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (crate-uri "surf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sl2d1ka01qz3qh4m2l5f2fjs0lhsmvdwl29f3pqzqbgv63wg2bi")))) + (base32 "0a33kw06jspi54rf38ncyqjj8861bid0wxhwzpk1ypkbr8rls59a")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-async-std" ,rust-async-std-1) ("rust-async-trait" ,rust-async-trait-0.1) - ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-cfg-if" ,rust-cfg-if-1) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futures-util" ,rust-futures-util-0.3) ("rust-http-client" ,rust-http-client-6) @@ -40085,7 +40085,7 @@ cryptographic implementations.") ("rust-log" ,rust-log-0.4) ("rust-mime-guess" ,rust-mime-guess-2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-pin-project-lite" ,rust-pin-project-lite-0.1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-web-sys" ,rust-web-sys-0.3)))) -- cgit 1.4.1 From 56613cc61936f9c9031ab04ab1c1634efd2d6575 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Mar 2021 15:28:13 +0100 Subject: gnu: Add rust-minus-3. * gnu/packages/crates-io.scm (rust-minus-3): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3e386aed2a..e1628bf565 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -23500,6 +23500,34 @@ drop-in replacement for miniz.") "This package provides math interoperability standard types.") (license license:expat))) +(define-public rust-minus-3 + (package + (name "rust-minus") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "minus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1f5kx0q3pc04zlaf0dv2vmbzza65kjdr1h9kk8x716fyzc0w5pga")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-async-std" ,rust-async-std-1) + ("rust-crossterm" ,rust-crossterm-0.19) + ("rust-regex" ,rust-regex-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/arijit79/minus") + (synopsis "Asynchronous paging library for Rust") + (description + "Minus is a fast, asynchronous terminal paging library for Rust. It +provides high level functionalities to easily write a pager for any terminal +application.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-0.7 (package (name "rust-mio") -- cgit 1.4.1 From a5a5ec560305a4f59ce4da9b622dfe263eed737d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 12 Mar 2021 15:33:01 +0100 Subject: gnu: nushell: Update to 0.28.0. * gnu/packages/shells.scm (nushell): (rust-nu-cli-0.28): (rust-nu-command-0.28): (rust-nu-data-0.28): (rust-nu-engine-0.28): (rust-nu-errors-0.28): (rust-nu-json-0.28): (rust-nu-plugin-0.28): (rust-nu-plugin-binaryview-0.28): (rust-nu-plugin-chart-0.28): (rust-nu-plugin-fetch-0.28): (rust-nu-plugin-from-sqlite-0.28): (rust-nu-plugin-inc-0.28): (rust-nu-plugin-match-0.28): (rust-nu-plugin-post-0.28): (rust-nu-plugin-ps-0.28): (rust-nu-plugin-s3-0.28): (rust-nu-plugin-sys-0.28): (rust-nu-plugin-textview-0.28): (rust-nu-plugin-to-bson-0.28): (rust-nu-plugin-to-sqlite-0.28): (rust-nu-plugin-tree-0.28): (rust-nu-plugin-xpath-0.28): (rust-nu-protocol-0.28): (rust-nu-source-0.28): (rust-nu-stream-0.28): (rust-nu-test-support-0.28): (rust-nu-value-ext-0.28): Update to 0.28.0. (rust-nu-ansi-term-0.28): New variable. --- gnu/packages/shells.scm | 611 +++++++++++++++++++++++++----------------------- 1 file changed, 320 insertions(+), 291 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 34ef460e10..c348bfde94 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -940,7 +940,7 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.27.1") + (version "0.28.0") (source (origin (method git-fetch) @@ -949,7 +949,7 @@ files and text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "19l42qdqmc9g2qxy4b856z0xlq2g4qrfxj8l7dmdv99vymyfik9j")))) + (base32 "0kbynyk4c0r2qi78mdchx6d0d0c7phz2sxj5cqwsz4gjziibhr7j")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.47 @@ -961,38 +961,38 @@ files and text.") ("rust-futures" ,rust-futures-0.3) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-cli" ,rust-nu-cli-0.27) - ("rust-nu-command" ,rust-nu-command-0.27) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-engine" ,rust-nu-engine-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-parser" ,rust-nu-parser-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.27) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.27) - ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.27) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.27) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.27) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.27) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.27) - ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.27) - ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.27) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.27) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.27) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.27) - ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.27) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.27) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.27) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.27) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.27) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.27) + ("rust-nu-cli" ,rust-nu-cli-0.28) + ("rust-nu-command" ,rust-nu-command-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-engine" ,rust-nu-engine-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-parser" ,rust-nu-parser-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.28) + ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.28) + ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.28) + ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.28) + ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.28) + ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.28) + ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.28) + ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.28) + ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.28) + ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.28) + ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.28) + ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.28) + ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.28) + ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.28) + ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.28) + ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.28) + ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.28) + ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.28) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) #:cargo-development-inputs (("rust-dunce" ,rust-dunce-1) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-test-support" ,rust-nu-test-support-0.28) ("rust-serial-test" ,rust-serial-test-0.5)))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1016,23 +1016,46 @@ directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") (license license:expat))) -(define-public rust-nu-cli-0.27 +(define-public rust-nu-ansi-term-0.28 + (package + (name "rust-nu-ansi-term") + (version "0.28.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nu-ansi-term" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j4ybp1bmlj9lakrp21i180c26x0i9ird08xshsr6607g8nvc73f")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://www.nushell.sh") + (synopsis "Library for ANSI terminal colors and styles (bold, underline)") + (description + "This package is a library for ANSI terminal colors and styles (bold, +underline).") + (license license:expat))) + +(define-public rust-nu-cli-0.28 (package (name "rust-nu-cli") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0rv4g5vfs81gans9npa2yyz893jqnd1yqcc16h0w6xlbsgdx2712")))) + (base32 "0wz3n4b7sz5zynwhs2gn11w1b9cji231f613r23j64a8y26hdzhn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-arboard" ,rust-arboard-1) + (("rust-arboard" ,rust-arboard-1) ("rust-async-recursion" ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) @@ -1069,19 +1092,20 @@ of commands called a ``pipeline''.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-command" ,rust-nu-command-0.27) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-engine" ,rust-nu-engine-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-json" ,rust-nu-json-0.27) - ("rust-nu-parser" ,rust-nu-parser-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-stream" ,rust-nu-stream-0.27) - ("rust-nu-table" ,rust-nu-table-0.27) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-command" ,rust-nu-command-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-engine" ,rust-nu-engine-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-json" ,rust-nu-json-0.28) + ("rust-nu-parser" ,rust-nu-parser-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-stream" ,rust-nu-stream-0.28) + ("rust-nu-table" ,rust-nu-table-0.28) + ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1132,23 +1156,22 @@ of commands called a ``pipeline''.") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-command-0.27 +(define-public rust-nu-command-0.28 (package (name "rust-nu-command") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kpf72fw310mnywv3y678cgxkdzhfss14228p0ndhr2knxz8gdki")))) + (base32 "0n6967w99m4zi52lfb57ycckammcc4im92yl5v2a2r6avnxrby1d")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-arboard" ,rust-arboard-1) + (("rust-arboard" ,rust-arboard-1) ("rust-async-recursion" ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) @@ -1160,6 +1183,7 @@ of commands called a ``pipeline''.") ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-crossterm" ,rust-crossterm-0.19) ("rust-csv" ,rust-csv-1) ("rust-ctrlc" ,rust-ctrlc-3) ("rust-derive-new" ,rust-derive-new-0.5) @@ -1185,19 +1209,20 @@ of commands called a ``pipeline''.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-engine" ,rust-nu-engine-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-json" ,rust-nu-json-0.27) - ("rust-nu-parser" ,rust-nu-parser-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-stream" ,rust-nu-stream-0.27) - ("rust-nu-table" ,rust-nu-table-0.27) - ("rust-nu-test-support" - ,rust-nu-test-support-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-minus" ,rust-minus-3) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-engine" ,rust-nu-engine-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-json" ,rust-nu-json-0.28) + ("rust-nu-parser" ,rust-nu-parser-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-stream" ,rust-nu-stream-0.28) + ("rust-nu-table" ,rust-nu-table-0.28) + ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1245,23 +1270,22 @@ of commands called a ``pipeline''.") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-data-0.27 +(define-public rust-nu-data-0.28 (package (name "rust-nu-data") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0v7rkbrbzjy9794isz1z3dz1kpciadgg7hdfr6107i3qw11j8pq3")))) + (base32 "1gq0izbpaw4lp92ia3d3i14x649r1s6jscabm6xdi2qcxfb420kz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-byte-unit" ,rust-byte-unit-4) ("rust-chrono" ,rust-chrono-0.4) ("rust-derive-new" ,rust-derive-new-0.5) @@ -1270,16 +1294,16 @@ of commands called a ``pipeline''.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-table" ,rust-nu-table-0.27) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-table" ,rust-nu-table-0.28) + ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-query-interface" ,rust-query-interface-0.3) ("rust-serde" ,rust-serde-1) ("rust-toml" ,rust-toml-0.5) @@ -1289,23 +1313,22 @@ of commands called a ``pipeline''.") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-engine-0.27 +(define-public rust-nu-engine-0.28 (package (name "rust-nu-engine") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0a1b8j7k2rawdimxr7yknw6yk0pbs69qj5p73sg4a24pyx0f7zkp")))) + (base32 "135bwcqvb8vhg417yzz90bj396f9hwpbqrdi9kw8fvmfz573z32s")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-async-recursion" ,rust-async-recursion-0.3) + (("rust-async-recursion" ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-bytes" ,rust-bytes-0.5) ("rust-derive-new" ,rust-derive-new-0.5) @@ -1322,14 +1345,15 @@ of commands called a ``pipeline''.") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-parser" ,rust-nu-parser-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-stream" ,rust-nu-stream-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-parser" ,rust-nu-parser-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-stream" ,rust-nu-stream-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) @@ -1337,6 +1361,7 @@ of commands called a ``pipeline''.") ("rust-tempfile" ,rust-tempfile-3) ("rust-term-size" ,rust-term-size-0.3) ("rust-termcolor" ,rust-termcolor-1) + ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) ("rust-users" ,rust-users-0.11)))) (home-page "https://www.nushell.sh") @@ -1344,28 +1369,28 @@ of commands called a ``pipeline''.") (description "Core commands for nushell") (license license:expat))) -(define-public rust-nu-errors-0.27 +(define-public rust-nu-errors-0.28 (package (name "rust-nu-errors") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0h81034cmlra627bnq7kp46s3k61j5xhzbbk61lxybmyg1m5dr74")))) + (base32 "1zb5mmhzjh5cd27ry4z0vgw99ic9k3badxy3ywjk72nzpr5ra303")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1377,41 +1402,42 @@ of commands called a ``pipeline''.") (description "Core error subsystem for Nushell") (license license:expat))) -(define-public rust-nu-json-0.27 +(define-public rust-nu-json-0.28 (package (name "rust-nu-json") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ymdiv606kiw6m79rr7blflk1m7cnk96ahxx5j82ygamkr4mckf3")))) + (base32 "02w1lp7mp1fg7rf5zpdzllvsmd0jlgmig50xxag6a901ic85ddr7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-regex" ,rust-regex-1) - ("rust-serde" ,rust-serde-0.8)))) + ("rust-serde" ,rust-serde-1)))) (home-page "https://www.nushell.sh") (synopsis "Fork of @code{serde-hjson}") (description "This package is a fork of @code{serde-hjson}.") (license license:expat))) -(define-public rust-nu-parser-0.27 +(define-public rust-nu-parser-0.28 (package (name "rust-nu-parser") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zv68yzkrgdk8c50bbsrx3jfsg46621522zgg1glbv0809gcns5p")))) + (base32 "0sixgfj7nsg66gmsqchydkqbhf3dzg5igvcri7dz6qdadi578wb5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1424,10 +1450,10 @@ of commands called a ``pipeline''.") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-test-support" ,rust-nu-test-support-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1438,10 +1464,10 @@ of commands called a ``pipeline''.") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-plugin-0.27 +(define-public rust-nu-plugin-0.28 (package (name "rust-nu-plugin") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) @@ -1449,18 +1475,19 @@ of commands called a ``pipeline''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12x01n7x9bqn0pp5pymmaxmd32gjm6lcs3hd3zhp1y15swrj2kr9")))) + (base32 "1bkxkffcywaam8r55v8ciq42mgimgxzl4x8vb5qzx49a5gjb1831")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-test-support" + ,rust-nu-test-support-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) @@ -1469,29 +1496,29 @@ of commands called a ``pipeline''.") (description "Nushell Plugin") (license license:expat))) -(define-public rust-nu-plugin-binaryview-0.27 +(define-public rust-nu-plugin-binaryview-0.28 (package (name "rust-nu-plugin-binaryview") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0py5wzzf0527dj43k5lah2da9ws9w4n4mi2i6dprswmy4pvplhq1")))) + (base32 "055pc3idf1jsrks0hpx55vazaivxdjfncvbqjjsp89dk1011a3yp")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-crossterm" ,rust-crossterm-0.19) + (("rust-crossterm" ,rust-crossterm-0.19) ("rust-image" ,rust-image-0.22) ("rust-neso" ,rust-neso-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-rawkey" ,rust-rawkey-0.1)))) (home-page "https://www.nushell.sh") @@ -1500,29 +1527,29 @@ of commands called a ``pipeline''.") "This package provides a binary viewer plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.27 +(define-public rust-nu-plugin-chart-0.28 (package (name "rust-nu-plugin-chart") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07im3fcd9lxfnj3b81j1jky3yl1sfx3gqgcf8n46gfqh5gmgismb")))) + (base32 "114kg6vspympi2fr14sgvwnlinwa7s2vwv8f9a9p1kwqg4qa281s")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-cli" ,rust-nu-cli-0.27) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-cli" ,rust-nu-cli-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-tui" ,rust-tui-0.14)))) (home-page "https://www.nushell.sh") (synopsis "Plugin to display charts") @@ -1530,56 +1557,57 @@ of commands called a ``pipeline''.") "This package provides a plugin to display charts in Nushell.") (license license:expat))) -(define-public rust-nu-plugin-fetch-0.27 +(define-public rust-nu-plugin-fetch-0.28 (package (name "rust-nu-plugin-fetch") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06mgd7vis7g3br3acswq24v4ffi15zq5fi0i7v65jz418vapvmzp")))) + (base32 "1v7pc58m8gi5zscvyviy8j5zbn30hxqlb37c0grgda7635vqhq31")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-surf" ,rust-surf-1) + ("rust-mime" ,rust-mime-0.3) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-surf" ,rust-surf-2) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") (synopsis "URL fetch plugin for Nushell") (description "This package provides a URL fetch plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.27 +(define-public rust-nu-plugin-from-bson-0.28 (package (name "rust-nu-plugin-from-bson") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16ksyzsxyy2wd138y1zz9sdq6s5zvrh7rrsvyhwdd4w7irk2q474")))) + (base32 "13k11dh2pc48181qcbqwwgwwqh5d2g99p0rq4ly75l5jwyyazi73")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1588,27 +1616,27 @@ of commands called a ``pipeline''.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.27 +(define-public rust-nu-plugin-from-sqlite-0.28 (package (name "rust-nu-plugin-from-sqlite") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0z35aw6n2w4lmwp2797zd85ix64ch1msn5d0g3g2kdrihbpymxj2")))) + (base32 "0mpaz3vn7zf1ijccfd9rgrzl0fr3fci6j16w7a81x6dh7pqavxgn")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1619,27 +1647,28 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.27 +(define-public rust-nu-plugin-inc-0.28 (package (name "rust-nu-plugin-inc") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ykrfixf642zv0h6349mxsidm9m7j933imnw978v96ymzp7hdalk")))) + (base32 "1dbayv8gcjpz46xgvh9b1pka2ygyhyalk1xzh43cvaccqn4qafrb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-test-support" ,rust-nu-test-support-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + (("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-test-support" + ,rust-nu-test-support-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-semver" ,rust-semver-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Version incrementer plugin for Nushell") @@ -1648,25 +1677,25 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-match-0.27 +(define-public rust-nu-plugin-match-0.28 (package (name "rust-nu-plugin-match") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ax8aanmr8clvz3abbc4mwhpp2bwwzfh03vydwa50dadnrhrh51s")))) + (base32 "1d19hwrrmbwxx3nn7gjs2wvzf6wfhdai9jsq35n7bgjx2qyip0ma")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + (("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-regex" ,rust-regex-1)))) (home-page "https://www.nushell.sh") (synopsis "Regex match plugin for Nushell") @@ -1674,27 +1703,27 @@ Nushell.") "This package provides a regex match plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-post-0.27 +(define-public rust-nu-plugin-post-0.28 (package (name "rust-nu-plugin-post") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19zsvddd5lb1y1jm1wldk8padxl3a4w55xh82hpxz4igvjblpcz6")))) + (base32 "1jha85gl422p9knr0m4xdx353nmm00zrj5yh9w2gdyzs6hbzf80q")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde-json" ,rust-serde-json-1) ("rust-surf" ,rust-surf-1) @@ -1704,27 +1733,27 @@ Nushell.") (description "This package is an HTTP POST plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-ps-0.27 +(define-public rust-nu-plugin-ps-0.28 (package (name "rust-nu-plugin-ps") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1d8i1hfpcjpiwikdi5i2gdnxxm43nnmmyfz1y7zivx5hzha1qjg1")))) + (base32 "0akgz7wi85ny2cfkcs9bn4hc97d4wdh9ayrzd6zasmird5kl1lv8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-timer" ,rust-futures-timer-3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1733,80 +1762,80 @@ Nushell.") "This package provides a process list plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-s3-0.27 +(define-public rust-nu-plugin-s3-0.28 (package (name "rust-nu-plugin-s3") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14kk07rm62am24fp7cks8gcfp7h67zlcmfzpixh0rfwkfgr87mwq")))) + (base32 "02b71ljsi7z2nbpm9djaxvdg7ql6xn0mqibpnzql0d39wfb0bxc2")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-s3handler" ,rust-s3handler-0.6)))) (home-page "https://www.nushell.sh") (synopsis "S3 plugin for Nushell") (description "This package is an S3 plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.27 +(define-public rust-nu-plugin-selector-0.28 (package (name "rust-nu-plugin-selector") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1nvqp8lzyiyk3n8c5gqr6wrk2pirzpyxpwc4r67fr9rsllyrfhw2")))) + (base32 "0g1sjlvylclhhp41h6xx6vaa10478albjgh3n7kg3p0s6i8db5a7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-nipper" ,rust-nipper-0.1) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27)))) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28)))) (home-page "https://www.nushell.sh") (synopsis "Web scraping using CSS selector") (description "This package provides web scraping using CSS selector.") (license license:expat))) -(define-public rust-nu-plugin-start-0.27 +(define-public rust-nu-plugin-start-0.28 (package (name "rust-nu-plugin-start") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kznb1npqbbak3xk9w6m6ng6h7ir164il7xydrhwrl45mll2g4yw")))) + (base32 "1gqn6b1jpxcfx81c5c4yfs52gzxp9viyqj7hjs7fqvf5czi0bmz7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-open" ,rust-open-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1816,10 +1845,10 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-sys-0.27 +(define-public rust-nu-plugin-sys-0.28 (package (name "rust-nu-plugin-sys") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) @@ -1827,17 +1856,17 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bdd745w5gmignfclp5fzwpyjfpqsmf6hrry3chn3jzdpl5gvgiw")))) + (base32 "16igj4z9f7kfy3x71ki3vaqdx6064l3k718vqfpabffjkz9qpfp5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1845,28 +1874,28 @@ Nushell.") (description "This package provides a system info plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-textview-0.27 +(define-public rust-nu-plugin-textview-0.28 (package (name "rust-nu-plugin-textview") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10w5isqgc5mf7rhs49rglm3s6pcij0ch12xkvrq4930y8pr6cy9l")))) + (base32 "07m3x9bkq1qliicnshgs6yi6q5fbl6d6gxcd60kqcavkvdknnf8m")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-bat" ,rust-bat-0.17) - ("rust-nu-data" ,rust-nu-data-0.27) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + (("rust-bat" ,rust-bat-0.17) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + ("rust-nu-data" ,rust-nu-data-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-term-size" ,rust-term-size-0.3) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1875,27 +1904,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.27 +(define-public rust-nu-plugin-to-bson-0.28 (package (name "rust-nu-plugin-to-bson") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1x90r11wg46i2wx21gk42pyjjcpib66rrqgxrc690y376dn9ivlr")))) + (base32 "1rq2kwzrby8rh57gq4s4ljj4fgfgblrhjncjycpmkw2jzn7sa6xi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1904,27 +1933,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.27 +(define-public rust-nu-plugin-to-sqlite-0.28 (package (name "rust-nu-plugin-to-sqlite") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "055k5sksxv7q4ivy74c1ndxps30c5c97rz6v7dibckh9c0q1vbhk")))) + (base32 "0q07fv4i4rkzjna54mkcri5bfngqkkmpfj3vmiyzib0x84pvzfjf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1935,26 +1964,26 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-tree-0.27 +(define-public rust-nu-plugin-tree-0.28 (package (name "rust-nu-plugin-tree") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0bjir9f5fraz5n9bj99ba7djmnzb8ws0dbvdhwn5hz9lmb5ss0mg")))) + (base32 "0xifcyg0z025n6w0cqjnmrjcbynv437dkxpsxgbvm4iybj558590")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-ptree" ,rust-ptree-0.3)))) (home-page "https://www.nushell.sh") (synopsis "Tree viewer plugin for Nushell") @@ -1962,27 +1991,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.27 +(define-public rust-nu-plugin-xpath-0.28 (package (name "rust-nu-plugin-xpath") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cyq7qb8bzzf599fq24pg7z0svsdffkd26fplggdg4nihjv28clv")))) + (base32 "0mwajr07489kgv2yhxsk0laydf8m8p736npvkcbsjxaxydnv5a5a")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-plugin" ,rust-nu-plugin-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-plugin" ,rust-nu-plugin-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) (home-page "https://www.nushell.sh") @@ -1990,17 +2019,17 @@ Nushell.") (description "Traverses XML") (license license:expat))) -(define-public rust-nu-protocol-0.27 +(define-public rust-nu-protocol-0.28 (package (name "rust-nu-protocol") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1031mysphq7qczmilmdshcm4h6wh0132cvdc0346qz2q2b3qmrjr")))) + (base32 "0khpg2dnapyyimyq4ys1nfs1xzysxq2nb1ka2lmjfgdxrbwzrqnj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2012,8 +2041,8 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) @@ -2027,17 +2056,17 @@ Nushell.") (description "Core values and protocols for Nushell") (license license:expat))) -(define-public rust-nu-source-0.27 +(define-public rust-nu-source-0.28 (package (name "rust-nu-source") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1akfcn7138sfaawb7sl5311vgmcba32c79lnkmdzpb48xdr9ybp8")))) + (base32 "13a590iff8bg6p38xs1hh5krmii6qz2w5k7ak57dyh3r3vbhvmmd")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2054,46 +2083,46 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-stream-0.27 +(define-public rust-nu-stream-0.28 (package (name "rust-nu-stream") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09xm93mk0kyi4nd6f1x89yfk3139ahamirs2zwnzr97f7xng216v")))) + (base32 "02dl4d9gzl2jhg71hfc04x9j4p29iwwcyvm6m9pihwfpwb3q2bhj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27)))) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28)))) (home-page "https://www.nushell.sh") (synopsis "Nushell stream") (description "This package provides Nushell stream.") (license license:expat))) -(define-public rust-nu-table-0.27 +(define-public rust-nu-table-0.28 (package (name "rust-nu-table") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vkn0kf7rwywrj8d31mr4j64rwjay9syjsvg94yi9rdxbccd5jf2")))) + (base32 "15yd0wrl0y0rmjdvq2gmk97nxppdy5r424vy8v85gk876g82gi1s")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) + (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) ("rust-regex" ,rust-regex-1) ("rust-unicode-width" ,rust-unicode-width-0.1)))) (home-page "https://www.nushell.sh") @@ -2101,17 +2130,17 @@ Nushell.") (description "Nushell table printing") (license license:expat))) -(define-public rust-nu-test-support-0.27 +(define-public rust-nu-test-support-0.28 (package (name "rust-nu-test-support") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0yk1368by0s9p7j2diw5mdk88by00cw6q6wspasbprcr684g5kvn")))) + (base32 "1qphsvr1wpn26ak5g4bj106csm8bia12srpv1dwy4zif42if57gm")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2122,10 +2151,10 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://www.nushell.sh") @@ -2134,10 +2163,10 @@ Nushell.") tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.27 +(define-public rust-nu-value-ext-0.28 (package (name "rust-nu-value-ext") - (version "0.27.1") + (version "0.28.0") (source (origin (method url-fetch) @@ -2145,16 +2174,16 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1yhzqzafg0l1fj4pwlbjl0h74b0rj0x4gdx2rgc3nzndc7j00axn")))) + (base32 "0kwx2s4gyss8gmj72kl0y2yzq5injwv9g9n53bal339b81dd7v90")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.27) - ("rust-nu-protocol" ,rust-nu-protocol-0.27) - ("rust-nu-source" ,rust-nu-source-0.27) + ("rust-nu-errors" ,rust-nu-errors-0.28) + ("rust-nu-protocol" ,rust-nu-protocol-0.28) + ("rust-nu-source" ,rust-nu-source-0.28) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "@code{Extension} traits for values in Nushell") -- cgit 1.4.1 From 35b3ab8e5748d9911ae7a0189065d0c25392895b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 14:07:34 -0500 Subject: gnu: libtiff: Fix documentation directory name in grafted replacement. Fixes . This is a followup to commit 6320700b114f09c09fbe613e2032abe077d28583. * gnu/packages/image.scm (libtiff/fixed)[name, arguments]: New fields. --- gnu/packages/image.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 29e88af231..4f249b7622 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -616,6 +616,7 @@ collection of tools for doing simple manipulations of TIFF images.") (define-public libtiff/fixed (package (inherit libtiff) + (name "libtiff") (version "4.2.0") (source (origin @@ -624,7 +625,14 @@ collection of tools for doing simple manipulations of TIFF images.") version ".tar.gz")) (sha256 (base32 - "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b")))))) + "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b")))) + (arguments + ;; Instead of using --docdir, this package has its own --with-docdir. + `(#:configure-flags (list (string-append "--with-docdir=" + (assoc-ref %outputs "doc") + "/share/doc/" + ,name "-" ,version) + "--disable-static"))))) (define-public leptonica (package -- cgit 1.4.1 From a39faf1abdac4ee518ed28bf6429e07eab0371ea Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 14:16:21 -0500 Subject: gnu: OpenSSL: Fix version number in build configuration. Fixes . This is a followup to commit 4a8b529ce15ddc69a9dd701e450fc85a0ed65910. * gnu/packages/tls.scm (openssl/fixed)[arguments]: New field. --- gnu/packages/tls.scm | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 4572b39aa1..a5cffeb3e1 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -436,7 +436,104 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))))) + "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))) + (arguments + `(#:parallel-tests? #f + #:test-target "test" + + ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, + ;; so we explicitly disallow it here. + #:disallowed-references ,(list (canonical-package perl)) + #:phases + (modify-phases %standard-phases + ,@(if (%current-target-system) + '((add-before + 'configure 'set-cross-compile + (lambda* (#:key target outputs #:allow-other-keys) + (setenv "CROSS_COMPILE" (string-append target "-")) + (setenv "CONFIGURE_TARGET_ARCH" + (cond + ((string-prefix? "i586" target) + "hurd-x86") + ((string-prefix? "i686" target) + "linux-x86") + ((string-prefix? "x86_64" target) + "linux-x86_64") + ((string-prefix? "mips64el" target) + "linux-mips64") + ((string-prefix? "arm" target) + "linux-armv4") + ((string-prefix? "aarch64" target) + "linux-aarch64") + ((string-prefix? "powerpc64le" target) + "linux-ppc64le") + ((string-prefix? "powerpc64" target) + "linux-ppc64") + ((string-prefix? "powerpc" target) + "linux-ppc"))) + #t))) + '()) + (replace 'configure + (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 ,@(if (%current-target-system) + '("./Configure") + '("./config")) + "shared" ;build shared libraries + "--libdir=lib" + + ;; The default for this catch-all directory is + ;; PREFIX/ssl. Change that to something more + ;; conventional. + (string-append "--openssldir=" out + "/share/openssl-" ,version) + + (string-append "--prefix=" out) + (string-append "-Wl,-rpath," lib) + ,@(if (%current-target-system) + '((getenv "CONFIGURE_TARGET_ARCH")) + '()))))) + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + ;; Move static libraries to the "static" output. + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (static (assoc-ref outputs "static")) + (slib (string-append static "/lib"))) + (for-each (lambda (file) + (install-file file slib) + (delete-file file)) + (find-files lib "\\.a$")) + #t))) + (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))) + (add-after + 'install 'remove-miscellany + (lambda* (#:key outputs #:allow-other-keys) + ;; The 'misc' directory contains random undocumented shell and Perl + ;; scripts. Remove them to avoid retaining a reference on Perl. + (let ((out (assoc-ref outputs "out"))) + (delete-file-recursively (string-append out "/share/openssl-" + ,version "/misc")) + #t)))))))) (define-public openssl-1.0 (package -- cgit 1.4.1 From bb5d84a0489a629d30bc2e978807caf20f46e329 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Mar 2021 14:39:36 -0500 Subject: gnu: ImageMagick: Fix version number in build configuration of grafted replacement. Fixes . This is a followup to commits 852ba914a43da0977d4f53b53da7039cdd6706b2 and 82e887ba48c2ba91b17aa9b6b17501e3e0ef4aef. * gnu/packages/imagemagick.scm (imagemagick/fixed)[name, arguments]: New fields. --- gnu/packages/imagemagick.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 1a5ddb63d4..8f6eddce0d 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -51,6 +51,7 @@ ;; 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.11-48") + (replacement imagemagick/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" @@ -58,7 +59,6 @@ (sha256 (base32 "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) - (replacement imagemagick/fixed) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" @@ -130,6 +130,7 @@ text, lines, polygons, ellipses and Bézier curves.") (define-public imagemagick/fixed (package (inherit imagemagick) + (name "imagemagick") (version "6.9.12-2g") ;; 'g' for 'guix', appended character to retain ;; version length so grafting works properly. (source (origin @@ -140,7 +141,45 @@ text, lines, polygons, ellipses and Bézier curves.") ".tar.xz")) (sha256 (base32 - "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))))) + "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))) + (arguments + `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") + + ;; FIXME: The test suite succeeded before version 6.9.6-2. + ;; Try enabling it again with newer releases. + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before + 'build 'pre-build + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + ;; Clear the `LIBRARY_PATH' setting, which otherwise + ;; interferes with our own use. + (("^LIBRARY_PATH[[:blank:]]*=.*$") + "") + + ;; Since the Makefile overrides $docdir, modify it to + ;; refer to what we want. + (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") + (let ((doc (assoc-ref outputs "doc"))) + (string-append "DOCUMENTATION_PATH = " + doc "/share/doc/" + ,name "-" ,version "\n")))) + #t)) + (add-before + 'configure 'strip-configure-xml + (lambda _ + (substitute* "config/configure.xml.in" + ;; Do not record 'configure' arguments in the + ;; configure.xml file that gets installed: That would + ;; include --docdir, and thus retain a reference to the + ;; 'doc' output. + (("@CONFIGURE_ARGS@") + "not recorded")) + #t))))))) (define-public perl-image-magick (package -- cgit 1.4.1 From 9d541e97e99793d0c75f01bc52de61473632e0ec Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:43:48 +0000 Subject: gnu: aws-c-common: Update to 0.5.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-common): Update to 0.5.2. [arguments]: Build as shared library. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 7d8d41d266..75fa6460be 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Maxim Cournoyer -;;; Copyright © 2020 Greg Hogan +;;; Copyright © 2020, 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -545,7 +545,7 @@ portability.") (define-public aws-c-common (package (name "aws-c-common") - (version "0.4.63") + (version "0.5.2") (source (origin (method git-fetch) (uri (git-reference @@ -554,8 +554,11 @@ portability.") (file-name (git-file-name name version)) (sha256 (base32 - "16bc6fn1gq3nqcrzgpi2kjphq7xkkr73aljakrg89ysm6hyzyim9")))) + "0rd2qzaa9mmn5f6f2bl1wgv54f17pqx3vwyy9f8ylh59qfnilpmg")))) (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) (synopsis "Amazon Web Services core C library") (description "This library provides common C99 primitives, configuration, data -- cgit 1.4.1 From cc95d03ec7aa2d4de2f880fdb0c9ccbf3343e041 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 4 Mar 2021 12:19:50 +0000 Subject: gnu: aws-checksums: Build as shared library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-checksums)[arguments]: Build as shared library. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 75fa6460be..1e338bd7bd 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -581,6 +581,9 @@ portability.") "1pjs31x3cq9wyw511y00kksz660m8im9zxk30hid8iwlilcbnyvx")) (patches (search-patches "aws-checksums-cmake-prefix.patch")))) (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) (inputs `(("aws-c-common" ,aws-c-common))) (synopsis "Amazon Web Services checksum library") -- cgit 1.4.1 From 748e2ec07a4f484dd4416b4cac5c28b1b13c47ee Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:51:36 +0000 Subject: gnu: Add aws-c-cal. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-cal): New variable. * gnu/packages/patches/aws-c-cal-cmake-prefix.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/c.scm | 30 +++++++++++++++++++++++ gnu/packages/patches/aws-c-cal-cmake-prefix.patch | 13 ++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/aws-c-cal-cmake-prefix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 46f76c16cc..44c665d5b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -830,6 +830,7 @@ dist_patch_DATA = \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ + %D%/packages/patches/aws-c-cal-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 1e338bd7bd..c83e6f36e3 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages gettext) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages tls) #:use-module (gnu packages xml)) (define-public tcc @@ -619,3 +620,32 @@ event stream encoding, a binary format for bidirectional client-server communication.") (home-page "https://github.com/awslabs/aws-c-event-stream") (license license:asl2.0))) + +(define-public aws-c-cal + (package + (name "aws-c-cal") + (version "0.4.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/awslabs/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "04acra1mnzw9q7jycs5966akfbgnx96hkrq90nq0dhw8pvarlyv6")) + (patches (search-patches "aws-c-cal-cmake-prefix.patch")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) + (propagated-inputs + `(("aws-c-common" ,aws-c-common))) + (inputs + `(("openssl" ,openssl) + ("openssl:static" ,openssl "static"))) + (synopsis "Amazon Web Services Crypto Abstraction Layer") + (description "This library provides a C99 wrapper for hash, HMAC, and ECC +cryptographic primitives for the @acronym{AWS,Amazon Web Services} SDK.") + (home-page "https://github.com/awslabs/aws-c-cal") + (license license:asl2.0))) diff --git a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch new file mode 100644 index 0000000000..1ee7aa851d --- /dev/null +++ b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -10,6 +10,10 @@ endif() + + option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF) + ++if (DEFINED ENV{CMAKE_PREFIX_PATH}) ++ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) ++endif() ++ + if (DEFINED CMAKE_PREFIX_PATH) + file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) + endif() -- cgit 1.4.1 From 1b518888638dce0c44192e8c0bbcb40752d162b4 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:52:01 +0000 Subject: gnu: Add s2n. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tls.scm (s2n): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/tls.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a5cffeb3e1..e0741ad310 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1135,3 +1135,30 @@ relatively simple Bash script.") derived from Mozilla's collection.") (home-page "https://certifi.io") (license license:mpl2.0)))) + +(define-public s2n + (package + (name "s2n") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/awslabs/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1q6kmgwb8jxmc4ijzk9pkqzz8lsbfsv9hyzqvy944w7306zx1r5h")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f ; tests fail to build for static library + #:configure-flags + '("-DBUILD_TESTING=OFF" + "-DBUILD_SHARED_LIBS=ON"))) + (propagated-inputs + `(("openssl" ,openssl) + ("openssl:static" ,openssl "static"))) + (synopsis "SSL/TLS implementation") + (description "This library provides a C99 implementation of SSL/TLS.") + (home-page "https://github.com/awslabs/s2n") + (license license:asl2.0))) -- cgit 1.4.1 From 8ea7b6f91e42133181dc7d48df3f92bfa4bb67c3 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:53:18 +0000 Subject: gnu: Add aws-c-io. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-io): New variable. * gnu/packages/patches/aws-c-io-cmake-prefix.patch, gnu/packages/patches/aws-c-io-disable-networking-tests.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/c.scm | 31 +++++++++ gnu/packages/patches/aws-c-io-cmake-prefix.patch | 13 ++++ .../aws-c-io-disable-networking-tests.patch | 81 ++++++++++++++++++++++ 4 files changed, 127 insertions(+) create mode 100644 gnu/packages/patches/aws-c-io-cmake-prefix.patch create mode 100644 gnu/packages/patches/aws-c-io-disable-networking-tests.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 44c665d5b0..e2bebb90d2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -832,6 +832,8 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-cal-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ + %D%/packages/patches/aws-c-io-cmake-prefix.patch \ + %D%/packages/patches/aws-c-io-disable-networking-tests.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index c83e6f36e3..74c4b673a7 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -621,6 +621,37 @@ communication.") (home-page "https://github.com/awslabs/aws-c-event-stream") (license license:asl2.0))) +(define-public aws-c-io + (package + (name "aws-c-io") + (version "0.9.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/awslabs/" name)) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1vwyf1pm0hhcypyjc9xh9x7y50ic79xlbck1yf9d9wz0bnh43p7v")) + (patches + (search-patches + "aws-c-io-cmake-prefix.patch" + "aws-c-io-disable-networking-tests.patch")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) + (propagated-inputs + `(("aws-c-cal" ,aws-c-cal) + ("aws-c-common" ,aws-c-common) + ("s2n" ,s2n))) + (synopsis "Event driven framework for implementing application protocols") + (description "This library provides a C99 framework for constructing +event-driven, asynchronous network application protocols.") + (home-page "https://github.com/awslabs/aws-c-io") + (license license:asl2.0))) + (define-public aws-c-cal (package (name "aws-c-cal") diff --git a/gnu/packages/patches/aws-c-io-cmake-prefix.patch b/gnu/packages/patches/aws-c-io-cmake-prefix.patch new file mode 100644 index 0000000000..da3e4eb4a5 --- /dev/null +++ b/gnu/packages/patches/aws-c-io-cmake-prefix.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,10 @@ if (POLICY CMP0069) + cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags + endif() + ++if (DEFINED ENV{CMAKE_PREFIX_PATH}) ++ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) ++endif() ++ + if (DEFINED CMAKE_PREFIX_PATH) + file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) + endif() diff --git a/gnu/packages/patches/aws-c-io-disable-networking-tests.patch b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch new file mode 100644 index 0000000000..09fe11310c --- /dev/null +++ b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch @@ -0,0 +1,81 @@ +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -52,8 +52,8 @@ add_test_case(local_socket_communication) + add_net_test_case(tcp_socket_communication) + add_net_test_case(udp_socket_communication) + add_test_case(udp_bind_connect_communication) +-add_net_test_case(connect_timeout) +-add_net_test_case(connect_timeout_cancelation) ++#add_net_test_case(connect_timeout) ++#add_net_test_case(connect_timeout_cancelation) + if (USE_VSOCK) + add_test_case(vsock_loopback_socket_communication) + endif () +@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors) + add_test_case(incoming_duplicate_tcp_bind_errors) + add_test_case(incoming_udp_sock_errors) + add_test_case(wrong_thread_read_write_fails) +-add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) ++#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) + add_test_case(cleanup_in_accept_doesnt_explode) + add_test_case(cleanup_in_write_cb_doesnt_explode) + add_test_case(sock_write_cb_is_async) +@@ -81,21 +81,21 @@ add_test_case(channel_tasks_run) + add_test_case(channel_rejects_post_shutdown_tasks) + add_test_case(channel_cancels_pending_tasks) + add_test_case(channel_duplicate_shutdown) +-add_net_test_case(channel_connect_some_hosts_timeout) ++#add_net_test_case(channel_connect_some_hosts_timeout) + +-add_net_test_case(test_default_with_ipv6_lookup) ++#add_net_test_case(test_default_with_ipv6_lookup) + add_test_case(test_resolver_ipv6_address_lookup) +-add_net_test_case(test_default_with_multiple_lookups) ++#add_net_test_case(test_default_with_multiple_lookups) + add_test_case(test_resolver_ipv4_address_lookup) +-add_net_test_case(test_default_with_ipv4_only_lookup) ++#add_net_test_case(test_default_with_ipv4_only_lookup) + add_test_case(test_resolver_ttls) + add_test_case(test_resolver_connect_failure_recording) + add_test_case(test_resolver_ttl_refreshes_on_resolve) + + add_net_test_case(test_resolver_listener_create_destroy) +-add_net_test_case(test_resolver_add_listener_before_host) +-add_net_test_case(test_resolver_add_listener_after_host) +-add_net_test_case(test_resolver_add_multiple_listeners_fn) ++#add_net_test_case(test_resolver_add_listener_before_host) ++#add_net_test_case(test_resolver_add_listener_after_host) ++#add_net_test_case(test_resolver_add_multiple_listeners_fn) + add_net_test_case(test_resolver_listener_host_re_add_fn) + add_net_test_case(test_resolver_listener_multiple_results) + add_net_test_case(test_resolver_listener_address_expired_fn) +@@ -119,20 +119,20 @@ add_test_case(socket_handler_close) + if (NOT BYO_CRYPTO) + add_net_test_case(test_concurrent_cert_import) + add_test_case(tls_channel_echo_and_backpressure_test) +- add_net_test_case(tls_client_channel_negotiation_error_expired) +- add_net_test_case(tls_client_channel_negotiation_error_wrong_host) +- add_net_test_case(tls_client_channel_negotiation_error_self_signed) +- add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) ++ #add_net_test_case(tls_client_channel_negotiation_error_expired) ++ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host) ++ #add_net_test_case(tls_client_channel_negotiation_error_self_signed) ++ #add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) + #track these down in s2n and find out why that aren't failing. + #add_net_test_case(tls_client_channel_negotiation_error_revoked) + #add_net_test_case(tls_client_channel_negotiation_error_pinning) +- add_net_test_case(tls_client_channel_negotiation_error_socket_closed) +- add_net_test_case(tls_client_channel_negotiation_success) +- add_net_test_case(tls_client_channel_negotiation_success_ecc256) +- add_net_test_case(tls_client_channel_negotiation_success_ecc384) ++ #add_net_test_case(tls_client_channel_negotiation_error_socket_closed) ++ #add_net_test_case(tls_client_channel_negotiation_success) ++ #add_net_test_case(tls_client_channel_negotiation_success_ecc256) ++ #add_net_test_case(tls_client_channel_negotiation_success_ecc384) + add_net_test_case(tls_server_multiple_connections) + add_net_test_case(tls_server_hangup_during_negotiation) +- add_net_test_case(tls_client_channel_no_verify) ++ #add_net_test_case(tls_client_channel_no_verify) + add_net_test_case(test_tls_negotiation_timeout) + add_net_test_case(tls_double_channel) + add_net_test_case(alpn_successfully_negotiates) -- cgit 1.4.1 From 97190845355768afefa52f3d1dc355cddbc43542 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:53:50 +0000 Subject: gnu: aws-c-event-stream: Update to 0.2.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-event-stream): Update to 0.2.7. [arguments]: Build as shared library. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 74c4b673a7..429ff94070 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -597,7 +597,7 @@ with fallback to efficient C99 software implementations.") (define-public aws-c-event-stream (package (name "aws-c-event-stream") - (version "0.1.6") + (version "0.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -606,13 +606,19 @@ with fallback to efficient C99 software implementations.") (file-name (git-file-name name version)) (sha256 (base32 - "1vl9ainc4klv0g9gk1iv4833bsllni6jxn6mwb0fnv2dnlz7zv9q")) + "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh")) (patches (search-patches "aws-c-event-stream-cmake-prefix.patch")))) (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) (propagated-inputs - `(("aws-c-common" ,aws-c-common))) + `(("aws-c-common" ,aws-c-common) + ("aws-c-io" ,aws-c-io) + ("aws-checksums" ,aws-checksums))) (inputs - `(("aws-checksums" ,aws-checksums))) + `(("aws-c-cal" ,aws-c-cal) + ("s2n" ,s2n))) (synopsis "Amazon Web Services client-server message format library") (description "This library is a C99 implementation for @acronym{AWS,Amazon Web Services} -- cgit 1.4.1 From bd0808f13159f2cd6ceb1ba74a00e51f4e595807 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 19 Jan 2021 12:54:39 +0000 Subject: gnu: aws-sdk-cpp: Update to 1.8.159. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (aws-sdk-cpp): Update to 1.8.159. [arguments]: Build as shared library Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ce9c9502ef..02a82091b8 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -813,7 +813,7 @@ of C++14 components that complements @code{std} and Boost.") (define-public aws-sdk-cpp (package (name "aws-sdk-cpp") - (version "1.8.102") + (version "1.8.159") (source (origin (method git-fetch) (uri (git-reference @@ -822,13 +822,13 @@ of C++14 components that complements @code{std} and Boost.") (file-name (git-file-name name version)) (sha256 (base32 - "1w8x2vakg5ngjyyg08n4g3dqy8wqnz0k3gkrlqrh460s2pvdivba")))) + "0jpfv9x82nq7hcix9in7qgrc8009dwpg6gr96hlgmcvqrqckd2r9")))) (build-system cmake-build-system) (arguments '(;; Tests are run during the build phase. #:tests? #f #:configure-flags - '("-DBUILD_SHARED_LIBS=OFF" + '("-DBUILD_SHARED_LIBS=ON" "-DBUILD_DEPS=OFF"))) (propagated-inputs `(("aws-c-common" ,aws-c-common) -- cgit 1.4.1 From 6862ae1a61b7fce12a7d50a6a15ce8e2fc00ad7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Mar 2021 23:43:05 +0100 Subject: gnu: photoflare: Update to 1.6.7. * gnu/packages/photo.scm (photoflare): Update to 1.6.7. --- gnu/packages/photo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5b15c1a727..4d679c7f02 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Vincent Legoll @@ -585,7 +585,7 @@ and enhance them.") (define-public photoflare (package (name "photoflare") - (version "1.6.6") + (version "1.6.7") (source (origin (method git-fetch) @@ -594,7 +594,7 @@ and enhance them.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d")))) + (base32 "0rh5gvnc1zwx4p9h599s82m69gsxp19nnfcxsblx3b2ddwzxh78v")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;no tests -- cgit 1.4.1 From 4ddf56c1364f21f2407783242e2715a6be86c5b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Mar 2021 23:44:06 +0100 Subject: gnu: libfreenect: Update to 0.6.2. * gnu/packages/openkinect.scm (libfreenect): Update to 0.6.2. --- gnu/packages/openkinect.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openkinect.scm b/gnu/packages/openkinect.scm index 0cdecca3ab..89e6c69cfc 100644 --- a/gnu/packages/openkinect.scm +++ b/gnu/packages/openkinect.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,7 +31,7 @@ #:use-module (gnu packages image-processing)) (define-public libfreenect - (let ((version "0.6.1")) + (let ((version "0.6.2")) (package (name "libfreenect") (version version) @@ -42,7 +43,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr")))) + "02pb8mcl62kzdcgbnv3rw4nl0f08iw8pjiqqhfy3ycpkvyppw97w")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; package has no tests -- cgit 1.4.1 From 1e71578c4a5faf4f9cfddd50573ad9e8a3044489 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 12 Mar 2021 23:54:57 +0100 Subject: gnu: micropython: Update to 1.14. * gnu/packages/python.scm (micropython): Update to 1.14. --- 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 e05c91b3d0..8f1bc65548 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2016, 2017 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018 Julien Lepiller -;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2016–2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017 Carlo Zancanaro ;;; Copyright © 2017 Frederick M. Muriithi @@ -668,15 +668,15 @@ To function properly, this package should not be installed together with the (define-public micropython (package (name "micropython") - (version "1.13") + (version "1.14") (source (origin (method url-fetch) (uri (string-append "https://github.com/micropython/micropython/" "releases/download/v" version - "/micropython-" version ".tar.gz")) + "/micropython-" version ".tar.xz")) (sha256 - (base32 "0lfl7dv5v9rqckslrjqy5swjri29x1nj5d79wxnjys4sq6r2xcws")) + (base32 "0k6ri3rxxnnmvcbi7z7x59r21f4vj9dcf9j64jhj1cgazmb62c4p")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From deb8853243e115112baff5325b4b137c1d0890b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 00:49:09 +0100 Subject: gnu: eid-mw: Update to 5.0.14. * gnu/packages/security-token.scm (eid-mw): Update to 5.0.14. --- 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 c1641e8b5f..f47619aa55 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -104,7 +104,7 @@ readers and is needed to communicate with such devices through the (define-public eid-mw (package (name "eid-mw") - (version "5.0.11") + (version "5.0.14") (source (origin (method git-fetch) @@ -113,7 +113,7 @@ readers and is needed to communicate with such devices through the (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0590cz00cny749p99srv880gpgzvxaf9fwm2lghv3nw0qdsilss8")))) + (base32 "1hyxsbxjjn9hh5p7jlcfb5yplf3n8dg49dfgi8fjp95phis3gbd4")))) (build-system glib-or-gtk-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From fab02edde013437cde293bcd8f5dba553535c0fb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 00:55:18 +0100 Subject: gnu: wireguard-tools: Update to 1.0.20210223. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210223. --- 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 f18dc6760c..2ea04acaa2 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -683,7 +683,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20200827") + (version "1.0.20210223") (source (origin (method git-fetch) @@ -692,7 +692,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1h351hn531z6z85sx9ya27xjz1jszgn1pkwibacjj49mds15f7gn")))) + (base32 "1pz7rir7bzj7rv1lqy45pqnr6jxsb4war31f9492757fql7kcrf4")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 347cc54200680b16d4d8e38abcedf4a3886c4061 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 00:54:02 +0100 Subject: gnu: apache-thrift: Update to 0.14.1. * gnu/packages/rpc.scm (apache-thrift): Update to 0.14.1. --- gnu/packages/rpc.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 8036998910..4a279874ce 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Greg Hogan +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -208,7 +209,7 @@ with the HTTP/2-based RPC framework gRPC.") (define-public apache-thrift (package (name "apache-thrift") - (version "0.14.0") + (version "0.14.1") (source (origin (method git-fetch) @@ -217,8 +218,7 @@ with the HTTP/2-based RPC framework gRPC.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "09s8j95vc18117ahyl34gbd0gdxijkf0krrd3mp47vl08lcvi4kc")))) + (base32 "1mj3c5jhjbg2sfkx9k9jqg88h1c5rswr9b606s02ny9ydf3akcny")))) (build-system gnu-build-system) (arguments '(#:tests? #f -- cgit 1.4.1 From c3250995358a3baf1f747816486b7ac4a9be533e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 00:59:03 +0100 Subject: gnu: nginx: Update to 1.19.8. * gnu/packages/web.scm (nginx): Update to 1.19.8. --- 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 ed9273e683..f9b94feb02 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -293,14 +293,14 @@ the same, being completely separated from the Internet.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.19.7") + (version "1.19.8") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "03mmfnkhayn8vm2yhs3ngvif6275c368ymx8wvhsbls11h1dvr3s")))) + "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit 1.4.1 From cad4aa667cc89493902aefbae157ddb97f381af2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 00:59:20 +0100 Subject: gnu: nginx-documentation: Update to 1.19.8-2673-4398fd0f0341. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.8-2673-4398fd0f0341. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f9b94feb02..4a14046d42 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -383,9 +383,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.19.7") - (revision 2655) - (changeset "eb417a9a089b")) + (let ((version "1.19.8") + (revision 2673) + (changeset "4398fd0f0341")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -397,7 +397,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "0l4rachjn5gr705f50d9pwgqzkb4fqd4fzz7083ilfarpg36wgv2")))) + "1pds76h19fadmymyr6pnfh72ql6vizpv2628lqcrpqhxgwa6hcbg")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit 1.4.1 From 62b1ae7444ebe216905e0cec0e0ae8ea8454775b Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Mar 2021 01:50:57 +0100 Subject: gnu: Add rust-bigdecimal-0.1. * gnu/packages/crates-io.scm (rust-bigdecimal-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e1628bf565..d94b9bd758 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3969,6 +3969,29 @@ tracebacks.") (description "This package provides arbitrary precision decimal numbers.") (license (list license:expat license:asl2.0)))) +(define-public rust-bigdecimal-0.1 + (package + (inherit rust-bigdecimal-0.2) + (name "rust-bigdecimal") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bigdecimal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0i32g88sin9dzr4jn41wgg3pyx2xxm0m1a9s5vh9lpyj5lg1jx0k")))) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-bincode-1 (package (name "rust-bincode") -- cgit 1.4.1 From 372a16e5c7c8181e9a84e0337252abba3ff31fd0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Mar 2021 01:51:47 +0100 Subject: gnu: rust-dotenv-0.10: Fix build by adding missing cargo input. * gnu/packages/crates-io.scm (rust-dotenv-0.10)[arguments]<#:cargo-inputs>: Add rust-syn-0.11. --- gnu/packages/crates-io.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d94b9bd758..c523389f47 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12134,7 +12134,8 @@ Rust.") `(#:cargo-inputs (("rust-derive-error-chain" ,rust-derive-error-chain-0.10) ("rust-error-chain" ,rust-error-chain-0.10) - ("rust-regex" ,rust-regex-0.2)))))) + ("rust-regex" ,rust-regex-0.2) + ("rust-syn" ,rust-syn-0.11)))))) (define-public rust-draw-state-0.8 (package -- cgit 1.4.1 From 77f1bd9dea3def1992603cbf24c4b0003fa3e0f0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Mar 2021 01:57:12 +0100 Subject: gnu: rust-diesel: Update to 1.4.6 [fixes CVE-2021-28305]. * gnu/packages/crates-io.scm (rust-diesel): Update to 1.4.6. [native-inputs]: Add sqlite for tests. [arguments]<#:cargo-inputs>: Remove rust-bigdecimal-0.2 (incompatible), rust-libsqlite3-sys-0.15, rust-num-bigint-0.3 and rust-uuid-0.7. Add rust-bigdecimal-0.1, rust-libsqlite3-sys-0.20, rust-num-bigint-0.2, rust-uuid-0.5 and rust-uuid-0.8. [arguments]<#:phases>: Replace 'check phase to provide required feature arguments and exclude failing 'expression::count::count' test. [synopsis]: Solve lint error by removing article at the beginning. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c523389f47..6b242e735c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11325,28 +11325,31 @@ procedural macros.") (define-public rust-diesel-1 (package (name "rust-diesel") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) (uri (crate-uri "diesel" version)) - (file-name (string-append name "-" version ".tar.gz")) + (file-name + (string-append name "-" version ".tar.gz")) (sha256 (base32 - "134dy6gdbv30q388gsp5777w2qh63hdqsim1j8s1aylpmggfjb9y")))) + "0hpmwrc0zx3zvpgwp9zrm6wj8d8i8q8990grlrnfzlivbi6zqyq4")))) (build-system cargo-build-system) + (native-inputs + `(("sqlite" ,sqlite))) (arguments `(#:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.2) + (("rust-bigdecimal" ,rust-bigdecimal-0.1) ("rust-bitflags" ,rust-bitflags-1) ("rust-byteorder" ,rust-byteorder-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-diesel-derives" ,rust-diesel-derives-1) ("rust-ipnetwork" ,rust-ipnetwork-0.17) ("rust-libc" ,rust-libc-0.2) - ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15) + ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20) ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2) - ("rust-num-bigint" ,rust-num-bigint-0.3) + ("rust-num-bigint" ,rust-num-bigint-0.2) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-pq-sys" ,rust-pq-sys-0.4) @@ -11355,14 +11358,21 @@ procedural macros.") ("rust-serde-json" ,rust-serde-json-1) ("rust-time" ,rust-time-0.1) ("rust-url" ,rust-url-1) - ("rust-uuid" ,rust-uuid-0.7)) + ("rust-uuid" ,rust-uuid-0.5) + ("rust-uuid" ,rust-uuid-0.8)) #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-dotenv" ,rust-dotenv-0.10) ("rust-quickcheck" ,rust-quickcheck-0.4) - ("rust-tempdir" ,rust-tempdir-0.3)))) + ("rust-tempdir" ,rust-tempdir-0.3)) + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "cargo" "test" "--features" "sqlite" "--" + "--skip=expression::count::count")))))) (home-page "https://diesel.rs") - (synopsis "A safe, extensible ORM and Query Builder") + (synopsis "Safe, extensible ORM and Query Builder") (description "This package provides a safe, extensible ORM and Query Builder for PostgreSQL, SQLite, and MySQL.") (license (list license:expat license:asl2.0)))) -- cgit 1.4.1 From 373c7b5791acd8f377455be47260948b843dd5db Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sat, 13 Mar 2021 02:31:53 +0100 Subject: gnu: Remove bsdiff. As discussed in , remove because of unpatched CVE-2020-14315 with no non-FreeBSD patch in sight. * gnu/packages/compression.scm (bsdiff): Remove. --- gnu/packages/compression.scm | 39 --------------------------------------- 1 file changed, 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 8e2a3a78f1..99569f68c9 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -953,45 +953,6 @@ possible and can compress in parallel. This is especially useful for large tarballs.") (license license:bsd-2))) -(define-public bsdiff - (package - (name "bsdiff") - (version "4.3") - (home-page "https://www.daemonology.net/bsdiff/") - (source (origin - (method url-fetch) - (uri (string-append home-page name "-" version ".tar.gz")) - (sha256 - (base32 - "0j2zm3z271x5aw63mwhr3vymzn45p2vvrlrpm9cz2nywna41b0hq")) - (patches (search-patches "bsdiff-CVE-2014-9862.patch")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags (list "INSTALL=install" - (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'fix-Makefile - (lambda _ - (substitute* "Makefile" - ;; Adjust syntax to make it compatible with GNU Make. - (("^\\.") "") - ;; Help install(1) create the target directory. - (("\\$\\{PREFIX\\}") "-D -t ${PREFIX}")) - #t))) - #:tests? #f)) ;no tests - (inputs - `(("bzip2" ,bzip2))) - (synopsis "Patch binary files") - (description - "@command{bsdiff} and @command{bspatch} are tools for building and -applying patches to binary files. By using suffix sorting (specifically -Larsson and Sadakane's @code{qsufsort}) and taking advantage of how -executable files change, bsdiff routinely produces binary patches 50-80% -smaller than those produced by @code{Xdelta}.") - (license license:bsd-2))) - (define-public cabextract (package (name "cabextract") -- cgit 1.4.1 From b7c19f2850824cac4c5f8919d1c355f484001cbf Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 12 Mar 2021 19:02:14 -0500 Subject: gnu: wxmaxima: Update to 21.02.0. * gnu/packages/maths.scm (wxmaxima): Update to 21.02.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 6856737bdf..565f109f47 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3523,7 +3523,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "21.01.0") + (version "21.02.0") (source (origin (method git-fetch) @@ -3532,7 +3532,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bnv9410xmk73adqi4r6w0qgbqk7qig0vr5219839c09xagyyd12")))) + (base32 "19sab596ydwz65151bwymnfilyfmr8qcxb0k8cxlnj1gmdldlyz6")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) -- cgit 1.4.1 From a61bdc588773902d402787db7ea68e4d038cd3ea Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 Mar 2021 09:13:23 +0100 Subject: gnu: rust-resolv-conf-0.7: Use HTTPS home page URI. * gnu/packages/crates-io.scm (rust-resolv-conf-0.7)[home-page]: Use HTTPS URI. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b242e735c..f6d565e24d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32681,7 +32681,7 @@ uses finite automata and guarantees linear time matching on all inputs.") #:cargo-inputs (("rust-hostname" ,rust-hostname-0.3) ("rust-quick-error" ,rust-quick-error-1)))) - (home-page "http://github.com/tailhook/resolv-conf") + (home-page "https://github.com/tailhook/resolv-conf") (synopsis "Parser for @file{/etc/resolv.conf}") (description "This package provides a parser for @file{/etc/resolv.conf} file.") -- cgit 1.4.1 From ca8fa11754563786ffbae8de8da21fe086e1f9d2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sat, 13 Mar 2021 09:29:26 +0100 Subject: gnu: mergerfs: Update to 2.32.4. * gnu/packages/file-systems.scm (mergerfs): Update to 2.32.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 a6c7969638..e7d78e41fb 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -978,7 +978,7 @@ community.") (define-public mergerfs (package (name "mergerfs") - (version "2.31.0") + (version "2.32.4") (source (origin (method url-fetch) @@ -986,7 +986,7 @@ community.") version "/mergerfs-" version ".tar.gz")) (sha256 (base32 - "0k4asbg5n9dhy5jpjkw6simqqnr1zira2y4i71cq05091dfwm90p")))) + "0yz7nljx6axcj6hb09sgc0waspgfhp535228rjqvqgyd8y74jc3s")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests exist. -- cgit 1.4.1 From 74e2c0e00f58c8bf948f7dc7c5ae2876af910d5a Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 13 Mar 2021 03:41:14 -0500 Subject: gnu: gnutls: Fix CVE-2021-20231 and CVE-2021-20232. * gnu/packages/patches/gnutls-CVE-2021-20231.patch, gnu/packages/patches/gnutls-CVE-2021-20232.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/tls.scm (gnutls)[replacement]: New field. (gnutls/fixed): New variable. (guile2.2-gnutls): Use package/inherit. --- gnu/local.mk | 2 + gnu/packages/patches/gnutls-CVE-2021-20231.patch | 62 ++++++++++++++++++++++++ gnu/packages/patches/gnutls-CVE-2021-20232.patch | 60 +++++++++++++++++++++++ gnu/packages/tls.scm | 15 ++++-- 4 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gnutls-CVE-2021-20231.patch create mode 100644 gnu/packages/patches/gnutls-CVE-2021-20232.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index e2bebb90d2..551503e053 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1144,6 +1144,8 @@ dist_patch_DATA = \ %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gnutls-cross.patch \ + %D%/packages/patches/gnutls-CVE-2021-20231.patch \ + %D%/packages/patches/gnutls-CVE-2021-20232.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ diff --git a/gnu/packages/patches/gnutls-CVE-2021-20231.patch b/gnu/packages/patches/gnutls-CVE-2021-20231.patch new file mode 100644 index 0000000000..5186522eee --- /dev/null +++ b/gnu/packages/patches/gnutls-CVE-2021-20231.patch @@ -0,0 +1,62 @@ +From 15beb4b193b2714d88107e7dffca781798684e7e Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 29 Jan 2021 14:06:05 +0100 +Subject: [PATCH 1/2] key_share: avoid use-after-free around realloc + +Signed-off-by: Daiki Ueno +--- + lib/ext/key_share.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/lib/ext/key_share.c b/lib/ext/key_share.c +index ab8abf8fe..a8c4bb5cf 100644 +--- a/lib/ext/key_share.c ++++ b/lib/ext/key_share.c +@@ -664,14 +664,14 @@ key_share_send_params(gnutls_session_t session, + { + unsigned i; + int ret; +- unsigned char *lengthp; +- unsigned int cur_length; + unsigned int generated = 0; + const gnutls_group_entry_st *group; + const version_entry_st *ver; + + /* this extension is only being sent on client side */ + if (session->security_parameters.entity == GNUTLS_CLIENT) { ++ unsigned int length_pos; ++ + ver = _gnutls_version_max(session); + if (unlikely(ver == NULL || ver->key_shares == 0)) + return 0; +@@ -679,16 +679,13 @@ key_share_send_params(gnutls_session_t session, + if (!have_creds_for_tls13(session)) + return 0; + +- /* write the total length later */ +- lengthp = &extdata->data[extdata->length]; ++ length_pos = extdata->length; + + ret = + _gnutls_buffer_append_prefix(extdata, 16, 0); + if (ret < 0) + return gnutls_assert_val(ret); + +- cur_length = extdata->length; +- + if (session->internals.hsk_flags & HSK_HRR_RECEIVED) { /* we know the group */ + group = get_group(session); + if (unlikely(group == NULL)) +@@ -736,7 +733,8 @@ key_share_send_params(gnutls_session_t session, + } + + /* copy actual length */ +- _gnutls_write_uint16(extdata->length - cur_length, lengthp); ++ _gnutls_write_uint16(extdata->length - length_pos - 2, ++ &extdata->data[length_pos]); + + } else { /* server */ + ver = get_version(session); +-- +2.30.2 + diff --git a/gnu/packages/patches/gnutls-CVE-2021-20232.patch b/gnu/packages/patches/gnutls-CVE-2021-20232.patch new file mode 100644 index 0000000000..dc3a0be690 --- /dev/null +++ b/gnu/packages/patches/gnutls-CVE-2021-20232.patch @@ -0,0 +1,60 @@ +From 75a937d97f4fefc6f9b08e3791f151445f551cb3 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Fri, 29 Jan 2021 14:06:23 +0100 +Subject: [PATCH 2/2] pre_shared_key: avoid use-after-free around realloc + +Signed-off-by: Daiki Ueno +--- + lib/ext/pre_shared_key.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c +index a042c6488..380bf39ed 100644 +--- a/lib/ext/pre_shared_key.c ++++ b/lib/ext/pre_shared_key.c +@@ -267,7 +267,7 @@ client_send_params(gnutls_session_t session, + size_t spos; + gnutls_datum_t username = {NULL, 0}; + gnutls_datum_t user_key = {NULL, 0}, rkey = {NULL, 0}; +- gnutls_datum_t client_hello; ++ unsigned client_hello_len; + unsigned next_idx; + const mac_entry_st *prf_res = NULL; + const mac_entry_st *prf_psk = NULL; +@@ -428,8 +428,7 @@ client_send_params(gnutls_session_t session, + assert(extdata->length >= sizeof(mbuffer_st)); + assert(ext_offset >= (ssize_t)sizeof(mbuffer_st)); + ext_offset -= sizeof(mbuffer_st); +- client_hello.data = extdata->data+sizeof(mbuffer_st); +- client_hello.size = extdata->length-sizeof(mbuffer_st); ++ client_hello_len = extdata->length-sizeof(mbuffer_st); + + next_idx = 0; + +@@ -440,6 +439,11 @@ client_send_params(gnutls_session_t session, + } + + if (prf_res && rkey.size > 0) { ++ gnutls_datum_t client_hello; ++ ++ client_hello.data = extdata->data+sizeof(mbuffer_st); ++ client_hello.size = client_hello_len; ++ + ret = compute_psk_binder(session, prf_res, + binders_len, binders_pos, + ext_offset, &rkey, &client_hello, 1, +@@ -474,6 +478,11 @@ client_send_params(gnutls_session_t session, + } + + if (prf_psk && user_key.size > 0 && info) { ++ gnutls_datum_t client_hello; ++ ++ client_hello.data = extdata->data+sizeof(mbuffer_st); ++ client_hello.size = client_hello_len; ++ + ret = compute_psk_binder(session, prf_psk, + binders_len, binders_pos, + ext_offset, &user_key, &client_hello, 0, +-- +2.30.2 + diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e0741ad310..e8e1350e29 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès -;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2013, 2015 Andreas Enge ;;; Copyright © 2015 David Thompson @@ -165,6 +165,7 @@ living in the same process.") (package (name "gnutls") (version "3.6.15") + (replacement gnutls/fixed) (source (origin (method url-fetch) ;; Note: Releases are no longer on ftp.gnu.org since the @@ -256,6 +257,15 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +(define gnutls/fixed + (package + (inherit gnutls) + (source (origin + (inherit (package-source gnutls)) + (patches (append (search-patches "gnutls-CVE-2021-20231.patch" + "gnutls-CVE-2021-20232.patch") + (origin-patches (package-source gnutls)))))))) + (define-public gnutls/guile-2.0 ;; GnuTLS for Guile 2.0. (package/inherit gnutls @@ -274,8 +284,7 @@ required structures.") ,@(package-inputs gnutls))))) (define-public guile2.2-gnutls - (package - (inherit gnutls) + (package/inherit gnutls (name "guile2.2-gnutls") (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" -- cgit 1.4.1 From d091371c59e2c10f4b2c61f5e18da5b8d1c0e109 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 13 Mar 2021 10:52:17 +0000 Subject: gnu: emacs-ivy-rich: Update to 0.1.6-1.7b9b7b2. * gnu/packages/emacs-xyz.scm (emacs-ivy-rich): Update to git snapshot 0.1.6-1.7b9b7b2. --- gnu/packages/emacs-xyz.scm | 47 +++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0bf744e1cf..ae5d2b18bb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -40,7 +40,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Alex Branham ;;; Copyright © 2018 Thorsten Wilms -;;; Copyright © 2018, 2019, 2020 Pierre Langlois +;;; Copyright © 2018, 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2018, 2019, 2020, 2021 Brett Gilio ;;; Copyright © 2019, 2020 Dimakakos Dimos ;;; Copyright © 2019, 2020 Brian Leung @@ -7962,30 +7962,35 @@ use it, call @code{M-x ivy-yasnippet} (but make sure you have enabled @code{yas-minor-mode} first).") (license license:gpl3+)))) +;; The 0.1.6 release is incompatible with newer ivy versions, so we instead +;; pick a more recent snapshot of the repository, see +;; https://github.com/Yevgnen/ivy-rich/pull/80. (define-public emacs-ivy-rich - (package - (name "emacs-ivy-rich") - (version "0.1.6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Yevgnen/ivy-rich") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ra18v6lgz3m6asm6d5b92zn1x22yiz4cwxd9b54dnvwi11121m7")))) - (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 Ivy by showing more information in the minibuffer + (let ((commit "7b9b7b20c3ead81da90232cd6707dfad3c1f1eb3") + (revision "1")) + (package + (name "emacs-ivy-rich") + (version (git-version "0.1.6" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Yevgnen/ivy-rich") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03p13z609ighdq4axls93alqfl7pclx12g4vdd7lwpcy0r0cgyf8")))) + (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 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+))) + (license license:gpl3+)))) (define-public emacs-avy (package -- cgit 1.4.1 From 9693868579709d6c036e7d08c042483e61d3f3df Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 8 Mar 2021 10:41:53 +0100 Subject: gnu: Add emacs-ox-gemini. * gnu/packages/emacs-xyz.scm (emacs-ox-gemini): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ae5d2b18bb..48c00835ca 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23933,6 +23933,31 @@ convert the resulting @code{.epub} to a @code{.mobi} file. Needs a working zip utility (default is @code{zip}).") (license license:gpl3+))) +(define-public emacs-ox-gemini + ;; No releases yet + (let ((commit "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0") + (revision "0")) + (package + (name "emacs-ox-gemini") + (version (git-version "2021-01-02" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~abrahms/ox-gemini") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29")))) + (build-system emacs-build-system) + (home-page "https://sr.ht/~abrahms/ox-gemini") + (synopsis "Export Org files in Gemini format") + (description + "@code{ox-gemini} adds support for exporting Org files in Gemini +format. Many things were taken from the ASCII exporter, from which +@code{ox-gemini} derives.") + (license license:gpl3+)))) + (define-public emacs-ox-hugo (package (name "emacs-ox-hugo") -- cgit 1.4.1 From aa596975092204c04e3952e4b6eb66f19eee1318 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 Mar 2021 12:09:08 +0100 Subject: gnu: emacs-ox-gemini: Fix version number. * gnu/packages/emacs-xyz.scm (emacs-ox-gemini)[version]: Set version number to 0 as set in the main library. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 48c00835ca..e559ab0e10 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23939,7 +23939,7 @@ zip utility (default is @code{zip}).") (revision "0")) (package (name "emacs-ox-gemini") - (version (git-version "2021-01-02" revision commit)) + (version (git-version "0" revision commit)) (source (origin (method git-fetch) -- cgit 1.4.1 From 339200699fc32ec31372c828bb98a38f7b460c1a Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 13 Mar 2021 12:13:03 +0100 Subject: gnu: Add emacs-ox-haunt. * gnu/packages/emacs-xyz.scm (emacs-ox-haunt): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e559ab0e10..cb0cfcd07f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23958,6 +23958,27 @@ format. Many things were taken from the ASCII exporter, from which @code{ox-gemini} derives.") (license license:gpl3+)))) +(define-public emacs-ox-haunt + (package + (name "emacs-ox-haunt") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~jakob/ox-haunt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rs1n228c2fmpvirc57bqgf2616ijpphkgf4w9ln5j46snmkam25")))) + (build-system emacs-build-system) + (home-page "https://git.sr.ht/~jakob/ox-haunt") + (synopsis "Export Org files to HTML appropriate for Haunt") + (description + "This library implements an HTML back-end for the Org generic exporter, +producing output appropriate for Haunt's @code{html-reader}.") + (license license:gpl3+))) + (define-public emacs-ox-hugo (package (name "emacs-ox-hugo") -- cgit 1.4.1 From e5d526d758f0887d96b12b56758dea2c027a8729 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Sat, 6 Mar 2021 02:50:53 +0000 Subject: gnu: Add python-click-default-group. * /gnu/packages/python-xyz.scm (python-click-default-group): New variable. Co-authored-by: Raghav Gururajan Co-authored-by: jgart Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 361626a128..6efd1c10e2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -98,6 +98,7 @@ ;;; Copyright © 2020 EuAndreh ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Ellis Kenyő +;;; Copyright © 2021 LibreMiami ;;; ;;; This file is part of GNU Guix. ;;; @@ -10851,6 +10852,27 @@ applications.") (home-page "https://github.com/click-contrib/click-log") (license license:expat))) +(define-public python-click-default-group + (package + (name "python-click-default-group") + (version "1.2.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "click-default-group" version)) + (sha256 + (base32 + "015r78jk8gznfw0dphpwaqcx5mhg5822b55w5xbb6i7sin70wmnr")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; no target + (propagated-inputs + `(("python-click" ,python-click))) + (synopsis "Extends click.Group") + (description "This package extends click.Group to invoke a command without +explicit subcommand name.") + (home-page "https://github.com/click-contrib/click-default-group") + (license license:bsd-3))) + (define-public python-structlog (package (name "python-structlog") -- cgit 1.4.1 From 8dc25b4bb3724690c30802d7e3bac8d609e3c836 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Sat, 13 Mar 2021 12:22:56 +0100 Subject: gnu: Add clikan. * gnu/packages/task-management.scm (clikan): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/task-management.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 3edf01a9f5..6b1ae7f6f7 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -44,6 +44,35 @@ #:use-module (guix build-system meson) #:use-module (guix build-system python)) +(define-public clikan + (let ((commit "90fd60e485b46e49fcec7d029384fe1471c4443a") + (revision "0")) + (package + (name "clikan") + (version + (git-version "0.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kitplummer/clikan/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "113kizm05v4cvyhdlg9zami54wk9qaiizq19mx36qvq9w7pg7a3k")))) + (build-system python-build-system) + (inputs + `(("click" ,python-click) + ("click-default-group" ,python-click-default-group) + ("pyyaml" ,python-pyyaml) + ("terminaltables" ,python-terminaltables))) + (synopsis "Command-line kanban (boarding) utility") + (description + "Clikan is a super simple command-line utility for tracking tasks +following the Japanese kanban (boarding) style.") + (home-page "https://github.com/kitplummer/clikan/") + (license license:expat)))) + (define-public t-todo-manager ;; Last release is more than 10 years old. Using latest commit. (let ((changeset "89ad444c000b") -- cgit 1.4.1 From 71c97c89b09f2c0670d71c7c0f51c25e827c2f07 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Tue, 9 Mar 2021 22:50:18 +0100 Subject: gnu: Add xe. * gnu/packages/parallel.scm (xe): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/parallel.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index ab4450c24e..8816844368 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Roel Janssen +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module ((guix utils) #:select (target-64bit?)) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages autotools) @@ -105,6 +107,34 @@ or more computers. Jobs can consist of single commands or of scripts and they are executed on lists of files, hosts, users or other items.") (license license:gpl3+))) +(define-public xe + (package + (name "xe") + (version "0.11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/leahneukirchen/xe") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04jr8f6jcijr0bsmn8ajm0aj35qh9my3xjsaq64h8lwg5bpyn29x")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" %output)) + #:phases (modify-phases %standard-phases + (delete 'configure)))) + (synopsis "Execute a command for every argument") + (description + "The xe utility constructs command lines from specified arguments, +combining some of the best features of xargs(1) and apply(1). Parallel +execution is also possible.") + (home-page "https://github.com/leahneukirchen/xe") + (license license:public-domain))) + (define-public slurm (package (name "slurm") -- cgit 1.4.1 From fe533002636be8f172b154ce7e54c6ffe2a5c7c9 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 12 Mar 2021 22:56:09 +0100 Subject: gnu: Add emacs-elfeed-score. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb0cfcd07f..a696d27e6e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9053,6 +9053,34 @@ duplicated a lot. Org-mode makes the book keeping of tags and feeds much easier.") (license license:gpl3+)))) +(define-public emacs-elfeed-score + (package + (name "emacs-elfeed-score") + (version "0.7.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sp1ff/elfeed-score") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07xid0a31ghknbfwj8dxzbqkg4sfayjhlqvp17p2bzlf1mj0zjyd")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-elfeed" ,emacs-elfeed))) + (home-page "https://github.com/sp1ff/elfeed-score") + (synopsis "Gnus-style scoring for Elfeed") + (description + "@Elfeed-score is an add-on for Elfeed, an RSS reader for Emacs. It +brings Gnus-style scoring to your RSS feeds. Elfeed, by default, displays +feed entries by date. This package allows you to setup rules for assigning +numeric scores to entries, and sorting entries with higher scores ahead of +those with lower, regardless of date. The idea is to prioritize content +important to you.") + (license license:gpl3+))) + (define-public emacs-el-x (package (name "emacs-el-x") -- cgit 1.4.1 From c0641c0965ed324968c9ea307c91a1a8c346f5e4 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 12 Mar 2021 22:40:07 +0100 Subject: gnu: Add emacs-org-msg. * gnu/packages/emacs-xyz.scm (emacs-org-msg): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a696d27e6e..74ab3c889b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6658,6 +6658,32 @@ useful for sending tables, fontified source code, and inline images in email.") (license license:gpl3+))) +(define-public emacs-org-msg + ;; No git tags. The commit below corresponds to the release of version 3.3. + (let ((commit "89e746c0a864031eef940758230bc7263a6f2289")) + (package + (name "emacs-org-msg") + (version "3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jeremy-compostella/org-msg") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15gd5zbxvdallyra9lmpb9i1r2mmwz0j0i0ra7j9imnbfiz3ln9r")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-htmlize" ,emacs-htmlize))) + (home-page "https://github.com/jeremy-compostella/org-msg") + (synopsis "Mix Org mode and Message mode to compose emails") + (description + "OrgMsg is a GNU Emacs global minor mode mixing up Org mode and your +Mail User Agent Mode (Message, mu4e, or Notmuch) to compose and reply to +emails in a Outlook HTML friendly style.") + (license license:gpl3+)))) + (define-public emacs-org-superstar (package (name "emacs-org-superstar") -- cgit 1.4.1 From 211c933077a6c61eb3a7a67df60cb01b1b5a2c3f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 9 Mar 2021 11:12:09 -0300 Subject: gnu: Add python-pooch. * gnu/packages/python-xyz.scm (python-pooch): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6efd1c10e2..dadf08f03d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -19276,6 +19276,31 @@ library: to minimize boilerplate code in traditional extension modules by inferring type information using compile-time introspection.") (license license:bsd-3))) +(define-public python-pooch + (package + (name "python-pooch") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pooch" version)) + (sha256 + (base32 "1618adsg9r8fsv422sv35z1i723q3a1iir5v7dv2sklh4pl4im1h")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;requires online data + (propagated-inputs + `(("python-appdirs" ,python-appdirs) + ("python-packaging" ,python-packaging) + ("python-requests" ,python-requests))) + (home-page "https://github.com/fatiando/pooch") + (synopsis "Manage your Python library's sample data files") + (description + "Pooch manages your Python library's sample data files: it automatically +downloads and stores them in a local directory, with support for versioning +and corruption checks.") + (license license:bsd-3))) + (define-public python-fasteners (package (name "python-fasteners") -- cgit 1.4.1 From 36062f16b6bce9e5178ba4614d1c8e763a96eb64 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 9 Mar 2021 11:15:54 -0300 Subject: gnu: python-scikit-image: Update to 0.18.1. * gnu/packages/python-science.scm (python-scikit-image): Update to 0.18.1. [propagated-inputs]: Remove python-six. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-science.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 391d37dcce..409745819b 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Pierre Langlois -;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. @@ -240,18 +240,18 @@ logic, also known as grey logic.") (define-public python-scikit-image (package (name "python-scikit-image") - (version "0.17.2") + (version "0.18.1") (source (origin (method url-fetch) (uri (pypi-uri "scikit-image" version)) (sha256 - (base32 "1cyqqbcbrg3prc36wis0sm3q5rjhd7h9bp33jwfyixzhi02lr5dx")))) + (base32 "0wgisa03smhrphcjnhq7waa5vyyd32b67hblapjbqrqqj751idpv")))) (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 + ;; See requirements/ for the list of build and run time requirements. (propagated-inputs `(("python-cloudpickle" ,python-cloudpickle) ("python-dask" ,python-dask) @@ -262,7 +262,6 @@ logic, also known as grey logic.") ("python-pillow" ,python-pillow) ("python-pywavelets" ,python-pywavelets) ("python-scipy" ,python-scipy) - ("python-six" ,python-six) ("python-tifffile" ,python-tifffile))) (native-inputs `(("python-cython" ,python-cython))) -- cgit 1.4.1 From 0455c19fa56396a460d6f707a39b6da6502b90e8 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Tue, 9 Mar 2021 12:51:14 -0300 Subject: gnu: python-scikit-image: Enable tests. * gnu/packages/python-science.scm (python-scikit-image)[arguments]: Add phases related to tests. [native-inputs]: Add python-codecov, python-flake8, python-pytest, python-pytest-cov, python-pytest-localserver, python-wheel. Signed-off-by: Nicolas Goaziou --- gnu/packages/python-science.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 409745819b..79ee7c8bb2 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -36,6 +36,8 @@ #:use-module (gnu packages maths) #:use-module (gnu packages perl) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) @@ -249,9 +251,25 @@ logic, also known as grey logic.") (base32 "0wgisa03smhrphcjnhq7waa5vyyd32b67hblapjbqrqqj751idpv")))) (build-system python-build-system) (arguments - ;; TODO: Some tests require running X11 server. Disable them? - '(#:tests? #f)) + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'change-home-dir + (lambda _ + ;; Change from /homeless-shelter to /tmp for write permission. + (setenv "HOME" "/tmp") + #t)) + (replace 'build + (lambda _ + (invoke "make"))) + (replace 'check + (lambda _ + ;; The following tests require online data. + (invoke "python" "-m" "pytest" "skimage" "--doctest-modules" "-k" + (string-append "not test_ndim" + " and not test_skin"))))))) ;; See requirements/ for the list of build and run time requirements. + ;; NOTE: scikit-image has an optional dependency on python-pooch, however + ;; propagating it would enable many more tests that require online data. (propagated-inputs `(("python-cloudpickle" ,python-cloudpickle) ("python-dask" ,python-dask) @@ -264,7 +282,13 @@ logic, also known as grey logic.") ("python-scipy" ,python-scipy) ("python-tifffile" ,python-tifffile))) (native-inputs - `(("python-cython" ,python-cython))) + `(("python-codecov" ,python-codecov) + ("python-cython" ,python-cython) + ("python-flake8" ,python-flake8) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-localserver" ,python-pytest-localserver) + ("python-wheel" ,python-wheel))) (home-page "https://scikit-image.org/") (synopsis "Image processing in Python") (description -- cgit 1.4.1 From 5e753287c8e1ac2381d8d01e487e25dc28ec9c80 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 13 Mar 2021 14:17:32 +0100 Subject: gnu: cagebreak: Update to 1.6.0. * gnu/packages/wm.scm (cagebreak): Update to 1.6.0. --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 9cab0cb3db..9c5938bd87 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Noodles! ;;; Copyright © 2019, 2020 Alexandru-Sergiu Marton -;;; Copyright © 2020 Nicolas Goaziou +;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Boris A. Dekshteyn ;;; Copyright © 2020 Marcin Karpezo @@ -2346,7 +2346,7 @@ shows a notification for the user on the screen.") (define-public cagebreak (package (name "cagebreak") - (version "1.4.4") + (version "1.6.0") (source (origin (method git-fetch) (uri (git-reference @@ -2355,7 +2355,7 @@ shows a notification for the user on the screen.") (file-name (git-file-name name version)) (sha256 (base32 - "0mnxs1m7jrqdl0asx39nxfzvkp7d4jqpdchi63w2yd1igpj2frb2")))) + "02gxmypfj75amdd8lwdkkk7imw7lwmghpyk8h9asljy9aq6ymdqp")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dxwayland=true"))) (native-inputs -- cgit 1.4.1 From 2ee7524c76e32e5277af40b4b55aa3ac4e421f19 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Mon, 15 Feb 2021 00:23:37 +0800 Subject: gnu: opencc: Update to 1.1.1. * gnu/packages/textutils.scm(opencc): Update to 1.1.1 [arguments]<#:out-of-source?>: Build in source tree. <#:parallel-build?>: Disable. <#:phases>: In "patch-3rd-party-references", fix the version of dependency. Add phases "patch-python-binding-installation", "install-python-binding" and "enable-bytecode-determinism". [native-inputs]: Add python-setuptools and python-wheel. Signed-off-by: Nicolas Goaziou --- gnu/packages/textutils.scm | 62 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 53 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 34da04d0d8..c2eb7ca1da 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -60,6 +60,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages slang) @@ -1051,36 +1052,79 @@ OpenDocument presentations (*.odp).") (define-public opencc (package (name "opencc") - (version "1.0.5") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BYVoid/OpenCC") - (commit (string-append "ver." version)))) + (url "https://github.com/BYVoid/OpenCC") + (commit (string-append "ver." version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1pv5md225qwhbn8ql932zdg6gh1qlx3paiajaks8gfsa07yzvhr4")) + "07y0pvxjlmpcnym229j87qcfwnfm7vi10dad0a20xy6as55a9j3d")) (modules '((guix build utils))) (snippet '(begin ;; TODO: Unbundle tclap, darts-clone, gtest - (delete-file-recursively "deps/rapidjson-0.11") #t)))) + (delete-file-recursively "deps/rapidjson-1.1.0") #t)))) (build-system cmake-build-system) (arguments - '(#:phases + ;; Required to locate the install script properly. + `(#:out-of-source? #f + #:parallel-build? #f ;occasionally failed. + #:imported-modules + (,@%cmake-build-system-modules + (guix build python-build-system)) + #:modules ((guix build cmake-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'prevent-rebuild-during-installation + (lambda _ + (substitute* "python/setup.py" + (("'build_py': BuildPyCommand,") "")) + #t)) (add-after 'unpack 'patch-3rd-party-references (lambda* (#:key inputs #:allow-other-keys) (let ((rapidjson (assoc-ref inputs "rapidjson"))) (substitute* "src/CMakeLists.txt" - (("../deps/rapidjson-0.11") + (("../deps/rapidjson-1.1.0") (string-append rapidjson "/include/rapidjson"))) - #t)))))) + #t))) + (add-before 'configure 'patch-python-binding-installation + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "python/opencc/__init__.py" + (("(_libopenccfile =).*$" _ prefix) + (format #f "~a os.path.join('~a/lib', _libopenccfilename)~%" + prefix out)) + (("(_opencc_share_dir =).*$" _ prefix) + (format #f "~a '~a/share/opencc'~%" prefix out)))) + #t)) + (add-after 'install 'install-python-binding + (lambda* (#:key outputs inputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dist (string-append + out "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages"))) + (chdir "python") + (mkdir-p dist) + (setenv "PYTHONPATH" + (string-append dist ":" (getenv "PYTHONPATH"))) + (invoke "python" "setup.py" "install" + "--root=/" "--single-version-externally-managed" + (string-append "--prefix=" out)) + #t))) + (add-before 'install-python-binding 'enable-bytecode-determinism + (assoc-ref python:%standard-phases 'enable-bytecode-determinism))))) (native-inputs `(("python" ,python-wrapper) - ("rapidjson" ,rapidjson))) + ("rapidjson" ,rapidjson) + ("python-setuptools" ,python-setuptools) + ("python-wheel" ,python-wheel))) (home-page "https://github.com/BYVoid/OpenCC") (synopsis "Convert between Traditional Chinese and Simplified Chinese") (description "Open Chinese Convert (OpenCC) converts between Traditional -- cgit 1.4.1 From de84dfbed56a7015337e2cdf64092d476a0635c7 Mon Sep 17 00:00:00 2001 From: Milkey Mouse Date: Sat, 20 Feb 2021 22:34:42 -0800 Subject: gnu: opencl-headers: Update to 2020.12.18 * gnu/packages/opencl.scm (opencl-headers): Update to 2020.12.18. [version]: Use the latest tagged version, now that they exist. [arguments]: Replace all phases with trivial header copy. [license]: Change license to Apache 2.0 (happened in March 2020). Signed-off-by: Nicolas Goaziou --- gnu/packages/opencl.scm | 68 +++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index ddc30ef037..e95d19db47 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -20,6 +20,7 @@ (define-module (gnu packages opencl) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -47,44 +48,35 @@ ;; tests that require such devices are all disabled. ;; Check https://lists.gnu.org/archive/html/guix-devel/2018-04/msg00293.html +(define-public opencl-headers + (package + (name "opencl-headers") + (version "2020.12.18") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KhronosGroup/OpenCL-Headers") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zslxfzvbb1mrzmsik4pjzj88ds8y3p94ry5nnrnkhv6qm4n4lw9")))) + (build-system copy-build-system) + (arguments + '(#:install-plan + '(("CL" "include/")))) ; TODO: add phase for tests + (synopsis "The Khronos OpenCL headers") + (description + "This package provides the C headers by Khronos for OpenCL programming.") + (home-page "https://www.khronos.org/registry/OpenCL/") + (license license:asl2.0))) + (define (make-opencl-headers major-version subversion) - (let ((commit "e986688daf750633898dfd3994e14a9e618f2aa5") - (revision "0")) - (package - (name "opencl-headers") - (version (git-version - (string-append major-version "." subversion ".0") - revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/KhronosGroup/OpenCL-Headers") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "176ydpbyws5nr4av6hf8p41pkhc0rc4m4vrah9w6gp2fw2i32838")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (delete 'check) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively (string-append "./opencl" (string-append - ,major-version - ,subversion) "/CL") - (string-append - (assoc-ref outputs "out") - "/include/CL"))))))) - (synopsis "The Khronos OpenCL headers") - (description - "This package provides the C headers by Khronos for OpenCL -programming.") - (home-page "https://www.khronos.org/registry/OpenCL/") - (license license:expat)))) + ;; The upstream OpenCL-Headers repository is no longer separating headers by + ;; version; instead, you are supposed to #define CL_TARGET_OPENCL_VERSION. + (deprecated-package (string-append "opencl-headers-" + major-version "." + subversion) opencl-headers)) (define-public opencl-headers-2.2 (make-opencl-headers "2" "2")) @@ -99,8 +91,6 @@ programming.") (define-public opencl-headers-1.0 (make-opencl-headers "1" "0")) -(define-public opencl-headers opencl-headers-2.2) - (define-public opencl-clhpp (package (name "opencl-clhpp") -- cgit 1.4.1 From 80a4b150fc6b8d8a387744f1957979c95240f79d Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 13 Mar 2021 14:43:49 +0100 Subject: gnu: terminator: Update to 2.1.0. * gnu/packages/gnome.scm (terminator): Update to 2.1.0. [inputs]: Add python, python-dbus, python-notify2. [arguments]: Add a phase to handle Python DBus. Disable tests. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 63 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d2881dbec6..b795cae145 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10839,19 +10839,20 @@ advanced image management tool") (define-public terminator (package (name "terminator") - (version "1.92") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/gnome-" name "/" name "/" - "releases/download/v" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z")))) + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/gnome-terminator/terminator/" + "releases/download/v" version "/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "1vap4li2i24l1iz2q4b8wvhj8flamarf18xcmzq5ik2vzcrisbjy")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-resources + ("glib:bin" ,glib "bin") ; for glib-compile-resources ("gobject-introspection" ,gobject-introspection) ("intltool" ,intltool) ("pkg-config" ,pkg-config) @@ -10863,33 +10864,45 @@ advanced image management tool") ("dbus-glib" ,dbus-glib) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gtk+" ,gtk+) + ("python" ,python-wrapper) + ("python-dbus" ,python-dbus) + ("python-notify2" ,python-notify2) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("vte" ,vte))) (propagated-inputs `(("python-configobj" ,python-configobj))) (arguments - `(#:imported-modules ((guix build glib-or-gtk-build-system) + ;; One test out of 28 fails due to dbus-python and python-notify; skip + ;; tests. + `(#:tests? #f + #:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) (guix build utils)) #:phases (modify-phases %standard-phases - (add-after - 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/terminator")) - (pylib (string-append (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t))) + (add-after 'unpack 'handle-dbus-python + (lambda _ + ;; python-dbus cannot be found but it's really there. See + ;; https://github.com/SpotlightKid/jack-select/issues/2 + (substitute* "setup.py" + (("'dbus-python',") "")) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/terminator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (home-page "https://gnome-terminator.org/") -- cgit 1.4.1 From e06b1ebcaa19dc80016d7ebff05d590a829dd930 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 13 Mar 2021 14:52:37 +0100 Subject: gnu: Add l2md. * gnu/packages/mail.scm (l2md): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f81674a5a2..b02f547e03 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -58,6 +58,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages mail) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages aspell) @@ -3924,6 +3925,45 @@ It is a replacement for the @command{urlview} program.") related tools to process winmail.dat files.") (license license:gpl2+))) +(define-public l2md + ;; No official release. + (let ((commit "f7286b49bb5fce25c898c143712fe34ad4d7864e") + (revision "1")) + (package + (name "l2md") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hxz8i70v1xgv30zjclfvmjqszn073c7i8nwmswi2lr6vd7cklvp")))) + (build-system gnu-build-system) + (inputs + `(("libgit2" ,libgit2))) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure scripts + (delete 'check) ;no tests + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((l2md (string-append (assoc-ref outputs "out") "/bin"))) + (mkdir-p l2md))))) + #:make-flags + (list ,(string-append "CC=" (cc-for-target)) + (string-append "PREFIX=" %output "/bin")))) + (home-page + "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git") + (synopsis "Import public-inbox archives via Git") + (description + "The @command{l2md} command line tool imports public-inbox archives via +Git and exports them in maildir format or to an MDA through a pipe.") + (license license:gpl2)))) + (define-public public-inbox (package (name "public-inbox") -- cgit 1.4.1 From aa0598974b9c454dcce0a7a4aba1a0198bce8b93 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 5 Mar 2021 23:04:19 +0100 Subject: gnu: Add guile-f-scm. * gnu/packages/guile-xyz.scm (guile-f-scm): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/guile-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 115c3d82f5..4799711c66 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -237,6 +238,30 @@ more.") (home-page "https://www.gnu.org/software/artanis/") (license (list license:gpl3+ license:lgpl3+)))) ;dual license +(define-public guile-f-scm + (package + (name "guile-f-scm") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~brown121407/f.scm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14wyrs3m1649l3km4pl2175dmap1372j5h8nkhykrbxg5xqp6ivd")))) + (build-system guile-build-system) + (native-inputs + `(("guile" ,guile-3.0))) + (home-page "https://git.sr.ht/~brown121407/f.scm") + (synopsis "Library for working with files and directories") + (description + "f.scm is a library intended to facilitate working with files and +directories (the file system in general). It was initially inspired by the +f library for Emacs.") + (license license:gpl3+))) + ;; There has not been any release yet. (define-public guildhall (let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778") -- cgit 1.4.1 From cb70485201ba7c25315b7d75243abef809fc9e5d Mon Sep 17 00:00:00 2001 From: Gerd Heber Date: Sun, 21 Feb 2021 16:42:10 -0600 Subject: gnu: Add syscall-intercept. * gnu/packages/engineering.scm (syscall-intercept): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/engineering.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9a10c21fc0..9358b2fd49 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020, 2021 Morgan Smith ;;; Copyright © 2021 qblade +;;; Copyright © 2021 Gerd Heber ;;; ;;; This file is part of GNU Guix. ;;; @@ -3044,3 +3045,39 @@ and drilling of PCBs. It takes Gerber files as input and outputs G-code files for the milling of PCBs. It also includes an autoleveller for the automatic dynamic calibration of the milling depth.") (license license:gpl3+))) + +(define-public syscall-intercept + ;; Upstream provides no tag. Also, last version update is 4 years old. + (let ((commit "304404581c57d43478438d175099d20260bae74e") + (revision "0")) + (package + (name "syscall-intercept") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/pmem/syscall_intercept/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17sw78xp5wjzv25adpbq3khl8fi0avj7bgpi57q3jnvl3c68xy5z")))) + (native-inputs + `(("perl" ,perl) + ("pkg-config" ,pkg-config))) + (inputs + `(("capstone" ,capstone))) + (build-system cmake-build-system) + (arguments + `(#:build-type "Release" + ;; FIXME: "syscall_format_logging" test fails. + #:tests? #f)) + (home-page "https://github.com/pmem/syscall_intercept") + (synopsis "System call intercepting library") + (description + "The system call intercepting library provides a low-level interface +for hooking Linux system calls in user space. This is achieved by +hot-patching the machine code of the standard C library in the memory of +a process.") + (license license:bsd-2)))) -- cgit 1.4.1 From 8698829587879d541bd115f0440084476b76df31 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 12:07:33 +0100 Subject: gnu: qjackctl: Update to 0.9.1. * gnu/packages/audio.scm (qjackctl): Update to 0.9.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 2440fed1fd..67a3e57dd9 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2678,14 +2678,14 @@ different audio devices such as ALSA or PulseAudio.") (define-public qjackctl (package (name "qjackctl") - (version "0.9.0") + (version "0.9.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "1gaabf2ncd5xd846fjm3k5d0kzphlyc33k9pralc2j3r3g0cb5ji")))) + "0m72kglwwvn91dxnka4lx765p3r0bcpqw251svymxr2wxjc4rgjg")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit 1.4.1 From ca8c2d1750653931ec093775f5759cdd04aded19 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 12:13:50 +0100 Subject: gnu: console-setup: Update to 1.201. * gnu/packages/xorg.scm (console-setup): Update to 1.201. --- 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 3f16f2c8b1..28ee64b96a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6631,7 +6631,7 @@ output.") (define-public console-setup (package (name "console-setup") - (version "1.197") + (version "1.201") (source (origin (method git-fetch) @@ -6639,7 +6639,7 @@ output.") (url "https://salsa.debian.org/installer-team/console-setup.git") (commit version))) (sha256 - (base32 "0m2q30f94vd1wb2zqpiyplpgfchjlm8j41xiyxcqdjzdgqbs7l27")) + (base32 "0xkynb8d1813wph3p0sdvbpimx7zqkzh4c3mmqymp3pibcg7af5a")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 15b39826ffef7adae2adff459264bfdc5362f320 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 17:06:33 +0100 Subject: gnu: quagga: Use archived source tarball. * gnu/packages/networking.scm (quagga)[source]: Download from Fossies archive. --- gnu/packages/networking.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f3f48321a9..e95e4870e9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2595,8 +2595,9 @@ does not use SSH and requires a pre-shared symmetric key.") (version "1.2.4") (source (origin (method url-fetch) - (uri (string-append "mirror://savannah/quagga/quagga-" - version ".tar.gz")) + ;; Use archived sources; see . + (uri (string-append "https://fossies.org/linux/misc/" + "quagga-" version ".tar.gz")) (sha256 (base32 "1lsksqxij5f1llqn86pkygrf5672kvrqn1kvxghi169hqf1c0r73")) -- cgit 1.4.1 From faf271e96e0a9c129790d141858e1b7ab1cadff4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Mar 2021 22:16:21 +0100 Subject: gnu: sudo: Update to 1.9.6. * gnu/packages/admin.scm (sudo): Update to 1.9.6. --- 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 8b3568e48e..e938d1bdac 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1495,7 +1495,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.5p2") + (version "1.9.6") (source (origin (method url-fetch) (uri @@ -1505,7 +1505,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0y093z4f3822rc88g9asdch12nljdamp817vjxk04mca7ks2x7jk")) + "0m9szw1fxj319z7d2j9nm04cbwk0flczwp1v4zb7sbndj825ijb2")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From c8887a5c6e8f6a19d54ffa428c6fe88a797b867a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Mar 2021 23:22:37 +0100 Subject: gnu: emacs-elfeed-score: Fix description Texinfo syntax. * gnu/packages/emacs-xyz.scm (emacs-elfeed-score)[description]: Remove extra "@". --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 74ab3c889b..dabac3c287 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9099,7 +9099,7 @@ much easier.") (home-page "https://github.com/sp1ff/elfeed-score") (synopsis "Gnus-style scoring for Elfeed") (description - "@Elfeed-score is an add-on for Elfeed, an RSS reader for Emacs. It + "Elfeed-score is an add-on for Elfeed, an RSS reader for Emacs. It brings Gnus-style scoring to your RSS feeds. Elfeed, by default, displays feed entries by date. This package allows you to setup rules for assigning numeric scores to entries, and sorting entries with higher scores ahead of -- cgit 1.4.1 From 8154beffd8c121e953a7c4cd75c3eebfcc073a9a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Mar 2021 23:59:03 +0100 Subject: gnu: guix: Update to c8887a5. * gnu/packages/package-management.scm (guix): Update to c8887a5. --- 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 d16b0fbc67..49067850c1 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "f8953bea858f894b406eed4a0aca0cd4c4d8671d") - (revision 15)) + (commit "c8887a5c6e8f6a19d54ffa428c6fe88a797b867a") + (revision 16)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "0m4mdg7fnn8vji2mk7ycaqrwwmh9gdwq3xli1fwbcn0ygj4cxlc6")) + "1fhli6h196chkd8b5j2qcyq5kj7pniw5n03jd502jm7kjzvkw18p")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 37b5e79154529efa9058c5d01c4f7826d532aa05 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 14 Mar 2021 06:04:33 +0100 Subject: gnu: wpewebkit: Update to 2.30.5 [security fixes]. * gnu/packages/webkit.scm (wpewebkit): Update to 2.30.5. [arguments]<#:configure-flags>: Add "-DUSE_SYSTEMD=OFF" and "-DUSE_GSTREAMER_GL=OFF". Change "-DENABLE_ENCRYPTED_MEDIA=ON" to "-DENABLE_ENCRYPTED_MEDIA=OFF" (DRM). --- gnu/packages/webkit.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 9ad6682880..9ce5fe4715 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -122,7 +122,7 @@ engine that uses Wayland for graphics output.") (define-public wpewebkit (package (name "wpewebkit") - (version "2.28.3") + (version "2.30.5") (source (origin (method url-fetch) @@ -130,7 +130,7 @@ engine that uses Wayland for graphics output.") (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "12z9457ja1xm93kl3gpd6nvd5xn11mvm8pr0w2zhmh3k9lx2cf95")))) + (base32 "16imr0kmzhs7dz6jva9750xbsdz9v50playnagabajy30x7pymsb")))) (build-system cmake-build-system) (outputs '("out" "doc")) (arguments @@ -140,8 +140,10 @@ engine that uses Wayland for graphics output.") "-DPORT=WPE" ;; XXX: To be enabled. ;; "-DENABLE_ACCELERATED_2D_CANVAS=ON" - "-DENABLE_ENCRYPTED_MEDIA=ON" - "-DENABLE_GTKDOC=ON") + "-DUSE_SYSTEMD=OFF" + "-DENABLE_ENCRYPTED_MEDIA=OFF" + "-DENABLE_GTKDOC=ON" + "-DUSE_GSTREAMER_GL=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'setenv -- cgit 1.4.1 From 92d0949a268fe8479af5851d5bb3733e207a5c81 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 14 Mar 2021 06:07:10 +0100 Subject: gnu: webkitgtk: Enable WOFF2 support. * gnu/packages/webkit.scm (webkitgtk): [arguments]<#:configure-flags>: Remove "-DUSE_WOFF2=OFF". [inputs]: Add woff2. --- gnu/packages/webkit.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 9ce5fe4715..bda05cc715 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -256,12 +256,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ;; included. More investigation is needed. For ;; now, we explicitly disable it to prevent an error ;; at configuration time. - "-DUSE_GSTREAMER_GL=OFF" - - ;; 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_GSTREAMER_GL=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'configure-bubblewrap-store-directory @@ -338,6 +333,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("mesa" ,mesa) ("openjpeg" ,openjpeg) ("sqlite" ,sqlite) + ("woff2" ,woff2) ("wpebackend-fdo" ,wpebackend-fdo) ("xdg-dbus-proxy" ,xdg-dbus-proxy))) (home-page "https://www.webkitgtk.org/") -- cgit 1.4.1 From 31d289a4759909d24dd309ac24d42902a8c20da0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 10 Mar 2021 08:29:53 +0100 Subject: gnu: unzip: Add patches from Fedora [security fixes]. Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and CVE-2019-13232. * gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch, gnu/packages/patches/unzip-CVE-2016-9844.patch, gnu/packages/patches/unzip-CVE-2018-1000035.patch, gnu/packages/patches/unzip-CVE-2018-18384.patch, gnu/packages/patches/unzip-case-insensitive.patch, gnu/packages/patches/unzip-alt-iconv-utf8-print.patch, gnu/packages/patches/unzip-alt-iconv-utf8.patch, gnu/packages/patches/unzip-close.patch, gnu/packages/patches/unzip-exec-shield.patch, gnu/packages/patches/unzip-fix-recmatch.patch, gnu/packages/patches/unzip-manpage-fix.patch, gnu/packages/patches/unzip-overflow.patch, gnu/packages/patches/unzip-symlink.patch, gnu/packages/patches/unzip-timestamp.patch, gnu/packages/patches/unzip-valgrind.patch, gnu/packages/patches/unzip-x-option.patch, gnu/packages/patches/unzip-zipbomb-manpage.patch, gnu/packages/patches/unzip-zipbomb-part1.patch, gnu/packages/patches/unzip-zipbomb-part2.patch, gnu/packages/patches/unzip-zipbomb-part3.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches. (unzip)[replacement]: Graft. --- gnu/local.mk | 20 + gnu/packages/compression.scm | 49 +++ .../unzip-COVSCAN-fix-unterminated-string.patch | 131 ++++++ gnu/packages/patches/unzip-CVE-2016-9844.patch | 39 ++ gnu/packages/patches/unzip-CVE-2018-1000035.patch | 34 ++ gnu/packages/patches/unzip-CVE-2018-18384.patch | 35 ++ .../patches/unzip-alt-iconv-utf8-print.patch | 381 ++++++++++++++++ gnu/packages/patches/unzip-alt-iconv-utf8.patch | 398 +++++++++++++++++ gnu/packages/patches/unzip-caseinsensitive.patch | 131 ++++++ gnu/packages/patches/unzip-close.patch | 176 ++++++++ gnu/packages/patches/unzip-exec-shield.patch | 10 + gnu/packages/patches/unzip-fix-recmatch.patch | 477 +++++++++++++++++++++ gnu/packages/patches/unzip-manpage-fix.patch | 11 + gnu/packages/patches/unzip-overflow.patch | 25 ++ gnu/packages/patches/unzip-symlink.patch | 17 + gnu/packages/patches/unzip-timestamp.patch | 41 ++ gnu/packages/patches/unzip-valgrind.patch | 26 ++ gnu/packages/patches/unzip-x-option.patch | 28 ++ gnu/packages/patches/unzip-zipbomb-manpage.patch | 25 ++ gnu/packages/patches/unzip-zipbomb-part1.patch | 25 ++ gnu/packages/patches/unzip-zipbomb-part2.patch | 349 +++++++++++++++ gnu/packages/patches/unzip-zipbomb-part3.patch | 112 +++++ 22 files changed, 2540 insertions(+) create mode 100644 gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch create mode 100644 gnu/packages/patches/unzip-CVE-2016-9844.patch create mode 100644 gnu/packages/patches/unzip-CVE-2018-1000035.patch create mode 100644 gnu/packages/patches/unzip-CVE-2018-18384.patch create mode 100644 gnu/packages/patches/unzip-alt-iconv-utf8-print.patch create mode 100644 gnu/packages/patches/unzip-alt-iconv-utf8.patch create mode 100644 gnu/packages/patches/unzip-caseinsensitive.patch create mode 100644 gnu/packages/patches/unzip-close.patch create mode 100644 gnu/packages/patches/unzip-exec-shield.patch create mode 100644 gnu/packages/patches/unzip-fix-recmatch.patch create mode 100644 gnu/packages/patches/unzip-manpage-fix.patch create mode 100644 gnu/packages/patches/unzip-overflow.patch create mode 100644 gnu/packages/patches/unzip-symlink.patch create mode 100644 gnu/packages/patches/unzip-timestamp.patch create mode 100644 gnu/packages/patches/unzip-valgrind.patch create mode 100644 gnu/packages/patches/unzip-x-option.patch create mode 100644 gnu/packages/patches/unzip-zipbomb-manpage.patch create mode 100644 gnu/packages/patches/unzip-zipbomb-part1.patch create mode 100644 gnu/packages/patches/unzip-zipbomb-part2.patch create mode 100644 gnu/packages/patches/unzip-zipbomb-part3.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 551503e053..6500f5bda2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1740,6 +1740,26 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-initialize-symlink-flag.patch \ %D%/packages/patches/unzip-overflow-long-fsize.patch \ %D%/packages/patches/unzip-remove-build-date.patch \ + %D%/packages/patches/unzip-case-insensitive.patch \ + %D%/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch \ + %D%/packages/patches/unzip-CVE-2016-9844.patch \ + %D%/packages/patches/unzip-CVE-2018-1000035.patch \ + %D%/packages/patches/unzip-CVE-2018-18384.patch \ + %D%/packages/patches/unzip-alt-iconv-utf8-print.patch \ + %D%/packages/patches/unzip-alt-iconv-utf8.patch \ + %D%/packages/patches/unzip-close.patch \ + %D%/packages/patches/unzip-exec-shield.patch \ + %D%/packages/patches/unzip-fix-recmatch.patch \ + %D%/packages/patches/unzip-manpage-fix.patch \ + %D%/packages/patches/unzip-overflow.patch \ + %D%/packages/patches/unzip-symlink.patch \ + %D%/packages/patches/unzip-timestamp.patch \ + %D%/packages/patches/unzip-valgrind.patch \ + %D%/packages/patches/unzip-x-option.patch \ + %D%/packages/patches/unzip-zipbomb-manpage.patch \ + %D%/packages/patches/unzip-zipbomb-part1.patch \ + %D%/packages/patches/unzip-zipbomb-part2.patch \ + %D%/packages/patches/unzip-zipbomb-part3.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 99569f68c9..7a4f70f2b4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1594,6 +1594,7 @@ Compression ratios of 2:1 to 3:1 are common for text files.") "unzip-overflow-on-invalid-input.patch" "unzip-format-secure.patch" "unzip-overflow-long-fsize.patch")))) + (replacement unzip/fixed) (build-system gnu-build-system) ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO (arguments @@ -1629,6 +1630,54 @@ recreates the stored directory structure by default.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) +(define-public unzip/fixed + (package + (inherit unzip) + (version "6.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/infozip" + "/UnZip%206.x%20%28latest%29/UnZip%206.0/unzip60.tar.gz")) + (sha256 + (base32 + "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) + (patches (search-patches "unzip-CVE-2014-8139.patch" + "unzip-CVE-2014-8140.patch" + "unzip-CVE-2014-8141.patch" + "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" + "unzip-allow-greater-hostver-values.patch" + "unzip-initialize-symlink-flag.patch" + "unzip-remove-build-date.patch" + "unzip-attribs-overflow.patch" + "unzip-overflow-on-invalid-input.patch" + "unzip-format-secure.patch" + "unzip-overflow-long-fsize.patch" + + ;; From Fedora + "unzip-alt-iconv-utf8.patch" + "unzip-alt-iconv-utf8-print.patch" + "unzip-fix-recmatch.patch" + "unzip-caseinsensitive.patch" + "unzip-close.patch" + "unzip-COVSCAN-fix-unterminated-string.patch" + "unzip-CVE-2016-9844.patch" + "unzip-CVE-2018-1000035.patch" + "unzip-CVE-2018-18384.patch" + "unzip-exec-shield.patch" + "unzip-manpage-fix.patch" + "unzip-overflow.patch" + "unzip-timestamp.patch" + "unzip-valgrind.patch" + "unzip-x-option.patch" + ;; CVE-2019-13232 + "unzip-zipbomb-manpage.patch" + "unzip-zipbomb-part1.patch" + "unzip-zipbomb-part2.patch" + "unzip-zipbomb-part3.patch")))))) + (define-public ziptime (let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc") (revision "0")) diff --git a/gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch b/gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch new file mode 100644 index 0000000000..717377119b --- /dev/null +++ b/gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch @@ -0,0 +1,131 @@ +From 06d1b08aef94984256cad3c5a54cedb10295681f Mon Sep 17 00:00:00 2001 +From: Jakub Martisko +Date: Thu, 8 Nov 2018 09:31:18 +0100 +Subject: [PATCH] Possible unterminated string fix + +--- + unix/unix.c | 4 +++- + unix/unxcfg.h | 2 +- + unzip.c | 12 ++++++++---- + zipinfo.c | 12 ++++++++---- + 4 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/unix/unix.c b/unix/unix.c +index 59b622d..cd57f80 100644 +--- a/unix/unix.c ++++ b/unix/unix.c +@@ -1945,7 +1945,9 @@ void init_conversion_charsets() + for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++) + if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) { + strncpy(OEM_CP, dos_charset_map[i].archive_charset, +- sizeof(OEM_CP)); ++ MAX_CP_NAME - 1); ++ ++ OEM_CP[MAX_CP_NAME - 1] = '\0'; + break; + } + } +diff --git a/unix/unxcfg.h b/unix/unxcfg.h +index 8729de2..9ee8cfe 100644 +--- a/unix/unxcfg.h ++++ b/unix/unxcfg.h +@@ -228,7 +228,7 @@ typedef struct stat z_stat; + /* and notfirstcall are used by do_wild(). */ + + +-#define MAX_CP_NAME 25 ++#define MAX_CP_NAME 25 + 1 + + #ifdef SETLOCALE + # undef SETLOCALE +diff --git a/unzip.c b/unzip.c +index 2d94a38..a485f2b 100644 +--- a/unzip.c ++++ b/unzip.c +@@ -1561,7 +1561,8 @@ int uz_opts(__G__ pargc, pargv) + "error: a valid character encoding should follow the -I argument")); + return(PK_PARAM); + } +- strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ strncpy(ISO_CP, s, MAX_CP_NAME - 1); ++ ISO_CP[MAX_CP_NAME - 1] = '\0'; + } else { /* -I charset */ + ++argv; + if(!(--argc > 0 && *argv != NULL && **argv != '-')) { +@@ -1570,7 +1571,8 @@ int uz_opts(__G__ pargc, pargv) + return(PK_PARAM); + } + s = *argv; +- strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ strncpy(ISO_CP, s, MAX_CP_NAME - 1); ++ ISO_CP[MAX_CP_NAME - 1] = '\0'; + } + while(*(++s)); /* No params straight after charset name */ + } +@@ -1665,7 +1667,8 @@ int uz_opts(__G__ pargc, pargv) + "error: a valid character encoding should follow the -I argument")); + return(PK_PARAM); + } +- strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ strncpy(OEM_CP, s, MAX_CP_NAME - 1); ++ OEM_CP[MAX_CP_NAME - 1] = '\0'; + } else { /* -O charset */ + ++argv; + if(!(--argc > 0 && *argv != NULL && **argv != '-')) { +@@ -1674,7 +1677,8 @@ int uz_opts(__G__ pargc, pargv) + return(PK_PARAM); + } + s = *argv; +- strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ strncpy(OEM_CP, s, MAX_CP_NAME - 1); ++ OEM_CP[MAX_CP_NAME - 1] = '\0'; + } + while(*(++s)); /* No params straight after charset name */ + } +diff --git a/zipinfo.c b/zipinfo.c +index accca2a..cb7e08d 100644 +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -519,7 +519,8 @@ int zi_opts(__G__ pargc, pargv) + "error: a valid character encoding should follow the -I argument")); + return(PK_PARAM); + } +- strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ strncpy(ISO_CP, s, MAX_CP_NAME - 1); ++ ISO_CP[MAX_CP_NAME - 1] = '\0'; + } else { /* -I charset */ + ++argv; + if(!(--argc > 0 && *argv != NULL && **argv != '-')) { +@@ -528,7 +529,8 @@ int zi_opts(__G__ pargc, pargv) + return(PK_PARAM); + } + s = *argv; +- strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ strncpy(ISO_CP, s, MAX_CP_NAME - 1); ++ ISO_CP[MAX_CP_NAME - 1] = '\0'; + } + while(*(++s)); /* No params straight after charset name */ + } +@@ -568,7 +570,8 @@ int zi_opts(__G__ pargc, pargv) + "error: a valid character encoding should follow the -I argument")); + return(PK_PARAM); + } +- strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ strncpy(OEM_CP, s, MAX_CP_NAME - 1); ++ OEM_CP[MAX_CP_NAME - 1] = '\0'; + } else { /* -O charset */ + ++argv; + if(!(--argc > 0 && *argv != NULL && **argv != '-')) { +@@ -577,7 +580,8 @@ int zi_opts(__G__ pargc, pargv) + return(PK_PARAM); + } + s = *argv; +- strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ strncpy(OEM_CP, s, MAX_CP_NAME - 1); ++ OEM_CP[MAX_CP_NAME - 1] = '\0'; + } + while(*(++s)); /* No params straight after charset name */ + } +-- +2.14.5 + diff --git a/gnu/packages/patches/unzip-CVE-2016-9844.patch b/gnu/packages/patches/unzip-CVE-2016-9844.patch new file mode 100644 index 0000000000..0e4a173397 --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2016-9844.patch @@ -0,0 +1,39 @@ +From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001 +From: Petr Stodulka +Date: Wed, 14 Dec 2016 16:30:36 +0100 +Subject: [PATCH] Fix CVE-2016-9844 (rhbz#1404283) + +Fixes buffer overflow in zipinfo in similar way like fix for +CVE-2014-9913 provided by upstream. +--- + zipinfo.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/zipinfo.c b/zipinfo.c +index c03620e..accca2a 100644 +--- a/zipinfo.c ++++ b/zipinfo.c +@@ -1984,7 +1984,19 @@ static int zi_short(__G) /* return PK-type error code */ + ush dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3); + methbuf[3] = dtype[dnum]; + } else if (methnum >= NUM_METHODS) { /* unknown */ +- sprintf(&methbuf[1], "%03u", G.crec.compression_method); ++ /* 2016-12-05 SMS. ++ * https://launchpad.net/bugs/1643750 ++ * Unexpectedly large compression methods overflow ++ * &methbuf[]. Use the old, three-digit decimal format ++ * for values which fit. Otherwise, sacrifice the "u", ++ * and use four-digit hexadecimal. ++ */ ++ if (G.crec.compression_method <= 999) { ++ sprintf( &methbuf[ 1], "%03u", G.crec.compression_method); ++ } else { ++ sprintf( &methbuf[ 0], "%04X", G.crec.compression_method); ++ } ++ + } + + for (k = 0; k < 15; ++k) +-- +2.5.5 + diff --git a/gnu/packages/patches/unzip-CVE-2018-1000035.patch b/gnu/packages/patches/unzip-CVE-2018-1000035.patch new file mode 100644 index 0000000000..8ca713865c --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2018-1000035.patch @@ -0,0 +1,34 @@ +--- a/fileio.c 2014-12-05 05:06:05 -0600 ++++ b/fileio.c 2017-11-14 01:06:28 -0600 +@@ -1,5 +1,5 @@ + /* +- Copyright (c) 1990-2009 Info-ZIP. All rights reserved. ++ Copyright (c) 1990-2017 Info-ZIP. All rights reserved. + + See the accompanying file LICENSE, version 2009-Jan-02 or later + (the contents of which are also included in unzip.h) for terms of use. +@@ -1582,6 +1582,8 @@ + int r = IZ_PW_ENTERED; + char *m; + char *prompt; ++ char *ep; ++ char *zp; + + #ifndef REENTRANT + /* tell picky compilers to shut up about "unused variable" warnings */ +@@ -1590,9 +1592,12 @@ + + if (*rcnt == 0) { /* First call for current entry */ + *rcnt = 2; +- if ((prompt = (char *)malloc(2*FILNAMSIZ + 15)) != (char *)NULL) { +- sprintf(prompt, LoadFarString(PasswPrompt), +- FnFilter1(zfn), FnFilter2(efn)); ++ zp = FnFilter1( zfn); ++ ep = FnFilter2( efn); ++ prompt = (char *)malloc( /* Slightly too long (2* "%s"). */ ++ sizeof( PasswPrompt)+ strlen( zp)+ strlen( ep)); ++ if (prompt != (char *)NULL) { ++ sprintf(prompt, LoadFarString(PasswPrompt), zp, ep); + m = prompt; + } else + m = (char *)LoadFarString(PasswPrompt2); diff --git a/gnu/packages/patches/unzip-CVE-2018-18384.patch b/gnu/packages/patches/unzip-CVE-2018-18384.patch new file mode 100644 index 0000000000..54d4b8cb64 --- /dev/null +++ b/gnu/packages/patches/unzip-CVE-2018-18384.patch @@ -0,0 +1,35 @@ +--- unzip60/list.c ++++ unzip60/list.c +@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type + { + int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL; + #ifndef WINDLL +- char sgn, cfactorstr[13]; ++ char sgn, cfactorstr[1+10+1+1]; /* %NUL */ + int longhdr=(uO.vflag>1); + #endif + int date_format; +@@ -389,9 +389,9 @@ int list_files(__G) /* return PK-type + } + #else /* !WINDLL */ + if (cfactor == 100) +- sprintf(cfactorstr, LoadFarString(CompFactor100)); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); + else +- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); + if (longhdr) + Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats), + FmZofft(G.crec.ucsize, "8", "u"), methbuf, +@@ -471,9 +471,9 @@ int list_files(__G) /* return PK-type + + #else /* !WINDLL */ + if (cfactor == 100) +- sprintf(cfactorstr, LoadFarString(CompFactor100)); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100)); + else +- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor); ++ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor); + if (longhdr) { + Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer), + FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"), diff --git a/gnu/packages/patches/unzip-alt-iconv-utf8-print.patch b/gnu/packages/patches/unzip-alt-iconv-utf8-print.patch new file mode 100644 index 0000000000..0b0153ba54 --- /dev/null +++ b/gnu/packages/patches/unzip-alt-iconv-utf8-print.patch @@ -0,0 +1,381 @@ +From ca0212ba19b64488b9e8459a762c11ecd6e7d0bd Mon Sep 17 00:00:00 2001 +From: Petr Stodulka +Date: Tue, 24 Nov 2015 17:56:11 +0100 +Subject: [PATCH] print correctly non-ascii filenames + +--- + extract.c | 289 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- + unzpriv.h | 7 ++ + 2 files changed, 233 insertions(+), 63 deletions(-) + +diff --git a/extract.c b/extract.c +index 0ee4e93..741b7e0 100644 +--- a/extract.c ++++ b/extract.c +@@ -2648,8 +2648,21 @@ static void set_deferred_symlink(__G__ slnk_entry) + } /* end function set_deferred_symlink() */ + #endif /* SYMLINKS */ + ++/* ++ * If Unicode is supported, assume we have what we need to do this ++ * check using wide characters, avoiding MBCS issues. ++ */ + +- ++#ifndef UZ_FNFILTER_REPLACECHAR ++ /* A convenient choice for the replacement of unprintable char codes is ++ * the "single char wildcard", as this character is quite unlikely to ++ * appear in filenames by itself. The following default definition ++ * sets the replacement char to a question mark as the most common ++ * "single char wildcard"; this setting should be overridden in the ++ * appropiate system-specific configuration header when needed. ++ */ ++# define UZ_FNFILTER_REPLACECHAR '?' ++#endif + + /*************************/ + /* Function fnfilter() */ /* here instead of in list.c for SFX */ +@@ -2661,48 +2674,168 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */ + extent size; + { + #ifndef NATIVE /* ASCII: filter ANSI escape codes, etc. */ +- ZCONST uch *r=(ZCONST uch *)raw; ++ ZCONST uch *r; // =(ZCONST uch *)raw; + uch *s=space; + uch *slim=NULL; + uch *se=NULL; + int have_overflow = FALSE; + +- if (size > 0) { +- slim = space + size +-#ifdef _MBCS +- - (MB_CUR_MAX - 1) +-#endif +- - 4; ++# if defined( UNICODE_SUPPORT) && defined( _MBCS) ++/* If Unicode support is enabled, and we have multi-byte characters, ++ * then do the isprint() checks by first converting to wide characters ++ * and checking those. This avoids our having to parse multi-byte ++ * characters for ourselves. After the wide-char replacements have been ++ * made, the wide string is converted back to the local character set. ++ */ ++ wchar_t *wstring; /* wchar_t version of raw */ ++ size_t wslen; /* length of wstring */ ++ wchar_t *wostring; /* wchar_t version of output string */ ++ size_t woslen; /* length of wostring */ ++ char *newraw; /* new raw */ ++ ++ /* 2012-11-06 SMS. ++ * Changed to check the value returned by mbstowcs(), and bypass the ++ * Unicode processing if it fails. This seems to fix a problem ++ * reported in the SourceForge forum, but it's not clear that we ++ * should be doing any Unicode processing without some evidence that ++ * the name actually is Unicode. (Check bit 11 in the flags before ++ * coming here?) ++ * http://sourceforge.net/p/infozip/bugs/40/ ++ */ ++ ++ if (MB_CUR_MAX <= 1) ++ { ++ /* There's no point to converting multi-byte chars if there are ++ * no multi-byte chars. ++ */ ++ wslen = (size_t)-1; + } +- while (*r) { +- if (size > 0 && s >= slim && se == NULL) { +- se = s; ++ else ++ { ++ /* Get Unicode wide character count (for storage allocation). */ ++ wslen = mbstowcs( NULL, raw, 0); ++ } ++ ++ if (wslen != (size_t)-1) ++ { ++ /* Apparently valid Unicode. Allocate wide-char storage. */ ++ wstring = (wchar_t *)malloc((wslen + 1) * sizeof(wchar_t)); ++ if (wstring == NULL) { ++ strcpy( (char *)space, raw); ++ return (char *)space; + } +-#ifdef QDOS +- if (qlflag & 2) { +- if (*r == '/' || *r == '.') { ++ wostring = (wchar_t *)malloc(2 * (wslen + 1) * sizeof(wchar_t)); ++ if (wostring == NULL) { ++ free(wstring); ++ strcpy( (char *)space, raw); ++ return (char *)space; ++ } ++ ++ /* Convert the multi-byte Unicode to wide chars. */ ++ wslen = mbstowcs(wstring, raw, wslen + 1); ++ ++ /* Filter the wide-character string. */ ++ fnfilterw( wstring, wostring, (2 * (wslen + 1) * sizeof(wchar_t))); ++ ++ /* Convert filtered wide chars back to multi-byte. */ ++ woslen = wcstombs( NULL, wostring, 0); ++ if ((newraw = malloc(woslen + 1)) == NULL) { ++ free(wstring); ++ free(wostring); ++ strcpy( (char *)space, raw); ++ return (char *)space; ++ } ++ woslen = wcstombs( newraw, wostring, (woslen * MB_CUR_MAX) + 1); ++ ++ if (size > 0) { ++ slim = space + size - 4; ++ } ++ r = (ZCONST uch *)newraw; ++ while (*r) { ++ if (size > 0 && s >= slim && se == NULL) { ++ se = s; ++ } ++# ifdef QDOS ++ if (qlflag & 2) { ++ if (*r == '/' || *r == '.') { ++ if (se != NULL && (s > (space + (size-3)))) { ++ have_overflow = TRUE; ++ break; ++ } ++ ++r; ++ *s++ = '_'; ++ continue; ++ } ++ } else ++# endif ++ { + if (se != NULL && (s > (space + (size-3)))) { + have_overflow = TRUE; + break; + } +- ++r; +- *s++ = '_'; +- continue; ++ *s++ = *r++; + } +- } else ++ } ++ if (have_overflow) { ++ strcpy((char *)se, "..."); ++ } else { ++ *s = '\0'; ++ } ++ ++ free(wstring); ++ free(wostring); ++ free(newraw); ++ } ++ else ++# endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */ ++ { ++ /* No Unicode support, or apparently invalid Unicode. */ ++ r = (ZCONST uch *)raw; ++ ++ if (size > 0) { ++ slim = space + size ++#ifdef _MBCS ++ - (MB_CUR_MAX - 1) ++#endif ++ - 4; ++ } ++ while (*r) { ++ if (size > 0 && s >= slim && se == NULL) { ++ se = s; ++ } ++#ifdef QDOS ++ if (qlflag & 2) { ++ if (*r == '/' || *r == '.') { ++ if (se != NULL && (s > (space + (size-3)))) { ++ have_overflow = TRUE; ++ break; ++ } ++ ++r; ++ *s++ = '_'; ++ continue; ++ } ++ } else + #endif + #ifdef HAVE_WORKING_ISPRINT +-# ifndef UZ_FNFILTER_REPLACECHAR +- /* A convenient choice for the replacement of unprintable char codes is +- * the "single char wildcard", as this character is quite unlikely to +- * appear in filenames by itself. The following default definition +- * sets the replacement char to a question mark as the most common +- * "single char wildcard"; this setting should be overridden in the +- * appropiate system-specific configuration header when needed. +- */ +-# define UZ_FNFILTER_REPLACECHAR '?' +-# endif +- if (!isprint(*r)) { ++ if (!isprint(*r)) { ++ if (*r < 32) { ++ /* ASCII control codes are escaped as "^{letter}". */ ++ if (se != NULL && (s > (space + (size-4)))) { ++ have_overflow = TRUE; ++ break; ++ } ++ *s++ = '^', *s++ = (uch)(64 + *r++); ++ } else { ++ /* Other unprintable codes are replaced by the ++ * placeholder character. */ ++ if (se != NULL && (s > (space + (size-3)))) { ++ have_overflow = TRUE; ++ break; ++ } ++ *s++ = UZ_FNFILTER_REPLACECHAR; ++ INCSTR(r); ++ } ++#else /* !HAVE_WORKING_ISPRINT */ + if (*r < 32) { + /* ASCII control codes are escaped as "^{letter}". */ + if (se != NULL && (s > (space + (size-4)))) { +@@ -2710,47 +2843,30 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */ + break; + } + *s++ = '^', *s++ = (uch)(64 + *r++); ++#endif /* ?HAVE_WORKING_ISPRINT */ + } else { +- /* Other unprintable codes are replaced by the +- * placeholder character. */ ++#ifdef _MBCS ++ unsigned i = CLEN(r); ++ if (se != NULL && (s > (space + (size-i-2)))) { ++ have_overflow = TRUE; ++ break; ++ } ++ for (; i > 0; i--) ++ *s++ = *r++; ++#else + if (se != NULL && (s > (space + (size-3)))) { + have_overflow = TRUE; + break; + } +- *s++ = UZ_FNFILTER_REPLACECHAR; +- INCSTR(r); +- } +-#else /* !HAVE_WORKING_ISPRINT */ +- if (*r < 32) { +- /* ASCII control codes are escaped as "^{letter}". */ +- if (se != NULL && (s > (space + (size-4)))) { +- have_overflow = TRUE; +- break; +- } +- *s++ = '^', *s++ = (uch)(64 + *r++); +-#endif /* ?HAVE_WORKING_ISPRINT */ +- } else { +-#ifdef _MBCS +- unsigned i = CLEN(r); +- if (se != NULL && (s > (space + (size-i-2)))) { +- have_overflow = TRUE; +- break; +- } +- for (; i > 0; i--) + *s++ = *r++; +-#else +- if (se != NULL && (s > (space + (size-3)))) { +- have_overflow = TRUE; +- break; +- } +- *s++ = *r++; + #endif +- } +- } +- if (have_overflow) { +- strcpy((char *)se, "..."); +- } else { +- *s = '\0'; ++ } ++ } ++ if (have_overflow) { ++ strcpy((char *)se, "..."); ++ } else { ++ *s = '\0'; ++ } + } + + #ifdef WINDLL +@@ -2772,6 +2888,53 @@ char *fnfilter(raw, space, size) /* convert name to safely printable form */ + } /* end function fnfilter() */ + + ++#if defined( UNICODE_SUPPORT) && defined( _MBCS) ++ ++/****************************/ ++/* Function fnfilter[w]() */ /* (Here instead of in list.c for SFX.) */ ++/****************************/ ++ ++/* fnfilterw() - Convert wide name to safely printable form. */ ++ ++/* fnfilterw() - Convert wide-character name to safely printable form. */ ++ ++wchar_t *fnfilterw( src, dst, siz) ++ ZCONST wchar_t *src; /* Pointer to source char (string). */ ++ wchar_t *dst; /* Pointer to destination char (string). */ ++ extent siz; /* Not used (!). */ ++{ ++ wchar_t *dsx = dst; ++ ++ /* Filter the wide chars. */ ++ while (*src) ++ { ++ if (iswprint( *src)) ++ { ++ /* Printable code. Copy it. */ ++ *dst++ = *src; ++ } ++ else ++ { ++ /* Unprintable code. Substitute something printable for it. */ ++ if (*src < 32) ++ { ++ /* Replace ASCII control code with "^{letter}". */ ++ *dst++ = (wchar_t)'^'; ++ *dst++ = (wchar_t)(64 + *src); ++ } ++ else ++ { ++ /* Replace other unprintable code with the placeholder. */ ++ *dst++ = (wchar_t)UZ_FNFILTER_REPLACECHAR; ++ } ++ } ++ src++; ++ } ++ *dst = (wchar_t)0; /* NUL-terminate the destination string. */ ++ return dsx; ++} /* fnfilterw(). */ ++ ++#endif /* defined( UNICODE_SUPPORT) && defined( _MBCS) */ + + + #ifdef SET_DIR_ATTRIB +diff --git a/unzpriv.h b/unzpriv.h +index 22d3923..e48a652 100644 +--- a/unzpriv.h ++++ b/unzpriv.h +@@ -1212,6 +1212,7 @@ + # ifdef UNICODE_WCHAR + # if !(defined(_WIN32_WCE) || defined(POCKET_UNZIP)) + # include ++# include + # endif + # endif + # ifndef _MBCS /* no need to include twice, see below */ +@@ -2410,6 +2411,12 @@ int memflush OF((__GPRO__ ZCONST uch *rawbuf, ulg size)); + char *fnfilter OF((ZCONST char *raw, uch *space, + extent size)); + ++# if defined( UNICODE_SUPPORT) && defined( _MBCS) ++wchar_t *fnfilterw OF((ZCONST wchar_t *src, wchar_t *dst, ++ extent siz)); ++#endif ++ ++ + /*--------------------------------------------------------------------------- + Decompression functions: + ---------------------------------------------------------------------------*/ +-- +2.4.3 + diff --git a/gnu/packages/patches/unzip-alt-iconv-utf8.patch b/gnu/packages/patches/unzip-alt-iconv-utf8.patch new file mode 100644 index 0000000000..b9e37774e2 --- /dev/null +++ b/gnu/packages/patches/unzip-alt-iconv-utf8.patch @@ -0,0 +1,398 @@ +From: Giovanni Scafora +Subject: unzip files encoded with non-latin, non-unicode file names +Last-Update: 2015-02-11 + +Updated 2015-02-11 by Marc Deslauriers +to fix buffer overflow in charset_to_intern() + +Index: unzip-6.0/unix/unix.c +=================================================================== +--- unzip-6.0.orig/unix/unix.c 2015-02-11 08:46:43.675324290 -0500 ++++ unzip-6.0/unix/unix.c 2015-02-11 09:18:04.902081319 -0500 +@@ -30,6 +30,9 @@ + #define UNZIP_INTERNAL + #include "unzip.h" + ++#include ++#include ++ + #ifdef SCO_XENIX + # define SYSNDIR + #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */ +@@ -1874,3 +1877,102 @@ + } + } + #endif /* QLZIP */ ++ ++ ++typedef struct { ++ char *local_charset; ++ char *archive_charset; ++} CHARSET_MAP; ++ ++/* A mapping of local <-> archive charsets used by default to convert filenames ++ * of DOS/Windows Zip archives. Currently very basic. */ ++static CHARSET_MAP dos_charset_map[] = { ++ { "ANSI_X3.4-1968", "CP850" }, ++ { "ISO-8859-1", "CP850" }, ++ { "CP1252", "CP850" }, ++ { "UTF-8", "CP866" }, ++ { "KOI8-R", "CP866" }, ++ { "KOI8-U", "CP866" }, ++ { "ISO-8859-5", "CP866" } ++}; ++ ++char OEM_CP[MAX_CP_NAME] = ""; ++char ISO_CP[MAX_CP_NAME] = ""; ++ ++/* Try to guess the default value of OEM_CP based on the current locale. ++ * ISO_CP is left alone for now. */ ++void init_conversion_charsets() ++{ ++ const char *local_charset; ++ int i; ++ ++ /* Make a guess only if OEM_CP not already set. */ ++ if(*OEM_CP == '\0') { ++ local_charset = nl_langinfo(CODESET); ++ for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++) ++ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) { ++ strncpy(OEM_CP, dos_charset_map[i].archive_charset, ++ sizeof(OEM_CP)); ++ break; ++ } ++ } ++} ++ ++/* Convert a string from one encoding to the current locale using iconv(). ++ * Be as non-intrusive as possible. If error is encountered during covertion ++ * just leave the string intact. */ ++static void charset_to_intern(char *string, char *from_charset) ++{ ++ iconv_t cd; ++ char *s,*d, *buf; ++ size_t slen, dlen, buflen; ++ const char *local_charset; ++ ++ if(*from_charset == '\0') ++ return; ++ ++ buf = NULL; ++ local_charset = nl_langinfo(CODESET); ++ ++ if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1) ++ return; ++ ++ slen = strlen(string); ++ s = string; ++ ++ /* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ ++ * as this function also gets called with G.outbuf in fileio.c ++ */ ++ buflen = FILNAMSIZ; ++ if (OUTBUFSIZ + 1 < FILNAMSIZ) ++ { ++ buflen = OUTBUFSIZ + 1; ++ } ++ ++ d = buf = malloc(buflen); ++ if(!d) ++ goto cleanup; ++ ++ bzero(buf,buflen); ++ dlen = buflen - 1; ++ ++ if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1) ++ goto cleanup; ++ strncpy(string, buf, buflen); ++ ++ cleanup: ++ free(buf); ++ iconv_close(cd); ++} ++ ++/* Convert a string from OEM_CP to the current locale charset. */ ++inline void oem_intern(char *string) ++{ ++ charset_to_intern(string, OEM_CP); ++} ++ ++/* Convert a string from ISO_CP to the current locale charset. */ ++inline void iso_intern(char *string) ++{ ++ charset_to_intern(string, ISO_CP); ++} +Index: unzip-6.0/unix/unxcfg.h +=================================================================== +--- unzip-6.0.orig/unix/unxcfg.h 2015-02-11 08:46:43.675324290 -0500 ++++ unzip-6.0/unix/unxcfg.h 2015-02-11 08:46:43.671324260 -0500 +@@ -228,4 +228,30 @@ + /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */ + /* and notfirstcall are used by do_wild(). */ + ++ ++#define MAX_CP_NAME 25 ++ ++#ifdef SETLOCALE ++# undef SETLOCALE ++#endif ++#define SETLOCALE(category, locale) setlocale(category, locale) ++#include ++ ++#ifdef _ISO_INTERN ++# undef _ISO_INTERN ++#endif ++#define _ISO_INTERN(str1) iso_intern(str1) ++ ++#ifdef _OEM_INTERN ++# undef _OEM_INTERN ++#endif ++#ifndef IZ_OEM2ISO_ARRAY ++# define IZ_OEM2ISO_ARRAY ++#endif ++#define _OEM_INTERN(str1) oem_intern(str1) ++ ++void iso_intern(char *); ++void oem_intern(char *); ++void init_conversion_charsets(void); ++ + #endif /* !__unxcfg_h */ +Index: unzip-6.0/unzip.c +=================================================================== +--- unzip-6.0.orig/unzip.c 2015-02-11 08:46:43.675324290 -0500 ++++ unzip-6.0/unzip.c 2015-02-11 08:46:43.675324290 -0500 +@@ -327,11 +327,21 @@ + -2 just filenames but allow -h/-t/-z -l long Unix \"ls -l\" format\n\ + -v verbose, multi-page format\n"; + ++#ifndef UNIX + static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\ + -h print header line -t print totals for listed files or for all\n\ + -z print zipfile comment -T print file times in sortable decimal format\ + \n -C be case-insensitive %s\ + -x exclude filenames that follow from listing\n"; ++#else /* UNIX */ ++static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\ ++ -h print header line -t print totals for listed files or for all\n\ ++ -z print zipfile comment %c-T%c print file times in sortable decimal format\ ++\n %c-C%c be case-insensitive %s\ ++ -x exclude filenames that follow from listing\n\ ++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\ ++ -I CHARSET specify a character encoding for UNIX and other archives\n"; ++#endif /* !UNIX */ + #ifdef MORE + static ZCONST char Far ZipInfoUsageLine4[] = + " -M page output through built-in \"more\"\n"; +@@ -664,6 +674,17 @@ + -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\ + -C match filenames case-insensitively -L make (some) names \ + lowercase\n %-42s -V retain VMS version numbers\n%s"; ++#elif (defined UNIX) ++static ZCONST char Far UnzipUsageLine4[] = "\ ++modifiers:\n\ ++ -n never overwrite existing files -q quiet mode (-qq => quieter)\n\ ++ -o overwrite files WITHOUT prompting -a auto-convert any text files\n\ ++ -j junk paths (do not make directories) -aa treat ALL files as text\n\ ++ -U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\ ++ -C match filenames case-insensitively -L make (some) names \ ++lowercase\n %-42s -V retain VMS version numbers\n%s\ ++ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\ ++ -I CHARSET specify a character encoding for UNIX and other archives\n\n"; + #else /* !VMS */ + static ZCONST char Far UnzipUsageLine4[] = "\ + modifiers:\n\ +@@ -802,6 +823,10 @@ + #endif /* UNICODE_SUPPORT */ + + ++#ifdef UNIX ++ init_conversion_charsets(); ++#endif ++ + #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__)) + extern void DebugMalloc(void); + +@@ -1335,6 +1360,11 @@ + argc = *pargc; + argv = *pargv; + ++#ifdef UNIX ++ extern char OEM_CP[MAX_CP_NAME]; ++ extern char ISO_CP[MAX_CP_NAME]; ++#endif ++ + while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) { + s = *argv + 1; + while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */ +@@ -1516,6 +1546,35 @@ + } + break; + #endif /* MACOS */ ++#ifdef UNIX ++ case ('I'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Icharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } else { /* -I charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case ('j'): /* junk pathnames/directory structure */ + if (negative) + uO.jflag = FALSE, negative = 0; +@@ -1591,6 +1650,35 @@ + } else + ++uO.overwrite_all; + break; ++#ifdef UNIX ++ case ('O'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Ocharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } else { /* -O charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -O argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case ('p'): /* pipes: extract to stdout, no messages */ + if (negative) { + uO.cflag = FALSE; +Index: unzip-6.0/unzpriv.h +=================================================================== +--- unzip-6.0.orig/unzpriv.h 2015-02-11 08:46:43.675324290 -0500 ++++ unzip-6.0/unzpriv.h 2015-02-11 08:46:43.675324290 -0500 +@@ -3008,7 +3008,7 @@ + !(((islochdr) || (isuxatt)) && \ + ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \ + (hostnum) == FS_HPFS_ || \ +- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \ ++ ((hostnum) == FS_NTFS_ /* && (hostver) == 50 */ )) { \ + _OEM_INTERN((string)); \ + } else { \ + _ISO_INTERN((string)); \ +Index: unzip-6.0/zipinfo.c +=================================================================== +--- unzip-6.0.orig/zipinfo.c 2015-02-11 08:46:43.675324290 -0500 ++++ unzip-6.0/zipinfo.c 2015-02-11 08:46:43.675324290 -0500 +@@ -457,6 +457,10 @@ + int tflag_slm=TRUE, tflag_2v=FALSE; + int explicit_h=FALSE, explicit_t=FALSE; + ++#ifdef UNIX ++ extern char OEM_CP[MAX_CP_NAME]; ++ extern char ISO_CP[MAX_CP_NAME]; ++#endif + + #ifdef MACOS + uO.lflag = LFLAG; /* reset default on each call */ +@@ -501,6 +505,35 @@ + uO.lflag = 0; + } + break; ++#ifdef UNIX ++ case ('I'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Icharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } else { /* -I charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(ISO_CP, s, sizeof(ISO_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case 'l': /* longer form of "ls -l" type listing */ + if (negative) + uO.lflag = -2, negative = 0; +@@ -521,6 +554,35 @@ + G.M_flag = TRUE; + break; + #endif ++#ifdef UNIX ++ case ('O'): ++ if (negative) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: encodings can't be negated")); ++ return(PK_PARAM); ++ } else { ++ if(*s) { /* Handle the -Ocharset case */ ++ /* Assume that charsets can't start with a dash to spot arguments misuse */ ++ if(*s == '-') { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -I argument")); ++ return(PK_PARAM); ++ } ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } else { /* -O charset */ ++ ++argv; ++ if(!(--argc > 0 && *argv != NULL && **argv != '-')) { ++ Info(slide, 0x401, ((char *)slide, ++ "error: a valid character encoding should follow the -O argument")); ++ return(PK_PARAM); ++ } ++ s = *argv; ++ strncpy(OEM_CP, s, sizeof(OEM_CP)); ++ } ++ while(*(++s)); /* No params straight after charset name */ ++ } ++ break; ++#endif /* ?UNIX */ + case 's': /* default: shorter "ls -l" type listing */ + if (negative) + uO.lflag = -2, negative = 0; diff --git a/gnu/packages/patches/unzip-caseinsensitive.patch b/gnu/packages/patches/unzip-caseinsensitive.patch new file mode 100644 index 0000000000..3cb68450b9 --- /dev/null +++ b/gnu/packages/patches/unzip-caseinsensitive.patch @@ -0,0 +1,131 @@ +diff --git a/match.c b/match.c +index 6cd656f..4e569f5 100644 +--- a/match.c ++++ b/match.c +@@ -190,10 +190,10 @@ char *___tmp_ptr; + + #endif + +-static int recmatch(p, s, cs) ++static int recmatch(p, s, ci) + ZCONST char *p; /* sh pattern to match */ + ZCONST char *s; /* string to match it to */ +-int cs; /* flag: force case-sensitive matching */ ++int ci; /* flag: force case-insensitive matching */ + /* Recursively compare the sh pattern p with the string s and return 1 if + they match, and 0 or 2 if they don't or if there is a syntax error in the + pattern. This routine recurses on itself no deeper than the number of +@@ -214,7 +214,7 @@ int cs; /* flag: force case-sensitive matching */ + if (CLEN(p) == 2) { + if (CLEN(s) == 2) { + return (*p == *s && *(p+1) == *(s+1)) ? +- recmatch(p + 2, s + 2, cs) : 0; ++ recmatch(p + 2, s + 2, ci) : 0; + } else { + return 0; + } +@@ -230,9 +230,9 @@ int cs; /* flag: force case-sensitive matching */ + /* '?' (or '%' or '#') matches any character (but not an empty string) */ + if (c == WILDCHR_SINGLE) { + if (wild_stop_at_dir) +- return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; ++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0; + else +- return *s ? recmatch(p, s + CLEN(s), cs) : 0; ++ return *s ? recmatch(p, s + CLEN(s), ci) : 0; + } + + /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ +@@ -253,14 +253,14 @@ int cs; /* flag: force case-sensitive matching */ + # endif /* ?AMIGA */ + /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ + for (; *s && *s != DIRSEP_CHR; INCSTR(s)) +- if ((c = recmatch(p, s, cs)) != 0) ++ if ((c = recmatch(p, s, ci)) != 0) + return c; + /* end of pattern: matched if at end of string, else continue */ + if (*p == 0) + return (*s == 0); + /* continue to match if at DIRSEP_CHR in pattern, else give up */ + return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) +- ? recmatch(p, s, cs) : 2; ++ ? recmatch(p, s, ci) : 2; + } + /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ + p++; /* move p past the second WILDCHR_MULTI */ +@@ -308,17 +308,17 @@ int cs; /* flag: force case-sensitive matching */ + */ + if (q != srest) + return 0; +- return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); ++ return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0); + } + #else /* !_MBCS */ +- return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); ++ return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0); + #endif /* ?_MBCS */ + } + else + { + /* pattern contains more wildcards, continue with recursion... */ + for (; *s; INCSTR(s)) +- if ((c = recmatch(p, s, cs)) != 0) ++ if ((c = recmatch(p, s, ci)) != 0) + return c; + return 2; /* 2 means give up--shmatch will return false */ + } +@@ -353,17 +353,17 @@ int cs; /* flag: force case-sensitive matching */ + c = *(p-1); + else + { +- uch cc = (cs ? (uch)*s : case_map((uch)*s)); ++ uch cc = (!ci ? (uch)*s : to_up((uch)*s)); + uch uc = (uch) c; + if (*(p+1) != '-') + for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) + /* compare range */ +- if ((cs ? uc : case_map(uc)) == cc) +- return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); ++ if ((!ci ? uc : to_up(uc)) == cc) ++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci); + c = e = 0; /* clear range, escape flags */ + } + } +- return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; ++ return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0; + /* bracket match failed */ + } + #endif /* !VMS */ +@@ -382,18 +382,18 @@ int cs; /* flag: force case-sensitive matching */ + { + /* Match "...]" with "]". Continue after "]" in both. */ + if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) +- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); + + /* Else, look for a reduced match in s, until "]" in or end of s. */ + for (; *s && (*s != ']'); INCSTR(s)) + if (*s == '.') + /* If reduced match, then continue after "..." in p, "." in s. */ +- if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) ++ if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0) + return (int)c; + + /* Match "...]" with "]". Continue after "]" in both. */ + if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) +- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); + + /* No reduced match. Quit. */ + return 2; +@@ -402,8 +402,8 @@ int cs; /* flag: force case-sensitive matching */ + #endif /* def VMS */ + + /* Just a character--compare it */ +- return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? +- recmatch(p, s + CLEN(s), cs) : 0; ++ return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ? ++ recmatch(p, s + CLEN(s), ci) : 0; + } + + diff --git a/gnu/packages/patches/unzip-close.patch b/gnu/packages/patches/unzip-close.patch new file mode 100644 index 0000000000..9a238a9006 --- /dev/null +++ b/gnu/packages/patches/unzip-close.patch @@ -0,0 +1,176 @@ +diff -up unzip60/extract.c.close unzip60/extract.c +--- unzip60/extract.c.close 2009-03-14 02:32:52.000000000 +0100 ++++ unzip60/extract.c 2009-11-19 08:17:23.481263496 +0100 +@@ -1924,24 +1924,21 @@ static int extract_or_test_member(__G) + + #ifdef VMS /* VMS: required even for stdout! (final flush) */ + if (!uO.tflag) /* don't close NULL file */ +- close_outfile(__G); ++ error = close_outfile(__G); + #else + #ifdef DLL + if (!uO.tflag && (!uO.cflag || G.redirect_data)) { + if (G.redirect_data) + FINISH_REDIRECT(); + else +- close_outfile(__G); ++ error = close_outfile(__G); + } + #else + if (!uO.tflag && !uO.cflag) /* don't close NULL file or stdout */ +- close_outfile(__G); ++ error = close_outfile(__G); + #endif + #endif /* VMS */ + +- /* GRR: CONVERT close_outfile() TO NON-VOID: CHECK FOR ERRORS! */ +- +- + if (G.disk_full) { /* set by flush() */ + if (G.disk_full > 1) { + #if (defined(DELETE_IF_FULL) && defined(HAVE_UNLINK)) +diff -up unzip60/unix/unix.c.close unzip60/unix/unix.c +--- unzip60/unix/unix.c.close 2009-01-24 00:31:26.000000000 +0100 ++++ unzip60/unix/unix.c 2009-11-19 08:33:25.568389171 +0100 +@@ -1096,10 +1096,41 @@ static int get_extattribs(__G__ pzt, z_u + #ifndef MTS + + /****************************/ ++/* Function CloseError() */ ++/***************************/ ++ ++int CloseError(__G) ++ __GDEF ++{ ++ int errval = PK_OK; ++ ++ if (fclose(G.outfile) < 0) { ++ switch (errno) { ++ case ENOSPC: ++ /* Do we need this on fileio.c? */ ++ Info(slide, 0x4a1, ((char *)slide, "%s: write error (disk full?). Continue? (y/n/^C) ", ++ FnFilter1(G.filename))); ++ fgets(G.answerbuf, 9, stdin); ++ if (*G.answerbuf == 'y') /* stop writing to this file */ ++ G.disk_full = 1; /* pass to next */ ++ else ++ G.disk_full = 2; /* no: exit program */ ++ ++ errval = PK_DISK; ++ break; ++ ++ default: ++ errval = PK_WARN; ++ } ++ } ++ return errval; ++} /* End of CloseError() */ ++ ++/****************************/ + /* Function close_outfile() */ + /****************************/ + +-void close_outfile(__G) /* GRR: change to return PK-style warning level */ ++int close_outfile(__G) + __GDEF + { + union { +@@ -1108,6 +1139,7 @@ void close_outfile(__G) /* GRR: chang + } zt; + ulg z_uidgid[2]; + int have_uidgid_flg; ++ int errval = PK_OK; + + have_uidgid_flg = get_extattribs(__G__ &(zt.t3), z_uidgid); + +@@ -1141,16 +1173,16 @@ void close_outfile(__G) /* GRR: chang + Info(slide, 0x201, ((char *)slide, + "warning: symbolic link (%s) failed: mem alloc overflow\n", + FnFilter1(G.filename))); +- fclose(G.outfile); +- return; ++ errval = CloseError(G.outfile, G.filename); ++ return errval ? errval : PK_WARN; + } + + if ((slnk_entry = (slinkentry *)malloc(slnk_entrysize)) == NULL) { + Info(slide, 0x201, ((char *)slide, + "warning: symbolic link (%s) failed: no mem\n", + FnFilter1(G.filename))); +- fclose(G.outfile); +- return; ++ errval = CloseError(G.outfile, G.filename); ++ return errval ? errval : PK_WARN; + } + slnk_entry->next = NULL; + slnk_entry->targetlen = ucsize; +@@ -1174,10 +1206,10 @@ void close_outfile(__G) /* GRR: chang + "warning: symbolic link (%s) failed\n", + FnFilter1(G.filename))); + free(slnk_entry); +- fclose(G.outfile); +- return; ++ errval = CloseError(G.outfile, G.filename); ++ return errval ? errval : PK_WARN; + } +- fclose(G.outfile); /* close "link" file for good... */ ++ errval = CloseError(G.outfile, G.filename); /* close "link" file for good... */ + slnk_entry->target[ucsize] = '\0'; + if (QCOND2) + Info(slide, 0, ((char *)slide, "-> %s ", +@@ -1188,7 +1220,7 @@ void close_outfile(__G) /* GRR: chang + else + G.slink_head = slnk_entry; + G.slink_last = slnk_entry; +- return; ++ return errval; + } + #endif /* SYMLINKS */ + +@@ -1201,7 +1233,7 @@ void close_outfile(__G) /* GRR: chang + #endif + + #if (defined(NO_FCHOWN)) +- fclose(G.outfile); ++ errval = CloseError(G.outfile, G.filename); + #endif + + /* if -X option was specified and we have UID/GID info, restore it */ +@@ -1227,7 +1259,7 @@ void close_outfile(__G) /* GRR: chang + } + + #if (!defined(NO_FCHOWN) && defined(NO_FCHMOD)) +- fclose(G.outfile); ++ errval = CloseError(G.outfile, G.filename); + #endif + + #if (!defined(NO_FCHOWN) && !defined(NO_FCHMOD)) +@@ -1239,7 +1271,7 @@ void close_outfile(__G) /* GRR: chang + if (fchmod(fileno(G.outfile), filtattr(__G__ G.pInfo->file_attr))) + perror("fchmod (file attributes) error"); + +- fclose(G.outfile); ++ errval = CloseError(G.outfile, G.filename); + #endif /* !NO_FCHOWN && !NO_FCHMOD */ + + /* skip restoring time stamps on user's request */ +@@ -1267,6 +1299,7 @@ void close_outfile(__G) /* GRR: chang + #endif + #endif /* NO_FCHOWN || NO_FCHMOD */ + ++ return errval; + } /* end function close_outfile() */ + + #endif /* !MTS */ +diff -up unzip60/unzpriv.h.close unzip60/unzpriv.h +--- unzip60/unzpriv.h.close 2009-04-20 01:59:26.000000000 +0200 ++++ unzip60/unzpriv.h 2009-11-19 08:19:08.610388618 +0100 +@@ -2604,7 +2604,7 @@ char *GetLoadPath OF((__GPRO)); + int SetFileSize OF((FILE *file, zusz_t filesize)); /* local */ + #endif + #ifndef MTS /* macro in MTS */ +- void close_outfile OF((__GPRO)); /* local */ ++ int close_outfile OF((__GPRO)); /* local */ + #endif + #ifdef SET_SYMLINK_ATTRIBS + int set_symlnk_attribs OF((__GPRO__ slinkentry *slnk_entry)); /* local */ diff --git a/gnu/packages/patches/unzip-exec-shield.patch b/gnu/packages/patches/unzip-exec-shield.patch new file mode 100644 index 0000000000..74500aa5d4 --- /dev/null +++ b/gnu/packages/patches/unzip-exec-shield.patch @@ -0,0 +1,10 @@ +diff -up unzip60/crc_i386.S.exec-shield unzip60/crc_i386.S +--- unzip60/crc_i386.S.exec-shield 2007-01-07 06:02:58.000000000 +0100 ++++ unzip60/crc_i386.S 2009-11-18 11:16:39.630389312 +0100 +@@ -302,3 +302,6 @@ _crc32: /* ulg c + #endif /* i386 || _i386 || _I386 || __i386 */ + + #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */ ++ ++.section .note.GNU-stack, "", @progbits ++.previous diff --git a/gnu/packages/patches/unzip-fix-recmatch.patch b/gnu/packages/patches/unzip-fix-recmatch.patch new file mode 100644 index 0000000000..2a8583c8ca --- /dev/null +++ b/gnu/packages/patches/unzip-fix-recmatch.patch @@ -0,0 +1,477 @@ +diff -up unzip60/match.c.recmatch unzip60/match.c +--- unzip60/match.c.recmatch 2005-08-14 13:00:36.000000000 -0400 ++++ unzip60/match.c 2013-05-28 10:29:57.949077543 -0400 +@@ -27,16 +27,14 @@ + + --------------------------------------------------------------------------- + +- Copyright on recmatch() from Zip's util.c (although recmatch() was almost +- certainly written by Mark Adler...ask me how I can tell :-) ): ++ Copyright on recmatch() from Zip's util.c ++ Copyright (c) 1990-2005 Info-ZIP. All rights reserved. + +- Copyright (C) 1990-1992 Mark Adler, Richard B. Wales, Jean-loup Gailly, +- Kai Uwe Rommel and Igor Mandrichenko. ++ See the accompanying file LICENSE, version 2004-May-22 or later ++ for terms of use. ++ If, for some reason, both of these files are missing, the Info-ZIP license ++ also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html + +- Permission is granted to any individual or institution to use, copy, +- or redistribute this software so long as all of the original files are +- included unmodified, that it is not sold for profit, and that this copy- +- right notice is retained. + + --------------------------------------------------------------------------- + +@@ -53,7 +51,7 @@ + + A set is composed of characters or ranges; a range looks like ``character + hyphen character'' (as in 0-9 or A-Z). [0-9a-zA-Z_] is the minimal set of +- characters allowed in the [..] pattern construct. Other characters are ++ characters ALlowed in the [..] pattern construct. Other characters are + allowed (i.e., 8-bit characters) if your system will support them. + + To suppress the special syntactic significance of any of ``[]*?!^-\'', in- +@@ -101,8 +99,32 @@ + # define WILDCHAR '?' + # define BEG_RANGE '[' + # define END_RANGE ']' ++# define WILDCHR_SINGLE '?' ++# define DIRSEP_CHR '/' ++# define WILDCHR_MULTI '*' + #endif + ++#ifdef WILD_STOP_AT_DIR ++ int wild_stop_at_dir = 1; /* default wildcards do not include / in matches */ ++#else ++ int wild_stop_at_dir = 0; /* default wildcards do include / in matches */ ++#endif ++ ++ ++ ++/* ++ * case mapping functions. case_map is used to ignore case in comparisons, ++ * to_up is used to force upper case even on Unix (for dosify option). ++ */ ++#ifdef USE_CASE_MAP ++# define case_map(c) upper[(c) & 0xff] ++# define to_up(c) upper[(c) & 0xff] ++#else ++# define case_map(c) (c) ++# define to_up(c) ((c) >= 'a' && (c) <= 'z' ? (c)-'a'+'A' : (c)) ++#endif /* USE_CASE_MAP */ ++ ++ + #if 0 /* GRR: add this to unzip.h someday... */ + #if !(defined(MSDOS) && defined(DOSWILD)) + #ifdef WILD_STOP_AT_DIR +@@ -114,8 +136,8 @@ int recmatch OF((ZCONST uch *pattern, ZC + int ignore_case __WDLPRO)); + #endif + #endif /* 0 */ +-static int recmatch OF((ZCONST uch *pattern, ZCONST uch *string, +- int ignore_case __WDLPRO)); ++static int recmatch OF((ZCONST char *, ZCONST char *, ++ int)); + static char *isshexp OF((ZCONST char *p)); + static int namecmp OF((ZCONST char *s1, ZCONST char *s2)); + +@@ -154,192 +176,240 @@ int match(string, pattern, ignore_case _ + } + dospattern[j-1] = '\0'; /* nuke the end "." */ + } +- j = recmatch((uch *)dospattern, (uch *)string, ignore_case __WDL); ++ j = recmatch(dospattern, string, ignore_case); + free(dospattern); + return j == 1; + } else + #endif /* MSDOS && DOSWILD */ +- return recmatch((uch *)pattern, (uch *)string, ignore_case __WDL) == 1; ++ return recmatch(pattern, string, ignore_case) == 1; + } + ++#ifdef _MBCS ++ ++char *___tmp_ptr; + ++#endif + +-static int recmatch(p, s, ic __WDL) +- ZCONST uch *p; /* sh pattern to match */ +- ZCONST uch *s; /* string to which to match it */ +- int ic; /* true for case insensitivity */ +- __WDLDEF /* directory sepchar for WildStopAtDir mode, or 0 */ ++static int recmatch(p, s, cs) ++ZCONST char *p; /* sh pattern to match */ ++ZCONST char *s; /* string to match it to */ ++int cs; /* flag: force case-sensitive matching */ + /* Recursively compare the sh pattern p with the string s and return 1 if +- * they match, and 0 or 2 if they don't or if there is a syntax error in the +- * pattern. This routine recurses on itself no more deeply than the number +- * of characters in the pattern. */ ++ they match, and 0 or 2 if they don't or if there is a syntax error in the ++ pattern. This routine recurses on itself no deeper than the number of ++ characters in the pattern. */ + { +- unsigned int c; /* pattern char or start of range in [-] loop */ ++ int c; /* pattern char or start of range in [-] loop */ ++ /* Get first character, the pattern for new recmatch calls follows */ ++ /* borrowed from Zip's global.c */ ++ int no_wild = 0; ++ int allow_regex=1; ++ /* This fix provided by akt@m5.dion.ne.jp for Japanese. ++ See 21 July 2006 mail. ++ It only applies when p is pointing to a doublebyte character and ++ things like / and wildcards are not doublebyte. This probably ++ should not be needed. */ + +- /* Get first character, the pattern for new recmatch calls follows */ +- c = *p; INCSTR(p); ++#ifdef _MBCS ++ if (CLEN(p) == 2) { ++ if (CLEN(s) == 2) { ++ return (*p == *s && *(p+1) == *(s+1)) ? ++ recmatch(p + 2, s + 2, cs) : 0; ++ } else { ++ return 0; ++ } ++ } ++#endif /* ?_MBCS */ + +- /* If that was the end of the pattern, match if string empty too */ +- if (c == 0) +- return *s == 0; ++ c = *POSTINCSTR(p); + +- /* '?' (or '%') matches any character (but not an empty string). */ +- if (c == WILDCHAR) +-#ifdef WILD_STOP_AT_DIR +- /* If uO.W_flag is non-zero, it won't match '/' */ +- return (*s && (!sepc || *s != (uch)sepc)) +- ? recmatch(p, s + CLEN(s), ic, sepc) : 0; +-#else +- return *s ? recmatch(p, s + CLEN(s), ic) : 0; +-#endif ++ /* If that was the end of the pattern, match if string empty too */ ++ if (c == 0) ++ return *s == 0; ++ ++ /* '?' (or '%' or '#') matches any character (but not an empty string) */ ++ if (c == WILDCHR_SINGLE) { ++ if (wild_stop_at_dir) ++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; ++ else ++ return *s ? recmatch(p, s + CLEN(s), cs) : 0; ++ } + +- /* '*' matches any number of characters, including zero */ ++ /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ + #ifdef AMIGA +- if (c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; ++ if (!no_wild && c == '#' && *p == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; + #endif /* AMIGA */ +- if (c == '*') { +-#ifdef WILD_STOP_AT_DIR +- if (sepc) { +- /* check for single "*" or double "**" */ +-# ifdef AMIGA +- if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ +- c = '*', p++; +- if (c != '*') { +-# else /* !AMIGA */ +- if (*p != '*') { +-# endif /* ?AMIGA */ +- /* single "*": this doesn't match the dirsep character */ +- for (; *s && *s != (uch)sepc; INCSTR(s)) +- if ((c = recmatch(p, s, ic, sepc)) != 0) +- return (int)c; +- /* end of pattern: matched if at end of string, else continue */ +- if (*p == '\0') +- return (*s == 0); +- /* continue to match if at sepc in pattern, else give up */ +- return (*p == (uch)sepc || (*p == '\\' && p[1] == (uch)sepc)) +- ? recmatch(p, s, ic, sepc) : 2; +- } +- /* "**": this matches slashes */ +- ++p; /* move p behind the second '*' */ +- /* and continue with the non-W_flag code variant */ +- } +-#endif /* WILD_STOP_AT_DIR */ ++ if (!no_wild && c == WILDCHR_MULTI) ++ { ++ if (wild_stop_at_dir) { ++ /* Check for an immediately following WILDCHR_MULTI */ ++# ifdef AMIGA ++ if ((c = p[0]) == '#' && p[1] == '?') /* "#?" is Amiga-ese for "*" */ ++ c = WILDCHR_MULTI, p++; ++ if (c != WILDCHR_MULTI) { ++# else /* !AMIGA */ ++ if (*p != WILDCHR_MULTI) { ++# endif /* ?AMIGA */ ++ /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ ++ for (; *s && *s != DIRSEP_CHR; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ /* end of pattern: matched if at end of string, else continue */ + if (*p == 0) +- return 1; +- if (isshexp((ZCONST char *)p) == NULL) { +- /* Optimization for rest of pattern being a literal string: +- * If there are no other shell expression chars in the rest +- * of the pattern behind the multi-char wildcard, then just +- * compare the literal string tail. +- */ +- ZCONST uch *srest; +- +- srest = s + (strlen((ZCONST char *)s) - strlen((ZCONST char *)p)); +- if (srest - s < 0) +- /* remaining literal string from pattern is longer than rest +- * of test string, there can't be a match +- */ +- return 0; +- else +- /* compare the remaining literal pattern string with the last +- * bytes of the test string to check for a match +- */ ++ return (*s == 0); ++ /* continue to match if at DIRSEP_CHR in pattern, else give up */ ++ return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) ++ ? recmatch(p, s, cs) : 2; ++ } ++ /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ ++ p++; /* move p past the second WILDCHR_MULTI */ ++ /* continue with the normal non-WILD_STOP_AT_DIR code */ ++ } /* wild_stop_at_dir */ ++ ++ /* Not wild_stop_at_dir */ ++ if (*p == 0) ++ return 1; ++ if (!isshexp((char *)p)) ++ { ++ /* optimization for rest of pattern being a literal string */ ++ ++ /* optimization to handle patterns like *.txt */ ++ /* if the first char in the pattern is '*' and there */ ++ /* are no other shell expression chars, i.e. a literal string */ ++ /* then just compare the literal string at the end */ ++ ++ ZCONST char *srest; ++ ++ srest = s + (strlen(s) - strlen(p)); ++ if (srest - s < 0) ++ /* remaining literal string from pattern is longer than rest of ++ test string, there can't be a match ++ */ ++ return 0; ++ else ++ /* compare the remaining literal pattern string with the last bytes ++ of the test string to check for a match */ + #ifdef _MBCS +- { +- ZCONST uch *q = s; ++ { ++ ZCONST char *q = s; + +- /* MBCS-aware code must not scan backwards into a string from +- * the end. +- * So, we have to move forward by character from our well-known +- * character position s in the test string until we have +- * advanced to the srest position. +- */ +- while (q < srest) +- INCSTR(q); +- /* In case the byte *srest is a trailing byte of a multibyte +- * character in the test string s, we have actually advanced +- * past the position (srest). +- * For this case, the match has failed! +- */ +- if (q != srest) +- return 0; +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)q) +- : strcmp((ZCONST char *)p, (ZCONST char *)q) +- ) == 0); +- } ++ /* MBCS-aware code must not scan backwards into a string from ++ * the end. ++ * So, we have to move forward by character from our well-known ++ * character position s in the test string until we have advanced ++ * to the srest position. ++ */ ++ while (q < srest) ++ INCSTR(q); ++ /* In case the byte *srest is a trailing byte of a multibyte ++ * character, we have actually advanced past the position (srest). ++ * For this case, the match has failed! ++ */ ++ if (q != srest) ++ return 0; ++ return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); ++ } + #else /* !_MBCS */ +- return ((ic +- ? namecmp((ZCONST char *)p, (ZCONST char *)srest) +- : strcmp((ZCONST char *)p, (ZCONST char *)srest) +- ) == 0); ++ return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); + #endif /* ?_MBCS */ +- } else { +- /* pattern contains more wildcards, continue with recursion... */ +- for (; *s; INCSTR(s)) +- if ((c = recmatch(p, s, ic __WDL)) != 0) +- return (int)c; +- return 2; /* 2 means give up--match will return false */ +- } + } +- +- /* Parse and process the list of characters and ranges in brackets */ +- if (c == BEG_RANGE) { +- int e; /* flag true if next char to be taken literally */ +- ZCONST uch *q; /* pointer to end of [-] group */ +- int r; /* flag true to match anything but the range */ +- +- if (*s == 0) /* need a character to match */ +- return 0; +- p += (r = (*p == '!' || *p == '^')); /* see if reverse */ +- for (q = p, e = 0; *q; INCSTR(q)) /* find closing bracket */ +- if (e) +- e = 0; +- else +- if (*q == '\\') /* GRR: change to ^ for MS-DOS, OS/2? */ +- e = 1; +- else if (*q == END_RANGE) +- break; +- if (*q != END_RANGE) /* nothing matches if bad syntax */ +- return 0; +- for (c = 0, e = (*p == '-'); p < q; INCSTR(p)) { +- /* go through the list */ +- if (!e && *p == '\\') /* set escape flag if \ */ +- e = 1; +- else if (!e && *p == '-') /* set start of range if - */ +- c = *(p-1); +- else { +- unsigned int cc = Case(*s); +- +- if (*(p+1) != '-') +- for (c = c ? c : *p; c <= *p; c++) /* compare range */ +- if ((unsigned)Case(c) == cc) /* typecast for MSC bug */ +- return r ? 0 : recmatch(q + 1, s + 1, ic __WDL); +- c = e = 0; /* clear range, escape flags */ +- } +- } +- return r ? recmatch(q + CLEN(q), s + CLEN(s), ic __WDL) : 0; +- /* bracket match failed */ ++ else ++ { ++ /* pattern contains more wildcards, continue with recursion... */ ++ for (; *s; INCSTR(s)) ++ if ((c = recmatch(p, s, cs)) != 0) ++ return c; ++ return 2; /* 2 means give up--shmatch will return false */ + } ++ } + +- /* if escape ('\\'), just compare next character */ +- if (c == '\\' && (c = *p++) == 0) /* if \ at end, then syntax error */ +- return 0; ++#ifndef VMS /* No bracket matching in VMS */ ++ /* Parse and process the list of characters and ranges in brackets */ ++ if (!no_wild && allow_regex && c == '[') ++ { ++ int e; /* flag true if next char to be taken literally */ ++ ZCONST char *q; /* pointer to end of [-] group */ ++ int r; /* flag true to match anything but the range */ ++ ++ if (*s == 0) /* need a character to match */ ++ return 0; ++ p += (r = (*p == '!' || *p == '^')); /* see if reverse */ ++ for (q = p, e = 0; *q; q++) /* find closing bracket */ ++ if (e) ++ e = 0; ++ else ++ if (*q == '\\') ++ e = 1; ++ else if (*q == ']') ++ break; ++ if (*q != ']') /* nothing matches if bad syntax */ ++ return 0; ++ for (c = 0, e = *p == '-'; p < q; p++) /* go through the list */ ++ { ++ if (e == 0 && *p == '\\') /* set escape flag if \ */ ++ e = 1; ++ else if (e == 0 && *p == '-') /* set start of range if - */ ++ c = *(p-1); ++ else ++ { ++ uch cc = (cs ? (uch)*s : case_map((uch)*s)); ++ uch uc = (uch) c; ++ if (*(p+1) != '-') ++ for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) ++ /* compare range */ ++ if ((cs ? uc : case_map(uc)) == cc) ++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); ++ c = e = 0; /* clear range, escape flags */ ++ } ++ } ++ return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; ++ /* bracket match failed */ ++ } ++#endif /* !VMS */ + +- /* just a character--compare it */ +-#ifdef QDOS +- return QMatch(Case((uch)c), Case(*s)) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#else +- return Case((uch)c) == Case(*s) ? +- recmatch(p, s + CLEN(s), ic __WDL) : 0; +-#endif ++ /* If escape ('\'), just compare next character */ ++ if (!no_wild && c == '\\') ++ if ((c = *p++) == '\0') /* if \ at end, then syntax error */ ++ return 0; ++ ++#ifdef VMS ++ /* 2005-11-06 SMS. ++ Handle "..." wildcard in p with "." or "]" in s. ++ */ ++ if ((c == '.') && (*p == '.') && (*(p+ CLEN( p)) == '.') && ++ ((*s == '.') || (*s == ']'))) ++ { ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* Else, look for a reduced match in s, until "]" in or end of s. */ ++ for (; *s && (*s != ']'); INCSTR(s)) ++ if (*s == '.') ++ /* If reduced match, then continue after "..." in p, "." in s. */ ++ if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) ++ return (int)c; ++ ++ /* Match "...]" with "]". Continue after "]" in both. */ ++ if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ ++ /* No reduced match. Quit. */ ++ return 2; ++ } ++ ++#endif /* def VMS */ ++ ++ /* Just a character--compare it */ ++ return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? ++ recmatch(p, s + CLEN(s), cs) : 0; ++} + +-} /* end function recmatch() */ + + + ++/*************************************************************************************************/ + static char *isshexp(p) + ZCONST char *p; + /* If p is a sh expression, a pointer to the first special character is diff --git a/gnu/packages/patches/unzip-manpage-fix.patch b/gnu/packages/patches/unzip-manpage-fix.patch new file mode 100644 index 0000000000..ec06516bbb --- /dev/null +++ b/gnu/packages/patches/unzip-manpage-fix.patch @@ -0,0 +1,11 @@ +--- unzip60/man/unzip.1 2011-01-11 11:59:59.000000000 +0000 ++++ unzip60/man/unzip_new 2011-02-05 18:45:55.000000000 +0000 +@@ -424,7 +424,7 @@ + .\" Amiga support possible eventually, but not yet + [MS-DOS, OS/2, NT] restore the volume label if the extraction medium is + removable (e.g., a diskette). Doubling the option (\fB\-$$\fP) allows fixed +-media (hard disks) to be labelled as well. By default, volume labels are ++media (hard disks) to be labeled as well. By default, volume labels are + ignored. + .IP \fB\-/\fP\ \fIextensions\fP + [Acorn only] overrides the extension list supplied by Unzip$Ext environment diff --git a/gnu/packages/patches/unzip-overflow.patch b/gnu/packages/patches/unzip-overflow.patch new file mode 100644 index 0000000000..228c28377f --- /dev/null +++ b/gnu/packages/patches/unzip-overflow.patch @@ -0,0 +1,25 @@ +diff --git a/extract.c b/extract.c +index a0a4929..9ef80b3 100644 +--- a/extract.c ++++ b/extract.c +@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + ulg eb_ucsize; + uch *eb_ucptr; + int r; ++ ush method; + + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ +@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) + eb_size <= (compr_offset + EB_CMPRHEADLEN))) + return IZ_EF_TRUNC; /* no compressed data! */ + ++ method = makeword(eb + (EB_HEADSIZE + compr_offset)); ++ if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize)) ++ return PK_ERR; /* compressed & uncompressed ++ * should match in STORED ++ * method */ ++ + if ( + #ifdef INT_16BIT + (((ulg)(extent)eb_ucsize) != eb_ucsize) || diff --git a/gnu/packages/patches/unzip-symlink.patch b/gnu/packages/patches/unzip-symlink.patch new file mode 100644 index 0000000000..d7eaf160b4 --- /dev/null +++ b/gnu/packages/patches/unzip-symlink.patch @@ -0,0 +1,17 @@ +diff --git a/process.c b/process.c +index 1e9a1e1..905732b 100644 +--- a/process.c ++++ b/process.c +@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G) /* return PK-type error code */ + = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); + #endif + ++#ifdef SYMLINKS ++ /* Initialize the symlink flag, may be set by the platform-specific ++ mapattr function. */ ++ G.pInfo->symlink = 0; ++#endif ++ + return PK_COOL; + + } /* end function process_cdir_file_hdr() */ diff --git a/gnu/packages/patches/unzip-timestamp.patch b/gnu/packages/patches/unzip-timestamp.patch new file mode 100644 index 0000000000..2aa9424eb8 --- /dev/null +++ b/gnu/packages/patches/unzip-timestamp.patch @@ -0,0 +1,41 @@ +From: "Steven M. Schweda" +Subject: Do not ignore extra fields containing Unix Timestamps +Bug-Debian: https://bugs.debian.org/842993 +X-Debian-version: 6.0-21 + +--- a/process.c ++++ b/process.c +@@ -2914,10 +2914,13 @@ + break; + + case EF_IZUNIX2: +- if (have_new_type_eb == 0) { +- flags &= ~0x0ff; /* ignore any previous IZUNIX field */ ++ if (have_new_type_eb == 0) { /* (< 1) */ + have_new_type_eb = 1; + } ++ if (have_new_type_eb <= 1) { ++ /* Ignore any prior (EF_IZUNIX/EF_PKUNIX) UID/GID. */ ++ flags &= 0x0ff; ++ } + #ifdef IZ_HAVE_UXUIDGID + if (have_new_type_eb > 1) + break; /* IZUNIX3 overrides IZUNIX2 e.f. block ! */ +@@ -2933,6 +2936,8 @@ + /* new 3rd generation Unix ef */ + have_new_type_eb = 2; + ++ /* Ignore any prior EF_IZUNIX/EF_PKUNIX/EF_IZUNIX2 UID/GID. */ ++ flags &= 0x0ff; + /* + Version 1 byte version of this extra field, currently 1 + UIDSize 1 byte Size of UID field +@@ -2953,8 +2958,6 @@ + uid_size = *((EB_HEADSIZE + 1) + ef_buf); + gid_size = *((EB_HEADSIZE + uid_size + 2) + ef_buf); + +- flags &= ~0x0ff; /* ignore any previous UNIX field */ +- + if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf, + uid_size, &z_uidgid[0]) + && diff --git a/gnu/packages/patches/unzip-valgrind.patch b/gnu/packages/patches/unzip-valgrind.patch new file mode 100644 index 0000000000..41a752023b --- /dev/null +++ b/gnu/packages/patches/unzip-valgrind.patch @@ -0,0 +1,26 @@ +diff --git a/fileio.c b/fileio.c +index ba0a1d0..03fc4be 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -2006,6 +2006,7 @@ int do_string(__G__ length, option) /* return PK-type error code */ + unsigned comment_bytes_left; + unsigned int block_len; + int error=PK_OK; ++ unsigned int length2; + #ifdef AMIGA + char tmp_fnote[2 * AMIGA_FILENOTELEN]; /* extra room for squozen chars */ + #endif +@@ -2292,8 +2293,12 @@ int do_string(__G__ length, option) /* return PK-type error code */ + seek_zipf(__G__ G.cur_zipfile_bufstart - G.extra_bytes + + (G.inptr-G.inbuf) + length); + } else { +- if (readbuf(__G__ (char *)G.extra_field, length) == 0) ++ if ((length2 = readbuf(__G__ (char *)G.extra_field, length)) == 0) + return PK_EOF; ++ if(length2 < length) { ++ memset (__G__ (char *)G.extra_field+length2, 0 , length-length2); ++ length = length2; ++ } + /* Looks like here is where extra fields are read */ + getZip64Data(__G__ G.extra_field, length); + #ifdef UNICODE_SUPPORT diff --git a/gnu/packages/patches/unzip-x-option.patch b/gnu/packages/patches/unzip-x-option.patch new file mode 100644 index 0000000000..72c77aeb78 --- /dev/null +++ b/gnu/packages/patches/unzip-x-option.patch @@ -0,0 +1,28 @@ +--- ./process.c.orig 2009-03-06 02:25:10.000000000 +0100 ++++ ./process.c 2013-09-12 10:51:16.000000000 +0200 +@@ -2901,9 +2901,9 @@ + */ + + #ifdef IZ_HAVE_UXUIDGID +- if (eb_len >= EB_UX3_MINLEN +- && z_uidgid != NULL +- && (*((EB_HEADSIZE + 0) + ef_buf) == 1) ++ if ((eb_len >= EB_UX3_MINLEN) ++ && (z_uidgid != NULL) ++ && ((*((EB_HEADSIZE + 0) + ef_buf) == 1))) + /* only know about version 1 */ + { + uch uid_size; +@@ -2915,10 +2915,10 @@ + flags &= ~0x0ff; /* ignore any previous UNIX field */ + + if ( read_ux3_value((EB_HEADSIZE + 2) + ef_buf, +- uid_size, z_uidgid[0]) ++ uid_size, &z_uidgid[0]) + && + read_ux3_value((EB_HEADSIZE + uid_size + 3) + ef_buf, +- gid_size, z_uidgid[1]) ) ++ gid_size, &z_uidgid[1]) ) + { + flags |= EB_UX2_VALID; /* signal success */ + } diff --git a/gnu/packages/patches/unzip-zipbomb-manpage.patch b/gnu/packages/patches/unzip-zipbomb-manpage.patch new file mode 100644 index 0000000000..cdeeea5c93 --- /dev/null +++ b/gnu/packages/patches/unzip-zipbomb-manpage.patch @@ -0,0 +1,25 @@ +From 6fe72291a5563cdbcd2bdd87e36528537b7cdcfb Mon Sep 17 00:00:00 2001 +From: Jakub Martisko +Date: Mon, 18 Nov 2019 14:17:46 +0100 +Subject: [PATCH] update the man page + +--- + man/unzip.1 | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/man/unzip.1 b/man/unzip.1 +index 21816d1..4d66073 100644 +--- a/man/unzip.1 ++++ b/man/unzip.1 +@@ -850,6 +850,8 @@ the specified zipfiles were not found. + invalid options were specified on the command line. + .IP 11 + no matching files were found. ++.IP 12 ++invalid zip file with overlapped components (possible zip bomb). + .IP 50 + the disk is (or was) full during extraction. + .IP 51 +-- +2.23.0 + diff --git a/gnu/packages/patches/unzip-zipbomb-part1.patch b/gnu/packages/patches/unzip-zipbomb-part1.patch new file mode 100644 index 0000000000..35cf856522 --- /dev/null +++ b/gnu/packages/patches/unzip-zipbomb-part1.patch @@ -0,0 +1,25 @@ +From 41beb477c5744bc396fa1162ee0c14218ec12213 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 27 May 2019 08:20:32 -0700 +Subject: [PATCH] Fix bug in undefer_input() that misplaced the input state. + +--- + fileio.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fileio.c b/fileio.c +index c042987..bc00d74 100644 +--- a/fileio.c ++++ b/fileio.c +@@ -530,8 +530,10 @@ void undefer_input(__G) + * This condition was checked when G.incnt_leftover was set > 0 in + * defer_leftover_input(), and it is NOT allowed to touch G.csize + * before calling undefer_input() when (G.incnt_leftover > 0) +- * (single exception: see read_byte()'s "G.csize <= 0" handling) !! ++ * (single exception: see readbyte()'s "G.csize <= 0" handling) !! + */ ++ if (G.csize < 0L) ++ G.csize = 0L; + G.incnt = G.incnt_leftover + (int)G.csize; + G.inptr = G.inptr_leftover - (int)G.csize; + G.incnt_leftover = 0; diff --git a/gnu/packages/patches/unzip-zipbomb-part2.patch b/gnu/packages/patches/unzip-zipbomb-part2.patch new file mode 100644 index 0000000000..903c845763 --- /dev/null +++ b/gnu/packages/patches/unzip-zipbomb-part2.patch @@ -0,0 +1,349 @@ +From 47b3ceae397d21bf822bc2ac73052a4b1daf8e1c Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Tue, 11 Jun 2019 22:01:18 -0700 +Subject: [PATCH] Detect and reject a zip bomb using overlapped entries. + +This detects an invalid zip file that has at least one entry that +overlaps with another entry or with the central directory to the +end of the file. A Fifield zip bomb uses overlapped local entries +to vastly increase the potential inflation ratio. Such an invalid +zip file is rejected. + +See https://www.bamsoftware.com/hacks/zipbomb/ for David Fifield's +analysis, construction, and examples of such zip bombs. + +The detection maintains a list of covered spans of the zip files +so far, where the central directory to the end of the file and any +bytes preceding the first entry at zip file offset zero are +considered covered initially. Then as each entry is decompressed +or tested, it is considered covered. When a new entry is about to +be processed, its initial offset is checked to see if it is +contained by a covered span. If so, the zip file is rejected as +invalid. + +This commit depends on a preceding commit: "Fix bug in +undefer_input() that misplaced the input state." +--- + extract.c | 190 +++++++++++++++++++++++++++++++++++++++++++++++++++++- + globals.c | 1 + + globals.h | 3 + + process.c | 11 ++++ + unzip.h | 1 + + 5 files changed, 205 insertions(+), 1 deletion(-) + +diff --git a/extract.c b/extract.c +index 1acd769..0973a33 100644 +--- a/extract.c ++++ b/extract.c +@@ -319,6 +319,125 @@ static ZCONST char Far UnsupportedExtraField[] = + "\nerror: unsupported extra-field compression type (%u)--skipping\n"; + static ZCONST char Far BadExtraFieldCRC[] = + "error [%s]: bad extra-field CRC %08lx (should be %08lx)\n"; ++static ZCONST char Far NotEnoughMemCover[] = ++ "error: not enough memory for bomb detection\n"; ++static ZCONST char Far OverlappedComponents[] = ++ "error: invalid zip file with overlapped components (possible zip bomb)\n"; ++ ++ ++ ++ ++ ++/* A growable list of spans. */ ++typedef zoff_t bound_t; ++typedef struct { ++ bound_t beg; /* start of the span */ ++ bound_t end; /* one past the end of the span */ ++} span_t; ++typedef struct { ++ span_t *span; /* allocated, distinct, and sorted list of spans */ ++ size_t num; /* number of spans in the list */ ++ size_t max; /* allocated number of spans (num <= max) */ ++} cover_t; ++ ++/* ++ * Return the index of the first span in cover whose beg is greater than val. ++ * If there is no such span, then cover->num is returned. ++ */ ++static size_t cover_find(cover, val) ++ cover_t *cover; ++ bound_t val; ++{ ++ size_t lo = 0, hi = cover->num; ++ while (lo < hi) { ++ size_t mid = (lo + hi) >> 1; ++ if (val < cover->span[mid].beg) ++ hi = mid; ++ else ++ lo = mid + 1; ++ } ++ return hi; ++} ++ ++/* Return true if val lies within any one of the spans in cover. */ ++static int cover_within(cover, val) ++ cover_t *cover; ++ bound_t val; ++{ ++ size_t pos = cover_find(cover, val); ++ return pos > 0 && val < cover->span[pos - 1].end; ++} ++ ++/* ++ * Add a new span to the list, but only if the new span does not overlap any ++ * spans already in the list. The new span covers the values beg..end-1. beg ++ * must be less than end. ++ * ++ * Keep the list sorted and merge adjacent spans. Grow the allocated space for ++ * the list as needed. On success, 0 is returned. If the new span overlaps any ++ * existing spans, then 1 is returned and the new span is not added to the ++ * list. If the new span is invalid because beg is greater than or equal to ++ * end, then -1 is returned. If the list needs to be grown but the memory ++ * allocation fails, then -2 is returned. ++ */ ++static int cover_add(cover, beg, end) ++ cover_t *cover; ++ bound_t beg; ++ bound_t end; ++{ ++ size_t pos; ++ int prec, foll; ++ ++ if (beg >= end) ++ /* The new span is invalid. */ ++ return -1; ++ ++ /* Find where the new span should go, and make sure that it does not ++ overlap with any existing spans. */ ++ pos = cover_find(cover, beg); ++ if ((pos > 0 && beg < cover->span[pos - 1].end) || ++ (pos < cover->num && end > cover->span[pos].beg)) ++ return 1; ++ ++ /* Check for adjacencies. */ ++ prec = pos > 0 && beg == cover->span[pos - 1].end; ++ foll = pos < cover->num && end == cover->span[pos].beg; ++ if (prec && foll) { ++ /* The new span connects the preceding and following spans. Merge the ++ following span into the preceding span, and delete the following ++ span. */ ++ cover->span[pos - 1].end = cover->span[pos].end; ++ cover->num--; ++ memmove(cover->span + pos, cover->span + pos + 1, ++ (cover->num - pos) * sizeof(span_t)); ++ } ++ else if (prec) ++ /* The new span is adjacent only to the preceding span. Extend the end ++ of the preceding span. */ ++ cover->span[pos - 1].end = end; ++ else if (foll) ++ /* The new span is adjacent only to the following span. Extend the ++ beginning of the following span. */ ++ cover->span[pos].beg = beg; ++ else { ++ /* The new span has gaps between both the preceding and the following ++ spans. Assure that there is room and insert the span. */ ++ if (cover->num == cover->max) { ++ size_t max = cover->max == 0 ? 16 : cover->max << 1; ++ span_t *span = realloc(cover->span, max * sizeof(span_t)); ++ if (span == NULL) ++ return -2; ++ cover->span = span; ++ cover->max = max; ++ } ++ memmove(cover->span + pos + 1, cover->span + pos, ++ (cover->num - pos) * sizeof(span_t)); ++ cover->num++; ++ cover->span[pos].beg = beg; ++ cover->span[pos].end = end; ++ } ++ return 0; ++} + + + +@@ -374,6 +493,29 @@ int extract_or_test_files(__G) /* return PK-type error code */ + } + #endif /* !SFX || SFX_EXDIR */ + ++ /* One more: initialize cover structure for bomb detection. Start with a ++ span that covers the central directory though the end of the file. */ ++ if (G.cover == NULL) { ++ G.cover = malloc(sizeof(cover_t)); ++ if (G.cover == NULL) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(NotEnoughMemCover))); ++ return PK_MEM; ++ } ++ ((cover_t *)G.cover)->span = NULL; ++ ((cover_t *)G.cover)->max = 0; ++ } ++ ((cover_t *)G.cover)->num = 0; ++ if ((G.extra_bytes != 0 && ++ cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, ++ G.extra_bytes + G.ecrec.offset_start_central_directory, ++ G.ziplen) != 0) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(NotEnoughMemCover))); ++ return PK_MEM; ++ } ++ + /*--------------------------------------------------------------------------- + The basic idea of this function is as follows. Since the central di- + rectory lies at the end of the zipfile and the member files lie at the +@@ -591,7 +733,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + if (error > error_in_archive) + error_in_archive = error; + /* ...and keep going (unless disk full or user break) */ +- if (G.disk_full > 1 || error_in_archive == IZ_CTRLC) { ++ if (G.disk_full > 1 || error_in_archive == IZ_CTRLC || ++ error == PK_BOMB) { + /* clear reached_end to signal premature stop ... */ + reached_end = FALSE; + /* ... and cancel scanning the central directory */ +@@ -1060,6 +1203,11 @@ static int extract_or_test_entrylist(__G__ numchunk, + + /* seek_zipf(__G__ pInfo->offset); */ + request = G.pInfo->offset + G.extra_bytes; ++ if (cover_within((cover_t *)G.cover, request)) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(OverlappedComponents))); ++ return PK_BOMB; ++ } + inbuf_offset = request % INBUFSIZ; + bufstart = request - inbuf_offset; + +@@ -1591,6 +1739,18 @@ static int extract_or_test_entrylist(__G__ numchunk, + return IZ_CTRLC; /* cancel operation by user request */ + } + #endif ++ error = cover_add((cover_t *)G.cover, request, ++ G.cur_zipfile_bufstart + (G.inptr - G.inbuf)); ++ if (error < 0) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(NotEnoughMemCover))); ++ return PK_MEM; ++ } ++ if (error != 0) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(OverlappedComponents))); ++ return PK_BOMB; ++ } + #ifdef MACOS /* MacOS is no preemptive OS, thus call event-handling by hand */ + UserStop(); + #endif +@@ -1992,6 +2152,34 @@ static int extract_or_test_member(__G) /* return PK-type error code */ + } + + undefer_input(__G); ++ ++ if ((G.lrec.general_purpose_bit_flag & 8) != 0) { ++ /* skip over data descriptor (harder than it sounds, due to signature ++ * ambiguity) ++ */ ++# define SIG 0x08074b50 ++# define LOW 0xffffffff ++ uch buf[12]; ++ unsigned shy = 12 - readbuf((char *)buf, 12); ++ ulg crc = shy ? 0 : makelong(buf); ++ ulg clen = shy ? 0 : makelong(buf + 4); ++ ulg ulen = shy ? 0 : makelong(buf + 8); /* or high clen if ZIP64 */ ++ if (crc == SIG && /* if not SIG, no signature */ ++ (G.lrec.crc32 != SIG || /* if not SIG, have signature */ ++ (clen == SIG && /* if not SIG, no signature */ ++ ((G.lrec.csize & LOW) != SIG || /* if not SIG, have signature */ ++ (ulen == SIG && /* if not SIG, no signature */ ++ (G.zip64 ? G.lrec.csize >> 32 : G.lrec.ucsize) != SIG ++ /* if not SIG, have signature */ ++ ))))) ++ /* skip four more bytes to account for signature */ ++ shy += 4 - readbuf((char *)buf, 4); ++ if (G.zip64) ++ shy += 8 - readbuf((char *)buf, 8); /* skip eight more for ZIP64 */ ++ if (shy) ++ error = PK_ERR; ++ } ++ + return error; + + } /* end function extract_or_test_member() */ +diff --git a/globals.c b/globals.c +index fa8cca5..1e0f608 100644 +--- a/globals.c ++++ b/globals.c +@@ -181,6 +181,7 @@ Uz_Globs *globalsCtor() + # if (!defined(NO_TIMESTAMPS)) + uO.D_flag=1; /* default to '-D', no restoration of dir timestamps */ + # endif ++ G.cover = NULL; /* not allocated yet */ + #endif + + uO.lflag=(-1); +diff --git a/globals.h b/globals.h +index 11b7215..2bdcdeb 100644 +--- a/globals.h ++++ b/globals.h +@@ -260,12 +260,15 @@ typedef struct Globals { + ecdir_rec ecrec; /* used in unzip.c, extract.c */ + z_stat statbuf; /* used by main, mapname, check_for_newer */ + ++ int zip64; /* true if Zip64 info in extra field */ ++ + int mem_mode; + uch *outbufptr; /* extract.c static */ + ulg outsize; /* extract.c static */ + int reported_backslash; /* extract.c static */ + int disk_full; + int newfile; ++ void **cover; /* used in extract.c for bomb detection */ + + int didCRlast; /* fileio static */ + ulg numlines; /* fileio static: number of lines printed */ +diff --git a/process.c b/process.c +index 1e9a1e1..d2e4dc3 100644 +--- a/process.c ++++ b/process.c +@@ -637,6 +637,13 @@ void free_G_buffers(__G) /* releases all memory allocated in global vars */ + } + #endif + ++ /* Free the cover span list and the cover structure. */ ++ if (G.cover != NULL) { ++ free(*(G.cover)); ++ free(G.cover); ++ G.cover = NULL; ++ } ++ + } /* end function free_G_buffers() */ + + +@@ -1890,6 +1897,8 @@ int getZip64Data(__G__ ef_buf, ef_len) + #define Z64FLGS 0xffff + #define Z64FLGL 0xffffffff + ++ G.zip64 = FALSE; ++ + if (ef_len == 0 || ef_buf == NULL) + return PK_COOL; + +@@ -1927,6 +1936,8 @@ int getZip64Data(__G__ ef_buf, ef_len) + #if 0 + break; /* Expect only one EF_PKSZ64 block. */ + #endif /* 0 */ ++ ++ G.zip64 = TRUE; + } + + /* Skip this extra field block. */ +diff --git a/unzip.h b/unzip.h +index 5b2a326..ed24a5b 100644 +--- a/unzip.h ++++ b/unzip.h +@@ -645,6 +645,7 @@ typedef struct _Uzp_cdir_Rec { + #define PK_NOZIP 9 /* zipfile not found */ + #define PK_PARAM 10 /* bad or illegal parameters specified */ + #define PK_FIND 11 /* no files found */ ++#define PK_BOMB 12 /* likely zip bomb */ + #define PK_DISK 50 /* disk full */ + #define PK_EOF 51 /* unexpected EOF */ + diff --git a/gnu/packages/patches/unzip-zipbomb-part3.patch b/gnu/packages/patches/unzip-zipbomb-part3.patch new file mode 100644 index 0000000000..3b8d67b773 --- /dev/null +++ b/gnu/packages/patches/unzip-zipbomb-part3.patch @@ -0,0 +1,112 @@ +From 6d351831be705cc26d897db44f878a978f4138fc Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Thu, 25 Jul 2019 20:43:17 -0700 +Subject: [PATCH] Do not raise a zip bomb alert for a misplaced central + directory. + +There is a zip-like file in the Firefox distribution, omni.ja, +which is a zip container with the central directory placed at the +start of the file instead of after the local entries as required +by the zip standard. This commit marks the actual location of the +central directory, as well as the end of central directory records, +as disallowed locations. This now permits such containers to not +raise a zip bomb alert, where in fact there are no overlaps. +--- + extract.c | 25 +++++++++++++++++++------ + process.c | 6 ++++++ + unzpriv.h | 10 ++++++++++ + 3 files changed, 35 insertions(+), 6 deletions(-) + +diff --git a/extract.c b/extract.c +index 0973a33..1b73cb0 100644 +--- a/extract.c ++++ b/extract.c +@@ -493,8 +493,11 @@ int extract_or_test_files(__G) /* return PK-type error code */ + } + #endif /* !SFX || SFX_EXDIR */ + +- /* One more: initialize cover structure for bomb detection. Start with a +- span that covers the central directory though the end of the file. */ ++ /* One more: initialize cover structure for bomb detection. Start with ++ spans that cover any extra bytes at the start, the central directory, ++ the end of central directory record (including the Zip64 end of central ++ directory locator, if present), and the Zip64 end of central directory ++ record, if present. */ + if (G.cover == NULL) { + G.cover = malloc(sizeof(cover_t)); + if (G.cover == NULL) { +@@ -506,15 +509,25 @@ int extract_or_test_files(__G) /* return PK-type error code */ + ((cover_t *)G.cover)->max = 0; + } + ((cover_t *)G.cover)->num = 0; +- if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || +- cover_add((cover_t *)G.cover, ++ if (cover_add((cover_t *)G.cover, + G.extra_bytes + G.ecrec.offset_start_central_directory, +- G.ziplen) != 0) { ++ G.extra_bytes + G.ecrec.offset_start_central_directory + ++ G.ecrec.size_central_directory) != 0) { + Info(slide, 0x401, ((char *)slide, + LoadFarString(NotEnoughMemCover))); + return PK_MEM; + } ++ if ((G.extra_bytes != 0 && ++ cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ (G.ecrec.have_ecr64 && ++ cover_add((cover_t *)G.cover, G.ecrec.ec64_start, ++ G.ecrec.ec64_end) != 0) || ++ cover_add((cover_t *)G.cover, G.ecrec.ec_start, ++ G.ecrec.ec_end) != 0) { ++ Info(slide, 0x401, ((char *)slide, ++ LoadFarString(OverlappedComponents))); ++ return PK_BOMB; ++ } + + /*--------------------------------------------------------------------------- + The basic idea of this function is as follows. Since the central di- +diff --git a/process.c b/process.c +index d2e4dc3..d75d405 100644 +--- a/process.c ++++ b/process.c +@@ -1408,6 +1408,10 @@ static int find_ecrec64(__G__ searchlen) /* return PK-class error */ + + /* Now, we are (almost) sure that we have a Zip64 archive. */ + G.ecrec.have_ecr64 = 1; ++ G.ecrec.ec_start -= ECLOC64_SIZE+4; ++ G.ecrec.ec64_start = ecrec64_start_offset; ++ G.ecrec.ec64_end = ecrec64_start_offset + ++ 12 + makeint64(&byterec[ECREC64_LENGTH]); + + /* Update the "end-of-central-dir offset" for later checks. */ + G.real_ecrec_offset = ecrec64_start_offset; +@@ -1542,6 +1546,8 @@ static int find_ecrec(__G__ searchlen) /* return PK-class error */ + makelong(&byterec[OFFSET_START_CENTRAL_DIRECTORY]); + G.ecrec.zipfile_comment_length = + makeword(&byterec[ZIPFILE_COMMENT_LENGTH]); ++ G.ecrec.ec_start = G.real_ecrec_offset; ++ G.ecrec.ec_end = G.ecrec.ec_start + 22 + G.ecrec.zipfile_comment_length; + + /* Now, we have to read the archive comment, BEFORE the file pointer + is moved away backwards to seek for a Zip64 ECLOC64 structure. +diff --git a/unzpriv.h b/unzpriv.h +index dc9eff5..297b3c7 100644 +--- a/unzpriv.h ++++ b/unzpriv.h +@@ -2185,6 +2185,16 @@ typedef struct VMStimbuf { + int have_ecr64; /* valid Zip64 ecdir-record exists */ + int is_zip64_archive; /* Zip64 ecdir-record is mandatory */ + ush zipfile_comment_length; ++ zusz_t ec_start, ec_end; /* offsets of start and end of the ++ end of central directory record, ++ including if present the Zip64 ++ end of central directory locator, ++ which immediately precedes the ++ end of central directory record */ ++ zusz_t ec64_start, ec64_end; /* if have_ecr64 is true, then these ++ are the offsets of the start and ++ end of the Zip64 end of central ++ directory record */ + } ecdir_rec; + + -- cgit 1.4.1 From cd73a812a39f64b6e326a8b598e8fb88ad0d65a4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Mar 2021 09:25:21 +0200 Subject: gnu: unzip: Rename patch. * gnu/packages/patches/unzip-case-insensitive.patch: Rename from unzip-caseinsensitive.patch. --- gnu/packages/patches/unzip-case-insensitive.patch | 131 ++++++++++++++++++++++ gnu/packages/patches/unzip-caseinsensitive.patch | 131 ---------------------- 2 files changed, 131 insertions(+), 131 deletions(-) create mode 100644 gnu/packages/patches/unzip-case-insensitive.patch delete mode 100644 gnu/packages/patches/unzip-caseinsensitive.patch (limited to 'gnu') diff --git a/gnu/packages/patches/unzip-case-insensitive.patch b/gnu/packages/patches/unzip-case-insensitive.patch new file mode 100644 index 0000000000..3cb68450b9 --- /dev/null +++ b/gnu/packages/patches/unzip-case-insensitive.patch @@ -0,0 +1,131 @@ +diff --git a/match.c b/match.c +index 6cd656f..4e569f5 100644 +--- a/match.c ++++ b/match.c +@@ -190,10 +190,10 @@ char *___tmp_ptr; + + #endif + +-static int recmatch(p, s, cs) ++static int recmatch(p, s, ci) + ZCONST char *p; /* sh pattern to match */ + ZCONST char *s; /* string to match it to */ +-int cs; /* flag: force case-sensitive matching */ ++int ci; /* flag: force case-insensitive matching */ + /* Recursively compare the sh pattern p with the string s and return 1 if + they match, and 0 or 2 if they don't or if there is a syntax error in the + pattern. This routine recurses on itself no deeper than the number of +@@ -214,7 +214,7 @@ int cs; /* flag: force case-sensitive matching */ + if (CLEN(p) == 2) { + if (CLEN(s) == 2) { + return (*p == *s && *(p+1) == *(s+1)) ? +- recmatch(p + 2, s + 2, cs) : 0; ++ recmatch(p + 2, s + 2, ci) : 0; + } else { + return 0; + } +@@ -230,9 +230,9 @@ int cs; /* flag: force case-sensitive matching */ + /* '?' (or '%' or '#') matches any character (but not an empty string) */ + if (c == WILDCHR_SINGLE) { + if (wild_stop_at_dir) +- return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; ++ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0; + else +- return *s ? recmatch(p, s + CLEN(s), cs) : 0; ++ return *s ? recmatch(p, s + CLEN(s), ci) : 0; + } + + /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ +@@ -253,14 +253,14 @@ int cs; /* flag: force case-sensitive matching */ + # endif /* ?AMIGA */ + /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ + for (; *s && *s != DIRSEP_CHR; INCSTR(s)) +- if ((c = recmatch(p, s, cs)) != 0) ++ if ((c = recmatch(p, s, ci)) != 0) + return c; + /* end of pattern: matched if at end of string, else continue */ + if (*p == 0) + return (*s == 0); + /* continue to match if at DIRSEP_CHR in pattern, else give up */ + return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) +- ? recmatch(p, s, cs) : 2; ++ ? recmatch(p, s, ci) : 2; + } + /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ + p++; /* move p past the second WILDCHR_MULTI */ +@@ -308,17 +308,17 @@ int cs; /* flag: force case-sensitive matching */ + */ + if (q != srest) + return 0; +- return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); ++ return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0); + } + #else /* !_MBCS */ +- return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); ++ return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0); + #endif /* ?_MBCS */ + } + else + { + /* pattern contains more wildcards, continue with recursion... */ + for (; *s; INCSTR(s)) +- if ((c = recmatch(p, s, cs)) != 0) ++ if ((c = recmatch(p, s, ci)) != 0) + return c; + return 2; /* 2 means give up--shmatch will return false */ + } +@@ -353,17 +353,17 @@ int cs; /* flag: force case-sensitive matching */ + c = *(p-1); + else + { +- uch cc = (cs ? (uch)*s : case_map((uch)*s)); ++ uch cc = (!ci ? (uch)*s : to_up((uch)*s)); + uch uc = (uch) c; + if (*(p+1) != '-') + for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) + /* compare range */ +- if ((cs ? uc : case_map(uc)) == cc) +- return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); ++ if ((!ci ? uc : to_up(uc)) == cc) ++ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci); + c = e = 0; /* clear range, escape flags */ + } + } +- return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; ++ return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0; + /* bracket match failed */ + } + #endif /* !VMS */ +@@ -382,18 +382,18 @@ int cs; /* flag: force case-sensitive matching */ + { + /* Match "...]" with "]". Continue after "]" in both. */ + if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) +- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); + + /* Else, look for a reduced match in s, until "]" in or end of s. */ + for (; *s && (*s != ']'); INCSTR(s)) + if (*s == '.') + /* If reduced match, then continue after "..." in p, "." in s. */ +- if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) ++ if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0) + return (int)c; + + /* Match "...]" with "]". Continue after "]" in both. */ + if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) +- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); ++ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); + + /* No reduced match. Quit. */ + return 2; +@@ -402,8 +402,8 @@ int cs; /* flag: force case-sensitive matching */ + #endif /* def VMS */ + + /* Just a character--compare it */ +- return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? +- recmatch(p, s + CLEN(s), cs) : 0; ++ return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ? ++ recmatch(p, s + CLEN(s), ci) : 0; + } + + diff --git a/gnu/packages/patches/unzip-caseinsensitive.patch b/gnu/packages/patches/unzip-caseinsensitive.patch deleted file mode 100644 index 3cb68450b9..0000000000 --- a/gnu/packages/patches/unzip-caseinsensitive.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/match.c b/match.c -index 6cd656f..4e569f5 100644 ---- a/match.c -+++ b/match.c -@@ -190,10 +190,10 @@ char *___tmp_ptr; - - #endif - --static int recmatch(p, s, cs) -+static int recmatch(p, s, ci) - ZCONST char *p; /* sh pattern to match */ - ZCONST char *s; /* string to match it to */ --int cs; /* flag: force case-sensitive matching */ -+int ci; /* flag: force case-insensitive matching */ - /* Recursively compare the sh pattern p with the string s and return 1 if - they match, and 0 or 2 if they don't or if there is a syntax error in the - pattern. This routine recurses on itself no deeper than the number of -@@ -214,7 +214,7 @@ int cs; /* flag: force case-sensitive matching */ - if (CLEN(p) == 2) { - if (CLEN(s) == 2) { - return (*p == *s && *(p+1) == *(s+1)) ? -- recmatch(p + 2, s + 2, cs) : 0; -+ recmatch(p + 2, s + 2, ci) : 0; - } else { - return 0; - } -@@ -230,9 +230,9 @@ int cs; /* flag: force case-sensitive matching */ - /* '?' (or '%' or '#') matches any character (but not an empty string) */ - if (c == WILDCHR_SINGLE) { - if (wild_stop_at_dir) -- return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), cs) : 0; -+ return (*s && *s != DIRSEP_CHR) ? recmatch(p, s + CLEN(s), ci) : 0; - else -- return *s ? recmatch(p, s + CLEN(s), cs) : 0; -+ return *s ? recmatch(p, s + CLEN(s), ci) : 0; - } - - /* WILDCHR_MULTI ('*') matches any number of characters, including zero */ -@@ -253,14 +253,14 @@ int cs; /* flag: force case-sensitive matching */ - # endif /* ?AMIGA */ - /* Single WILDCHR_MULTI ('*'): this doesn't match slashes */ - for (; *s && *s != DIRSEP_CHR; INCSTR(s)) -- if ((c = recmatch(p, s, cs)) != 0) -+ if ((c = recmatch(p, s, ci)) != 0) - return c; - /* end of pattern: matched if at end of string, else continue */ - if (*p == 0) - return (*s == 0); - /* continue to match if at DIRSEP_CHR in pattern, else give up */ - return (*p == DIRSEP_CHR || (*p == '\\' && p[1] == DIRSEP_CHR)) -- ? recmatch(p, s, cs) : 2; -+ ? recmatch(p, s, ci) : 2; - } - /* Two consecutive WILDCHR_MULTI ("**"): this matches DIRSEP_CHR ('/') */ - p++; /* move p past the second WILDCHR_MULTI */ -@@ -308,17 +308,17 @@ int cs; /* flag: force case-sensitive matching */ - */ - if (q != srest) - return 0; -- return ((cs ? strcmp(p, q) : namecmp(p, q)) == 0); -+ return ((!ci ? strcmp(p, q) : namecmp(p, q)) == 0); - } - #else /* !_MBCS */ -- return ((cs ? strcmp(p, srest) : namecmp(p, srest)) == 0); -+ return ((!ci ? strcmp(p, srest) : namecmp(p, srest)) == 0); - #endif /* ?_MBCS */ - } - else - { - /* pattern contains more wildcards, continue with recursion... */ - for (; *s; INCSTR(s)) -- if ((c = recmatch(p, s, cs)) != 0) -+ if ((c = recmatch(p, s, ci)) != 0) - return c; - return 2; /* 2 means give up--shmatch will return false */ - } -@@ -353,17 +353,17 @@ int cs; /* flag: force case-sensitive matching */ - c = *(p-1); - else - { -- uch cc = (cs ? (uch)*s : case_map((uch)*s)); -+ uch cc = (!ci ? (uch)*s : to_up((uch)*s)); - uch uc = (uch) c; - if (*(p+1) != '-') - for (uc = uc ? uc : (uch)*p; uc <= (uch)*p; uc++) - /* compare range */ -- if ((cs ? uc : case_map(uc)) == cc) -- return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), cs); -+ if ((!ci ? uc : to_up(uc)) == cc) -+ return r ? 0 : recmatch(q + CLEN(q), s + CLEN(s), ci); - c = e = 0; /* clear range, escape flags */ - } - } -- return r ? recmatch(q + CLEN(q), s + CLEN(s), cs) : 0; -+ return r ? recmatch(q + CLEN(q), s + CLEN(s), ci) : 0; - /* bracket match failed */ - } - #endif /* !VMS */ -@@ -382,18 +382,18 @@ int cs; /* flag: force case-sensitive matching */ - { - /* Match "...]" with "]". Continue after "]" in both. */ - if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) -- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); -+ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); - - /* Else, look for a reduced match in s, until "]" in or end of s. */ - for (; *s && (*s != ']'); INCSTR(s)) - if (*s == '.') - /* If reduced match, then continue after "..." in p, "." in s. */ -- if ((c = recmatch( (p+ CLEN( p)), s, cs)) != 0) -+ if ((c = recmatch( (p+ CLEN( p)), s, ci)) != 0) - return (int)c; - - /* Match "...]" with "]". Continue after "]" in both. */ - if ((*(p+ 2* CLEN( p)) == ']') && (*s == ']')) -- return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), cs); -+ return recmatch( (p+ 3* CLEN( p)), (s+ CLEN( s)), ci); - - /* No reduced match. Quit. */ - return 2; -@@ -402,8 +402,8 @@ int cs; /* flag: force case-sensitive matching */ - #endif /* def VMS */ - - /* Just a character--compare it */ -- return (cs ? c == *s : case_map((uch)c) == case_map((uch)*s)) ? -- recmatch(p, s + CLEN(s), cs) : 0; -+ return (!ci ? c == *s : to_up((uch)c) == to_up((uch)*s)) ? -+ recmatch(p, s + CLEN(s), ci) : 0; - } - - -- cgit 1.4.1 From 699a56e3a36e7fcf8f9e207e86e728b9a3aebe45 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Mar 2021 09:27:43 +0200 Subject: gnu: unzip: Fix patch name. This is what happens when you push without testing your changes :/ * gnu/packages/compression.scm (unzip)[source]: Adjust patch name. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 7a4f70f2b4..399e4451e7 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1660,7 +1660,7 @@ recreates the stored directory structure by default.") "unzip-alt-iconv-utf8.patch" "unzip-alt-iconv-utf8-print.patch" "unzip-fix-recmatch.patch" - "unzip-caseinsensitive.patch" + "unzip-case-insensitive.patch" "unzip-close.patch" "unzip-COVSCAN-fix-unterminated-string.patch" "unzip-CVE-2016-9844.patch" -- cgit 1.4.1 From 703843922aa32c833b1c0ea56ac7362230e60a3a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Sun, 14 Mar 2021 09:09:45 +0100 Subject: gun: unzip/fixed: Fix tests on 32-bit systems. * gnu/packages/patches/unzip-32bit-zipbomb-fix.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (unzip/fixed): Apply patch. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 5 ++- gnu/packages/patches/unzip-32bit-zipbomb-fix.patch | 50 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/unzip-32bit-zipbomb-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 6500f5bda2..25f8a7fde8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1760,6 +1760,7 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-zipbomb-part1.patch \ %D%/packages/patches/unzip-zipbomb-part2.patch \ %D%/packages/patches/unzip-zipbomb-part3.patch \ + %D%/packages/patches/unzip-32bit-zipbomb-fix.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 399e4451e7..123d408e96 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1676,7 +1676,10 @@ recreates the stored directory structure by default.") "unzip-zipbomb-manpage.patch" "unzip-zipbomb-part1.patch" "unzip-zipbomb-part2.patch" - "unzip-zipbomb-part3.patch")))))) + "unzip-zipbomb-part3.patch" + + ;; https://github.com/madler/unzip/issues/2 + "unzip-32bit-zipbomb-fix.patch")))))) (define-public ziptime (let ((commit "2a5bc9dfbf7c6a80e5f7cb4dd05b4036741478bc") diff --git a/gnu/packages/patches/unzip-32bit-zipbomb-fix.patch b/gnu/packages/patches/unzip-32bit-zipbomb-fix.patch new file mode 100644 index 0000000000..ad6a157c56 --- /dev/null +++ b/gnu/packages/patches/unzip-32bit-zipbomb-fix.patch @@ -0,0 +1,50 @@ +From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Sun, 9 Feb 2020 07:20:13 -0800 +Subject: [PATCH] Fix false overlapped components detection on 32-bit systems. + +32-bit systems with ZIP64_SUPPORT enabled could have different +size types for zoff_t and zusz_t. That resulted in bad parameter +passing to the bound tracking functions, itself due to the lack of +use of C function prototypes in unzip. This commit assures that +parameters are cast properly for those calls. + +This problem occurred only for ill-chosen make options, which give +a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits, +even on 32-bit systems. +--- + extract.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/extract.c b/extract.c +index 1b73cb0..d9866f9 100644 +--- a/extract.c ++++ b/extract.c +@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] = + + + /* A growable list of spans. */ +-typedef zoff_t bound_t; ++typedef zusz_t bound_t; + typedef struct { + bound_t beg; /* start of the span */ + bound_t end; /* one past the end of the span */ +@@ -518,7 +518,8 @@ int extract_or_test_files(__G) /* return PK-type error code */ + return PK_MEM; + } + if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, ++ (bound_t)0, (bound_t)G.extra_bytes) != 0) || + (G.ecrec.have_ecr64 && + cover_add((cover_t *)G.cover, G.ecrec.ec64_start, + G.ecrec.ec64_end) != 0) || +@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk, + + /* seek_zipf(__G__ pInfo->offset); */ + request = G.pInfo->offset + G.extra_bytes; +- if (cover_within((cover_t *)G.cover, request)) { ++ if (cover_within((cover_t *)G.cover, (bound_t)request)) { + Info(slide, 0x401, ((char *)slide, + LoadFarString(OverlappedComponents))); + return PK_BOMB; -- cgit 1.4.1 From dc1e643601b6f0a75a8eafcbe374dea24eb5459f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 14 Mar 2021 10:30:35 +0100 Subject: gnu: font-ibm-plex: Update to 5.1.3. * gnu/packages/fonts.scm (font-ibm-plex): Update to 5.1.3. --- 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 8c49c05c47..59af99032e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -82,7 +82,7 @@ (define-public font-ibm-plex (package (name "font-ibm-plex") - (version "4.0.2") + (version "5.1.3") (source (origin (method url-fetch) (uri (string-append @@ -90,7 +90,7 @@ "v" version "/OpenType.zip")) (sha256 (base32 - "17bd84ic7z9hkcjy4bwnh4z51bnkh2vrjzwvs9g6lwzmxjswa5b6")))) + "0zlz8kxx54i4hpgaip9690bilvn5w14gp7jjkk6cz4h9p3xml231")))) (build-system font-build-system) (home-page "https://github.com/IBM/plex") (synopsis "IBM Plex typeface") -- cgit 1.4.1 From cd3b4c85f9c03d67b42407f52c22e107f2c1207b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 14 Mar 2021 10:39:43 +0100 Subject: gnu: font-abattis-cantarell: Update to 0.301. * gnu/packages/fonts.scm (font-abattis-cantarell): Update to 0.301. --- 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 59af99032e..16f2d2b3a7 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -221,7 +221,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") (define-public font-cantarell (package (name "font-abattis-cantarell") - (version "0.201") + (version "0.301") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/cantarell-fonts/" @@ -229,7 +229,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.") "/cantarell-fonts-" version ".tar.xz")) (sha256 (base32 - "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn")))) + "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal))) ; for msgfmt -- cgit 1.4.1 From 930d22883d96adee9d2f4676dbb317ef77b9d3b9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Sun, 14 Mar 2021 10:45:58 +0100 Subject: gnu: font-libertinus: Update to 7.040. * gnu/packages/fonts.scm (font-libertinus): Update to 7.040. --- 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 16f2d2b3a7..b78c46b0f8 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -408,7 +408,7 @@ Biolinum is available in both Regular and Bold weights.") (define-public font-libertinus (package (name "font-libertinus") - (version "6.12") + (version "7.040") (source (origin (method url-fetch) @@ -416,7 +416,7 @@ Biolinum is available in both Regular and Bold weights.") "/download/v" version "/libertinus-" version ".zip")) (sha256 - (base32 "06pcsd5pijjid7xjxak35jla089krm5hqnbglv8ldncq475q7kb2")))) + (base32 "1xkj993hwkr49q63dd2dnkvdkm9sckxm3zjwhdxsxn21fi80ikic")))) (build-system font-build-system) (home-page "https://github.com/alerque/libertinus") (synopsis "Font family based on Linux Libertine") -- cgit 1.4.1 From 87a8eaf671f7619df782a662c12a4ffeba8183dc Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 19 Dec 2020 10:06:07 +0100 Subject: gnu: mescc-tools: Update to 0.7.0. * gnu/packages/mes.scm (mescc-tools)[source]: Update to 0.7.0. [arguments]: Add patch-prefix phase to remove hardcoded "/usr/bin". --- gnu/packages/mes.scm | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 5ceb1c6151..c9dd98ccd4 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -293,21 +293,30 @@ get_machine.") (package (inherit mescc-tools-0.5.2) (name "mescc-tools") - (version "0.6.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.nongnu.org/r/mescc-tools.git") - (commit (string-append "Release_" version)))) - (file-name (string-append "mescc-tools-" version "-checkout")) - (sha256 - (base32 - "1cgxcdza6ws725x84i31la7jxmlk5a3nsij5shz1zljg0i36kj99")))) + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (string-append + "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-Release_" version + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1p1ijia4rm3002f5sypidl9v5gq0mlch9b0n61rpxkdsaaxjqax3")))) (arguments (substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) ((#:make-flags _) `(list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc")))))) + "CC=gcc")) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'patch-prefix + (lambda _ + (substitute* "sha256.sh" + (("/usr/bin/sha256sum") (which "sha256sum"))) + #t)))))))) (define-public m2-planet (let ((commit "b87ddb0051b168ea45f8d49a610dcd069263336a") -- cgit 1.4.1 From 8b05461cabaeababa314768d2e48cec531aea9aa Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 13 Dec 2020 14:45:45 +0100 Subject: gnu: Add nyacc-1.00.2. * gnu/packages/mes.scm (nyacc-1.00.2): New variable. --- gnu/packages/mes.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index c9dd98ccd4..33db948f0a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -117,6 +117,35 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) (inputs `(("guile" ,guile-3.0))))) +(define-public nyacc-1.00.2 + (package + (inherit nyacc) + (version "1.00.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://savannah/nyacc/nyacc-" + version ".tar.gz")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* (find-files "." "^Makefile\\.in$") + (("^SITE_SCM_DIR =.*") + "SITE_SCM_DIR = \ +@prefix@/share/guile/site/@GUILE_EFFECTIVE_VERSION@\n") + (("^SITE_SCM_GO_DIR =.*") + "SITE_SCM_GO_DIR = \ +@prefix@/lib/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n") + (("^INFODIR =.*") + "INFODIR = @prefix@/share/info\n") + (("^DOCDIR =.*") + "DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n")) + #t)) + (sha256 + (base32 + "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk")))) + (inputs + `(("guile" ,guile-2.2))))) + (define-public mes-0.19 ;; Mes used for bootstrap. (package -- cgit 1.4.1 From ba485217b8ee55792abe6360a208d8c12e3ee7a0 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 19 Dec 2020 15:01:45 +0100 Subject: gnu: mes: Update to nyacc-1.00.2. * gnu/packages/mes.scm (mes)[propagated-inputs]: Use nyacc-1.00.2. --- 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 33db948f0a..848f63f0fb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -204,7 +204,7 @@ Guile.") "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) (propagated-inputs `(("mescc-tools" ,mescc-tools) - ("nyacc" ,nyacc-0.99))) + ("nyacc" ,nyacc-1.00.2))) (native-search-paths (list (search-path-specification (variable "C_INCLUDE_PATH") -- cgit 1.4.1 From 1d684aedf839ca35c2f8784f168fd56835402ab6 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 14 Mar 2021 11:53:00 +0100 Subject: gnu: mes: Update to 0.23. * gnu/packages/mes.scm (mes)[source]: Update to 0.23. [supported-systems]: Add aarch64-linux, armhf-linux. (mes-rb5)[version,source,supported-systems]: Revert to v0.22. --- gnu/packages/mes.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 848f63f0fb..b1b194eb80 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; @@ -194,14 +194,16 @@ Guile.") (define-public mes (package (inherit mes-0.19) - (version "0.22") + (version "0.23") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) + "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s")))) + (supported-systems '("armhf-linux" "aarch64-linux" + "i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) ("nyacc" ,nyacc-1.00.2))) @@ -223,6 +225,15 @@ Guile.") (package (inherit mes) (name "mes-rb5") + (version "0.22") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/mes/" + "mes-" version ".tar.gz")) + (sha256 + (base32 + "0p1jsrrmcbc0zrvbvnjbb6iyxr0in71km293q8qj6gnar6bw09av")))) + (supported-systems '("i686-linux" "x86_64-linux")) (inputs '()) (propagated-inputs '()) (native-inputs -- cgit 1.4.1 From a9d537594d074b65196426aa9d3bce7b8d46e2ef Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 14 Mar 2021 16:40:48 +0100 Subject: bootstrap: mescc-tools-static: Base arguments on version 0.5.2. * gnu/packages/make-bootstrap.scm (%mescc-tools-static)[arguments]: Use fixed package-arguments of mescc-tools-0.5.2. --- gnu/packages/make-bootstrap.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index b2d3e2a326..bf76d5052f 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Mark H Weaver -;;; Copyright © 2018, 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Mathieu Othacehe ;;; @@ -593,7 +593,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (name "mescc-tools-static") (arguments `(#:system "i686-linux" - ,@(substitute-keyword-arguments (package-arguments mescc-tools) + ,@(substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) ((#:make-flags flags) `(cons "CC=gcc -static" ,flags))))))) -- cgit 1.4.1 From 7982adb40a0253290fba9e1dbd43b153753159a7 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 14 Mar 2021 16:49:12 +0100 Subject: gnu: mescc-tools: Build for armhf-linux and aarch64-linux too. * gnu/packages/mes.scm (mescc-tools)[supported-systems]: New field, overriding the v0.5.2 version. --- gnu/packages/mes.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index b1b194eb80..b9b2352b96 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -345,6 +345,8 @@ get_machine.") (sha256 (base32 "1p1ijia4rm3002f5sypidl9v5gq0mlch9b0n61rpxkdsaaxjqax3")))) + (supported-systems '("armhf-linux" "aarch64-linux" + "i686-linux" "x86_64-linux")) (arguments (substitute-keyword-arguments (package-arguments mescc-tools-0.5.2) ((#:make-flags _) -- cgit 1.4.1 From 7327295462fccae4ee3e9bf74962c82d3445fec8 Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sun, 14 Mar 2021 17:32:01 +0100 Subject: gnu: mes: Remove aarch64-linux from supported-systems. * gnu/packages/mes.scm (mes)[supported-systems]: Remove aarch64-linux. Thinko: mes only builds on aarch64-linux using --system=armhf-linux. --- gnu/packages/mes.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index b9b2352b96..b4b7bcb6b5 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -202,8 +202,7 @@ Guile.") (sha256 (base32 "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s")))) - (supported-systems '("armhf-linux" "aarch64-linux" - "i686-linux" "x86_64-linux")) + (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) ("nyacc" ,nyacc-1.00.2))) -- cgit 1.4.1 From 61a1165340a8bcc45550259edca25275d899fe09 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Mar 2021 18:19:16 +0100 Subject: ci: Add channel subset support. * gnu/ci.scm (cuirass-jobs): Add channel subset support. --- gnu/ci.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 6edcdd0e19..664cabfec6 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -23,6 +23,7 @@ (define-module (gnu ci) #:use-module (guix channels) #:use-module (guix config) + #:use-module (guix describe) #:use-module (guix store) #:use-module (guix grafts) #:use-module (guix profiles) @@ -521,6 +522,17 @@ valid." (let ((hello (specification->package "hello"))) (list (package-job store (job-name hello) hello system)))) + (('channels . channels) + ;; Build only the packages from CHANNELS. + (let ((all (all-packages))) + (filter-map + (lambda (package) + (match (package-channels package) + ((channel . _) + (and (member (channel-name channel) channels) + (package->job store package system))) + (else #f))) + all))) (('packages . rest) ;; Build selected list of packages only. (let ((packages (map specification->package rest))) -- cgit 1.4.1 From 7af3daa7576e4b60825de9beb3ab77235f4e4fce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Mar 2021 19:50:47 +0200 Subject: gnu: librsvg-next: Adjust to changes in cargo-build-system. * gnu/packages/gnome.scm (librsvg-next)[arguments]: Add flag to not install source. --- 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 b795cae145..11bbee6e2a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3386,7 +3386,8 @@ library.") (build-system cargo-build-system) (outputs '("out" "doc")) (arguments - `(#:modules + `(#:install-source? #f + #:modules ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) -- cgit 1.4.1 From 21ead0fc5b8519b586c051b75fbc9d3ee5520755 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Mar 2021 19:51:33 +0200 Subject: gnu: newsboat: Adjust to changes in cargo-build-system. * gnu/packages/syndication.scm (newsboat)[arguments]: Add flag to not install source. --- gnu/packages/syndication.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 79dbb77018..5f0aa1bd8b 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -90,6 +90,7 @@ (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) #:vendor-dir "vendor" + #:install-source? #f #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) ("rust-bitflags" ,rust-bitflags-1) -- cgit 1.4.1 From e598556ee524a62544e777b1f0dd80316ef41754 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Mar 2021 19:52:12 +0200 Subject: gnu: alacritty: Adjust to changes in the cargo-build-system. * gnu/packages/terminals.scm (alacritty)[arguments]: Add flag to not install source. --- gnu/packages/terminals.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 291a241473..1a465305de 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1220,7 +1220,8 @@ made by suckless.") (base32 "1b9hy3ya72hhpl8nkayc7dy4f97xp75np48dm5na5pgyv8b45agi")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags '("--release" "--" "--skip=config_read_eof") + `(#:install-source? #f ; virtual manifest + #:cargo-test-flags '("--release" "--" "--skip=config_read_eof") #:cargo-inputs (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.12) -- cgit 1.4.1 From 2babf7d831f77a379a6fdc70a70a2b4d57f68f8a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 14 Mar 2021 19:16:55 +0100 Subject: gnu: pdfarranger: Update to 1.7.1. * gnu/packages/pdf.scm (pdfarranger): Update to 1.7.1. --- 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 e81c3caf87..437000b7c0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1276,7 +1276,7 @@ python-pypdf2 instead.") (define-public pdfarranger (package (name "pdfarranger") - (version "1.7.0") + (version "1.7.1") (source (origin (method git-fetch) @@ -1285,7 +1285,7 @@ python-pypdf2 instead.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0dmgmvpghsm938iznalbg8h8k17a5h3q466yfc67mcll428n4nx3")))) + (base32 "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3")))) (build-system python-build-system) (arguments '(#:tests? #f ;no tests -- cgit 1.4.1 From b15720182e393bc26e9d61ea4d7534b7eea19390 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Mar 2021 21:57:21 -0600 Subject: gnu: Add python-sphobjinv. * gnu/packages/sphinx.scm (python-sphobjinv): New variable. --- gnu/packages/sphinx.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index e046885a6b..29872ed942 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -697,3 +698,27 @@ their results) in both HTML and LaTeX output. Un-evaluated notebooks - i.e. notebooks without stored output cells - will be automatically executed during the Sphinx build process.") (license license:expat))) + +(define-public python-sphobjinv + (package + (name "python-sphobjinv") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphobjinv" version)) + (sha256 + (base32 + "126lgm54c94ay3fci512ap4l607gak90pbz0fk98syxvj5izrrzx")) + (patches (search-patches "python-sphobjinv-system-ca.patch")))) + (build-system python-build-system) + (propagated-inputs + `(("python-attrs" ,python-attrs) + ;("python-certifi" ,python-certifi) + ("python-fuzzywuzzy" ,python-fuzzywuzzy) + ("python-jsonschema" ,python-jsonschema) + ("python-levenshtein" ,python-levenshtein))) + (home-page "https://github.com/bskinn/sphobjinv") + (synopsis "Sphinx cross-reference tool") + (description "Sphinx objects.inv inspection/manipulation tool.") + (license license:expat))) -- cgit 1.4.1 From 207aa62e6ba476ecefd101ba7643b5afa9c1de20 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Mar 2021 22:05:07 -0600 Subject: gnu: Add python-sphinx-autodoc-typehints. * gnu/packages/sphinx.scm (python-sphinx-autodoc-typehints): New variable. --- gnu/packages/sphinx.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 29872ed942..1704cbce59 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -670,6 +670,33 @@ documentation when a change is detected. It also includes a livereload enabled web server.") (license license:expat))) +(define-public python-sphinx-autodoc-typehints + (package + (name "python-sphinx-autodoc-typehints") + (version "1.11.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sphinx-autodoc-typehints" version)) + (sha256 + (base32 + "086v9mg21pvfx0lfqjx2xf36hnzrsripfg345xi59f7xwb9scjr4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-setuptools-scm" ,python-setuptools-scm) + ("python-sphinx" ,python-sphinx))) + (native-inputs + `(("python-dataclasses" ,python-dataclasses) + ("python-pytest" ,python-pytest) + ("python-sphinx" ,python-sphinx) + ("python-sphobjinv" ,python-sphobjinv) + ("python-typing-extensions" ,python-typing-extensions))) + (home-page "https://pypi.org/project/sphinx-autodoc-typehints/") + (synopsis "Type hints for the Sphinx autodoc extension") + (description "This extension allows you to use Python 3 annotations for +documenting acceptable argument types and return value types of functions.") + (license license:expat))) + (define-public python-nbsphinx (package (name "python-nbsphinx") -- cgit 1.4.1 From 30f53814873349c9a1b48844a1cb36b6ea432513 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Mar 2021 22:12:10 -0600 Subject: gnu: Add python-sortedcollections. * gnu/packages/python-xyz.scm (python-sortedcollections): New variable. --- gnu/packages/python-xyz.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dadf08f03d..7a633ee48b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014, 2015, 2016, 2019 Andreas Enge ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2014, 2017 Eric Bavier +;;; Copyright © 2014, 2017, 2021 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa ;;; Copyright © 2015 Omar Radwan ;;; Copyright © 2015 Pierre-Antoine Rault @@ -19877,6 +19877,26 @@ 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-sortedcollections + (package + (name "python-sortedcollections") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sortedcollections" version)) + (sha256 + (base32 + "1kfabpnjyjm5ml2zspry9jy3xq49aybchgaa4ahic2jqdjfn1sfq")))) + (build-system python-build-system) + (propagated-inputs + `(("python-sortedcontainers" ,python-sortedcontainers))) + (arguments '(#:tests? #f)) ; Tests not included in release tarball. + (home-page "http://www.grantjenks.com/docs/sortedcollections/") + (synopsis "Python Sorted Collections") + (description "Sorted Collections is a Python sorted collections library.") + (license license:asl2.0))) + (define-public python-sortedcontainers (package (name "python-sortedcontainers") -- cgit 1.4.1 From af25357b7d8b37fd0da040ff847bd243c3660132 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Mar 2021 22:45:55 -0600 Subject: gnu: Add python-bidict. * gnu/packages/python-xyz.scm (python-bidict): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7a633ee48b..16658de514 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -779,6 +779,47 @@ certificate returned by the server to which a connection has been established, and verifies that it matches the intended target hostname.") (license license:psfl))) +(define-public python-bidict + (package + (name "python-bidict") + (version "0.21.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "bidict" version)) + (sha256 + (base32 + "02dy0b1k7qlhn7ajyzkrvxhyhjj0hzcq6ws3zjml9hkdz5znz92g")))) + (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-hypothesis" ,python-hypothesis-5.23) ; use_true_random=... from >=5.19.0 + ("python-pre-commit" ,python-pre-commit) + ("python-py" ,python-py) + ("python-pytest" ,python-pytest) + ("python-pytest-benchmark" ,python-pytest-benchmark) + ("python-pytest-cov" ,python-pytest-cov) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-sortedcollections" ,python-sortedcollections) + ("python-sortedcontainers" ,python-sortedcontainers) + ("python-sphinx" ,python-sphinx) + ("python-sphinx-autodoc-typehints" ,python-sphinx-autodoc-typehints) + ("python-tox" ,python-tox))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-reqs + (lambda _ + (substitute* "setup.py" + (("sortedcollections < 2") "sortedcollections")) + #t)) + (replace 'check + (lambda _ (invoke "./run_tests.py")))))) + (home-page "https://bidict.readthedocs.io") + (synopsis "Bidirectional mapping library") + (description "The @code{bidict} library provides several data structures +for working with bidirectional mappings in Python.") + (license license:mpl2.0))) + (define-public python-bitarray (package (name "python-bitarray") -- cgit 1.4.1 From 7164d2105af9d0ebd53f5f4ecbaf1ecd02825e79 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Wed, 3 Mar 2021 21:55:36 -0600 Subject: gnu: Add python-engineio * gnu/packages/python-web.scm (python-engineio): 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 8cfddcdfac..586e778bff 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2016, 2017, 2020 Julien Lepiller ;;; Copyright © 2016, 2017 Nikita -;;; Copyright © 2014, 2017 Eric Bavier +;;; Copyright © 2014, 2017, 2021 Eric Bavier ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2015 Cyril Roelandt ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari @@ -3806,6 +3806,29 @@ this it tries to be opinion-free and very extendable.") (define-public python2-elasticsearch (package-with-python2 python-elasticsearch)) +(define-public python-engineio + (package + (name "python-engineio") + (version "4.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-engineio" version)) + (sha256 + (base32 + "0xqkjjxbxakz9fd7v94rkr2r5r9nrkap2c3gf3abbd0j6ld5qmxv")))) + (build-system python-build-system) + (propagated-inputs + `(("python-aiohttp" ,python-aiohttp) + ("python-requests" ,python-requests) + ("python-websocket-client" ,python-websocket-client))) + (arguments '(#:tests? #f)) ; Tests not included in release tarball. + (home-page "https://github.com/miguelgrinberg/python-engineio/") + (synopsis "Engine.IO server") + (description "Python implementation of the Engine.IO realtime client and +server.") + (license license:expat))) + (define-public python-flask-script (package (name "python-flask-script") -- cgit 1.4.1 From 078f3288e29ddab9a10187b1d0697c57448eac7b Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 13 Mar 2021 20:37:16 -0600 Subject: gnu: Add python-socketio. * gnu/packages/python-web.scm (python-socketio): 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 586e778bff..9828d5e61c 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5826,6 +5826,32 @@ that's written to go fast. It allows the usage of the your code non-blocking and speedy.") (license license:expat))) +(define-public python-socketio + (package + (name "python-socketio") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-socketio" version)) + (sha256 + (base32 + "14vhpxdn54lz54mhcqlgcks0ssbws9gd1y7ii16a2g3gpfdc531k")))) + (build-system python-build-system) + (propagated-inputs + `(("python-aiohttp" ,python-aiohttp) + ("python-bidict" ,python-bidict) + ("python-engineio" ,python-engineio) + ("python-requests" ,python-requests) + ("python-websocket-client" ,python-websocket-client) + ("python-websockets" ,python-websockets))) + (arguments '(#:tests? #f)) ; Tests not included in release tarball. + (home-page "https://github.com/miguelgrinberg/python-socketio/") + (synopsis "Python Socket.IO server") + (description + "Python implementation of the Socket.IO realtime client and server.") + (license license:expat))) + (define-public python-socks (package (name "python-socks") -- cgit 1.4.1 From 5a31eb7d35d7085246cf40f138318501adc27d36 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 13 Mar 2021 20:37:43 -0600 Subject: gnu: Add python-flask-socketio. * gnu/packages/python-web.scm (python-flask-socketio): New variable. --- gnu/packages/python-web.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 9828d5e61c..e327b3b030 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -5489,6 +5489,27 @@ decorators and tools to describe your API and expose its documentation properly Swagger.") (license license:bsd-3))) +(define-public python-flask-socketio + (package + (name "python-flask-socketio") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Flask-SocketIO" version)) + (sha256 + (base32 + "09r2gpj2nbn72v2zaf6xsvlazln77pgqzp2pg2021nja47sijhsw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flask" ,python-flask) + ("python-socketio" ,python-socketio))) + (arguments '(#:tests? #f)) ; Tests not included in release tarball. + (home-page "https://github.com/miguelgrinberg/Flask-SocketIO/") + (synopsis "Socket.IO integration for Flask applications") + (description "Socket.IO integration for Flask applications") + (license license:expat))) + (define-public python-manuel (package (name "python-manuel") -- cgit 1.4.1 From 620206b680169e6c90cbf65e8e4a222f15060fce Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sat, 13 Mar 2021 20:38:20 -0600 Subject: gnu: python-eventlet: Add missing dependencies. * gnu/packages/python-xyz.scm (python-eventlet)[propagated-inputs]: Add python-dnspython and python-monotonic. --- gnu/packages/python-xyz.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 16658de514..3535649c0d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1882,7 +1882,9 @@ standard.") "1hgz8jq19wlz8vwqj900ry8cjv578nz4scc91mlc8944yid6573c")))) (build-system python-build-system) (propagated-inputs - `(("python-greenlet" ,python-greenlet))) + `(("python-dnspython" ,python-dnspython) + ("python-greenlet" ,python-greenlet) + ("python-monotonic" ,python-monotonic))) (arguments ;; TODO: Requires unpackaged 'enum-compat'. '(#:tests? #f)) -- cgit 1.4.1 From b76762a9b7f723ec59302927dde488c80f7f4ee9 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Sun, 14 Mar 2021 11:07:59 -0500 Subject: gnu: Update OnionShare to 2.3.1. * gnu/packages/tor.scm (onionshare-cli): New variable. (onionshare): Inherit from onionshare-cli. [arguments]: Add patch-tests and install-data phases. Adjust check phase for new tests. [inputs]: Remove python-pycryptodome, python-nautilus, python-sip, python-stem, and python-pyqt. Add onionshare-cli, python-shiboken-2, python-pyside-2, python-qrcode. [description]: Use new upstream description. --- gnu/packages/tor.scm | 168 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 128 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 2284483ca3..86ae5d0ea4 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice -;;; Copyright © 2017, 2018, 2019 Eric Bavier +;;; Copyright © 2017, 2018, 2019, 2021 Eric Bavier ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2020 Vincent Legoll @@ -221,10 +221,10 @@ tastes. It has application for both stand-alone systems and multi-user networks.") (license license:gpl2+))) -(define-public onionshare +(define-public onionshare-cli (package - (name "onionshare") - (version "2.2") + (name "onionshare-cli") + (version "2.3.1") (source (origin (method git-fetch) @@ -233,53 +233,141 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4")))) + (base32 "1llvnvb676s2cs6a4y7isxdj75ddfvskw1p93v5m35vsw7f72kqz")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-install-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (onionshare (string-append out "/share/onionshare"))) - (substitute* '("setup.py" "onionshare/common.py") - (("sys.prefix,") (string-append "'" out "',"))) - (substitute* "setup.py" - ;; For the nautilus plugin. - (("/usr/share/nautilus") "share/nautilus")) - (substitute* "install/org.onionshare.OnionShare.desktop" - (("/usr") out)) - #t))) - (delete 'check) - (add-before 'strip 'check - ;; After all the patching we run the tests after installing. - (lambda _ - (setenv "HOME" "/tmp") ; Some tests need a writable homedir - (invoke "pytest" "tests/") - #t))))) (native-inputs `(("python-pytest" ,python-pytest))) (inputs - `(("python-pycryptodome" ,python-pycryptodome) + ;; TODO: obfs4proxy + `(("python-click" ,python-click) + ("python-eventlet" ,python-eventlet) ("python-flask" ,python-flask) ("python-flask-httpauth" ,python-flask-httpauth) - ("python-nautilus" ,python-nautilus) - ("python-sip" ,python-sip) - ("python-stem" ,python-stem) + ("python-flask-socketio" ,python-flask-socketio) + ("python-psutil" ,python-psutil) + ("python-pycryptodome" ,python-pycryptodome) ("python-pysocks" ,python-pysocks) - ("python-pyqt" ,python-pyqt))) + ("python-requests" ,python-requests) + ("python-stem" ,python-stem) + ("python-unidecode" ,python-unidecode) + ("python-urllib3" ,python-urllib3) + ("tor" ,tor))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'bake-tor + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (list "cli/onionshare_cli/common.py" + "desktop/src/onionshare/gui_common.py") + (("shutil\\.which\\(\\\"tor\\\"\\)") + (string-append "\"" (which "tor") "\""))) + #t)) + (add-before 'build 'change-directory + (lambda _ (chdir "cli") #t)) + (replace 'check + (lambda _ + (setenv "HOME" "/tmp") + ;; Greendns is not needed for testing, and if eventlet tries to + ;; load it, an OSError is thrown when getprotobyname is called. + ;; Thankfully there is an environment variable to disable the + ;; greendns import, so use it: + (setenv "EVENTLET_NO_GREENDNS" "yes") + (invoke "pytest" "-v" "./tests")))))) (home-page "https://onionshare.org/") (synopsis "Securely and anonymously share files") - (description "OnionShare is a tool for securely and anonymously sending -and receiving files using Tor onion services. It works by starting a web -server directly on your computer and making it accessible as an unguessable -Tor web address that others can load in a Tor-enabled web browser to download -files from you, or upload files to you. It doesn't require setting up a -separate server, using a third party file-sharing service, or even logging -into an account.") - ;; Bundled, minified jquery is expat licensed. + (description "OnionShare lets you securely and anonymously share files, +host websites, and chat with friends using the Tor network. + +This package contains @code{onionshare-cli}, a command-line interface to +OnionShare.") + ;; Bundled, minified jquery and socket.io are expat licensed. (license (list license:gpl3+ license:expat)))) +(define-public onionshare + (package (inherit onionshare-cli) + (name "onionshare") + (arguments + (substitute-keyword-arguments (package-arguments onionshare-cli) + ((#:phases phases) + `(modify-phases ,phases + (replace 'change-directory + (lambda _ (chdir "desktop/src") #t)) + (add-after 'unpack 'patch-tests + (lambda _ + ;; Disable tests that require starting servers, which will hang + ;; during build: + ;; - test_autostart_and_autostop_timer_mismatch + ;; - test_autostart_timer + ;; - test_autostart_timer_too_short + ;; - test_autostop_timer_too_short + (substitute* "desktop/tests/test_gui_share.py" + (("( *)def test_autost(art|op)_(timer(_too_short)?|and_[^(]*)\\(" & >) + (string-append > "@pytest.mark.skip\n" &))) + ;; - test_13_quit_with_server_started_should_warn + (substitute* "desktop/tests/test_gui_tabs.py" + (("( *)def test_13" & >) + (string-append > "@pytest.mark.skip\n" &))) + ;; Remove multiline load-path adjustment, so that onionshare-cli + ;; modules are loaded from input + (use-modules (ice-9 regex) + (ice-9 rdelim)) + (with-atomic-file-replacement "desktop/tests/conftest.py" + (let ((start-rx (make-regexp "^# Allow importing"))) + (lambda (in out) + (let loop () + (let ((line (read-line in 'concat))) + (if (regexp-exec start-rx line) + (begin ; slurp until closing paren + (let slurp () + (let ((line (read-line in 'concat))) + (if (string=? line ")\n") + (dump-port in out) ; done + (slurp))))) + (begin + (display line out) + (loop)))))))))) + (replace 'check + (lambda _ + ;; Some tests need a writable homedir: + (setenv "HOME" "/tmp") + ;; Ensure installed modules can be found: + (setenv "PYTHONPATH" + (string-append %output "/lib/python" + ,(version-major+minor (package-version python)) + "/site-packages:" + (getenv "PYTHONPATH"))) + ;; Avoid `getprotobyname` issues: + (setenv "EVENTLET_NO_GREENDNS" "yes") + ;; Make Qt render "offscreen": + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Must be run from "desktop" dir: + (chdir "..") + (invoke "./tests/run.sh"))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (install-file "org.onionshare.OnionShare.svg" + (string-append share "/icons/hicolor/scalable/apps")) + (install-file "org.onionshare.OnionShare.desktop" + (string-append share "/applications")) + #t))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + ;; TODO: obfs4proxy + `(("onionshare-cli" ,onionshare-cli) + ("python-shiboken-2" ,python-shiboken-2) + ("python-pyside-2" ,python-pyside-2) + ("python-qrcode" ,python-qrcode) + ;; The desktop client uses onionshare-cli like a python module. But + ;; propagating onionshare-cli's inputs is not great, since a user would + ;; not expect to have those installed when using onionshare-cli as a + ;; standalone utility. So add onionshare-cli's inputs here. + ,@(package-inputs onionshare-cli))) + (description "OnionShare lets you securely and anonymously share files, +host websites, and chat with friends using the Tor network."))) + (define-public nyx (package (name "nyx") -- cgit 1.4.1 From cbfcbb79df41c2485716e12874424215d9840e3d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 14 Mar 2021 19:30:36 +0100 Subject: ci: Support packages with multiple channels. This is a follow-up of 61a1165340a8bcc45550259edca25275d899fe09. For packages provided by external channels, package-channels procedure will return at least two channels. Take it into account. * gnu/ci.scm (cuirass-jobs): Fix channels subset argument. --- gnu/ci.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 664cabfec6..acd05a18b4 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -527,11 +527,10 @@ valid." (let ((all (all-packages))) (filter-map (lambda (package) - (match (package-channels package) - ((channel . _) - (and (member (channel-name channel) channels) - (package->job store package system))) - (else #f))) + (any (lambda (channel) + (and (member (channel-name channel) channels) + (package->job store package system))) + (package-channels package))) all))) (('packages . rest) ;; Build selected list of packages only. -- cgit 1.4.1 From d4e29f3628ad0c7576d7cab659d7fcc19d21999a Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 14 Mar 2021 19:40:32 +0100 Subject: gnu: libhandy: Update to 1.2.0. * gnu/packages/gnome.scm (libhandy): Update to 1.2.0. --- 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 11bbee6e2a..af8722a02e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10916,7 +10916,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (define-public libhandy (package (name "libhandy") - (version "1.0.3") + (version "1.2.0") (source (origin (method git-fetch) @@ -10925,7 +10925,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0flgwlm921801i3ns0dwqpnxl89f3rzn4y9h723i13bmflch3in7")))) + (base32 "1a8wfgm2jd3gcbk1nzhq6f2xq7vkxdc9qky8p9k0za9gqi7xfg4v")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 43cbb05f4b75ba131dfb9176e5c79f4eb7f70fd7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 13 Mar 2021 15:47:33 -0500 Subject: gnu: libtiff: Refer to the version number in a more robust way. * gnu/packages/image.scm (libtiff)[arguments]: Replace use of VERSION with (PACKAGE-VERSION THIS-PACKAGE). (libtiff/fixed): Adjust accordingly. --- gnu/packages/image.scm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4f249b7622..de6872b9b2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -596,11 +596,12 @@ extracting icontainer icon files.") "doc")) ;1.3 MiB of HTML documentation (arguments ;; Instead of using --docdir, this package has its own --with-docdir. - `(#:configure-flags (list (string-append "--with-docdir=" - (assoc-ref %outputs "doc") - "/share/doc/" - ,name "-" ,version) - "--disable-static"))) + `(#:configure-flags + (list (string-append "--with-docdir=" + (assoc-ref %outputs "doc") + "/share/doc/" + ,name "-" ,(package-version this-package)) + "--disable-static"))) (inputs `(("zlib" ,zlib) ("libjpeg" ,libjpeg-turbo))) (synopsis "Library for handling TIFF files") @@ -625,14 +626,7 @@ collection of tools for doing simple manipulations of TIFF images.") version ".tar.gz")) (sha256 (base32 - "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b")))) - (arguments - ;; Instead of using --docdir, this package has its own --with-docdir. - `(#:configure-flags (list (string-append "--with-docdir=" - (assoc-ref %outputs "doc") - "/share/doc/" - ,name "-" ,version) - "--disable-static"))))) + "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b")))))) (define-public leptonica (package -- cgit 1.4.1 From bb2427fa283555a997049f107a5fec2e1434eeb7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Mar 2021 16:25:08 -0400 Subject: gnu: ImageMagick: Refer to the version number in a more robust way. * gnu/packages/imagemagick.scm (imagemagick)[arguments]: Replace use of VERSION with (PACKAGE-VERSION THIS-PACKAGE). (imagemagick/fixed): Adjust accordingly. --- gnu/packages/imagemagick.scm | 54 ++++++++------------------------------------ 1 file changed, 9 insertions(+), 45 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 8f6eddce0d..9ac15361b4 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -85,7 +85,8 @@ (let ((doc (assoc-ref outputs "doc"))) (string-append "DOCUMENTATION_PATH = " doc "/share/doc/" - ,name "-" ,version "\n")))) + ,name "-" + ,(package-version this-package) "\n")))) #t)) (add-before 'configure 'strip-configure-xml @@ -131,55 +132,18 @@ text, lines, polygons, ellipses and Bézier curves.") (package (inherit imagemagick) (name "imagemagick") - (version "6.9.12-2g") ;; 'g' for 'guix', appended character to retain - ;; version length so grafting works properly. + ;; 'g' for 'guix', appended character to retain version length so grafting + ;; works properly. + (version "6.9.12-2g") (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" - "6.9.12-2" ;; Hardcode version here since we - ;; had to change it up there. - ".tar.xz")) + ;; Hardcode the version here since we had to + ;; change it above. + "6.9.12-2.tar.xz")) (sha256 (base32 - "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))) - (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" - - ;; Do not embed the build date in binaries. - "--enable-reproducible-build") - - ;; FIXME: The test suite succeeded before version 6.9.6-2. - ;; Try enabling it again with newer releases. - #:tests? #f - #:phases (modify-phases %standard-phases - (add-before - 'build 'pre-build - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - ;; Clear the `LIBRARY_PATH' setting, which otherwise - ;; interferes with our own use. - (("^LIBRARY_PATH[[:blank:]]*=.*$") - "") - - ;; Since the Makefile overrides $docdir, modify it to - ;; refer to what we want. - (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") - (let ((doc (assoc-ref outputs "doc"))) - (string-append "DOCUMENTATION_PATH = " - doc "/share/doc/" - ,name "-" ,version "\n")))) - #t)) - (add-before - 'configure 'strip-configure-xml - (lambda _ - (substitute* "config/configure.xml.in" - ;; Do not record 'configure' arguments in the - ;; configure.xml file that gets installed: That would - ;; include --docdir, and thus retain a reference to the - ;; 'doc' output. - (("@CONFIGURE_ARGS@") - "not recorded")) - #t))))))) + "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))))) (define-public perl-image-magick (package -- cgit 1.4.1 From b082ea9406f19f0d0c296227510256b87fe11e3c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 14 Mar 2021 16:28:48 -0400 Subject: gnu: OpenSSL: Refer to the version number in a more robust way. * gnu/packages/tls.scm (openssl)[arguments]: Replace use of VERSION with (PACKAGE-VERSION THIS-PACKAGE). (openssl/fixed): Adjust accordingly. --- gnu/packages/tls.scm | 107 +++------------------------------------------------ 1 file changed, 6 insertions(+), 101 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e8e1350e29..c10975ed52 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -296,6 +296,7 @@ required structures.") (define-public openssl (package (name "openssl") + (replacement openssl/fixed) (version "1.1.1i") (source (origin (method url-fetch) @@ -310,7 +311,6 @@ required structures.") (sha256 (base32 "0hjj1phcwkz69lx1lrvr9grhpl4y529mwqycqc1hdla1zqsnmgp8")))) - (replacement openssl/fixed) (build-system gnu-build-system) (outputs '("out" "doc" ;6.8 MiB of man3 pages and full HTML documentation @@ -371,7 +371,8 @@ required structures.") ;; PREFIX/ssl. Change that to something more ;; conventional. (string-append "--openssldir=" out - "/share/openssl-" ,version) + "/share/openssl-" + ,(package-version this-package)) (string-append "--prefix=" out) (string-append "-Wl,-rpath," lib) @@ -411,7 +412,8 @@ required structures.") ;; scripts. Remove them to avoid retaining a reference on Perl. (let ((out (assoc-ref outputs "out"))) (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) + ,(package-version this-package) + "/misc")) #t)))))) (native-search-paths (list (search-path-specification @@ -445,104 +447,7 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))) - (arguments - `(#:parallel-tests? #f - #:test-target "test" - - ;; Changes to OpenSSL sometimes cause Perl to "sneak in" to the closure, - ;; so we explicitly disallow it here. - #:disallowed-references ,(list (canonical-package perl)) - #:phases - (modify-phases %standard-phases - ,@(if (%current-target-system) - '((add-before - 'configure 'set-cross-compile - (lambda* (#:key target outputs #:allow-other-keys) - (setenv "CROSS_COMPILE" (string-append target "-")) - (setenv "CONFIGURE_TARGET_ARCH" - (cond - ((string-prefix? "i586" target) - "hurd-x86") - ((string-prefix? "i686" target) - "linux-x86") - ((string-prefix? "x86_64" target) - "linux-x86_64") - ((string-prefix? "mips64el" target) - "linux-mips64") - ((string-prefix? "arm" target) - "linux-armv4") - ((string-prefix? "aarch64" target) - "linux-aarch64") - ((string-prefix? "powerpc64le" target) - "linux-ppc64le") - ((string-prefix? "powerpc64" target) - "linux-ppc64") - ((string-prefix? "powerpc" target) - "linux-ppc"))) - #t))) - '()) - (replace 'configure - (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 ,@(if (%current-target-system) - '("./Configure") - '("./config")) - "shared" ;build shared libraries - "--libdir=lib" - - ;; The default for this catch-all directory is - ;; PREFIX/ssl. Change that to something more - ;; conventional. - (string-append "--openssldir=" out - "/share/openssl-" ,version) - - (string-append "--prefix=" out) - (string-append "-Wl,-rpath," lib) - ,@(if (%current-target-system) - '((getenv "CONFIGURE_TARGET_ARCH")) - '()))))) - (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) - (slib (string-append static "/lib"))) - (for-each (lambda (file) - (install-file file slib) - (delete-file file)) - (find-files lib "\\.a$")) - #t))) - (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))) - (add-after - 'install 'remove-miscellany - (lambda* (#:key outputs #:allow-other-keys) - ;; The 'misc' directory contains random undocumented shell and Perl - ;; scripts. Remove them to avoid retaining a reference on Perl. - (let ((out (assoc-ref outputs "out"))) - (delete-file-recursively (string-append out "/share/openssl-" - ,version "/misc")) - #t)))))))) + "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))))) (define-public openssl-1.0 (package -- cgit 1.4.1 From d059485257bbe5b4f4d903b357ec99a3af2d4f39 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sun, 14 Mar 2021 19:12:53 -0400 Subject: gnu: unzip: Remove redundant and unused "unzip-symlink.patch". This is a followup to commit 31d289a4759909d24dd309ac24d42902a8c20da0, which added, but did not use, "unzip-symlink.patch", which is redundant with the pre-existing "unzip-initialize-symlink-flag.patch". * gnu/packages/patches/unzip-symlink.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/patches/unzip-symlink.patch | 17 ----------------- 2 files changed, 18 deletions(-) delete mode 100644 gnu/packages/patches/unzip-symlink.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 25f8a7fde8..cf8849cf59 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1752,7 +1752,6 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-fix-recmatch.patch \ %D%/packages/patches/unzip-manpage-fix.patch \ %D%/packages/patches/unzip-overflow.patch \ - %D%/packages/patches/unzip-symlink.patch \ %D%/packages/patches/unzip-timestamp.patch \ %D%/packages/patches/unzip-valgrind.patch \ %D%/packages/patches/unzip-x-option.patch \ diff --git a/gnu/packages/patches/unzip-symlink.patch b/gnu/packages/patches/unzip-symlink.patch deleted file mode 100644 index d7eaf160b4..0000000000 --- a/gnu/packages/patches/unzip-symlink.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/process.c b/process.c -index 1e9a1e1..905732b 100644 ---- a/process.c -+++ b/process.c -@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G) /* return PK-type error code */ - = (G.crec.general_purpose_bit_flag & (1 << 11)) == (1 << 11); - #endif - -+#ifdef SYMLINKS -+ /* Initialize the symlink flag, may be set by the platform-specific -+ mapattr function. */ -+ G.pInfo->symlink = 0; -+#endif -+ - return PK_COOL; - - } /* end function process_cdir_file_hdr() */ -- cgit 1.4.1 From c4e826bbd2dd22bd7005cbb5e32e2a5018e6216d Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:08:30 +0100 Subject: gnu: Add r-esc. * gnu/packages/statistics.scm (r-esc): New variable. --- gnu/packages/statistics.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9761b9ceaf..86a818da9e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -6058,3 +6058,28 @@ Helper functions to apply the Correcting for Outcome Reporting Bias (CORB) method to correct for outcome reporting bias in a meta-analysis (van Aert & Wicherts, 2020).") (license license:gpl2+))) + +(define-public r-esc + (package + (name "r-esc") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "esc" version)) + (sha256 + (base32 + "0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q")))) + (properties `((upstream-name . "esc"))) + (build-system r-build-system) + (home-page "https://strengejacke.github.io/esc/") + (synopsis + "Effect Size Computation for Meta Analysis") + (description + "Implementation of the web-based +@url{http://www.campbellcollaboration.org/escalc/html/EffectSizeCalculator-Home.php,'Practical +Meta-Analysis Effect Size Calculator'} from David B. Wilson in R. Based on the +input, the effect size can be returned as standardized mean difference, Cohen's +f, Hedges' g, Pearson's r or Fisher's transformation z, odds ratio or log odds, +or eta squared effect size.") + (license license:gpl3))) -- cgit 1.4.1 From ae807fdb3736f8fbe60caa2ac1fbf2511aab561e Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:18:23 +0100 Subject: gnu: Add r-qdapregex. * gnu/packages/cran.scm (r-qdapregex): 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 e6b205077b..c41d6d953d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27353,3 +27353,29 @@ predictions either by cell means or by more advanced/powerful mixed effects models, yielding predictions and confidence intervals that may be easily visualized at any level of the experiment's design.") (license license:gpl2+))) + +(define-public r-qdapregex + (package + (name "r-qdapregex") + (version "0.7.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "qdapRegex" version)) + (sha256 + (base32 + "1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p")))) + (properties `((upstream-name . "qdapRegex"))) + (build-system r-build-system) + (propagated-inputs `(("r-stringi" ,r-stringi))) + (home-page + "https://trinker.github.com/qdapRegex/") + (synopsis + "Regular Expression Removal, Extraction, and Replacement Tools") + (description + "This package provides a collection of regular expression tools +associated with the @code{qdap} package that may be useful outside of the +context of discourse analysis. Tools include removal/extraction/replacement of +abbreviations, dates, dollar amounts, email addresses, hash tags, numbers, +percentages, citations, person tags, phone numbers, times, and zip codes.") + (license license:gpl2))) -- cgit 1.4.1 From 4bc1707dba0098d416cbe4b53a3077025a2cc422 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:20:07 +0100 Subject: gnu: Add r-mgsub. * gnu/packages/cran.scm (r-mgsub): 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 c41d6d953d..af5055c392 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27379,3 +27379,27 @@ context of discourse analysis. Tools include removal/extraction/replacement of abbreviations, dates, dollar amounts, email addresses, hash tags, numbers, percentages, citations, person tags, phone numbers, times, and zip codes.") (license license:gpl2))) + +(define-public r-mgsub + (package + (name "r-mgsub") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "mgsub" version)) + (sha256 + (base32 + "02l1b96zv36ia0c97wgcwfhi037mbn3wy9c64hcw0n0w67yj77rr")))) + (properties `((upstream-name . "mgsub"))) + (build-system r-build-system) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://cran.r-project.org/package=mgsub") + (synopsis + "Safe, Multiple, Simultaneous String Substitution") + (description + "Designed to enable simultaneous substitution in strings in a safe +fashion. Safe means it does not rely on placeholders (which can cause errors +in same length matches).") + (license license:expat))) -- cgit 1.4.1 From ed48898931107767c0d404a031c7b34632db7a83 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:23:42 +0100 Subject: gnu: Add r-dtt. * gnu/packages/algebra.scm (r-dtt): New variable. --- gnu/packages/algebra.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 948f9bd42e..d2caa13d0e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Vinicius Monego +;;; Copyright © 2021 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,6 +64,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system python) + #:use-module (guix build-system r) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix hg-download) @@ -1584,3 +1586,24 @@ general purpose; they require that p satisfy some preconditions based on the dimension of the input matrix (usually p should be prime and should be no more than about 20 bits long).") (license license:bsd-3))) + +(define-public r-dtt + (package + (name "r-dtt") + (version "0.1-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "dtt" version)) + (sha256 + (base32 + "0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn")))) + (properties `((upstream-name . "dtt"))) + (build-system r-build-system) + (home-page "http://www.r-project.org") + (synopsis "Discrete Trigonometric Transforms") + (description + "This package provides functions for 1D and 2D Discrete Cosine Transform +(@dfn{DCT}), Discrete Sine Transform (@dfn{DST}) and Discrete Hartley Transform +(@dfn{DHT}).") + (license license:gpl2+))) -- cgit 1.4.1 From d332c5c7f2dcf9e3562a411cff2fa43808a326a3 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:25:30 +0100 Subject: gnu: Add r-textshape. * gnu/packages/cran.scm (r-textshape): 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 af5055c392..dd37ae0d6c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27403,3 +27403,26 @@ percentages, citations, person tags, phone numbers, times, and zip codes.") fashion. Safe means it does not rely on placeholders (which can cause errors in same length matches).") (license license:expat))) + +(define-public r-textshape + (package + (name "r-textshape") + (version "1.7.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "textshape" version)) + (sha256 + (base32 + "02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa")))) + (properties `((upstream-name . "textshape"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-slam" ,r-slam) + ("r-stringi" ,r-stringi))) + (home-page "http://github.com/trinker/textshape") + (synopsis "Tools for Reshaping Text") + (description + "Tools that can be used to reshape and restructure text data.") + (license license:gpl2))) -- cgit 1.4.1 From bc82567b0bd69e630ae82e77943d5726f0af9e36 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:28:28 +0100 Subject: gnu: Add r-syuzhet. * gnu/packages/cran.scm (r-syuzhet): New variable. --- gnu/packages/cran.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dd37ae0d6c..6f8230278e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27426,3 +27426,41 @@ in same length matches).") (description "Tools that can be used to reshape and restructure text data.") (license license:gpl2))) + +(define-public r-syuzhet + (package + (name "r-syuzhet") + (version "1.0.6") + (source + (origin + (method url-fetch) + (uri (cran-uri "syuzhet" version)) + (sha256 + (base32 + "16iccqdbw02iw82nah6kwz3gwfghi864j2y698n4b9dyc386ijzv")))) + (properties `((upstream-name . "syuzhet"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dplyr" ,r-dplyr) + ("r-dtt" ,r-dtt) + ("r-nlp" ,r-nlp) + ("r-rlang" ,r-rlang) + ("r-textshape" ,r-textshape) + ("r-tidyr" ,r-tidyr) + ("r-zoo" ,r-zoo))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/mjockers/syuzhet") + (synopsis + "Extracts Sentiment and Sentiment-Derived Plot Arcs from Text") + (description + "Extracts sentiment and sentiment-derived plot arcs from text using a +variety of sentiment dictionaries conveniently packaged for consumption by R +users. Implemented dictionaries include @dfn{syuzhet} (default) developed in the +Nebraska Literary Lab, @dfn{afinn} developed by Finn Arup Nielsen, @dfn{bing} +developed by Minqing Hu and Bing Liu, and @dfn{nrc} developed by Mohammad, Saif +M. and Turney, Peter D. Applicable references are available in +@file{README.md} and in the documentation for the @code{get_sentiment} +function. The package also provides a hack for implementing Stanford's coreNLP +sentiment parser. The package provides several methods for plot arc +normalization.") + (license license:gpl3))) -- cgit 1.4.1 From c3a1373c15908b347cc580abf8522693d21923bb Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:36:14 +0100 Subject: gnu: Add r-lexicon. * gnu/packages/cran.scm (r-lexicon): 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 6f8230278e..f5ed504744 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27464,3 +27464,26 @@ function. The package also provides a hack for implementing Stanford's coreNLP sentiment parser. The package provides several methods for plot arc normalization.") (license license:gpl3))) + +(define-public r-lexicon + (package + (name "r-lexicon") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "lexicon" version)) + (sha256 + (base32 + "0x7rscsh6par2lj11sby7bmz41cxn63iiw51lgh29z09cg8j606c")))) + (properties `((upstream-name . "lexicon"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-syuzhet" ,r-syuzhet))) + (home-page "https://github.com/trinker/lexicon") + (synopsis "Lexicons for Text Analysis") + (description + "This package provides a collection of lexical hash tables, dictionaries, +and word lists.") + (license license:gpl3))) -- cgit 1.4.1 From 584c868fbd6fe5fea5715e2938fc80ec14446502 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:38:23 +0100 Subject: gnu: Add r-english. * gnu/packages/cran.scm (r-english): 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 f5ed504744..b8a57cdb28 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27487,3 +27487,26 @@ normalization.") "This package provides a collection of lexical hash tables, dictionaries, and word lists.") (license license:gpl3))) + +(define-public r-english + (package + (name "r-english") + (version "1.2-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "english" version)) + (sha256 + (base32 + "0d6rin40wy2y6k75x8d5qvf03rfy139f309wrl8xwbdb1h8fjkd1")))) + (properties `((upstream-name . "english"))) + (build-system r-build-system) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://cran.r-project.org/package=english") + (synopsis "Translate Integers into English") + (description + "Allow numbers to be presented in an English language version, one, two, +three, ... Ordinals are also available, first, second, third, ... and +indefinite article choice, \"a\" or \"an\".") + (license license:gpl2))) -- cgit 1.4.1 From 804fad34e8e0f74483e987cfe5f6a496c1debe74 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:40:05 +0100 Subject: gnu: Add r-textclean. * gnu/packages/cran.scm (r-textclean): 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 b8a57cdb28..7f6003ac01 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27510,3 +27510,38 @@ and word lists.") three, ... Ordinals are also available, first, second, third, ... and indefinite article choice, \"a\" or \"an\".") (license license:gpl2))) + +(define-public r-textclean + (package + (name "r-textclean") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "textclean" version)) + (sha256 + (base32 + "0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz")))) + (properties `((upstream-name . "textclean"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-english" ,r-english) + ("r-glue" ,r-glue) + ("r-lexicon" ,r-lexicon) + ("r-mgsub" ,r-mgsub) + ("r-qdapregex" ,r-qdapregex) + ("r-stringi" ,r-stringi) + ("r-textshape" ,r-textshape))) + (home-page + "https://github.com/trinker/textclean") + (synopsis "Text Cleaning Tools") + (description + "Tools to clean and process text. Tools are geared at checking for +substrings that are not optimal for analysis and replacing or removing them +(normalizing) with more analysis friendly substrings (see Sproat, Black, Chen, +Kumar, Ostendorf, & Richards (2001) @url{doi:10.1006/csla.2001.0169}) or +extracting them into new variables. For example, emoticons are often used in +text but not always easily handled by analysis algorithms. The +@code{replace_emoticon()} function replaces emoticons with word equivalents.") + (license license:gpl2))) -- cgit 1.4.1 From e4150032027455ccf920e2f407754e93ca052dec Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 09:43:49 +0100 Subject: gnu: Add r-striprtf. * gnu/packages/cran.scm (r-striprtf): 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 7f6003ac01..0ffc90488a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27545,3 +27545,26 @@ extracting them into new variables. For example, emoticons are often used in text but not always easily handled by analysis algorithms. The @code{replace_emoticon()} function replaces emoticons with word equivalents.") (license license:gpl2))) + +(define-public r-striprtf + (package + (name "r-striprtf") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "striprtf" version)) + (sha256 + (base32 + "1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd")))) + (properties `((upstream-name . "striprtf"))) + (build-system r-build-system) + (propagated-inputs + `(("r-magrittr" ,r-magrittr) + ("r-rcpp" ,r-rcpp) + ("r-stringr" ,r-stringr))) + (home-page "https://github.com/kota7/striprtf") + (synopsis "Extract Text from RTF File") + (description + "Extracts plain text from @dfn{Rich Text Format} (RTF) file.") + (license license:expat))) -- cgit 1.4.1 From ee4ba5427167aa44fc608557b2e888629c5b3926 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:05:24 +0100 Subject: gnu: gzstream: Add PIC flag. * gnu/packages/compression.scm (gzstream) [arguments]: Add phase 'use-pic. --- gnu/packages/compression.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 123d408e96..a3afcf41f4 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Björn Höfling ;;; Copyright © 2020 Arun Isaac -;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020, 2021 Lars-Dominik Braun ;;; Copyright © 2020 Guillaume Le Vaillant ;;; Copyright © 2020 Léo Le Bouter ;;; Copyright © 2021 Antoine Côté @@ -1224,6 +1224,12 @@ handles the 7z format which features very high compression ratios.") `(#:test-target "test" #:phases (modify-phases %standard-phases + ;; Enable PIC, so it can be used in shared libraries. + (add-after 'unpack 'use-pic + (lambda _ + (substitute* "Makefile" + (("CPPFLAGS = " all) (string-append all "-fPIC "))) + #t)) (delete 'configure) (replace 'install (lambda* (#:key outputs #:allow-other-keys) -- cgit 1.4.1 From a64e355ea680bff5f6047011d936e3a3576d62c9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:06:08 +0100 Subject: gnu: Add r-ndjson. * gnu/packages/cran.scm (r-ndjson): 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 0ffc90488a..75c11c7af3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27568,3 +27568,50 @@ text but not always easily handled by analysis algorithms. The (description "Extracts plain text from @dfn{Rich Text Format} (RTF) file.") (license license:expat))) + +(define-public r-ndjson + (package + (name "r-ndjson") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "ndjson" version)) + (sha256 + (base32 + "0lvzbgfi1sg4kya1mvv67z14qk3vz9q57x22qh57xq8ampdkg812")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor gzstream + (for-each delete-file '("src/gzstream.cpp" "src/gzstream.h")) + #t)))) + (properties `((upstream-name . "ndjson"))) + (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-gzstream + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/Makevars" + (("PKG_LIBS = " all) + (string-append all "-lgzstream "))) + #t))))) + (inputs `(("zlib" ,zlib) ("gzstream" ,gzstream))) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-rcpp" ,r-rcpp) + ("r-tibble" ,r-tibble))) + (home-page "https://gitlab.com/hrbrmstr/ndjson") + (synopsis + "Wicked-Fast @dfn{Streaming JSON} (ndjson) Reader") + (description + "@dfn{Streaming JSON} (ndjson) has one JSON record per-line and many +modern ndjson files contain large numbers of records. These constructs may not +be columnar in nature, but it is often useful to read in these files and +\"flatten\" the structure out to enable working with the data in an R +@code{data.frame}-like context. Functions are provided that make it possible +to read in plain ndjson files or compressed (@code{gz}) ndjson files and either +validate the format of the records or create \"flat\" @code{data.table} +structures from them.") + (license license:expat))) -- cgit 1.4.1 From cb360afd66b8534b957a8fc9cbf87ce0f35f7e0c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:10:46 +0100 Subject: gnu: Add r-streamr * gnu/packages/cran.scm (r-streamr): 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 75c11c7af3..6bc6f77a8e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27615,3 +27615,29 @@ to read in plain ndjson files or compressed (@code{gz}) ndjson files and either validate the format of the records or create \"flat\" @code{data.table} structures from them.") (license license:expat))) + +(define-public r-streamr + (package + (name "r-streamr") + (version "0.4.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "streamR" version)) + (sha256 + (base32 + "1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix")))) + (properties `((upstream-name . "streamR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-ndjson" ,r-ndjson) + ("r-rcurl" ,r-rcurl) + ("r-rjson" ,r-rjson))) + (home-page + "https://cran.r-project.org/package=streamR") + (synopsis + "Access to Twitter Streaming API via R") + (description + "This package provides functions to access Twitter's filter, sample, and +user streams, and to parse the output into data frames.") + (license license:gpl2))) -- cgit 1.4.1 From 03af89bd9efaeac35490b75fffb598dde302df12 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:13:07 +0100 Subject: gnu: Add r-readods. * gnu/packages/cran.scm (r-readods): 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 6bc6f77a8e..b6ee33170d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27641,3 +27641,30 @@ structures from them.") "This package provides functions to access Twitter's filter, sample, and user streams, and to parse the output into data frames.") (license license:gpl2))) + +(define-public r-readods + (package + (name "r-readods") + (version "1.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "readODS" version)) + (sha256 + (base32 + "1hi217ab7hp15jsbzi5ak57cqf8jn2rv78bnn74q72gn9mrfra7n")))) + (properties `((upstream-name . "readODS"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cellranger" ,r-cellranger) + ("r-readr" ,r-readr) + ("r-stringi" ,r-stringi) + ("r-xml2" ,r-xml2))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://cran.r-project.org/package=readODS") + (synopsis "Read and Write ODS Files") + (description + "Import @dfn{OpenDocument Spreadsheet} (ODS) into R as a data frame. +Also support writing data frame into ODS file.") + (license license:gpl3))) -- cgit 1.4.1 From 52c70fb66ea82c8c4bbc555c361a42ebd839941c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:19:00 +0100 Subject: gnu: Add r-qpdf. Cannot add to (gnu packages pdf) due to circular module dependency. * gnu/packages/cran.scm (r-qpdf): 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 b6ee33170d..877396b996 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -91,6 +91,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages node) #:use-module (gnu packages pcre) + #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) ;libsndfile @@ -27668,3 +27669,49 @@ user streams, and to parse the output into data frames.") "Import @dfn{OpenDocument Spreadsheet} (ODS) into R as a data frame. Also support writing data frame into ODS file.") (license license:gpl3))) + +(define-public r-qpdf + (package + (name "r-qpdf") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "qpdf" version)) + (sha256 + (base32 + "03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor libqpdf + (delete-file-recursively "src/libqpdf") + (delete-file-recursively "src/include/qpdf") + #t)))) + (properties `((upstream-name . "qpdf"))) + (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda _ + (setenv "EXTERNAL_QPDF" "1") + #t))))) + (inputs + `(("zlib" ,zlib) + ("qpdf" ,qpdf))) + (propagated-inputs + `(("r-askpass" ,r-askpass) + ("r-curl" ,r-curl) + ("r-rcpp" ,r-rcpp))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/ropensci/qpdf") + (synopsis + "Split, Combine and Compress PDF Files") + (description + "Content-preserving transformations transformations of PDF files such as +split, combine, and compress. This package interfaces directly to the +@code{qpdf} C++ API and does not require any command line utilities. Note that +@code{qpdf} does not read actual content from PDF files: to extract text and +data you need the @code{pdftools} package.") + (license license:asl2.0))) -- cgit 1.4.1 From 275b7987c0baf66bed2c64c044975b1c3719b22b Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:21:23 +0100 Subject: gnu: Add r-pdftools. * gnu/packages/cran.scm (r-pdftools): 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 877396b996..f7d170ef63 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27715,3 +27715,33 @@ split, combine, and compress. This package interfaces directly to the @code{qpdf} does not read actual content from PDF files: to extract text and data you need the @code{pdftools} package.") (license license:asl2.0))) + +(define-public r-pdftools + (package + (name "r-pdftools") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "pdftools" version)) + (sha256 + (base32 + "01i5g2mjkshis0zlm7lrvi7kkzl4dn3if1hzwkgzf9n2mi33ndsx")))) + (properties `((upstream-name . "pdftools"))) + (build-system r-build-system) + (inputs + `(("zlib" ,zlib) + ("poppler" ,poppler))) + (propagated-inputs + `(("r-qpdf" ,r-qpdf) ("r-rcpp" ,r-rcpp))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page + "https://docs.ropensci.org/pdftools/") + (synopsis + "Text Extraction, Rendering and Converting of PDF Documents") + (description + "Utilities based on @code{libpoppler} for extracting text, fonts, +attachments and metadata from a PDF file. Also supports high quality rendering +of PDF documents into PNG, JPEG, TIFF format, or into raw bitmap vectors for +further processing in R.") + (license license:expat))) -- cgit 1.4.1 From 6f688733b5597d7f2c9727d06a63f69a4329e1a2 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:24:07 +0100 Subject: gnu: Add r-antiword. * gnu/packages/cran.scm (r-antiword): New variable. --- gnu/packages/cran.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f7d170ef63..6d95df6e62 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -100,6 +100,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) #:use-module (gnu packages tcl) + #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages web) @@ -27745,3 +27746,44 @@ attachments and metadata from a PDF file. Also supports high quality rendering of PDF documents into PNG, JPEG, TIFF format, or into raw bitmap vectors for further processing in R.") (license license:expat))) + +(define-public r-antiword + (package + (name "r-antiword") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (cran-uri "antiword" version)) + (sha256 + (base32 + "034znb0g9wwb8gi1r3z75v3sbb4mh83qrc4y8mbfx5lbgh8zhj6j")) + (modules '((guix build utils))) + (snippet + '(begin + ;; unvendor libantiword + (delete-file-recursively "src") + #t)))) + (properties `((upstream-name . "antiword"))) + (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-antiword + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "R/antiword.R" + (("system.file\\(\"bin\", package = \"antiword\"\\)") + (string-append "\"" (assoc-ref inputs "antiword") "/bin\""))) + #t))))) + (inputs `(("antiword" ,antiword))) + (propagated-inputs `(("r-sys" ,r-sys))) + (home-page + "https://github.com/ropensci/antiword#readme") + (synopsis + "Extract Text from Microsoft Word Documents") + (description + "Wraps the @code{AntiWord} utility to extract text from Microsoft Word +documents. The utility only supports the old @code{doc} format, not the new +xml based @code{docx} format. Use the @code{xml2} package to read the +latter.") + (license license:gpl2))) -- cgit 1.4.1 From 5d719fe6087a5412a0b17d0e0c113488b3329c32 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:29:26 +0100 Subject: gnu: Add r-readtext. * gnu/packages/cran.scm (r-readtext): 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 6d95df6e62..24eb22e638 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27787,3 +27787,42 @@ documents. The utility only supports the old @code{doc} format, not the new xml based @code{docx} format. Use the @code{xml2} package to read the latter.") (license license:gpl2))) + +(define-public r-readtext + (package + (name "r-readtext") + (version "0.80") + (source + (origin + (method url-fetch) + (uri (cran-uri "readtext" version)) + (sha256 + (base32 + "0q8ajnp99fwvh14ppkm2z3gqwdwmjrvxvsfb4q7ad0dhkqric05y")))) + (properties `((upstream-name . "readtext"))) + (build-system r-build-system) + (propagated-inputs + `(("r-antiword" ,r-antiword) + ("r-data-table" ,r-data-table) + ("r-digest" ,r-digest) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-pdftools" ,r-pdftools) + ("r-readods" ,r-readods) + ("r-readxl" ,r-readxl) + ("r-streamr" ,r-streamr) + ("r-stringi" ,r-stringi) + ("r-striprtf" ,r-striprtf) + ("r-tibble" ,r-tibble) + ("r-xml2" ,r-xml2))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/quanteda/readtext") + (synopsis + "Import and Handling for Plain and Formatted Text Files") + (description + "This package provides functions for importing and handling text files +and formatted text files with additional meta-data, such including @code{.csv}, +@code{.tab}, @code{.json}, @code{.xml}, @code{.html}, @code{.pdf}, @code{.doc}, +@code{.docx}, @code{.rtf}, @code{.xls}, @code{.xlsx}, and others.") + (license license:gpl3))) -- cgit 1.4.1 From 5ce5e49c10b932743b730801632c5212ea8f7ed6 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:31:20 +0100 Subject: gnu: Add r-packcircles. * gnu/packages/cran.scm (r-packcircles): 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 24eb22e638..89a7c4f0cc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27826,3 +27826,25 @@ and formatted text files with additional meta-data, such including @code{.csv}, @code{.tab}, @code{.json}, @code{.xml}, @code{.html}, @code{.pdf}, @code{.doc}, @code{.docx}, @code{.rtf}, @code{.xls}, @code{.xlsx}, and others.") (license license:gpl3))) + +(define-public r-packcircles + (package + (name "r-packcircles") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "packcircles" version)) + (sha256 + (base32 + "05pv5c4k4njkr0xw6i6ksiy34hcyx2lbiqpv5gxw81yrkm0rxfyk")))) + (properties `((upstream-name . "packcircles"))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/mbedward/packcircles") + (synopsis "Circle Packing") + (description + "Algorithms to find arrangements of non-overlapping circles.") + (license license:expat))) -- cgit 1.4.1 From a1dd43e4cd35b6028beb1515960661ba0476dc61 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:35:20 +0100 Subject: gnu: Add r-lwgeom. * gnu/packages/cran.scm (r-lwgeom): 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 89a7c4f0cc..39d11dd8ee 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27848,3 +27848,34 @@ and formatted text files with additional meta-data, such including @code{.csv}, (description "Algorithms to find arrangements of non-overlapping circles.") (license license:expat))) + +;; Cannot unbundle liblwgeom, because PostGIS does not support building it on +;; its own. +(define-public r-lwgeom + (package + (name "r-lwgeom") + (version "0.2-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "lwgeom" version)) + (sha256 + (base32 + "0byhjqa2acns8mznl1ngnfygxxxyszvnq66qfg0smhhhdkwr67aa")))) + (properties `((upstream-name . "lwgeom"))) + (build-system r-build-system) + (inputs `(("geos" ,geos) ("proj" ,proj) ("sqlite" ,sqlite))) + (propagated-inputs + `(("r-rcpp" ,r-rcpp) + ("r-sf" ,r-sf) + ("r-units" ,r-units))) + (native-inputs `(("pkg-config" ,pkg-config))) + (home-page + "https://github.com/r-spatial/lwgeom/") + (synopsis + "Bindings to Selected 'liblwgeom' Functions for Simple Features") + (description + "Access to selected functions found in +@url{https://github.com/postgis/postgis/tree/master/liblwgeom,liblwgeom}, the +light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") + (license license:gpl2))) -- cgit 1.4.1 From 82344f59363530a092f4bbaca809820b2077b5fe Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:37:18 +0100 Subject: gnu: Add r-stars. * gnu/packages/cran.scm (r-stars): 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 39d11dd8ee..3581d51ee0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27879,3 +27879,33 @@ and formatted text files with additional meta-data, such including @code{.csv}, @url{https://github.com/postgis/postgis/tree/master/liblwgeom,liblwgeom}, the light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (license license:gpl2))) + +(define-public r-stars + (package + (name "r-stars") + (version "0.5-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "stars" version)) + (sha256 + (base32 + "0ybk899rc0rpf2cv5kwk78fvis5xnr255hfcy5khdxsxdqgl0m9j")))) + (properties `((upstream-name . "stars"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-classint" ,r-classint) + ("r-lwgeom" ,r-lwgeom) + ("r-rlang" ,r-rlang) + ("r-sf" ,r-sf) + ("r-units" ,r-units))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://r-spatial.github.io/stars/") + (synopsis + "Spatiotemporal Arrays, Raster and Vector Data Cubes") + (description + "Reading, manipulating, writing and plotting spatiotemporal arrays +(raster and vector data cubes) in @code{R}, using @code{GDAL} bindings provided +by @code{sf}, and @code{NetCDF} bindings by @code{ncmeta} and @code{RNetCDF}.") + (license license:asl2.0))) -- cgit 1.4.1 From 3095255b7bdb194479dbc58d6d51dff752b3352f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:38:48 +0100 Subject: gnu: Add r-tmaptools. * gnu/packages/cran.scm (r-tmaptools): 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 3581d51ee0..a539042a24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27909,3 +27909,35 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (raster and vector data cubes) in @code{R}, using @code{GDAL} bindings provided by @code{sf}, and @code{NetCDF} bindings by @code{ncmeta} and @code{RNetCDF}.") (license license:asl2.0))) + +(define-public r-tmaptools + (package + (name "r-tmaptools") + (version "3.1-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "tmaptools" version)) + (sha256 + (base32 + "0bal3czrdr93qig8s5cf5szld5vjbbks67rismfhlkmlgw6wp2gx")))) + (properties `((upstream-name . "tmaptools"))) + (build-system r-build-system) + (propagated-inputs + `(("r-dichromat" ,r-dichromat) + ("r-lwgeom" ,r-lwgeom) + ("r-magrittr" ,r-magrittr) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-sf" ,r-sf) + ("r-stars" ,r-stars) + ("r-units" ,r-units) + ("r-viridislite" ,r-viridislite) + ("r-xml" ,r-xml))) + (home-page + "https://github.com/mtennekes/tmaptools") + (synopsis "Thematic Map Tools") + (description + "Set of tools for reading and processing spatial data. The aim is to +supply the workflow to create thematic maps. This package also facilitates +@code{tmap}, the package for visualizing thematic maps.") + (license license:gpl3))) -- cgit 1.4.1 From 83b6d7a33e559b688f34822ec7ef28d63ab28924 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:40:21 +0100 Subject: gnu: Add r-rworldmap. * gnu/packages/cran.scm (r-rworldmap): 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 a539042a24..bd3c040d1d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27941,3 +27941,27 @@ by @code{sf}, and @code{NetCDF} bindings by @code{ncmeta} and @code{RNetCDF}.") supply the workflow to create thematic maps. This package also facilitates @code{tmap}, the package for visualizing thematic maps.") (license license:gpl3))) + +(define-public r-rworldmap + (package + (name "r-rworldmap") + (version "1.3-6") + (source + (origin + (method url-fetch) + (uri (cran-uri "rworldmap" version)) + (sha256 + (base32 + "1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk")))) + (properties `((upstream-name . "rworldmap"))) + (build-system r-build-system) + (propagated-inputs + `(("r-fields" ,r-fields) + ("r-maptools" ,r-maptools) + ("r-sp" ,r-sp))) + (home-page + "https://github.com/AndySouth/rworldmap/") + (synopsis "Mapping Global Data") + (description + "Enables mapping of country level and gridded user datasets.") + (license license:gpl2+))) -- cgit 1.4.1 From 181e3c01282f9260a5ff868d15369521bedb3583 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:42:29 +0100 Subject: gnu: Add r-rtweet. * gnu/packages/cran.scm (r-rtweet): 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 bd3c040d1d..37a13b4c1a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27965,3 +27965,34 @@ supply the workflow to create thematic maps. This package also facilitates (description "Enables mapping of country level and gridded user datasets.") (license license:gpl2+))) + +(define-public r-rtweet + (package + (name "r-rtweet") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "rtweet" version)) + (sha256 + (base32 + "05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n")))) + (properties `((upstream-name . "rtweet"))) + (build-system r-build-system) + (propagated-inputs + `(("r-httpuv" ,r-httpuv) + ("r-httr" ,r-httr) + ("r-jsonlite" ,r-jsonlite) + ("r-magrittr" ,r-magrittr) + ("r-progress" ,r-progress) + ("r-rcpp" ,r-rcpp) + ("r-tibble" ,r-tibble))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://docs.ropensci.org/rtweet/") + (synopsis "Collecting Twitter Data") + (description + "An implementation of calls designed to collect and organize Twitter data +via @url{https://developer.twitter.com/en/docs,Twitter's REST and stream +Application Program Interfaces (API)}.") + (license license:expat))) -- cgit 1.4.1 From 32603dbba9a0ab03301b67591927f98fd1f7b2ba Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:46:39 +0100 Subject: gnu: Add r-intervals. * gnu/packages/cran.scm (r-intervals): 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 37a13b4c1a..2fa16753d9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27996,3 +27996,23 @@ supply the workflow to create thematic maps. This package also facilitates via @url{https://developer.twitter.com/en/docs,Twitter's REST and stream Application Program Interfaces (API)}.") (license license:expat))) + +(define-public r-intervals + (package + (name "r-intervals") + (version "0.15.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "intervals" version)) + (sha256 + (base32 + "0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb")))) + (properties `((upstream-name . "intervals"))) + (build-system r-build-system) + (home-page "https://github.com/edzer/intervals") + (synopsis + "Tools for Working with Points and Intervals") + (description + "Tools for working with and comparing sets of points and intervals.") + (license license:artistic2.0))) -- cgit 1.4.1 From 20fb147c9abbd60bea1c8d9e54b11b2b95e69970 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:47:48 +0100 Subject: gnu: Add r-eyelinker. * gnu/packages/cran.scm (r-eyelinker): 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 2fa16753d9..66fd2c733d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28016,3 +28016,32 @@ Application Program Interfaces (API)}.") (description "Tools for working with and comparing sets of points and intervals.") (license license:artistic2.0))) + +(define-public r-eyelinker + (package + (name "r-eyelinker") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "eyelinker" version)) + (sha256 + (base32 + "14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2")))) + (properties `((upstream-name . "eyelinker"))) + (build-system r-build-system) + (propagated-inputs + `(("r-intervals" ,r-intervals) + ("r-readr" ,r-readr) + ("r-stringi" ,r-stringi) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page + "https://github.com/a-hurst/eyelinker") + (synopsis + "Import ASC Files from EyeLink Eye Trackers") + (description + "Imports plain-text ASC data files from EyeLink eye trackers into +(relatively) tidy data frames for analysis and visualization.") + (license license:gpl3))) -- cgit 1.4.1 From ca3913d1f8d0582236989e516dc61ed38eec6ed9 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:49:50 +0100 Subject: gnu: Add r-btm. * gnu/packages/cran.scm (r-btm): 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 66fd2c733d..91cf7c550d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28045,3 +28045,34 @@ Application Program Interfaces (API)}.") "Imports plain-text ASC data files from EyeLink eye trackers into (relatively) tidy data frames for analysis and visualization.") (license license:gpl3))) + +(define-public r-btm + (package + (name "r-btm") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (cran-uri "BTM" version)) + (sha256 + (base32 + "1x6bncb7r97z8bdyxnn2frdi9kyawfy6c2041mv9f42zdrfzm6jb")))) + (properties `((upstream-name . "BTM"))) + (build-system r-build-system) + (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (home-page "https://github.com/bnosac/BTM") + (synopsis "Biterm Topic Models for Short Text") + (description + "Biterm Topic Models find topics in collections of short texts. It is a +word co-occurrence based topic model that learns topics by modeling word-word +co-occurrences patterns which are called biterms. This in contrast to +traditional topic models like Latent Dirichlet Allocation and Probabilistic +Latent Semantic Analysis which are word-document co-occurrence topic models. A +biterm consists of two words co-occurring in the same short text window. This +context window can for example be a twitter message, a short answer on a +survey, a sentence of a text or a document identifier. The techniques are +explained in detail in the paper 'A Biterm Topic Model For Short Text' by +Xiaohui Yan, Jiafeng Guo, Yanyan Lan, Xueqi Cheng (2013) +@url{https://github.com/xiaohuiyan/xiaohuiyan.github.io/blob/master/paper/\ +BTM-WWW13.pdf}.") + (license license:asl2.0))) -- cgit 1.4.1 From c3163fe6b4265d8626f1794c40abdfab39721104 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 15 Mar 2021 10:51:41 +0100 Subject: gnu: Add r-textplot. * gnu/packages/cran.scm (r-textplot): 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 91cf7c550d..5854ff6031 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28076,3 +28076,30 @@ Xiaohui Yan, Jiafeng Guo, Yanyan Lan, Xueqi Cheng (2013) @url{https://github.com/xiaohuiyan/xiaohuiyan.github.io/blob/master/paper/\ BTM-WWW13.pdf}.") (license license:asl2.0))) + +(define-public r-textplot + (package + (name "r-textplot") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (cran-uri "textplot" version)) + (sha256 + (base32 + "1sgkndy2cxk8c76h8hwajn6f78w5jj2n8vsmaxh9kj931crzn8cy")))) + (properties `((upstream-name . "textplot"))) + (build-system r-build-system) + (propagated-inputs + `(("r-data-table" ,r-data-table) + ("r-lattice" ,r-lattice) + ("r-matrix" ,r-matrix))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/bnosac/textplot") + (synopsis "Text Plots") + (description + "Visualise complex relations in texts. This is done by providing +functionalities for displaying text co-occurrence networks, text correlation +networks, dependency relationships as well as text clustering. Feel free to +join the effort of providing interesting text visualisations.") + (license license:gpl2))) -- cgit 1.4.1 From 714a8faa0469b4c79a0694f1451e7b1a6214d12f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 10:34:24 +0100 Subject: gnu: guile-email-latest: Update to 0.2.2-1.ca0520a. * gnu/packages/guile-xyz.scm (guile-email-latest): Update to 0.2.2-1.ca0520a. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4799711c66..2e02f6f482 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1237,7 +1237,7 @@ format.") (license license:agpl3+))) (define-public guile-email-latest - (let ((commit "03e9cacb826bd4a56d3d834fe5526e497d7c57eb") + (let ((commit "ca0520a33c9042a68691d85c6849f88412ca8357") (revision "1")) (package (inherit guile-email) @@ -1252,7 +1252,7 @@ format.") (file-name (git-file-name name version)) (sha256 (base32 - "1a15gdlbmzx220xg82fgyd0zk2wqn13ddmzs13nhgfzx8d5cns68")))) + "1l5mikalawq83786rnb9zky908ncsd5dna9vyz6bx6kc2frrl7xv")))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit 1.4.1 From 8b85aea49bc63355bffdf79a97effec6a0ba2f91 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:37:52 +0100 Subject: gnu: Add python-uncertainties. * gnu/packages/python-xyz.scm (python-uncertainties): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3535649c0d..b308948728 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11558,6 +11558,34 @@ document.") manipulation library.") (license license:expat))) +(define-public python-uncertainties + (package + (name "python-uncertainties") + (version "3.1.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "uncertainties" version)) + (sha256 + (base32 + "00z9xl40czmqk0vmxjvmjvwb41r893l4dad7nj1nh6blw3kw28li")))) + (build-system python-build-system) + ;; While there are test files, there is no "tests" directory, so the tests + ;; fail. + (arguments '(#:tests? #false)) + (propagated-inputs + `(("python-future" ,python-future))) + (native-inputs + `(("python-nose" ,python-nose) + ("python-numpy" ,python-numpy))) + (home-page "https://uncertainties-python-package.readthedocs.io/") + (synopsis "Calculations with uncertainties") + (description + "The uncertainties package transparently handles calculations with +numbers with uncertainties. It can also yield the derivatives of any +expression.") + (license license:bsd-3))) + (define-public python-boto (package (name "python-boto") -- cgit 1.4.1 From 0bd166253a61f43763d488ba592c570bc6a558cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:38:06 +0100 Subject: gnu: Add python-asteval. * gnu/packages/python-xyz.scm (python-asteval): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b308948728..9ae80bda6d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11586,6 +11586,27 @@ numbers with uncertainties. It can also yield the derivatives of any expression.") (license license:bsd-3))) +(define-public python-asteval + (package + (name "python-asteval") + (version "0.9.23") + (source + (origin + (method url-fetch) + (uri (pypi-uri "asteval" version)) + (sha256 + (base32 + "0f54sd4w1a72ij1bcxs2x7dk9xf8bzclawijf1z18bqx9f96l2gm")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/newville/asteval") + (synopsis "Minimalistic evaluator of Python expressions") + (description + "This package provides a minimalistic evaluator of Python expression +using the @code{ast} module") + (license license:expat))) + (define-public python-boto (package (name "python-boto") -- cgit 1.4.1 From c20813bb08d19d424a5965da467599284adad8fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:38:15 +0100 Subject: gnu: Add python-lmfit. * gnu/packages/python-xyz.scm (python-lmfit): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9ae80bda6d..a9fa391bb2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11607,6 +11607,36 @@ expression.") using the @code{ast} module") (license license:expat))) +(define-public python-lmfit + (package + (name "python-lmfit") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lmfit" version)) + (sha256 + (base32 + "0iab33jjb60f8kn0k0cqb0vjp1mdskks2n3kpn97zkw5cvjhq2b7")))) + (build-system python-build-system) + (propagated-inputs + `(("python-asteval" ,python-asteval) + ("python-numpy" ,python-numpy) + ("python-scipy" ,python-scipy) + ("python-uncertainties" ,python-uncertainties))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://lmfit.github.io/lmfit-py/") + (synopsis "Least-Squares minimization with bounds and constraints") + (description + "Lmfit provides a high-level interface to non-linear optimization and +curve fitting problems for Python. It builds on and extends many of the +optimization methods of @code{scipy.optimize}. Initially inspired by (and +named for) extending the Levenberg-Marquardt method from +@code{scipy.optimize.leastsq}, lmfit now provides a number of useful +enhancements to optimization and data fitting problems.") + (license license:bsd-3))) + (define-public python-boto (package (name "python-boto") -- cgit 1.4.1 From ad34eb222c9ebc2b31f03b70ba6655ebe8ee74b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:38:29 +0100 Subject: gnu: Add python-drep. * gnu/packages/bioinformatics.scm (python-drep): 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 b2d10457fe..c629b79c39 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13147,6 +13147,36 @@ create connections between analogous cells in different batches without altering the counts or PCA space.") (license license:expat))) +(define-public python-drep + (package + (name "python-drep") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "drep" version)) + (sha256 + (base32 + "08vk0x6v5c5n7afgd5pcjhsvb424absypxy22hw1cm1n9kirbi77")))) + (build-system python-build-system) + (propagated-inputs + `(("python-biopython" ,python-biopython) + ("python-matplotlib" ,python-matplotlib) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-pytest" ,python-pytest) + ("python-scikit-learn" ,python-scikit-learn) + ("python-seaborn" ,python-seaborn) + ("python-tqdm" ,python-tqdm))) + (home-page "https://github.com/MrOlm/drep") + (synopsis "De-replication of microbial genomes assembled from multiple samples") + (description + "dRep is a Python program for rapidly comparing large numbers of genomes. +dRep can also \"de-replicate\" a genome set by identifying groups of highly +similar genomes and choosing the best representative genome for each genome +set.") + (license license:expat))) + (define-public gffcompare (let ((commit "be56ef4349ea3966c12c6397f85e49e047361c41") (revision "1")) -- cgit 1.4.1 From 6e0ed09e687d9b8ae2cf2d01a9946b84bc8bf641 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:38:40 +0100 Subject: gnu: Add instrain. * gnu/packages/bioinformatics.scm (instrain): 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 c629b79c39..b0736d32e4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -13177,6 +13177,59 @@ similar genomes and choosing the best representative genome for each genome set.") (license license:expat))) +(define-public instrain + (package + (name "instrain") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "inStrain" version)) + (sha256 + (base32 + "0ykqlpf6yz4caihsaz3ys00cyvlr7wdj4s9a8rh56q5r8xf80ic0")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-relative-imports + (lambda _ + (substitute* "docker/run_instrain.py" + (("from s3_utils") + "from .s3_utils") + (("from job_utils") + "from .job_utils"))))))) + (inputs + `(("python-biopython" ,python-biopython) + ("python-boto3" ,python-boto3) + ("python-h5py" ,python-h5py) + ("python-lmfit" ,python-lmfit) + ("python-matplotlib" ,python-matplotlib) + ("python-networkx" ,python-networkx) + ("python-numba" ,python-numba) + ("python-numpy" ,python-numpy) + ("python-pandas" ,python-pandas) + ("python-psutil" ,python-psutil) + ("python-pysam" ,python-pysam) + ("python-scikit-learn" ,python-scikit-learn) + ("python-seaborn" ,python-seaborn) + ("python-tqdm" ,python-tqdm) + ;; drep is needed for deprecated plot utilities + ("python-drep" ,python-drep))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/MrOlm/inStrain") + (synopsis "Calculation of strain-level metrics") + (description + "inStrain is a Python program for analysis of co-occurring genome +populations from metagenomes that allows highly accurate genome comparisons, +analysis of coverage, microdiversity, and linkage, and sensitive SNP detection +with gene localization and synonymous non-synonymous identification.") + ;; The tool itself says that the license is "MIT", but the repository + ;; contains a LICENSE file with the GPLv3. + ;; See https://github.com/MrOlm/inStrain/issues/51 + (license license:expat))) + (define-public gffcompare (let ((commit "be56ef4349ea3966c12c6397f85e49e047361c41") (revision "1")) -- cgit 1.4.1 From 21bc326b9a20eca7ae5b14569a8e173957eb3cd9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 11:57:56 +0100 Subject: gnu: guile-opengl: Fix linking with libGL.so. * gnu/packages/gl.scm (guile-opengl)[arguments]: Fix reference to libGL.so. --- gnu/packages/gl.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 5b4f5ec0fa..dec2835ca6 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 Nikita -;;; Copyright © 2016, 2017, 2018, 2020 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 David Thompson ;;; Copyright © 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Arun Isaac @@ -600,6 +600,11 @@ extension functionality is exposed in a single header file.") "godir = $(moddir)\n")))) (add-before 'build 'patch-dynamic-link (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "gl/runtime.scm" + (("\\(dynamic-link\\)") + (string-append "(dynamic-link \"" + (assoc-ref inputs "mesa") + "/lib/libGL.so" "\")"))) (define (dynamic-link-substitute file lib input) (substitute* file (("dynamic-link \"lib([a-zA-Z]+)\"" _ lib) -- cgit 1.4.1 From 1daedaa8646696783c88553e03035d547fd001ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 12:05:50 +0100 Subject: gnu: libusb-for-axoloti: Revert to 1.0.23. * gnu/packages/axoloti.scm (libusb-for-axoloti): Revert to 1.0.23, because the patch does not apply to the latest version. --- gnu/packages/axoloti.scm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 2a5cf8e0fc..3049051486 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -39,14 +39,21 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages xml)) +;; XXX The patch does not apply to libusb 1.0.24. +;; See https://github.com/axoloti/axoloti/issues/464 (define libusb-for-axoloti - (package (inherit libusb) - (name "axoloti-libusb") - (version (package-version libusb)) + (package + (inherit libusb) + (version "1.0.23") (source (origin - (inherit (package-source libusb)) - (patches (list (search-patch "libusb-for-axoloti.patch"))))))) + (method url-fetch) + (uri (string-append "https://github.com/libusb/libusb/" + "releases/download/v" version + "/libusb-" version ".tar.bz2")) + (sha256 + (base32 "13dd2a9x290d1q8nb1lqiaf36grcvns5ripk5k2xm0lajmpc04fv")) + (patches (list (search-patch "libusb-for-axoloti.patch"))))))) (define dfu-util-for-axoloti (package (inherit dfu-util) -- cgit 1.4.1 From 3eeb7dbf04b5ee3120b3ebcf264d54a56ad934e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 12:15:18 +0100 Subject: gnu: r-gkmsvm: Move back to (gnu packages cran). * gnu/packages/bioconductor.scm (r-gkmsvm): Move this variable from here... * gnu/packages/cran.scm (r-gkmsvm): ...to here. --- gnu/packages/bioconductor.scm | 27 --------------------------- gnu/packages/cran.scm | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 526c2eecbb..4f8e0562b1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -4042,33 +4042,6 @@ visualising metrics relative to experiment run time or spatially over the surface of a flowcell.") (license license:expat))) -;; This is a CRAN package, but it depends on packages from Bioconductor. -(define-public r-gkmsvm - (package - (name "r-gkmsvm") - (version "0.81.0") - (source - (origin - (method url-fetch) - (uri (cran-uri "gkmSVM" version)) - (sha256 - (base32 - "119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj")))) - (properties `((upstream-name . "gkmSVM"))) - (build-system r-build-system) - (propagated-inputs - `(("r-kernlab" ,r-kernlab) - ("r-rcpp" ,r-rcpp) - ("r-rocr" ,r-rocr) - ("r-seqinr" ,r-seqinr))) - (home-page "https://cran.r-project.org/web/packages/gkmSVM") - (synopsis "Gapped-kmer support vector machine") - (description - "This R package provides tools for training gapped-kmer SVM classifiers -for DNA and protein sequences. This package supports several sequence -kernels, including: gkmSVM, kmer-SVM, mismatch kernel and wildcard kernel.") - (license license:gpl2+))) - ;; This is a CRAN package, but it depends on multtest from Bioconductor. (define-public r-mutoss (package diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 5854ff6031..30c346d0c1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16471,6 +16471,32 @@ visualizations and provides the same flexible approach to building up plots layer by layer.") (license license:gpl3))) +(define-public r-gkmsvm + (package + (name "r-gkmsvm") + (version "0.81.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "gkmSVM" version)) + (sha256 + (base32 + "119g5rhc7ffyviz04r04aj5z1g6abnj3ddd01g7db505sdr6lapj")))) + (properties `((upstream-name . "gkmSVM"))) + (build-system r-build-system) + (propagated-inputs + `(("r-kernlab" ,r-kernlab) + ("r-rcpp" ,r-rcpp) + ("r-rocr" ,r-rocr) + ("r-seqinr" ,r-seqinr))) + (home-page "https://cran.r-project.org/web/packages/gkmSVM") + (synopsis "Gapped-kmer support vector machine") + (description + "This R package provides tools for training gapped-kmer SVM classifiers +for DNA and protein sequences. This package supports several sequence +kernels, including: gkmSVM, kmer-SVM, mismatch kernel and wildcard kernel.") + (license license:gpl2+))) + (define-public r-varselrf (package (name "r-varselrf") -- cgit 1.4.1 From 014fa5cc6b65fb64ce0641c21703aa57202e4170 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 12 Mar 2021 08:50:19 +0100 Subject: gnu: python-poetry-core: Update to 1.0.2. * gnu/packages/python-build.scm (python-poetry-core): Update to 1.0.2. Signed-off-by: Christopher Baines --- gnu/packages/python-build.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 1ce6a3095a..259fe163b5 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -142,13 +142,13 @@ order to make bootstrapping easier.") (define-public python-poetry-core (package (name "python-poetry-core") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (pypi-uri "poetry-core" version)) (sha256 - (base32 "1mgv276h1iphn5fqhp2sgkgd5d0c39hs33vgaf157x5ri7rlyrka")))) + (base32 "0wgfc51dgymnfg23mvsxl4iqbdrppysxi4s3z3xhzx3cd9jmsl7z")))) (build-system python-build-system) (home-page "https://github.com/python-poetry/poetry-core") (synopsis "Poetry PEP 517 build back-end") -- cgit 1.4.1 From 3e83e99322cbcc697fea1e085ba2416fa6854348 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 12 Mar 2021 08:50:20 +0100 Subject: gnu: poetry: Update to 1.1.5. * gnu/packages/python-xyz.scm (poetry): Update to 1.1.5. Signed-off-by: Christopher Baines --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a9fa391bb2..2114503ff3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13614,7 +13614,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "1.1.4") + (version "1.1.5") ;; Poetry can only be built from source with Poetry. (source (origin @@ -13622,7 +13622,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (uri (pypi-uri "poetry" version)) (sha256 (base32 - "1a2kgfiw66fvxhlqk5qc83s6l38czfh5hcsrbiy7qq5yfc8mlsll")))) + "1dvx08ksv5wnsj45db23921rj136akmcnxa0kmlsddf3wbh6wcka")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. -- cgit 1.4.1 From cddf0b8955393d0e656d0708e43ca338c3fe91b6 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 15 Mar 2021 12:19:40 +0100 Subject: gnu: unzip/fixed: Make private. * gnu/packages/compression.scm (unzip/fixed): Use define instead of define-public. --- gnu/packages/compression.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index a3afcf41f4..827ad43dc2 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1636,7 +1636,7 @@ recreates the stored directory structure by default.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) -(define-public unzip/fixed +(define unzip/fixed (package (inherit unzip) (version "6.0") -- cgit 1.4.1 From 8a085c178095d0ed204b6263deb6fc275b651ee1 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 15 Mar 2021 12:21:02 +0100 Subject: gnu: cyrus-sasl/fixed: Make private. * gnu/packages/cyrus-sasl.scm (cyrus-sasl/fixed): Use define instead of define-public. --- gnu/packages/cyrus-sasl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 691349a38f..c18703fde0 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -82,7 +82,7 @@ server writers.") "See COPYING in the distribution.")) (home-page "https://cyrusimap.org/sasl/"))) -(define-public cyrus-sasl/fixed +(define cyrus-sasl/fixed (package (inherit cyrus-sasl) (version "2.1.27") -- cgit 1.4.1 From 309642888981def98fef2ce66b06e22a860adcb9 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 15 Mar 2021 12:21:41 +0100 Subject: gnu: libcroco/fixed: Make private. * gnu/packages/gnome.scm (libcroco/fixed): Use define instead of define-public. --- 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 af8722a02e..db7941bb98 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3246,7 +3246,7 @@ XML/CSS rendering engine.") ;; LGPLv2.1-only. (license license:lgpl2.1))) -(define-public libcroco/fixed +(define libcroco/fixed (package (inherit libcroco) (name "libcroco") -- cgit 1.4.1 From 1ed435bf394eee1a6cd9c354efb405920c212f0e Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 15 Mar 2021 12:51:54 +0100 Subject: gnu: python-sphobjinv: Fix build. * gnu/packages/sphinx.scm (python-sphobjinv): [patches]: Remove. [propagated-inputs]: Add (uncomment) python-certifi. --- gnu/packages/sphinx.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 1704cbce59..e85e4a0f7e 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages time)) @@ -736,12 +737,11 @@ executed during the Sphinx build process.") (uri (pypi-uri "sphobjinv" version)) (sha256 (base32 - "126lgm54c94ay3fci512ap4l607gak90pbz0fk98syxvj5izrrzx")) - (patches (search-patches "python-sphobjinv-system-ca.patch")))) + "126lgm54c94ay3fci512ap4l607gak90pbz0fk98syxvj5izrrzx")))) (build-system python-build-system) (propagated-inputs `(("python-attrs" ,python-attrs) - ;("python-certifi" ,python-certifi) + ("python-certifi" ,python-certifi) ("python-fuzzywuzzy" ,python-fuzzywuzzy) ("python-jsonschema" ,python-jsonschema) ("python-levenshtein" ,python-levenshtein))) -- cgit 1.4.1 From 78373e394dc1d0e04d76c491767ffa527920f3b3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:36:57 +0100 Subject: gnu: Add r-spatstat-sparse. * gnu/packages/cran.scm (r-spatstat-sparse): 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 30c346d0c1..6ae746a093 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24809,6 +24809,33 @@ diagonals. This package allows you to compute the tensor product of arrays.") which may also be useful for other purposes.") (license license:gpl2+))) +(define-public r-spatstat-sparse + (package + (name "r-spatstat-sparse") + (version "1.2-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "spatstat.sparse" version)) + (sha256 + (base32 + "1w312q7gxzchigxxzk9akscdsz66j5085lgjryamschjgp4f8yk2")))) + (properties + `((upstream-name . "spatstat.sparse"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-matrix" ,r-matrix) + ("r-spatstat-utils" ,r-spatstat-utils) + ("r-tensor" ,r-tensor))) + (home-page "http://spatstat.org/") + (synopsis "Sparse three-dimensional arrays and linear algebra utilities") + (description + "This package defines sparse three-dimensional arrays and supports +standard operations on them. The package also includes utility functions for +matrix calculations that are common in statistics, such as quadratic forms.") + (license license:gpl2+))) + (define-public r-spatstat-data (package (name "r-spatstat-data") -- cgit 1.4.1 From ddfe3f77a9354c166bdb6b09ae87e62a4c533eba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:39:00 +0100 Subject: gnu: Add r-spatstat-geom. * gnu/packages/cran.scm (r-spatstat-geom): 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 6ae746a093..c70c734a8c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24859,6 +24859,33 @@ matrix calculations that are common in statistics, such as quadratic forms.") package.") (license license:gpl2+))) +(define-public r-spatstat-geom + (package + (name "r-spatstat-geom") + (version "1.65-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "spatstat.geom" version)) + (sha256 + (base32 + "0g0m5b3nbzpyblbp77n56k6aiw3fn23jkk72h9fhqlg1ydn2fzpk")))) + (properties `((upstream-name . "spatstat.geom"))) + (build-system r-build-system) + (propagated-inputs + `(("r-deldir" ,r-deldir) + ("r-polyclip" ,r-polyclip) + ("r-spatstat-data" ,r-spatstat-data) + ("r-spatstat-sparse" ,r-spatstat-sparse) + ("r-spatstat-utils" ,r-spatstat-utils))) + (home-page "http://spatstat.org/") + (synopsis "Geometrical functionality of the spatstat package") + (description + "This is a subset of the original spatstat package, containing the +user-level code from spatstat which performs geometrical operations, except +for the geometry of linear networks.") + (license license:gpl2+))) + (define-public r-spatstat (package (name "r-spatstat") -- cgit 1.4.1 From 3ebae705f993098a688eff88c07e75e52f5e67a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:39:25 +0100 Subject: gnu: Add r-spatstat-core. * gnu/packages/cran.scm (r-spatstat-core): 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 c70c734a8c..5bc47ef53b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24886,6 +24886,38 @@ user-level code from spatstat which performs geometrical operations, except for the geometry of linear networks.") (license license:gpl2+))) +(define-public r-spatstat-core + (package + (name "r-spatstat-core") + (version "1.65-5") + (source + (origin + (method url-fetch) + (uri (cran-uri "spatstat.core" version)) + (sha256 + (base32 + "0wq61sd53hwyk3fzjdc2prrr66n67zbwb5i3ii7kvyhfwx0xikm3")))) + (properties `((upstream-name . "spatstat.core"))) + (build-system r-build-system) + (propagated-inputs + `(("r-abind" ,r-abind) + ("r-goftest" ,r-goftest) + ("r-matrix" ,r-matrix) + ("r-mgcv" ,r-mgcv) + ("r-nlme" ,r-nlme) + ("r-rpart" ,r-rpart) + ("r-spatstat-data" ,r-spatstat-data) + ("r-spatstat-geom" ,r-spatstat-geom) + ("r-spatstat-sparse" ,r-spatstat-sparse) + ("r-spatstat-utils" ,r-spatstat-utils) + ("r-tensor" ,r-tensor))) + (home-page "http://spatstat.org/") + (synopsis "Core functionality of the spatstat package") + (description + "This is a subset of the original spatstat package, containing all of the +user-level code from spatstat, except for the code for linear networks.") + (license license:gpl2+))) + (define-public r-spatstat (package (name "r-spatstat") -- cgit 1.4.1 From e1240e22f5b5029f2eab4ebc295e15336eb1927e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:39:48 +0100 Subject: gnu: Add r-spatstat-linnet. * gnu/packages/cran.scm (r-spatstat-linnet): 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 5bc47ef53b..7cb8ef2dda 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24918,6 +24918,33 @@ for the geometry of linear networks.") user-level code from spatstat, except for the code for linear networks.") (license license:gpl2+))) +(define-public r-spatstat-linnet + (package + (name "r-spatstat-linnet") + (version "1.65-3") + (source + (origin + (method url-fetch) + (uri (cran-uri "spatstat.linnet" version)) + (sha256 + (base32 + "1y088r26h5yv006ydgcb4iwpvnc7ql857gky0hbi7xqqciqr8wdv")))) + (properties + `((upstream-name . "spatstat.linnet"))) + (build-system r-build-system) + (propagated-inputs + `(("r-matrix" ,r-matrix) + ("r-spatstat-core" ,r-spatstat-core) + ("r-spatstat-data" ,r-spatstat-data) + ("r-spatstat-geom" ,r-spatstat-geom) + ("r-spatstat-utils" ,r-spatstat-utils))) + (home-page "http://spatstat.org/") + (synopsis "Linear networks functionality of the spatstat package") + (description + "This is a subset of the spatstat package, containing its functionality +for spatial data on a linear network.") + (license license:gpl2+))) + (define-public r-spatstat (package (name "r-spatstat") -- cgit 1.4.1 From 7bdef3789d1fa291ab00184150076f0275d2cd32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:02 +0100 Subject: gnu: r-zoo: Update to 1.8-9. * gnu/packages/cran.scm (r-zoo): Update to 1.8-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 7cb8ef2dda..f2bee30f7c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -343,13 +343,13 @@ the system clipboards.") (define-public r-zoo (package (name "r-zoo") - (version "1.8-8") + (version "1.8-9") (source (origin (method url-fetch) (uri (cran-uri "zoo" version)) (sha256 (base32 - "1rrw431jwaxd9xljp73f15rhcxvwc0xlyrmr0ghi5fj7a03c932f")))) + "18vjywalpgzqyk66gajb8x1yp8avdaaf11ykynld9fd8cy82bgmp")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit 1.4.1 From 172da782db4cc161af05df2a82d057d53bb6fff1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:08 +0100 Subject: gnu: r-rvest: Update to 1.0.0. * gnu/packages/cran.scm (r-rvest): Update to 1.0.0. [propagated-inputs]: Add r-lifecycle, r-rlang, and r-tibble. --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f2bee30f7c..6ef25cb61e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -873,18 +873,21 @@ single step.") (define-public r-rvest (package (name "r-rvest") - (version "0.3.6") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "rvest" version)) (sha256 - (base32 "1yh2p429a0zr8pqmlw5rzf6m797j20j5w6xwxlqq0wrdbnif6bka")))) + (base32 "04spcv6nxlmx5bxncq0vybfqrs8jgjamzyrn6wmkdcwii8jvyn53")))) (build-system r-build-system) (propagated-inputs `(("r-httr" ,r-httr) + ("r-lifecycle" ,r-lifecycle) ("r-magrittr" ,r-magrittr) + ("r-rlang" ,r-rlang) ("r-selectr" ,r-selectr) + ("r-tibble" ,r-tibble) ("r-xml2" ,r-xml2))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From bfa09fd922b25e3c3793d9242bcaac2107c98a16 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:12 +0100 Subject: gnu: r-lava: Update to 1.6.9. * gnu/packages/cran.scm (r-lava): Update to 1.6.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 6ef25cb61e..5df2bbf011 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3891,14 +3891,14 @@ available in a vignette.") (define-public r-lava (package (name "r-lava") - (version "1.6.8.1") + (version "1.6.9") (source (origin (method url-fetch) (uri (cran-uri "lava" version)) (sha256 (base32 - "1yiz8y3jhxkszgz9m9fialp9r27hy97xh0imfvs8ziv7dk43y93d")))) + "07difbrz8zmvdyns63958v0zw4hyv48956mcww8zh7064a564k83")))) (build-system r-build-system) (propagated-inputs `(("r-numderiv" ,r-numderiv) -- cgit 1.4.1 From 70257ad2c03a6d7dc81418f9b0a0f8ed20c8b86a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:15 +0100 Subject: gnu: r-ipred: Update to 0.9-11. * gnu/packages/cran.scm (r-ipred): Update to 0.9-11. --- 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 5df2bbf011..6c033f361a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4219,14 +4219,14 @@ provided.") (define-public r-ipred (package (name "r-ipred") - (version "0.9-10") + (version "0.9-11") (source (origin (method url-fetch) (uri (cran-uri "ipred" version)) (sha256 (base32 - "0p9cd2v47h71jbz8q0z6xykkaqpcp0mkpsfmd2bn961n1hfgpa63")))) + "04hfg27c72v0fz4091w3rgbc2vd7g6yl78y9plvsvh0vjlx8ymmp")))) (build-system r-build-system) (propagated-inputs `(("r-class" ,r-class) -- cgit 1.4.1 From d163c71e0a828674dd8e140c47467acbab5c43b4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:18 +0100 Subject: gnu: r-xfun: Update to 0.22. * gnu/packages/cran.scm (r-xfun): Update to 0.22. --- 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 6c033f361a..e120c613b1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5282,13 +5282,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.21") + (version "0.22") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "18qjs81fn8q2d2drcan8gpgvrbgxgd0b659c92z19kg2h4c1g3k4")))) + (base32 "0ix3p0iw2c60whn5mvsflh0vhm4yixhw4s9d9v4023qhp077nw9y")))) (build-system r-build-system) ;; knitr itself depends on xfun #; -- cgit 1.4.1 From 87d3f805b9494c7ac4cabe4f2ded0c8141a14629 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:22 +0100 Subject: gnu: r-utf8: Update to 1.2.1. * gnu/packages/cran.scm (r-utf8): Update to 1.2.1. [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 e120c613b1..94218d0933 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5304,15 +5304,17 @@ packages maintained by Yihui Xie.") (define-public r-utf8 (package (name "r-utf8") - (version "1.1.4") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "utf8" version)) (sha256 (base32 - "0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn")))) + "1yw7vjn3gpkqddc91rbfh4kk0zmn2kp0jycrd3066sissh01jhdk")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/patperry/r-utf8") (synopsis "Unicode text processing") (description -- cgit 1.4.1 From 77e5a20c43e90328d8576087fe9e34859370f3f0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:25 +0100 Subject: gnu: r-maptools: Update to 1.1-1. * gnu/packages/cran.scm (r-maptools): 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 94218d0933..fb6c1cc7a4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6911,14 +6911,14 @@ simple method for converting between file types.") (define-public r-maptools (package (name "r-maptools") - (version "1.0-2") + (version "1.1-1") (source (origin (method url-fetch) (uri (cran-uri "maptools" version)) (sha256 (base32 - "0jgf3wg47jdnznxb3ncv4is9ackwviy4lzcyggqwzw3wh6jnvb6s")))) + "0pn4gwh2rl6pfh2vbc7ln86kzlg22cfpd02z95j7zpjidz2mva8l")))) (build-system r-build-system) (propagated-inputs `(("r-foreign" ,r-foreign) -- cgit 1.4.1 From 796a2241e302be0bff02fd10d2cf71ef33e642ca Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:29 +0100 Subject: gnu: r-flextable: Update to 0.6.4. * gnu/packages/cran.scm (r-flextable): Update to 0.6.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 fb6c1cc7a4..ce15619125 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8330,14 +8330,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.6.3") + (version "0.6.4") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "0as80m19lvajc0vzllq9d9p63zglsm2ph7vdfg3jgk90jp8j76dg")))) + "1ykjfnqhn8nd9f3l4jj8hf1bbjjckkna3p7fdsg0a73c05a17yma")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit 1.4.1 From dfa052bbc9b4168d1797ba1ae1ff951a1a3c8bf3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:32 +0100 Subject: gnu: r-blockfest: Update to 2.0. * gnu/packages/cran.scm (r-blockfest): Update to 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 ce15619125..759951bc41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8664,14 +8664,14 @@ procedures to speed up calculations in R.") (define-public r-blockfest (package (name "r-blockfest") - (version "1.8") + (version "2.0") (source (origin (method url-fetch) (uri (cran-uri "BlockFeST" version)) (sha256 (base32 - "12cbrmgqszlj729zrn9d1d7drbr0iay43knnmrzcxs6v7lfszsx5")))) + "1fcl3yc1cf09znqbj787d3fd2kl5rp63la7pxawsgmap7nxwkp65")))) (properties `((upstream-name . "BlockFeST"))) (build-system r-build-system) (propagated-inputs `(("r-basix" ,r-basix))) -- cgit 1.4.1 From b5aa552e6376cfc38809f9acce09e1ddf3cff032 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:35 +0100 Subject: gnu: r-magick: Update to 2.7.0. * gnu/packages/cran.scm (r-magick): 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 759951bc41..837469ae02 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9691,14 +9691,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "1k4fqhxh2ppynl56fs044wpn4wk6gbv6lwp2x4x7j67zwcv56n36")))) + "0m1kij6pp7dmsrhl80h60iyccjqmbbb3zdnqdc9sgy1kj1x3pscp")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit 1.4.1 From ecd03401c6c18f7487a4f4abb5adf07a23db14a0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:38 +0100 Subject: gnu: r-effectsize: Update to 0.4.4. * gnu/packages/cran.scm (r-effectsize): Update to 0.4.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 837469ae02..c67769023c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10453,14 +10453,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "1hcrnax9wf0nwsb8nv15rxw8yy8w5dak16dw3w5bxi8xnf56lkz2")))) + "0mgkq12ym72ncakkjpkzkjglhksyhj3iw8v4a8fjgpf7prvn191g")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From dae999bc48c8d0ac8853cb13550250645ce0f27b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:41 +0100 Subject: gnu: r-parallelly: Update to 1.24.0. * gnu/packages/cran.scm (r-parallelly): Update to 1.24.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 c67769023c..4196a895cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13701,14 +13701,14 @@ them in distributed compute environments.") (define-public r-parallelly (package (name "r-parallelly") - (version "1.23.0") + (version "1.24.0") (source (origin (method url-fetch) (uri (cran-uri "parallelly" version)) (sha256 (base32 - "025whcz55wj9jd73dalkbxh4l2331mqn758glr6hlf472lwf4v1p")))) + "1x04pxcyyzmg1rl9mcd7mmxglzmxgy40fmbwpy7vf5y7z15rzrp6")))) (properties `((upstream-name . "parallelly"))) (build-system r-build-system) (home-page "https://github.com/HenrikBengtsson/parallelly") -- cgit 1.4.1 From 58a2c438d3b420da1a4d84e165937283c5e143a7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:45 +0100 Subject: gnu: r-lavaan: Update to 0.6-8. * gnu/packages/cran.scm (r-lavaan): Update to 0.6-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 4196a895cf..bf02a8fd49 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14449,14 +14449,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-7") + (version "0.6-8") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "0ks62wrwghbm1brzmqvr92h5n1295dpc87m1g3xrfx0mkdaqdcdk")))) + "18l49f1v7nrngwra4v983ic8w1d4w23ws8xf36337dq0j6809qj0")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass) -- cgit 1.4.1 From 7bd5a643032e04fd662a1b2f24730c8121545681 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:48 +0100 Subject: gnu: r-forecast: Update to 8.14. * gnu/packages/cran.scm (r-forecast): Update to 8.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 bf02a8fd49..39db6a00e1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21892,14 +21892,14 @@ Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") (define-public r-forecast (package (name "r-forecast") - (version "8.13") + (version "8.14") (source (origin (method url-fetch) (uri (cran-uri "forecast" version)) (sha256 (base32 - "0vrql5d4v28890np2m6ws1nr1fcl6frs1bz74vfkihkixcmkl3j9")))) + "12bfw029xb1dndcjyn2r7a51i7hnkkbdilp69k97sz2v8b7v1y3s")))) (properties `((upstream-name . "forecast"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b0036b407c9a4db895f9e65e3b858e0f26f85b45 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:51 +0100 Subject: gnu: r-brms: Update to 2.15.0. * gnu/packages/cran.scm (r-brms): Update to 2.15.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 39db6a00e1..ee4528a7b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24118,14 +24118,14 @@ vignette for more information and examples.") (define-public r-brms (package (name "r-brms") - (version "2.14.4") + (version "2.15.0") (source (origin (method url-fetch) (uri (cran-uri "brms" version)) (sha256 (base32 - "0mzwihhgmn405l6zq11a180q4k3chggj9qj0j7q838b9vrszg59j")))) + "0byc3fyvf9qbvvgwf55ih5d4br1nnxlbaidq9fvr11bmv38h25y1")))) (properties `((upstream-name . "brms"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From e4d4046999304a3693da80cf0fdfe5fd5753b2b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:41:56 +0100 Subject: gnu: r-spatstat: Update to 2.0-1. * gnu/packages/cran.scm (r-spatstat): Update to 2.0-1. [propagated-inputs]: Remove r-abind, r-deldir, r-goftest, r-matrix, r-mgcv, r-nlme, r-polyclip, r-rpart, and r-tensor; add r-spatstat-core, r-spatstat-geom, and r-spatstat-linnet. --- gnu/packages/cran.scm | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ee4528a7b3..ffba66e80e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24953,28 +24953,22 @@ for spatial data on a linear network.") (define-public r-spatstat (package (name "r-spatstat") - (version "1.64-1") + (version "2.0-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "06jmxfs9kz9qqi3ichfgn8dglwb87kq2nl578p83za5psv8cfgya")))) + "1xq11ijc0d0lbixxb3wnvyr4gplfj2d2i64ynsa089xd525zzzbw")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs - `(("r-abind" ,r-abind) - ("r-deldir" ,r-deldir) - ("r-goftest" ,r-goftest) - ("r-matrix" ,r-matrix) - ("r-mgcv" ,r-mgcv) - ("r-nlme" ,r-nlme) - ("r-polyclip" ,r-polyclip) - ("r-rpart" ,r-rpart) + `(("r-spatstat-core" ,r-spatstat-core) ("r-spatstat-data" ,r-spatstat-data) - ("r-spatstat-utils" ,r-spatstat-utils) - ("r-tensor" ,r-tensor))) + ("r-spatstat-geom" ,r-spatstat-geom) + ("r-spatstat-linnet" ,r-spatstat-linnet) + ("r-spatstat-utils" ,r-spatstat-utils))) (home-page "http://www.spatstat.org") (synopsis "Spatial Point Pattern analysis, model-fitting, simulation, tests") (description -- cgit 1.4.1 From ee92bb90042cfbd99814f22913552a5ef9206240 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:00 +0100 Subject: gnu: r-workflows: Update to 0.2.2. * gnu/packages/cran.scm (r-workflows): Update to 0.2.2. [propagated-inputs]: Add r-vctrs. --- 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 ffba66e80e..6351d0ca7a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25603,14 +25603,14 @@ more.") (define-public r-workflows (package (name "r-workflows") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (cran-uri "workflows" version)) (sha256 (base32 - "1mk0pnmpqlhf143mvj9rwvjrrshirz6s83s5hbfalhnyw7hzkfb9")))) + "19ipcxx4qfz28cjkgr1vny03yhmbd3m2v64v30gk5pf73nazvmaz")))) (properties `((upstream-name . "workflows"))) (build-system r-build-system) (propagated-inputs @@ -25621,7 +25621,8 @@ more.") ("r-hardhat" ,r-hardhat) ("r-parsnip" ,r-parsnip) ("r-rlang" ,r-rlang) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidymodels/workflows") -- cgit 1.4.1 From 921ecdba7c78d0b49bf8a26e97e978906236fc8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:04 +0100 Subject: gnu: r-bbotk: Update to 0.3.1. * gnu/packages/cran.scm (r-bbotk): Update to 0.3.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 6351d0ca7a..b08c41e98a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26963,14 +26963,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "0kbjbwwq1fdfpl4xzy08hz4qvhjjchvz58icxq0dlbsmdyqwhwv0")))) + "1f29wxnxr73c4yp5afk05jqggpm7k1z8wiak8xsyw68h7xflq550")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ea23f17ece3ad97ff4d7b2d1c0b56d960d5de600 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:07 +0100 Subject: gnu: r-mlr3tuning: Update to 0.8.0. * gnu/packages/cran.scm (r-mlr3tuning): Update to 0.8.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 b08c41e98a..b000212858 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26993,13 +26993,13 @@ annealing.") (define-public r-mlr3tuning (package (name "r-mlr3tuning") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuning" version)) (sha256 (base32 - "0xpq16qij05nsfwg0qnfziqjvgk5wn0dgl0sb5gg3qsp1cs6vfqj")))) + "16rvsf0jf06yvalydbs7zzn2994hvvyfw975ydiyv3wy1qzgr8bv")))) (build-system r-build-system) (propagated-inputs `(("r-bbotk" ,r-bbotk) -- cgit 1.4.1 From bbc542b53c3fe592d092eefd3c7ad7acd465cfc1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:10 +0100 Subject: gnu: r-textshaping: Update to 0.3.2. * gnu/packages/cran.scm (r-textshaping): 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 b000212858..3afe67f7cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27292,14 +27292,14 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "16y3amb9cxwq126q1mxssx7kswzalqf9n2437mi5n7q1nqby6wlq")))) + "0fqh4z505b2qriqcj70g2hhdgiawd3w2rs9rqxdwizz5vk8jjygx")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From fe903cb89d62045a52bdd3195c5b20f866e54bed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:13 +0100 Subject: gnu: r-survival: Update to 3.2-9. * gnu/packages/statistics.scm (r-survival): Update to 3.2-9. --- 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 86a818da9e..5b9a6368f4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -710,14 +710,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.2-7") + (version "3.2-9") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "0ila864g5b9yhjhk3jirgdpi06sksc0axa78890dmkvyv9rwsmjk")))) + "1dkpdci2lvx141193wd69445y65w8k2pa89lc3l83i5jaj56svdn")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit 1.4.1 From 2fc2983e595439fbd346c5458fd515a0c29a9d61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:17 +0100 Subject: gnu: r-formatr: Update to 1.8. * gnu/packages/statistics.scm (r-formatr): Update to 1.8. [native-inputs]: Add r-knitr. --- 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 5b9a6368f4..37968095ce 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1329,14 +1329,16 @@ adapted for other output formats, such as HTML or LaTeX.") (define-public r-formatr (package (name "r-formatr") - (version "1.7") + (version "1.8") (source (origin (method url-fetch) (uri (cran-uri "formatR" version)) (sha256 (base32 - "1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3")))) + "04q6y53ji7ll131khbwiz584wl8sinhh3z82p6r8dqa9f618ay6z")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://yihui.org/formatr/") (synopsis "Format R code automatically") (description -- cgit 1.4.1 From 2e2cc58681dbca41cf35f01d11d06dad91d5c717 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:20 +0100 Subject: gnu: r-rcpparmadillo: Update to 0.10.2.2.0. * gnu/packages/statistics.scm (r-rcpparmadillo): Update to 0.10.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 37968095ce..1d4d7d06a8 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2635,13 +2635,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.10.2.1.0") + (version "0.10.2.2.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "03i9npq2mcv08ppp1ab2vzr412d4q9vldcc87nz2djbh9ai3xnv5")))) + "193smj6vp3cn3qjhrx2llgi5c7hs069crhvi85xj2vzx80fx6r9q")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 53dff6ac8ffaeeaa704957b83b2245d4494b030a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 13:42:24 +0100 Subject: gnu: r-rsqlite: Update to 2.2.4. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.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 1d4d7d06a8..a0f3f59342 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2842,13 +2842,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1sps1qn1x5r5l216rx0yfda7zk365b2xyzii3zv6f78nzdsgadbj")))) + "050s7gv42v43d15yqj2sdrh82iikfpm32idfnw4nbjjjnlcg7wxf")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 134404b437a2b17bbe072b263884f6ff5d8daf86 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:27 +0100 Subject: gnu: r-biocviews: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biocviews): Move from here... * gnu/packages/bioconductor.scm (r-biocviews): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/bioinformatics.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 4f8e0562b1..c02d1c7877 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8477,6 +8477,34 @@ monograph.") different graph related packages produced by Bioconductor.") (license license:artistic2.0))) +(define-public r-biocviews + (package + (name "r-biocviews") + (version "1.58.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "biocViews" version)) + (sha256 + (base32 + "1by2639z7n62z84dr8rj9jz12gsd1k8q42zsnxacxbwfwp6h0cl4")))) + (properties + `((upstream-name . "biocViews"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocmanager" ,r-biocmanager) + ("r-graph" ,r-graph) + ("r-rbgl" ,r-rbgl) + ("r-rcurl" ,r-rcurl) + ("r-xml" ,r-xml) + ("r-runit" ,r-runit))) + (home-page "https://bioconductor.org/packages/biocViews") + (synopsis "Bioconductor package categorization helper") + (description "The purpose of biocViews is to create HTML pages that +categorize packages in a Bioconductor package repository according to keywords, +also known as views, in a controlled vocabulary.") + (license license:artistic2.0))) + (define-public r-experimenthub (package (name "r-experimenthub") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b0736d32e4..8169ff4f26 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7718,34 +7718,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biocviews - (package - (name "r-biocviews") - (version "1.58.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "biocViews" version)) - (sha256 - (base32 - "1by2639z7n62z84dr8rj9jz12gsd1k8q42zsnxacxbwfwp6h0cl4")))) - (properties - `((upstream-name . "biocViews"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocmanager" ,r-biocmanager) - ("r-graph" ,r-graph) - ("r-rbgl" ,r-rbgl) - ("r-rcurl" ,r-rcurl) - ("r-xml" ,r-xml) - ("r-runit" ,r-runit))) - (home-page "https://bioconductor.org/packages/biocViews") - (synopsis "Bioconductor package categorization helper") - (description "The purpose of biocViews is to create HTML pages that -categorize packages in a Bioconductor package repository according to keywords, -also known as views, in a controlled vocabulary.") - (license license:artistic2.0))) - (define-public r-biocstyle (package (name "r-biocstyle") -- cgit 1.4.1 From 5ac55aea8b78439cc72b70718cb7922599182712 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:28 +0100 Subject: gnu: r-biocstyle: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biocstyle): Move from here... * gnu/packages/bioconductor.scm (r-biocstyle): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/bioinformatics.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 c02d1c7877..ca9bcc07eb 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8477,6 +8477,34 @@ monograph.") different graph related packages produced by Bioconductor.") (license license:artistic2.0))) +(define-public r-biocstyle + (package + (name "r-biocstyle") + (version "2.18.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocStyle" version)) + (sha256 + (base32 + "0rsxyna4dd99x42vc82mlkxx774vb9375llpakg53max1hhwkrqp")))) + (properties + `((upstream-name . "BiocStyle"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocmanager" ,r-biocmanager) + ("r-bookdown" ,r-bookdown) + ("r-knitr" ,r-knitr) + ("r-rmarkdown" ,r-rmarkdown) + ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocStyle") + (synopsis "Bioconductor formatting styles") + (description "This package provides standard formatting styles for +Bioconductor PDF and HTML documents. Package vignettes illustrate use and +functionality.") + (license license:artistic2.0))) + (define-public r-biocviews (package (name "r-biocviews") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8169ff4f26..c90dcada7b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7718,34 +7718,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biocstyle - (package - (name "r-biocstyle") - (version "2.18.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocStyle" version)) - (sha256 - (base32 - "0rsxyna4dd99x42vc82mlkxx774vb9375llpakg53max1hhwkrqp")))) - (properties - `((upstream-name . "BiocStyle"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocmanager" ,r-biocmanager) - ("r-bookdown" ,r-bookdown) - ("r-knitr" ,r-knitr) - ("r-rmarkdown" ,r-rmarkdown) - ("r-yaml" ,r-yaml))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocStyle") - (synopsis "Bioconductor formatting styles") - (description "This package provides standard formatting styles for -Bioconductor PDF and HTML documents. Package vignettes illustrate use and -functionality.") - (license license:artistic2.0))) - (define-public r-bioccheck (package (name "r-bioccheck") -- cgit 1.4.1 From d5576b6eb7808574dd519bf7591b4cf08ea6cb2c Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:26 +0100 Subject: gnu: r-grohmm: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-grohmm): Move from here... * gnu/packages/bioconductor.scm (r-grohmm): ...to here. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ca9bcc07eb..91d02639a3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8567,6 +8567,33 @@ and manages a local cache of files retrieved enabling quick and reproducible access.") (license license:artistic2.0))) +(define-public r-grohmm + (package + (name "r-grohmm") + (version "1.24.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "groHMM" version)) + (sha256 + (base32 + "08pap9wsaxl4jjlc1py0rc019gmi6daa0f9cr3ih1d97wybncanx")))) + (properties `((upstream-name . "groHMM"))) + (build-system r-build-system) + (propagated-inputs + `(("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-mass" ,r-mass) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://github.com/Kraus-Lab/groHMM") + (synopsis "GRO-seq analysis pipeline") + (description + "This package provides a pipeline for the analysis of GRO-seq data.") + (license license:gpl3+))) + (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c90dcada7b..ad3ae204e1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7387,33 +7387,6 @@ includes software to ") (license license:cc0)))) -(define-public r-grohmm - (package - (name "r-grohmm") - (version "1.24.0") - (source - (origin - (method url-fetch) - (uri (bioconductor-uri "groHMM" version)) - (sha256 - (base32 - "08pap9wsaxl4jjlc1py0rc019gmi6daa0f9cr3ih1d97wybncanx")))) - (properties `((upstream-name . "groHMM"))) - (build-system r-build-system) - (propagated-inputs - `(("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicalignments" ,r-genomicalignments) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-mass" ,r-mass) - ("r-rtracklayer" ,r-rtracklayer) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://github.com/Kraus-Lab/groHMM") - (synopsis "GRO-seq analysis pipeline") - (description - "This package provides a pipeline for the analysis of GRO-seq data.") - (license license:gpl3+))) - (define-public vsearch (package (name "vsearch") -- cgit 1.4.1 From 852fa82d4ccd902dfd7b8e673d4d1f71fd69e89a Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:29 +0100 Subject: gnu: r-bioccheck: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-bioccheck): Move from here... * gnu/packages/bioconductor.scm (r-bioccheck): ...to here. --- gnu/packages/bioconductor.scm | 49 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 49 ----------------------------------------- 2 files changed, 49 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 91d02639a3..7c97e52312 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8452,6 +8452,55 @@ microarray data.") monograph.") (license license:artistic2.0))) +(define-public r-bioccheck + (package + (name "r-bioccheck") + (version "1.26.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocCheck" version)) + (sha256 + (base32 + "1hyncn9zqj432da95k86rm5b28nbwrvzm52jbhisifkxj1j43cib")))) + (properties + `((upstream-name . "BiocCheck"))) + (build-system r-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; This package can be used by calling BiocCheck() from + ;; within R, or by running R CMD BiocCheck . This phase + ;; makes sure the latter works. For this to work, the BiocCheck + ;; script must be somewhere on the PATH (not the R bin directory). + (add-after 'install 'install-bioccheck-subcommand + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dest-dir (string-append out "/bin")) + (script-dir + (string-append out "/site-library/BiocCheck/script/"))) + (mkdir-p dest-dir) + (symlink (string-append script-dir "/checkBadDeps.R") + (string-append dest-dir "/checkBadDeps.R")) + (symlink (string-append script-dir "/BiocCheck") + (string-append dest-dir "/BiocCheck"))) + #t))))) + (propagated-inputs + `(("r-codetools" ,r-codetools) + ("r-graph" ,r-graph) + ("r-httr" ,r-httr) + ("r-knitr" ,r-knitr) + ("r-optparse" ,r-optparse) + ("r-biocmanager" ,r-biocmanager) + ("r-biocviews" ,r-biocviews) + ("r-stringdist" ,r-stringdist))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocCheck") + (synopsis "Executes Bioconductor-specific package checks") + (description "This package contains tools to perform additional quality +checks on R packages that are to be submitted to the Bioconductor repository.") + (license license:artistic2.0))) + (define-public r-biocgraph (package (name "r-biocgraph") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ad3ae204e1..d8d64818d2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,55 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-bioccheck - (package - (name "r-bioccheck") - (version "1.26.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocCheck" version)) - (sha256 - (base32 - "1hyncn9zqj432da95k86rm5b28nbwrvzm52jbhisifkxj1j43cib")))) - (properties - `((upstream-name . "BiocCheck"))) - (build-system r-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - ;; This package can be used by calling BiocCheck() from - ;; within R, or by running R CMD BiocCheck . This phase - ;; makes sure the latter works. For this to work, the BiocCheck - ;; script must be somewhere on the PATH (not the R bin directory). - (add-after 'install 'install-bioccheck-subcommand - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dest-dir (string-append out "/bin")) - (script-dir - (string-append out "/site-library/BiocCheck/script/"))) - (mkdir-p dest-dir) - (symlink (string-append script-dir "/checkBadDeps.R") - (string-append dest-dir "/checkBadDeps.R")) - (symlink (string-append script-dir "/BiocCheck") - (string-append dest-dir "/BiocCheck"))) - #t))))) - (propagated-inputs - `(("r-codetools" ,r-codetools) - ("r-graph" ,r-graph) - ("r-httr" ,r-httr) - ("r-knitr" ,r-knitr) - ("r-optparse" ,r-optparse) - ("r-biocmanager" ,r-biocmanager) - ("r-biocviews" ,r-biocviews) - ("r-stringdist" ,r-stringdist))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocCheck") - (synopsis "Executes Bioconductor-specific package checks") - (description "This package contains tools to perform additional quality -checks on R packages that are to be submitted to the Bioconductor repository.") - (license license:artistic2.0))) - (define-public r-s4vectors (package (name "r-s4vectors") -- cgit 1.4.1 From d64e3a487ba890b1aa6b24b7be917f55f80740a8 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:30 +0100 Subject: gnu: r-s4vectors: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-s4vectors): Move from here... * gnu/packages/bioconductor.scm (r-s4vectors): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7c97e52312..ed34a9308a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen +;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Simon Tournier ;;; Copyright © 2020 Peter Lo @@ -9154,6 +9155,33 @@ generated.") routines.") (license license:lgpl2.0+))) +(define-public r-s4vectors + (package + (name "r-s4vectors") + (version "0.28.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "S4Vectors" version)) + (sha256 + (base32 + "0fhf4lsfxrim7glazh6ng46ykzaly5ggwpg170vcz4cc24prv0rh")))) + (properties + `((upstream-name . "S4Vectors"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/S4Vectors") + (synopsis "S4 implementation of vectors and lists") + (description + "The S4Vectors package defines the @code{Vector} and @code{List} virtual +classes and a set of generic functions that extend the semantic of ordinary +vectors and lists in R. Package developers can easily implement vector-like +or list-like objects as concrete subclasses of @code{Vector} or @code{List}. +In addition, a few low-level concrete subclasses of general interest (e.g. +@code{DataFrame}, @code{Rle}, and @code{Hits}) are implemented in the +S4Vectors package itself.") + (license license:artistic2.0))) + ;; This is a CRAN package, but it depends on preprocessorcore, which is a ;; Bioconductor package. (define-public r-wgcna diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d8d64818d2..1fcb436f0d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,33 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-s4vectors - (package - (name "r-s4vectors") - (version "0.28.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "S4Vectors" version)) - (sha256 - (base32 - "0fhf4lsfxrim7glazh6ng46ykzaly5ggwpg170vcz4cc24prv0rh")))) - (properties - `((upstream-name . "S4Vectors"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/S4Vectors") - (synopsis "S4 implementation of vectors and lists") - (description - "The S4Vectors package defines the @code{Vector} and @code{List} virtual -classes and a set of generic functions that extend the semantic of ordinary -vectors and lists in R. Package developers can easily implement vector-like -or list-like objects as concrete subclasses of @code{Vector} or @code{List}. -In addition, a few low-level concrete subclasses of general interest (e.g. -@code{DataFrame}, @code{Rle}, and @code{Hits}) are implemented in the -S4Vectors package itself.") - (license license:artistic2.0))) - (define-public r-iranges (package (name "r-iranges") -- cgit 1.4.1 From 9949f459bff3980f59db8925a90891577e4f91d6 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:31 +0100 Subject: gnu: r-iranges: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-iranges): Move from here... * gnu/packages/bioconductor.scm (r-iranges): ...to here. --- gnu/packages/bioconductor.scm | 30 ++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 29 ----------------------------- 2 files changed, 30 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ed34a9308a..68c5ed7768 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen ;;; Copyright © 2016 Pjotr Prins +;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Simon Tournier ;;; Copyright © 2020 Peter Lo @@ -1244,6 +1245,35 @@ and evaluate clustering results.") arbitrary genomic intervals along chromosomal ideogram.") (license license:gpl2))) +(define-public r-iranges + (package + (name "r-iranges") + (version "2.24.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "IRanges" version)) + (sha256 + (base32 + "01mx46a82vd3gz705pj0kk4wpxg683s8jqxchzjia3gz00b4qw52")))) + (properties + `((upstream-name . "IRanges"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/IRanges") + (synopsis "Infrastructure for manipulating intervals on sequences") + (description + "This package provides efficient low-level and highly reusable S4 classes +for storing ranges of integers, RLE vectors (Run-Length Encoding), and, more +generally, data that can be organized sequentially (formally defined as +@code{Vector} objects), as well as views on these @code{Vector} objects. +Efficient list-like classes are also provided for storing big collections of +instances of the basic classes. All classes in the package use consistent +naming and share the same rich and consistent \"Vector API\" as much as +possible.") + (license license:artistic2.0))) + ;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19 ;; from Bioconductor. (define-public r-deconstructsigs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 1fcb436f0d..36ecf47467 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,35 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-iranges - (package - (name "r-iranges") - (version "2.24.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "IRanges" version)) - (sha256 - (base32 - "01mx46a82vd3gz705pj0kk4wpxg683s8jqxchzjia3gz00b4qw52")))) - (properties - `((upstream-name . "IRanges"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://bioconductor.org/packages/IRanges") - (synopsis "Infrastructure for manipulating intervals on sequences") - (description - "This package provides efficient low-level and highly reusable S4 classes -for storing ranges of integers, RLE vectors (Run-Length Encoding), and, more -generally, data that can be organized sequentially (formally defined as -@code{Vector} objects), as well as views on these @code{Vector} objects. -Efficient list-like classes are also provided for storing big collections of -instances of the basic classes. All classes in the package use consistent -naming and share the same rich and consistent \"Vector API\" as much as -possible.") - (license license:artistic2.0))) - (define-public r-genomeinfodbdata (package (name "r-genomeinfodbdata") -- cgit 1.4.1 From 8d6d75ff392af1d2633a2ffc07f29c5c1da0071c Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:32 +0100 Subject: gnu: r-genomeinfodbdata: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-genomeinfodbdata): Move from here... * gnu/packages/bioconductor.scm (r-genomeinfodbdata): ...to here. [source]: Use 'bioconductor-uri'. --- gnu/packages/bioconductor.scm | 20 ++++++++++++++++++++ gnu/packages/bioinformatics.scm | 23 ----------------------- 2 files changed, 20 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 68c5ed7768..53f025ec61 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Roel Janssen ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Ben Woodcroft +;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019, 2020, 2021 Simon Tournier ;;; Copyright © 2020 Peter Lo @@ -391,6 +392,25 @@ musculus (Mouse) as provided by UCSC (mm10, December 2011) and stored in Biostrings objects.") (license license:artistic2.0))) +(define-public r-genomeinfodbdata + (package + (name "r-genomeinfodbdata") + (version "1.2.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomeInfoDbData" version 'annotation)) + (sha256 + (base32 + "0di6nlqpsyqf693k2na65ayqldih563x3zfrczpqc5q2hl5kg35c")))) + (properties + `((upstream-name . "GenomeInfoDbData"))) + (build-system r-build-system) + (home-page "https://bioconductor.org/packages/GenomeInfoDbData") + (synopsis "Species and taxonomy ID look up tables for GenomeInfoDb") + (description "This package contains data for mapping between NCBI taxonomy +ID and species. It is used by functions in the GenomeInfoDb package.") + (license license:artistic2.0))) + (define-public r-homo-sapiens (package (name "r-homo-sapiens") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 36ecf47467..25ade2b9db 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,29 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-genomeinfodbdata - (package - (name "r-genomeinfodbdata") - (version "1.2.0") - (source (origin - (method url-fetch) - ;; We cannot use bioconductor-uri here because this tarball is - ;; located under "data/annotation/" instead of "bioc/". - (uri (string-append "https://bioconductor.org/packages/release/" - "data/annotation/src/contrib/GenomeInfoDbData_" - version ".tar.gz")) - (sha256 - (base32 - "0di6nlqpsyqf693k2na65ayqldih563x3zfrczpqc5q2hl5kg35c")))) - (properties - `((upstream-name . "GenomeInfoDbData"))) - (build-system r-build-system) - (home-page "https://bioconductor.org/packages/GenomeInfoDbData") - (synopsis "Species and taxonomy ID look up tables for GenomeInfoDb") - (description "This package contains data for mapping between NCBI taxonomy -ID and species. It is used by functions in the GenomeInfoDb package.") - (license license:artistic2.0))) - (define-public r-genomeinfodb (package (name "r-genomeinfodb") -- cgit 1.4.1 From 35b62c044e45a3add35b62839b07030f704bf708 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:33 +0100 Subject: gnu: r-genomeinfodb: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-genomeinfodb): Move from here... * gnu/packages/bioconductor.scm (r-genomeinfodb): ...to here. --- gnu/packages/bioconductor.scm | 30 ++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 30 ------------------------------ 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 53f025ec61..b4456d13c8 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1712,6 +1712,36 @@ exploration of the results.") high-throughput sequencing experiments.") (license license:artistic2.0))) +(define-public r-genomeinfodb + (package + (name "r-genomeinfodb") + (version "1.26.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomeInfoDb" version)) + (sha256 + (base32 + "092izc49maxjhf6m4b0qx21ad16dz7bmxy5pysp3vkyhdrfa2f7v")))) + (properties + `((upstream-name . "GenomeInfoDb"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-genomeinfodbdata" ,r-genomeinfodbdata) + ("r-iranges" ,r-iranges) + ("r-rcurl" ,r-rcurl) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GenomeInfoDb") + (synopsis "Utilities for manipulating chromosome identifiers") + (description + "This package contains data and functions that define and allow +translation between different chromosome sequence naming conventions (e.g., +\"chr1\" versus \"1\"), including a function that attempts to place sequence +names in their natural, rather than lexicographic, order.") + (license license:artistic2.0))) + (define-public r-gostats (package (name "r-gostats") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 25ade2b9db..ff6996011e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,36 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-genomeinfodb - (package - (name "r-genomeinfodb") - (version "1.26.2") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "GenomeInfoDb" version)) - (sha256 - (base32 - "092izc49maxjhf6m4b0qx21ad16dz7bmxy5pysp3vkyhdrfa2f7v")))) - (properties - `((upstream-name . "GenomeInfoDb"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-genomeinfodbdata" ,r-genomeinfodbdata) - ("r-iranges" ,r-iranges) - ("r-rcurl" ,r-rcurl) - ("r-s4vectors" ,r-s4vectors))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GenomeInfoDb") - (synopsis "Utilities for manipulating chromosome identifiers") - (description - "This package contains data and functions that define and allow -translation between different chromosome sequence naming conventions (e.g., -\"chr1\" versus \"1\"), including a function that attempts to place sequence -names in their natural, rather than lexicographic, order.") - (license license:artistic2.0))) - (define-public r-edger (package (name "r-edger") -- cgit 1.4.1 From 082f3c54337aaba40b978dfa9963f8ed6f20123d Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:34 +0100 Subject: gnu: r-edger: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-edger): Move from here... * gnu/packages/bioconductor.scm (r-edger): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/bioinformatics.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 b4456d13c8..fb0127b7ca 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1684,6 +1684,34 @@ testing. The package also provides functions for the visualization and exploration of the results.") (license license:gpl3+))) +(define-public r-edger + (package + (name "r-edger") + (version "3.32.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "edgeR" version)) + (sha256 + (base32 + "1gaic8qf6a6sy0bmydh1xzf52w0wnq31aanpvw3a30pfsi218bcp")))) + (properties `((upstream-name . "edgeR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-limma" ,r-limma) + ("r-locfit" ,r-locfit) + ("r-rcpp" ,r-rcpp) + ("r-statmod" ,r-statmod))) ;for estimateDisp + (home-page "http://bioinf.wehi.edu.au/edgeR") + (synopsis "EdgeR does empirical analysis of digital gene expression data") + (description "This package can do differential expression analysis of +RNA-seq expression profiles with biological replication. It implements a range +of statistical methodology based on the negative binomial distributions, +including empirical Bayes estimation, exact tests, generalized linear models +and quasi-likelihood tests. It be applied to differential signal analysis of +other types of genomic data that produce counts, including ChIP-seq, SAGE and +CAGE.") + (license license:gpl2+))) + (define-public r-genefilter (package (name "r-genefilter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ff6996011e..dc0d7a2906 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,34 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-edger - (package - (name "r-edger") - (version "3.32.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "edgeR" version)) - (sha256 - (base32 - "1gaic8qf6a6sy0bmydh1xzf52w0wnq31aanpvw3a30pfsi218bcp")))) - (properties `((upstream-name . "edgeR"))) - (build-system r-build-system) - (propagated-inputs - `(("r-limma" ,r-limma) - ("r-locfit" ,r-locfit) - ("r-rcpp" ,r-rcpp) - ("r-statmod" ,r-statmod))) ;for estimateDisp - (home-page "http://bioinf.wehi.edu.au/edgeR") - (synopsis "EdgeR does empirical analysis of digital gene expression data") - (description "This package can do differential expression analysis of -RNA-seq expression profiles with biological replication. It implements a range -of statistical methodology based on the negative binomial distributions, -including empirical Bayes estimation, exact tests, generalized linear models -and quasi-likelihood tests. It be applied to differential signal analysis of -other types of genomic data that produce counts, including ChIP-seq, SAGE and -CAGE.") - (license license:gpl2+))) - (define-public r-variantannotation (package (name "r-variantannotation") -- cgit 1.4.1 From bf612ead766ee5afcdccd7c8ab003b791ecea9df Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 14:01:58 +0100 Subject: gnu: r-variantannotation: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-variantannotation): Move from here... * gnu/packages/bioconductor.scm (r-variantannotation): ...to here. --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 38 -------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fb0127b7ca..c4df090a05 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2051,6 +2051,44 @@ experimental designs is facilitated by a consistently implemented sample annotation infrastructure.") (license license:artistic2.0))) +(define-public r-variantannotation + (package + (name "r-variantannotation") + (version "1.36.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "VariantAnnotation" version)) + (sha256 + (base32 + "1sl0l6v05lfglj281nszma0h5k234md7rn2pdah8vs2d4iq3kimw")))) + (properties + `((upstream-name . "VariantAnnotation"))) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biostrings" ,r-biostrings) + ("r-bsgenome" ,r-bsgenome) + ("r-dbi" ,r-dbi) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicfeatures" ,r-genomicfeatures) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-matrixgenerics" ,r-matrixgenerics) + ("r-summarizedexperiment" ,r-summarizedexperiment) + ("r-rhtslib" ,r-rhtslib) + ("r-rsamtools" ,r-rsamtools) + ("r-rtracklayer" ,r-rtracklayer) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector) + ("r-zlibbioc" ,r-zlibbioc))) + (build-system r-build-system) + (home-page "https://bioconductor.org/packages/VariantAnnotation") + (synopsis "Package for annotation of genetic variants") + (description "This R package can annotate variants, compute amino acid +coding changes and predict coding outcomes.") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index dc0d7a2906..78df3091fe 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,44 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-variantannotation - (package - (name "r-variantannotation") - (version "1.36.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "VariantAnnotation" version)) - (sha256 - (base32 - "1sl0l6v05lfglj281nszma0h5k234md7rn2pdah8vs2d4iq3kimw")))) - (properties - `((upstream-name . "VariantAnnotation"))) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-biostrings" ,r-biostrings) - ("r-bsgenome" ,r-bsgenome) - ("r-dbi" ,r-dbi) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicfeatures" ,r-genomicfeatures) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-matrixgenerics" ,r-matrixgenerics) - ("r-summarizedexperiment" ,r-summarizedexperiment) - ("r-rhtslib" ,r-rhtslib) - ("r-rsamtools" ,r-rsamtools) - ("r-rtracklayer" ,r-rtracklayer) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector) - ("r-zlibbioc" ,r-zlibbioc))) - (build-system r-build-system) - (home-page "https://bioconductor.org/packages/VariantAnnotation") - (synopsis "Package for annotation of genetic variants") - (description "This R package can annotate variants, compute amino acid -coding changes and predict coding outcomes.") - (license license:artistic2.0))) - (define-public r-limma (package (name "r-limma") -- cgit 1.4.1 From 69c757c45ae4f6ee7c8e67981d2de112278bc7bd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 13:05:17 +0200 Subject: gnu: rust-quote-1: Update to 1.0.9. * gnu/packages/crates-io.scm (rust-quote-1): Update to 1.0.9. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f6d565e24d..b4fd754c0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30736,7 +30736,7 @@ integers, floats, tuples, booleans, lists, strings, options and results.") (define-public rust-quote-1 (package (name "rust-quote") - (version "1.0.7") + (version "1.0.9") (source (origin (method url-fetch) @@ -30744,7 +30744,7 @@ integers, floats, tuples, booleans, lists, strings, options and results.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0drzd6pq7whq7qhdvvs8wn6pbb0hhc12pz8wv80fb05ixhbksmma")))) + "19rjmfqzk26rxbgxy5j2ckqc2v12sw2xw8l4gi8bzpn2bmsbkl63")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 4363b542f276b4d6a5a8cc4c85d527fd53fb5261 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 13:09:12 +0200 Subject: gnu: rust-wayland-sys-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-sys-0.28)[arguments]: Don't skip build. Add phase to refer explicitly to wayland libraries. [inputs]: Add rust-dlib-0.4, rust-lazy-static-1, rust-libc-0.2, rust-pkg-config-0.3. [propagated-inputs]: Add wayland. (rust-wayland-sys-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c26cf56394..d67e9dc02f 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Valentin Ignatev ;;; Copyright © 2020 Hartmut Goebel -;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020, 2021 Efraim Flashner ;;; Copyright © 2020 John Soo ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020 Raghav Gururajan @@ -2748,12 +2748,27 @@ the wayland protocol, server side.") (base32 "16f03jsy7q6p2wpaazc4w4kycyyk0fz7lacpdbcizl9m1i7874v7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-dlib" ,rust-dlib-0.4) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-libraries + (lambda* (#:key inputs #:allow-other-keys) + (let ((libwayland (assoc-ref inputs "wayland"))) + (substitute* (find-files "src" "\\.rs$") + (("libwayland.*\\.so" shared-lib) + (string-append libwayland "/lib/" shared-lib))) + #t)))))) + (inputs + `(("rust-dlib" ,rust-dlib-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3))) + (propagated-inputs + `(("wayland" ,wayland))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "FFI bindings to the various @file{libwayland-*.so} libraries") (description @@ -2778,10 +2793,13 @@ crate @code{rust-wayland-client} for usable bindings.") (base32 "1x2qafvj8hd2x5qfaan2dfpw9amg0f5g9sqrkdy7qvbddsl8jknr")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-dlib" ,rust-dlib-0.4) ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2)))))) + ("rust-libc" ,rust-libc-0.2)))) + (inputs `()) + (propagated-inputs `()))) (define-public rust-wayland-sys-0.21 (package -- cgit 1.4.1 From d49991143211943c9571fb86a638ace7b370312c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:21:49 +0200 Subject: gnu: rust-pkg-config-0.3: Update to 0.3.19. * gnu/packages/crates-io.scm (rust-pkg-config-0.3): Update to 0.3.19. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index b4fd754c0b..425ab95901 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28714,7 +28714,7 @@ written with declarative macros.") (define-public rust-pkg-config-0.3 (package (name "rust-pkg-config") - (version "0.3.17") + (version "0.3.19") (source (origin (method url-fetch) @@ -28722,7 +28722,7 @@ written with declarative macros.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "0xynnaxdv0gzadlw4h79j855k0q7rj4zb9xb1vk00nc6ss559nh5")))) + "0k4860955riciibxr8bhnklp79jydp4xfylwdn5v9kj96hxlac9q")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs -- cgit 1.4.1 From 12c699572c41cb267172e864523dff09af599cd5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:22:52 +0200 Subject: gnu: rust-pkg-config-0.3: Hardcode location of pkg-config. * gnu/packages/crates-io.scm (rust-pkg-config-0.3)[arguments]: Add phase to hardcode location of pkg-config binary. --- gnu/packages/crates-io.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 425ab95901..664bb10773 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28726,7 +28726,16 @@ written with declarative macros.") (build-system cargo-build-system) (arguments `(#:cargo-development-inputs - (("rust-lazy-static" ,rust-lazy-static-1)))) + (("rust-lazy-static" ,rust-lazy-static-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'hardcode-pkg-config-loation + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/lib.rs" + (("\"pkg-config\"") + (string-append "\"" (assoc-ref inputs "pkg-config") + "/bin/pkg-config\""))) + #t))))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://github.com/rust-lang/pkg-config-rs") -- cgit 1.4.1 From c805bdd550908e2f5c796ac1eccd916de90937bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:24:08 +0200 Subject: gnu: rust-winapi-0.3: Adjust for new build system. * gnu/packages/crates-io.scm (rust-winapi-0.3)[inputs]: Add rust-winapi-i686-pc-windows-gnu, rust-winapi-x86-64-pc-windows-gnu. --- gnu/packages/crates-io.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 664bb10773..ad15cebe0b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48658,6 +48658,9 @@ command-line, uniformly on all platforms") `(#:cargo-inputs (("winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) ("winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4)))) + (inputs + `(("rust-winapi-i686-pc-windows-gnu" ,rust-winapi-i686-pc-windows-gnu-0.4) + ("rust-winapi-x86-64-pc-windows-gnu" ,rust-winapi-x86-64-pc-windows-gnu-0.4))) (home-page "https://github.com/retep998/winapi-rs") (synopsis "Raw FFI bindings for all of Windows API") (description -- cgit 1.4.1 From 358f5d9b1b9f098a28e4b379944c8a31d9fcd2da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:25:03 +0200 Subject: gnu: rust-proc-macro2-1: Adapt for new build system. * gnu/packages/crates-io.scm (rust-proc-macro2-1)[inputs]: Add rust-unicode-xid-0.2. --- gnu/packages/crates-io.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ad15cebe0b..80f9e3f828 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29803,6 +29803,8 @@ in your code.") (("rust-unicode-xid" ,rust-unicode-xid-0.2)) #:cargo-development-inputs (("rust-quote" ,rust-quote-1)))) + (inputs + `(("rust-unicode-xid" ,rust-unicode-xid-0.2))) (home-page "https://github.com/alexcrichton/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") (description "This package provides a stable implementation of the upcoming new -- cgit 1.4.1 From bafeee4f6d6b6a1be8fc40583302e87fb878b937 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:27:08 +0200 Subject: gnu: dlib-0.4: Update to 0.4.2. * gnu/packages/crates-io.scm (rust-dlib-0.4): Update to 0.4.2. [arguments]: Replace rust-libloading-0.5 with 0.6. [inputs]: Add rust-libloading-0.6. --- gnu/packages/crates-io.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 80f9e3f828..de987995d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11910,7 +11910,7 @@ Google's diff-match-patch.") (define-public rust-dlib-0.4 (package (name "rust-dlib") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) @@ -11919,11 +11919,13 @@ Google's diff-match-patch.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0smp2cdvy12xfw26qyqms273w5anszfadv73g75s88yqm54i5rbp")))) + "0xlsf3lrz9hd7q3ff6lp5mw4kn3nbryn746kd07i93r6wg8ia7xi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-libloading" ,rust-libloading-0.5)))) + (("rust-libloading" ,rust-libloading-0.6)))) + (inputs + `(("rust-libloading" ,rust-libloading-0.6))) (home-page "https://github.com/vberger/dlib") (synopsis "Helper macros for manually loading optional system libraries") (description -- cgit 1.4.1 From b10c637e48f40f7a68e5dd13fa516c7e4e73ca32 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:28:27 +0200 Subject: gnu: rust-libloading-0.6: Update to 0.6.7. * gnu/packages/crates-io.scm (rust-libloading-0.6): Update to 0.6. [arguments]: Replace rust-cfg-if-0.1 with 1. [inputs]: Add rust-cfg-if-1, rust-winapi-0.3. --- gnu/packages/crates-io.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index de987995d9..fc5dd72de2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -21236,23 +21236,26 @@ library.") (define-public rust-libloading-0.6 (package (name "rust-libloading") - (version "0.6.3") + (version "0.6.7") (source (origin (method url-fetch) (uri (crate-uri "libloading" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ygliqa518jjxwa5ih4b2f8m984ib596vxmjb28pa5lb8zqdhhr4")))) + (base32 "10wq4a4jkman8k6y0v2cw3d38y1h3rw6d2in5klggm8jg90k46im")))) (build-system cargo-build-system) (arguments `(#:skip-build? #true #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + (("rust-cfg-if" ,rust-cfg-if-1) ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-static-assertions" ,rust-static-assertions-1)))) + (inputs + `(("rust-cfg-if" ,rust-cfg-if-1) + ("rust-winapi" ,rust-winapi-0.3))) (home-page "https://github.com/nagisa/rust_libloading/") (synopsis "Safer binding to dynamic library loading utilities") (description "This package provides a safer binding to dynamic library @@ -24872,7 +24875,12 @@ while still providing platform specific APIs.") ("rust-rand" ,rust-rand-0.6) ("rust-semver" ,rust-semver-0.9) ("rust-sysctl" ,rust-sysctl-0.1) - ("rust-tempfile" ,rust-tempfile-3)))))) + ("rust-tempfile" ,rust-tempfile-3)))) + (inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2))))) (define-public rust-nix-0.17 (package -- cgit 1.4.1 From f35ab79e033aa8e4955e9c9100c74ecbb3ce4d0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:31:12 +0200 Subject: gnu: rust-wayland-commons-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-commons-0.28) [arguments]: Don't skip build. Remove rust-wayland-sys-0.28 from cargo-inputs. [inputs]: Add rust-nix-0.18, rust-once-cell-1, rust-smallvec-1, rust-wayland-sys-0.28. (rust-wayland-commons-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index d67e9dc02f..7dde00ffdb 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2413,12 +2413,15 @@ the wayland protocol, client side.") (base32 "0mid1sgy3bmiywnrhsr31b8w6zvk1ll2ci2as15ddv8pczvm0128")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-nix" ,rust-nix-0.18) ("rust-once-cell" ,rust-once-cell-1) - ("rust-smallvec" ,rust-smallvec-1) - ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + ("rust-smallvec" ,rust-smallvec-1)))) + (inputs + `(("rust-nix" ,rust-nix-0.18) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-wayland-sys" ,rust-wayland-sys-0.28))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Types and structures used by wayland-client and wayland-server") (description @@ -2441,9 +2444,11 @@ and wayland-server.") (base32 "1nyvcs6xxxzqgh0wvc7z0fgi89bf3h9p4qrbf77bnfbwlb8v0rmv")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-nix" ,rust-nix-0.14) - ("rust-wayland-sys" ,rust-wayland-sys-0.23)))))) + ("rust-wayland-sys" ,rust-wayland-sys-0.23)))) + (inputs `()))) (define-public rust-wayland-commons-0.21 (package -- cgit 1.4.1 From 770e326fdb006b2f689f55d5eb300d28ffd6a95b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:34:08 +0200 Subject: gnu: rust-wayland-client-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-client-0.28) [arguments]: Don't skip build. Remove rust-wayland-commons-0.28, rust-wayland-scanner-0.28, rust-wayland-sys-0.28 from cargo-inputs. [inputs]: Add rust-bitflags-1, rust-downcast-rs-1, rust-libc-0.2, rust-nix-0.18, rust-scoped-tls-1, rust-wayland-commons-0.28, rust-wayland-scanner-0.28, rust-wayland-sys-0.28. (rust-wayland-client-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 7dde00ffdb..65339c44de 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2324,16 +2324,23 @@ applications.") (base32 "1mxnflzv9s3qpcp0z7kqvrzki5bknfar9n9yky06f8ivs00vxgdx")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-libc" ,rust-libc-0.2) ("rust-nix" ,rust-nix-0.18) - ("rust-scoped-tls" ,rust-scoped-tls-1) - ("rust-wayland-commons" ,rust-wayland-commons-0.28) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) - ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + ("rust-scoped-tls" ,rust-scoped-tls-1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3)))) + (inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.18) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Rust bindings to the standard C implementation of the wayland protocol") @@ -2357,7 +2364,8 @@ the wayland protocol, client side.") (base32 "1nmw2kz70llc5mxwzg6bglnqy0qnyr9224zjmq9czazgw3mq045g")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) ("rust-downcast-rs" ,rust-downcast-rs-1) @@ -2369,7 +2377,8 @@ the wayland protocol, client side.") ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)) #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1) - ("rust-tempfile" ,rust-tempfile-3)))))) + ("rust-tempfile" ,rust-tempfile-3)))) + (inputs `()))) (define-public rust-wayland-client-0.21 (package -- cgit 1.4.1 From 3b6ec859c2101fea2aa58cfc95d83f63e83aa3f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:35:39 +0200 Subject: gnu: rust-wayland-cursor-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-cursor-0.28) [arguments]: Don't skip build. Remove rust-wayland-client-0.28 from cargo-inputs. [inputs]: Add rust-nix-0.18, rust-wayland-client-0.28, rust-xcursor-0.3. --- gnu/packages/crates-graphics.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 65339c44de..f2699ed8c3 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2491,11 +2491,13 @@ and wayland-server.") (base32 "0pvf96a9hg7b40vyvamcg491sa0006fr9bzf1xkaf8q22qn15syn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-nix" ,rust-nix-0.18) - ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-xcursor" ,rust-xcursor-0.3)))) + (inputs + `(("rust-nix" ,rust-nix-0.18) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-xcursor" ,rust-xcursor-0.3))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Bindings to libwayland-cursor") (description -- cgit 1.4.1 From bb06a747b2884c00a8c125cb499c7c13dcddf46e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:36:55 +0200 Subject: gnu: rust-wayland-egl-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-egl-0.28) [arguments]: Don't skip build. Remove cargo-inputs. [inputs]: Add rust-wayland-client-0.28, rust-wayland-sys-0.28. [native-inputs]: Add pkg-config. --- gnu/packages/crates-graphics.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index f2699ed8c3..76a4cc96e3 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2518,11 +2518,12 @@ properly display animated cursors.") (sha256 (base32 "1xd7iap0x4sidmy9dv02cdnxjhnbk9li7r7f39x9cg0i8xs50ly6")))) (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-wayland-client" ,rust-wayland-client-0.28) - ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + (inputs + `(("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28))) + ;; For the PKG_CONFIG_PATH environment variable. + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Bindings to libwayland-egl") (description -- cgit 1.4.1 From facf27e08b1be5a8ab390b4998dd3589fc71e540 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:38:36 +0200 Subject: gnu: rust-wayland-protocols-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-protocols-0.28) [arguments]: Don't skip build. Remove everything from cargo-inputs except rust-bitflags-1. [inputs]: Add rust-bitflags-1, rust-wayland-client-0.28, rust-wayland-commons-0.28, rust-wayland-scanner-0.28, rust-wayland-server-0.28. (rust-wayland-protocols-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 76a4cc96e3..dfc85de4de 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2546,13 +2546,14 @@ initializing an OpenGL or Vulkan context.") (base32 "0c0sw13qssrvf3jgygwqpiimpaagz3haxn9jridd4k85sfs856ii")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-wayland-client" ,rust-wayland-client-0.28) - ("rust-wayland-commons" ,rust-wayland-commons-0.28) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) - ("rust-wayland-server" ,rust-wayland-server-0.28)))) + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1)))) + (inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-server" ,rust-wayland-server-0.28))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generated API for the officials Wayland protocol extensions") (description @@ -2575,12 +2576,14 @@ extensions.") (base32 "1ygwbzqlnks5xzafka3c8ag6k92g2h6ygj2xsmvjfx2n6rj8dhkc")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-wayland-client" ,rust-wayland-client-0.23) ("rust-wayland-commons" ,rust-wayland-commons-0.23) ("rust-wayland-server" ,rust-wayland-server-0.23) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))))) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (inputs `()))) (define-public rust-wayland-protocols-0.21 (package -- cgit 1.4.1 From fb6f926193b3f63a2cd4ab539cbffae68b96da67 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:40:29 +0200 Subject: gnu: rust-wayland-scanner-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-scanner-0.28): [arguments]: Don't skip build. Remove cargo-inputs. [inputs]: Add rust-proc-macro2-1, rust-quote-1, rust-xml-rs-0.8. (rust-wayland-scanner-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index dfc85de4de..71719fe3ed 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2620,12 +2620,10 @@ extensions.") (sha256 (base32 "0g8ky63qk27in7zajycj3fyydsxlj19hanfcvr8d7z5kcxbvl43h")))) (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-xml-rs" ,rust-xml-rs-0.8)))) + (inputs + `(("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-xml-rs" ,rust-xml-rs-0.8))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Generate Rust APIs from XML Wayland protocol files") (description @@ -2650,7 +2648,8 @@ wayland-client crate for usable bindings.") (base32 "0g8wcphykjrcpslznyi3qccx1pckw97rckq5b295nfbg6r3j5c4k")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6) ("rust-xml-rs" ,rust-xml-rs-0.8)))))) -- cgit 1.4.1 From 6f655caf42f52568180bbeee382c955abf0838cf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:42:46 +0200 Subject: gnu: rust-wayland-server-0.28: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-wayland-server-0.28) [arguments]: Don't skip build. Remove rust-wayland-commons-0.28, rust-wayland-scanner-0.28, rust-wayland-sys-0.28 from cargo-inputs. [inputs]: Add rust-bitflags-1, rust-downcast-rs-1, rust-lazy-static-1, rust-libc-0.2, rust-nix-0.18, rust-parking-lot-0.18, rust-scoped-tls-1, rust-wayland-commons-0.28, rust-wayland-scanner-0.28, rust-wayland-sys-0.28. (rust-wayland-server-0.23): Adjust accordingly. --- gnu/packages/crates-graphics.scm | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 71719fe3ed..e0bca86647 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2682,18 +2682,25 @@ wayland-client crate for usable bindings.") (base32 "09jfdjfqhjfcpiz4csgh60ymfkmz1cl3jmxyzq9hzcp0kyyxix93")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-nix" ,rust-nix-0.18) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-scoped-tls" ,rust-scoped-tls-1) - ("rust-wayland-commons" ,rust-wayland-commons-0.28) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) - ("rust-wayland-sys" ,rust-wayland-sys-0.28)))) + ("rust-scoped-tls" ,rust-scoped-tls-1)))) + (inputs + `(("rust-bitflags" ,rust-bitflags-1) + ("rust-downcast-rs" ,rust-downcast-rs-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nix" ,rust-nix-0.18) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-wayland-commons" ,rust-wayland-commons-0.28) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.28) + ("rust-wayland-sys" ,rust-wayland-sys-0.28))) (home-page "https://github.com/smithay/wayland-rs") (synopsis "Bindings to the standard C implementation of the wayland protocol") @@ -2717,7 +2724,8 @@ the wayland protocol, server side.") (base32 "1ccsalq6gnf07klnbjx2dxcbibhw03rqsgi578p913s3zsjlcg8a")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-calloop" ,rust-calloop-0.4) ("rust-downcast-rs" ,rust-downcast-rs-1) @@ -2726,7 +2734,8 @@ the wayland protocol, server side.") ("rust-nix" ,rust-nix-0.14) ("rust-wayland-commons" ,rust-wayland-commons-0.23) ("rust-wayland-sys" ,rust-wayland-sys-0.23) - ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))))) + ("rust-wayland-scanner" ,rust-wayland-scanner-0.23)))) + (inputs `()))) (define-public rust-wayland-server-0.21 (package -- cgit 1.4.1 From 87d747860d9d388438cc992f4cf83e5d7bc893b2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:43:57 +0200 Subject: gnu: rust-winit-0.24: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-winit-0.24)[arguments]: Move rust-wayland-client-0.28 from cargo-inputs ... [inputs]: ... to here. --- gnu/packages/crates-graphics.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index e0bca86647..c5246d0c26 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -2882,10 +2882,11 @@ crate @code{rust-wayland-client} for usable bindings.") ("rust-smithay-client-toolkit" ,rust-smithay-client-toolkit-0.12) ("rust-stdweb" ,rust-stdweb-0.4) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-web-sys" ,rust-web-sys-0.3) ("rust-winapi" ,rust-winapi-0.3) ("rust-x11-dl" ,rust-x11-dl-2)))) + (inputs + `(("rust-wayland-client" ,rust-wayland-client-0.28))) (home-page "https://github.com/rust-windowing/winit") (synopsis "Window creation library") (description -- cgit 1.4.1 From 190e94b27830ddef27d36e63d0879245f619a9b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:45:37 +0200 Subject: gnu: rust-glutin-0.26: Adapt for new build system. * gnu/packages/crates-graphics.scm (rust-glutin-0.26) [arguments]: Don't skip build. Remove rust-wayland-client-0.28 from cargo-inputs. [inputs]: Add rust-wayland-client-0.28, rust-wayland-egl-0.28. --- gnu/packages/crates-graphics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index c5246d0c26..3485e53938 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -907,8 +907,7 @@ EUI-64, also known as MAC-48 media access control addresses.") (base32 "18szbh4dixcr7pmymvbrpv21hv0wrpii5w03rv2534bb2ywwpq8s")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-android-glue" ,rust-android-glue-0.2) ("rust-cgl" ,rust-cgl-0.3) ("rust-cocoa" ,rust-cocoa-0.23) @@ -924,10 +923,12 @@ EUI-64, also known as MAC-48 media access control addresses.") ("rust-objc" ,rust-objc-0.2) ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-wayland-egl" ,rust-wayland-egl-0.28) ("rust-winapi" ,rust-winapi-0.3) ("rust-winit" ,rust-winit-0.24)))) + (inputs + `(("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-wayland-egl" ,rust-wayland-egl-0.28))) (home-page "https://github.com/tomaka/glutin") (synopsis "Cross-platform OpenGL context provider") (description "This package provides an OpenGL context provider.") -- cgit 1.4.1 From f69a3fe28cd97c0aa56367d4d6fb140597c0756b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:47:23 +0200 Subject: gnu: alacritty: Use packaged rust-wayland-client. * gnu/packages/terminals.scm (alacritty)[arguments]: Remove rust-wayland-client-0.28 from cargo-inputs. In custom 'add-absolute-library-references remove substitutions for rust-wayland-client. [inputs]: Add rust-wayland-client-0.28. --- gnu/packages/terminals.scm | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 1a465305de..d1a343e193 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1250,7 +1250,6 @@ made by suckless.") ("rust-time" ,rust-time-0.1) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-urlocator" ,rust-urlocator-0.1) - ("rust-wayland-client" ,rust-wayland-client-0.28) ("rust-winapi" ,rust-winapi-0.3) ("rust-x11-dl" ,rust-x11-dl-2) ("rust-xdg" ,rust-xdg-2)) @@ -1269,13 +1268,7 @@ made by suckless.") (smithay-client-toolkit-src (string-append smithay-client-toolkit-name "-" smithay-client-toolkit-version ".tar.gz/src")) - (wayland-sys-name ,(package-name rust-wayland-sys-0.28)) - (wayland-sys-version ,(package-version rust-wayland-sys-0.28)) - (wayland-sys-src (string-append wayland-sys-name "-" - wayland-sys-version - ".tar.gz/src")) (libxkbcommon (assoc-ref inputs "libxkbcommon")) - (libwayland (assoc-ref inputs "wayland")) (mesa (assoc-ref inputs "mesa"))) ;; Fix dlopen()ing some libraries on pure Wayland (no $DISPLAY): ;; Failed to initialize any backend! Wayland status: NoWaylandLib @@ -1288,22 +1281,6 @@ made by suckless.") "/seat/keyboard/ffi.rs") (("libxkbcommon\\.so") (string-append libxkbcommon "/lib/libxkbcommon.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/server.rs") - (("libwayland-server\\.so") - (string-append libwayland "/lib/libwayland-server.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/cursor.rs") - (("libwayland-cursor\\.so") - (string-append libwayland "/lib/libwayland-cursor.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/egl.rs") - (("libwayland-egl\\.so") - (string-append libwayland "/lib/libwayland-egl.so"))) - (substitute* (string-append vendor-dir "/" wayland-sys-src - "/client.rs") - (("libwayland-client\\.so") - (string-append libwayland "/lib/libwayland-client.so"))) ;; Mesa is needed everywhere. (substitute* @@ -1367,8 +1344,9 @@ made by suckless.") ("libxkbcommon" ,libxkbcommon) ("libxrandr" ,libxrandr) ("libxxf86vm" ,libxxf86vm) - ("wayland" ,wayland) - ("mesa" ,mesa))) + ("mesa" ,mesa) + ("rust-wayland-client" ,rust-wayland-client-0.28) + ("wayland" ,wayland))) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is ;; provided for usability reasons. See . -- cgit 1.4.1 From 647dfa788e9dc0895481aa98e351a8b2bdf0f688 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 14:52:06 +0200 Subject: gnu: rust-lazy-static-1: Adapt for new build system. * gnu/packages/crates-io.scm (rust-lazy-static-1)[inputs]: Add rust-spin-0.5. --- gnu/packages/crates-io.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fc5dd72de2..7a6cbec992 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20851,6 +20851,8 @@ generated by LALRPOP.") `(#:cargo-inputs (("rust-spin" ,rust-spin-0.5)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) + (inputs + `(("rust-spin" ,rust-spin-0.5))) (home-page "https://github.com/rust-lang-nursery/lazy-static.rs") (synopsis "Macro for declaring lazily evaluated statics in Rust") (description -- cgit 1.4.1 From a4bbebb2b35af4b49a67f753a744f4e8b4deb97a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 15:11:52 +0200 Subject: gnu: rust-dirs-sys-0.3: Adapt for new build system. * gnu/packages/crates-io.scm (rust-dirs-sys-0.3)[inputs]: Add rust-cfg-if-0.1, rust-libc-0.2, rust-redox-users-0.3, rust-winapi-0.3. --- gnu/packages/crates-io.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7a6cbec992..ac75c7591d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11801,6 +11801,11 @@ other data.") ("rust-libc" ,rust-libc-0.2) ("rust-redox-users" ,rust-redox-users-0.3) ("rust-winapi" ,rust-winapi-0.3)))) + (inputs + `(("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-users" ,rust-redox-users-0.3) + ("rust-winapi" ,rust-winapi-0.3))) (home-page "https://github.com/soc/dirs-sys-rs") (synopsis "System-level helper functions for the dirs and directories crates") -- cgit 1.4.1 From ca3b97baaa7125fdcda17c046e10720a88199601 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 15:12:32 +0200 Subject: gnu: rust-dirs-2: Adapt for new build system. * gnu/packages/crates-io.scm (rust-dirs-2)[inputs]: Add rust-cfg-if-0.1, rust-dirs-sys-0.3. --- gnu/packages/crates-io.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac75c7591d..299a2d1443 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11712,7 +11712,10 @@ standard locations of directories for config, cache and other data.") (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-dirs-sys" ,rust-dirs-sys-0.3)))))) + ("rust-dirs-sys" ,rust-dirs-sys-0.3)))) + (inputs + `(("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-dirs-sys" ,rust-dirs-sys-0.3))))) (define-public rust-dirs-1 (package -- cgit 1.4.1 From 4ce712aca41fec9845d0a112eb9603f93b8c32eb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Mar 2021 15:14:02 +0200 Subject: gnu: alacritty: Use more packaged rust libraries. * gnu/packages/terminals.scm (alacritty)[arguments]: Move rust-bitflags-1, rust-dirs-2, rust-libc-0.2, rust-unicode-width-0.1, rust-winapi-0.3 from cargo-inputs ... [inputs]: ... to here. --- gnu/packages/terminals.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index d1a343e193..f4c97e0002 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1225,19 +1225,16 @@ made by suckless.") #:cargo-inputs (("rust-alacritty-config-derive" ,rust-alacritty-config-derive-0.1) ("rust-alacritty-terminal" ,rust-alacritty-terminal-0.12) - ("rust-bitflags" ,rust-bitflags-1) ("rust-clap" ,rust-clap-2) ("rust-cocoa" ,rust-cocoa-0.24) ("rust-copypasta" ,rust-copypasta-0.7) ("rust-crossfont" ,rust-crossfont-0.2) - ("rust-dirs" ,rust-dirs-2) ("rust-embed-resource" ,rust-embed-resource-1) ("rust-fnv" ,rust-fnv-1) ("rust-gl-generator" ,rust-gl-generator-0.14) ;; XXX: Adjust `add-absolute-library-references' phase when updating ;; glutin input. ("rust-glutin" ,rust-glutin-0.26) - ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-notify" ,rust-notify-4) ("rust-objc" ,rust-objc-0.2) @@ -1248,9 +1245,7 @@ made by suckless.") ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-time" ,rust-time-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-urlocator" ,rust-urlocator-0.1) - ("rust-winapi" ,rust-winapi-0.3) ("rust-x11-dl" ,rust-x11-dl-2) ("rust-xdg" ,rust-xdg-2)) #:phases @@ -1345,7 +1340,12 @@ made by suckless.") ("libxrandr" ,libxrandr) ("libxxf86vm" ,libxxf86vm) ("mesa" ,mesa) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-dirs" ,rust-dirs-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-wayland-client" ,rust-wayland-client-0.28) + ("rust-winapi" ,rust-winapi-0.3) ("wayland" ,wayland))) (native-search-paths ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is -- cgit 1.4.1 From b45c625f10de2d8579dc6faa7c99c0915b8863c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:16 +0100 Subject: gnu: r-deseq2: Update to 1.30.1. * gnu/packages/bioconductor.scm (r-deseq2): Update to 1.30.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 c4df090a05..7e66308f33 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1604,14 +1604,14 @@ analysis.") (define-public r-deseq2 (package (name "r-deseq2") - (version "1.30.0") + (version "1.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DESeq2" version)) (sha256 (base32 - "0q2f9cywrcmp1p7ii8f45g4dk4hsnjflq3yqhsxgnpv9fw338qpp")))) + "1i0jpzsm1vl7q6qdmplj45w13lsaycxrx5pazlanjba2khn79k19")))) (properties `((upstream-name . "DESeq2"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From fa227c9640e95de45c6ad12a6bec7ee5c9d503ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:23 +0100 Subject: gnu: r-genomeinfodb: Update to 1.26.4. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.26.4. --- 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 7e66308f33..6feb3d8c16 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1743,13 +1743,13 @@ high-throughput sequencing experiments.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.26.2") + (version "1.26.4") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "092izc49maxjhf6m4b0qx21ad16dz7bmxy5pysp3vkyhdrfa2f7v")))) + "1sbhdpgabqbi749ixih8nlmq5id7sg8y6kkfj46r00642rc293ys")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit 1.4.1 From ee61edb6215e78445e1b4470a6970eca715ebc8a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:26 +0100 Subject: gnu: r-reportingtools: Update to 2.30.2. * gnu/packages/bioconductor.scm (r-reportingtools): Update to 2.30.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 6feb3d8c16..0e059f1e1c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1907,14 +1907,14 @@ region sets and other genomic features.") (define-public r-reportingtools (package (name "r-reportingtools") - (version "2.30.0") + (version "2.30.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ReportingTools" version)) (sha256 (base32 - "0gkshdhx44yjffqf1xmvik7j5hlhszp1n9ckanaws9ky3iia8j31")))) + "1vvra7l29s7lnq996nwlpzbkrbdkr3ivkgmfp4kndfykxsl9q4vb")))) (properties `((upstream-name . "ReportingTools"))) (build-system r-build-system) -- cgit 1.4.1 From 11dc49afc2c892b27365c77b101e1566345f2372 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:29 +0100 Subject: gnu: r-diffbind: Update to 3.0.14. * gnu/packages/bioconductor.scm (r-diffbind): Update to 3.0.14. --- 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 0e059f1e1c..3f9b2e4265 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2297,14 +2297,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.0.13") + (version "3.0.14") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "0kxn59v93hl5pq8d156lnbz0sslpnxyjcfrvq2gzgd91sd587qmn")))) + "1siabhjd0w7bb6v2gfhsm9j7c7c86z8m6lfsyl8p84h0zhjs2vrw")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From fa6bb614c8438eb57a05f19ac2a2f1cef167f7d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:33 +0100 Subject: gnu: r-cytoml: Update to 2.2.2. * gnu/packages/bioconductor.scm (r-cytoml): Update to 2.2.2. [inputs]: Add zlib. --- gnu/packages/bioconductor.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3f9b2e4265..3a59333576 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6999,14 +6999,14 @@ sequential way to mimic the manual gating strategy.") (define-public r-cytoml (package (name "r-cytoml") - (version "2.2.1") + (version "2.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "CytoML" version)) (sha256 (base32 - "1d8x49aqc95x1vx456hya5r7mal80pj9l6wmr5x5pb5r8qyzz6yq")))) + "0ckjb7bkz0cy46scrv4vl9w37g54c0yihvzmbkzilip1ikpvhxd1")))) (properties `((upstream-name . "CytoML"))) (build-system r-build-system) (arguments @@ -7021,7 +7021,8 @@ sequential way to mimic the manual gating strategy.") (string-append match "/libhdf5.a"))) #t))))) (inputs - `(("libxml2" ,libxml2))) + `(("libxml2" ,libxml2) + ("zlib" ,zlib))) (propagated-inputs `(("r-base64enc" ,r-base64enc) ("r-bh" ,r-bh) -- cgit 1.4.1 From 1ada8ea96ca1bcc6bec8f7b83137df866e5455f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:36 +0100 Subject: gnu: r-scater: Update to 1.18.6. * gnu/packages/bioconductor.scm (r-scater): Update to 1.18.6. --- 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 3a59333576..d611f3a491 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9857,13 +9857,13 @@ of other packages.") (define-public r-scater (package (name "r-scater") - (version "1.18.3") + (version "1.18.6") (source (origin (method url-fetch) (uri (bioconductor-uri "scater" version)) (sha256 (base32 - "14f7yw277nykxmcm7wlhlsf3nizpwzz24hax1icx73lavfxmc535")))) + "0k1ls5gqv1zsn1w2kszhmbhwfccfjw8khk36s5zbf90rbbkw5609")))) (build-system r-build-system) (propagated-inputs `(("r-biocgenerics" ,r-biocgenerics) -- cgit 1.4.1 From f10f2745eb1ec38eae5c41323f31980d2dd1f38c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:40 +0100 Subject: gnu: r-delayedarray: Update to 0.16.2. * gnu/packages/bioinformatics.scm (r-delayedarray): Update to 0.16.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 78df3091fe..996a3614e7 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7966,13 +7966,13 @@ tab-delimited (tabix) files.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.16.1") + (version "0.16.2") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "1d75zrhha1v7dhbvjp6a4iap441l5k268w0jjxklpqywbqns7l3d")))) + "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit 1.4.1 From 14204d696c6fc0e49be93981328bc5148907aee7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:02:43 +0100 Subject: gnu: r-genomicfeatures: Update to 1.42.2. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.42.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 996a3614e7..d9afe2c56f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8114,13 +8114,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.42.1") + (version "1.42.2") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "17dyd9hcw6pw16y353dh55wfhxmkxka99lbsxsp9xyrhffwrxi0s")))) + "17ns5hvx5q8mrmkgb6linspwml62mi34i6al5bxlib5xi9d9f04s")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit 1.4.1 From f9e016baec766eb7985c978951a346d399ff3f36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:23:50 +0100 Subject: gnu: libpinyin: Update to 2.6.0. * gnu/packages/ibus.scm (libpinyin): Update to 2.6.0. --- gnu/packages/ibus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index ecf33cb570..930381fe09 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017, 2018 Efraim Flashner @@ -224,7 +224,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.") (define-public libpinyin (package (name "libpinyin") - (version "2.3.0") + (version "2.6.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/libpinyin/" @@ -232,7 +232,7 @@ ZhuYin (Bopomofo) input method based on libpinyin for IBus.") "/libpinyin-" version ".tar.gz")) (sha256 (base32 - "14969v6w8n1aiqphl2386dws7dmsdwbzyqnlz4kr8ppm39m9rp5k")))) + "10h5mjgv4ibhispvr3s1k36a4aclx4dcvcc2knd4sg1xibw0dp4w")))) (build-system gnu-build-system) (inputs `(("glib" ,glib) -- cgit 1.4.1 From 266d55dc3080475544bf45e72359c9b9bbcecd53 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 15:24:01 +0100 Subject: gnu: ibus-libpinyin: Update to 1.12.0. * gnu/packages/ibus.scm (ibus-libpinyin): Update to 1.12.0. [arguments]: Enable opencc; include setup files on PYTHONPATH; override PYTHONPATH instead of prefixing. [inputs]: Add opencc; remove python-pyxdg. [license]: Change to GPLv3+. --- gnu/packages/ibus.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 930381fe09..e6001efa7f 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -174,7 +174,7 @@ may also simplify input method development.") (define-public ibus-libpinyin (package (name "ibus-libpinyin") - (version "1.11.1") + (version "1.12.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/libpinyin/ibus-libpinyin/" @@ -182,10 +182,12 @@ may also simplify input method development.") "/ibus-libpinyin-" version ".tar.gz")) (sha256 (base32 - "1bl1cgicd2df797dx1x0q904438bsn8i23djzcfcai4dp3631xc0")))) + "0xl2lmffy42f6h6za05z4vpazpza1a9gsrva65giwyv3kpf652dd")))) (build-system glib-or-gtk-build-system) (arguments - `(#:phases + `(#:configure-flags + '("--enable-opencc") + #:phases (modify-phases %standard-phases (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key inputs outputs #:allow-other-keys) @@ -193,21 +195,25 @@ may also simplify input method development.") ;; PYTHONPATH and GI_TYPELIB_PATH. (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/libexec/ibus-setup-libpinyin") - `("PYTHONPATH" ":" prefix + `("PYTHONPATH" ":" = (,(getenv "PYTHONPATH") ,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0"))) + "/lib/girepository-1.0") + ,(string-append (assoc-ref outputs "out") + "/share/ibus-libpinyin/setup/"))) `("GI_TYPELIB_PATH" ":" prefix (,(string-append (assoc-ref inputs "ibus") - "/lib/girepository-1.0")))) + "/lib/girepository-1.0") + ,(string-append (assoc-ref outputs "out") + "/share/ibus-libpinyin/setup/")))) #t)))))) (inputs `(("ibus" ,ibus) ("libpinyin" ,libpinyin) ("bdb" ,bdb) ("sqlite" ,sqlite) + ("opencc" ,opencc) ("python" ,python) - ("pyxdg" ,python-pyxdg) ("pygobject2" ,python-pygobject) ("gtk+" ,gtk+))) (native-inputs @@ -219,7 +225,7 @@ may also simplify input method development.") "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+))) + (license gpl3+))) (define-public libpinyin (package -- cgit 1.4.1 From 20d090f43552e1e397a9eeb6ea2411976511b1cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 15 Mar 2021 20:31:12 +0100 Subject: gnu: sudo: Update to 1.9.6p1. * gnu/packages/admin.scm (sudo): Update to 1.9.6p1. --- 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 e938d1bdac..407ab4165c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1495,7 +1495,7 @@ system administrator.") (define-public sudo (package (name "sudo") - (version "1.9.6") + (version "1.9.6p1") (source (origin (method url-fetch) (uri @@ -1505,7 +1505,7 @@ system administrator.") version ".tar.gz"))) (sha256 (base32 - "0m9szw1fxj319z7d2j9nm04cbwk0flczwp1v4zb7sbndj825ijb2")) + "146alf6cwnzjcckia8m0ibcj9ram2z469f5z7v6vkzpsb30cvsd9")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From fcb122b4ed3f8e7fde815a843338921e5d8302b0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Mar 2021 12:42:44 +0100 Subject: gnu: xterm: Fix uxterm in pure environments. * gnu/packages/xorg.scm (xterm)[arguments]: Add a 'patch-file-names phase. --- gnu/packages/xorg.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 28ee64b96a..0aa4411ddc 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6087,7 +6087,19 @@ to answer a question. Xmessage can also exit after a specified time.") '(#:configure-flags '("--enable-wide-chars" "--enable-load-vt-fonts" "--enable-i18n" "--enable-doublechars" "--enable-luit" "--enable-mini-luit") - #:tests? #f)) + #:tests? #f ; no test suite + #:phases + (modify-phases %standard-phases + (add-after 'build 'patch-file-names + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "uxterm" + (("([ `\\|])(sh|sed|awk|xmessage) " _ prefix command) + (string-append prefix (which command) " ")) + (("(`|\"|LANG=C )(locale) " _ prefix command) + (string-append prefix (which command) " ")) + (("=xterm") + (string-append "=" out "/bin/xterm"))))))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 29e992c03001ce0c6b4a5ed33d9db7d9593cc23b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 22:05:43 +0100 Subject: gnu: r-seurat: Fix build. This is a follow-up to commit e4d4046999304a3693da80cf0fdfe5fd5753b2b7 * gnu/packages/cran.scm (r-seurat)[arguments]: Patch NAMESPACE file. --- gnu/packages/cran.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 3afe67f7cf..5617383cbc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26491,6 +26491,18 @@ other R users.") "1mp3py00bmzj4541d8ry5sfzkpfzvnl9dpa8n4qhakd13dl30xdn")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) + ;; This is needed because r-spatstat has been split up and there has + ;; been no new release of Seurat since then. + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-spatstat-import + (lambda _ + (substitute* "NAMESPACE" + (("importFrom\\(spatstat,markvario\\)") + "importFrom(spatstat.core,markvario)") + (("importFrom\\(spatstat,ppp\\)") + "importFrom(spatstat.geom,ppp)"))))))) (propagated-inputs `(("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) -- cgit 1.4.1 From 3fe46eef57b068158b9efd1044fcdb581d2243a6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 20 Feb 2021 13:27:58 -0500 Subject: gnu: qemu: Fix indentation and remove trailing #t. * gnu/packages/virtualization.scm (qemu): Fix indentation and remove trailing #t, appeasing 'guix lint'. --- gnu/packages/virtualization.scm | 78 +++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 41 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3e15e72181..104cebced2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -134,33 +134,34 @@ (package (name "qemu") (version "5.1.0") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch" - "qemu-CVE-2021-20203.patch")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Fix a bug in the do_ioctl_ifconf() function of qemu to - ;; make ioctl(…, SIOCGIFCONF, …) work for emulated 64 bit - ;; architectures. The size of struct ifreq is handled - ;; incorrectly. - ;; https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg01545.html - (substitute* '("linux-user/syscall.c") - (("^([[:blank:]]*)const argtype ifreq_arg_type.*$" line indent) - (string-append line indent - "const argtype ifreq_max_type[] = { MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) - (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) - (string-append indent "target_ifreq_size = thunk_type_size(ifreq_max_type, 0);"))) - #t)))) - (outputs '("out" "doc")) ;4.7 MiB of HTML docs - (build-system gnu-build-system) - (arguments + (source + (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) + (patches (search-patches "qemu-build-info-manual.patch" + "qemu-CVE-2021-20203.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix a bug in the do_ioctl_ifconf() function of qemu to + ;; make ioctl(…, SIOCGIFCONF, …) work for emulated 64 bit + ;; architectures. The size of struct ifreq is handled + ;; incorrectly. + ;; https://lists.nongnu.org/archive/html/qemu-devel/2021-01/msg01545.html + (substitute* '("linux-user/syscall.c") + (("^([[:blank:]]*)const argtype ifreq_arg_type.*$" line indent) + (string-append line indent "const argtype ifreq_max_type[] = " + "{ MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) + (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) + (string-append indent "target_ifreq_size = " + "thunk_type_size(ifreq_max_type, 0);"))))))) + (outputs '("out" "doc")) ;4.7 MiB of HTML docs + (build-system gnu-build-system) + (arguments `(;; FIXME: Disable tests on i686 to work around ;; . #:tests? ,(or (%current-target-system) @@ -194,8 +195,7 @@ inputs))) (set-path-environment-variable "C_INCLUDE_PATH" '("include") - input-directories) - #t))) + input-directories)))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; These tests can time out on heavily-loaded and/or slow storage. @@ -219,16 +219,14 @@ ;; x86 CPUs (see https://issues.guix.info/43048 and ;; https://bugs.launchpad.net/qemu/+bug/1896263). (("check-qtest-i386-y \\+= bios-tables-test" all) - (string-append "# " all))) - #t)) + (string-append "# " all))))) (add-after 'patch-source-shebangs 'patch-/bin/sh-references (lambda _ ;; Ensure the executables created by these source files reference ;; /bin/sh from the store so they work inside the build container. (substitute* '("block/cloop.c" "migration/exec.c" "net/tap.c" "tests/qtest/libqtest.c") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (replace 'configure (lambda* (#:key inputs outputs (configure-flags '()) #:allow-other-keys) @@ -273,8 +271,7 @@ (format port "#!/bin/sh exec smbd $@"))) (chmod "samba-wrapper" #o755) - (install-file "samba-wrapper" libexec)) - #t)) + (install-file "samba-wrapper" libexec)))) (add-after 'install 'move-html-doc (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -282,23 +279,22 @@ exec smbd $@"))) (qemu-doc (string-append doc "/share/doc/qemu-" ,version))) (mkdir-p qemu-doc) (rename-file (string-append out "/share/doc/qemu") - (string-append qemu-doc "/html"))) - #t))))) - (inputs ; TODO: Add optional inputs. + (string-append qemu-doc "/html")))))))) + (inputs ; TODO: Add optional inputs. `(("alsa-lib" ,alsa-lib) ("attr" ,attr) ("glib" ,glib) ("gtk+" ,gtk+) ("libaio" ,libaio) ("libattr" ,attr) - ("libcacard" ,libcacard) ; smartcard support - ("libcap-ng" ,libcap-ng) ; virtfs support requires libcap-ng & libattr + ("libcacard" ,libcacard) ; smartcard support + ("libcap-ng" ,libcap-ng) ; virtfs support requires libcap-ng & libattr ("libdrm" ,libdrm) ("libepoxy" ,libepoxy) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) ("libseccomp" ,libseccomp) - ("libusb" ,libusb) ;USB pass-through support + ("libusb" ,libusb) ;USB pass-through support ("mesa" ,mesa) ("ncurses" ,ncurses) ;; ("pciutils" ,pciutils) -- cgit 1.4.1 From ce29866c01661693645daeba60657bf32bd3322b Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 20 Feb 2021 14:55:37 -0500 Subject: gnu: Add glib-static. * gnu/packages/glib.scm (glib-static): New variable. --- gnu/packages/glib.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eaa319a2ff..0d265e8687 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Petter ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong -;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2019, 2021 Maxim Cournoyer ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Nicolò Balzarotti @@ -446,6 +446,34 @@ dynamic loading, and an object system.") (delete-file-recursively (string-append out html)) #t))))))))) +;;; TODO: Merge into glib as a 'static' output on core-updates. +(define-public glib-static + (hidden-package + (package + (inherit glib) + (name "glib-static") + (outputs '("out")) + (arguments + (substitute-keyword-arguments (package-arguments glib) + ((#:configure-flags flags ''()) + `(cons* "--default-library=static" + "-Dselinux=disabled" + "-Dman=false" + "-Dgtk_doc=false" + "-Dinternal_pcre=false" + ,flags)) + ((#:phases phases) + `(modify-phases ,phases + (delete 'move-executables) + (replace 'install + ;; Only install the static libraries. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (for-each (lambda (f) + (install-file f lib)) + (find-files "." "\\.a$")))))))))))) + (define gobject-introspection (package (name "gobject-introspection") -- cgit 1.4.1 From d184fd42165a72221a1762dbb8651ff81534ac8c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 21 Feb 2021 21:16:39 -0500 Subject: gnu: qemu: Add a static output. The static output is equivalent to what other distributions commonly package as 'qemu-user-static'. * gnu/packages/virtualization.scm (qemu)[outputs]: Add a static output. [phases]{configure}: Configure the main build as an out-of-source build. Move all configure flags to ... [configure-flags]: ... here. The options explicitly enabling optional features are removed; the configure script does a good job at enabling all the features available based on the inputs present and this allows reusing the flags in variant packages such as qemu-minimal. {configure-user-static, build-user-static, install-user-static}: New phases. {patch-test-shebangs}: New phase, extracted from the configure phase. [native-inputs]: Add glib-static, pcre:static and zlib:static. (qemu-minimal)[arguments]: Reuse the configure-flags argument. Rewrite to use match instead of cond. --- gnu/packages/virtualization.scm | 171 +++++++++++++++++++++++++--------------- 1 file changed, 106 insertions(+), 65 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 104cebced2..98aca1e301 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; ;;; This file is part of GNU Guix. @@ -83,6 +83,7 @@ #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages protobuf) @@ -118,6 +119,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (ice-9 match)) (define (qemu-patch commit file-name sha256-bv) @@ -159,23 +161,30 @@ (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) (string-append indent "target_ifreq_size = " "thunk_type_size(ifreq_max_type, 0);"))))))) - (outputs '("out" "doc")) ;4.7 MiB of HTML docs + (outputs '("out" "static" "doc")) ;4.7 MiB of HTML docs (build-system gnu-build-system) (arguments - `(;; FIXME: Disable tests on i686 to work around - ;; . - #:tests? ,(or (%current-target-system) + ;; FIXME: Disable tests on i686 to work around + ;; . + `(#:tests? ,(or (%current-target-system) (not (string=? "i686-linux" (%current-system)))) - - #:configure-flags (list "--enable-usb-redir" "--enable-opengl" - "--enable-docs" - (string-append "--smbd=" - (assoc-ref %outputs "out") - "/libexec/samba-wrapper") - "--audio-drv-list=alsa,pa,sdl") + #:configure-flags + (let ((gcc (string-append (assoc-ref %build-inputs "gcc") "/bin/gcc")) + (out (assoc-ref %outputs "out"))) + (list (string-append "--cc=" gcc) + ;; Some architectures insist on using HOST_CC. + (string-append "--host-cc=" gcc) + (string-append "--prefix=" out) + "--sysconfdir=/etc" + (string-append "--smbd=" out "/libexec/samba-wrapper") + "--disable-debug-info" ;for space considerations + ;; The binaries need to be linked against -lrt. + (string-append "--extra-ldflags=-lrt"))) ;; Make build and test output verbose to facilitate investigation upon failure. #:make-flags '("V=1") #:modules ((srfi srfi-1) + (srfi srfi-26) + (ice-9 ftw) (ice-9 match) ,@%gnu-build-system-modules) #:phases @@ -220,6 +229,11 @@ ;; https://bugs.launchpad.net/qemu/+bug/1896263). (("check-qtest-i386-y \\+= bios-tables-test" all) (string-append "# " all))))) + (add-after 'unpack 'patch-test-shebangs + (lambda _ + (substitute* "tests/qemu-iotests/check" + (("#!/usr/bin/env python3") + (string-append "#!" (which "python3")))))) (add-after 'patch-source-shebangs 'patch-/bin/sh-references (lambda _ ;; Ensure the executables created by these source files reference @@ -228,37 +242,56 @@ "net/tap.c" "tests/qtest/libqtest.c") (("/bin/sh") (which "sh"))))) (replace 'configure - (lambda* (#:key inputs outputs (configure-flags '()) - #:allow-other-keys) + (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) ;; The `configure' script doesn't understand some of the ;; GNU options. Thus, add a new phase that's compatible. (let ((out (assoc-ref outputs "out"))) (setenv "SHELL" (which "bash")) - - ;; While we're at it, patch for tests. - (substitute* "tests/qemu-iotests/check" - (("#!/usr/bin/env python3") - (string-append "#!" (which "python3")))) - ;; Ensure config.status gets the correct shebang off the bat. ;; The build system gets confused if we change it later and ;; attempts to re-run the whole configury, and fails. (substitute* "configure" (("#!/bin/sh") (string-append "#!" (which "sh")))) - - ;; The binaries need to be linked against -lrt. - (setenv "LDFLAGS" "-lrt") - (apply invoke - `("./configure" - ,(string-append "--cc=" (which "gcc")) - ;; Some architectures insist on using HOST_CC - ,(string-append "--host-cc=" (which "gcc")) - "--disable-debug-info" ; save build space - "--enable-virtfs" ; just to be sure - ,(string-append "--prefix=" out) - ,(string-append "--sysconfdir=/etc") - ,@configure-flags))))) + (mkdir-p "b/qemu") + (chdir "b/qemu") + (apply invoke "../../configure" configure-flags)))) + ;; Configure, build and install QEMU user-emulation static binaries. + (add-after 'configure 'configure-user-static + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((gcc (string-append (assoc-ref inputs "gcc") "/bin/gcc")) + (static (assoc-ref outputs "static")) + ;; This is the common set of configure flags; it is + ;; duplicated here to isolate this phase from manipulations + ;; to the #:configure-flags build argument, as done in + ;; derived packages such as qemu-minimal. + (configure-flags (list (string-append "--cc=" gcc) + (string-append "--host-cc=" gcc) + "--sysconfdir=/etc" + "--disable-debug-info"))) + (mkdir-p "../user-static") + (with-directory-excursion "../user-static" + (apply invoke "../../configure" + "--static" + "--disable-docs" ;already built + "--disable-system" + "--enable-linux-user" + (string-append "--prefix=" static) + configure-flags))))) + (add-after 'build 'build-user-static + (lambda args + (with-directory-excursion "../user-static" + (apply (assoc-ref %standard-phases 'build) args)))) + (add-after 'install 'install-user-static + (lambda* (#:key outputs #:allow-other-keys) + (let* ((static (assoc-ref outputs "static")) + (bin (string-append static "/bin"))) + (with-directory-excursion "../user-static" + (for-each (cut install-file <> bin) + (append-map (cut find-files <> "^qemu-") + (scandir "." + (cut string-suffix? + "-linux-user" <>)))))))) ;; Create a wrapper for Samba. This allows QEMU to use Samba without ;; pulling it in as an input. Note that you need to explicitly install ;; Samba in your Guix profile for Samba support. @@ -315,7 +348,12 @@ exec smbd $@"))) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("python-sphinx" ,python-sphinx) - ("texinfo" ,texinfo))) + ("texinfo" ,texinfo) + ;; The following static libraries are required to build + ;; the static output of QEMU. + ("glib-static" ,glib-static) + ("pcre:static" ,pcre "static") + ("zlib:static" ,zlib "static"))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") (description @@ -340,46 +378,49 @@ server and embedded PowerPC, and S390 guests.") (define-public qemu-minimal ;; QEMU without GUI support, only supporting the host's architecture - (package (inherit qemu) + (package + (inherit qemu) (name "qemu-minimal") (synopsis "Machine emulator and virtualizer (without GUI) for the host architecture") (arguments (substitute-keyword-arguments (package-arguments qemu) - ((#:configure-flags _ '(list)) + ((#:configure-flags configure-flags '(list)) ;; Restrict to the host's architecture. - (let ((system (or (%current-target-system) - (%current-system)))) - (cond - ((string-prefix? "i686" system) - '(list "--target-list=i386-softmmu")) - ((string-prefix? "xasdf86_64" system) - '(list "--target-list=i386-softmmu,x86_64-softmmu")) - ((string-prefix? "mips64" system) - '(list (string-append "--target-list=mips-softmmu,mipsel-softmmu," - "mips64-softmmu,mips64el-softmmu"))) - ((string-prefix? "mips" system) - '(list "--target-list=mips-softmmu,mipsel-softmmu")) - ((string-prefix? "aarch64" system) - '(list "--target-list=arm-softmmu,aarch64-softmmu")) - ((string-prefix? "arm" system) - '(list "--target-list=arm-softmmu")) - ((string-prefix? "alpha" system) - '(list "--target-list=alpha-softmmu")) - ((string-prefix? "powerpc64" system) - '(list "--target-list=ppc-softmmu,ppc64-softmmu")) - ((string-prefix? "powerpc" system) - '(list "--target-list=ppc-softmmu")) - ((string-prefix? "s390" system) - '(list "--target-list=s390x-softmmu")) - ((string-prefix? "riscv" system) - '(list "--target-list=riscv32-softmmu,riscv64-softmmu")) - (else ; An empty list actually builds all the targets. - ''())))))) + (let* ((system (or (%current-target-system) + (%current-system))) + (target-list-arg + (match system + ((? (cut string-prefix? "i686" <>)) + "--target-list=i386-softmmu") + ((? (cut string-prefix? "x86_64" <>)) + "--target-list=i386-softmmu,x86_64-softmmu") + ((? (cut string-prefix? "mips64" <>)) + (string-append "--target-list=mips-softmmu,mipsel-softmmu," + "mips64-softmmu,mips64el-softmmu")) + ((? (cut string-prefix? "mips" <>)) + "--target-list=mips-softmmu,mipsel-softmmu") + ((? (cut string-prefix? "aarch64" <>)) + "--target-list=arm-softmmu,aarch64-softmmu") + ((? (cut string-prefix? "arm" <>)) + "--target-list=arm-softmmu") + ((? (cut string-prefix? "alpha" <>)) + "--target-list=alpha-softmmu") + ((? (cut string-prefix? "powerpc64" <>)) + "--target-list=ppc-softmmu,ppc64-softmmu") + ((? (cut string-prefix? "powerpc" <>)) + "--target-list=ppc-softmmu") + ((? (cut string-prefix? "s390" <>)) + "--target-list=s390x-softmmu") + ((? (cut string-prefix? "riscv" <>)) + "--target-list=riscv32-softmmu,riscv64-softmmu") + (else ; An empty list actually builds all the targets. + '())))) + `(cons ,target-list-arg ,configure-flags))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (native-inputs (fold alist-delete (package-native-inputs qemu) - '("gettext"))) + '("gettext"))) (inputs (fold alist-delete (package-inputs qemu) '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2" -- cgit 1.4.1 From 77c2f4e2068ebec3f384c826c5a99785125ff72c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Feb 2021 08:55:39 -0500 Subject: services/qemu-binfmt: Use the F flag and the static output of QEMU. Fixes . Before this change, the 'binfmt_misc' entries registered for QEMU would not be usable in container contexts outside of guix-daemon (without manually bind mounting file names). For example: $ docker run --rm arm32v7/debian true standard_init_linux.go:207: exec user process caused "no such file or directory" After this change, any container can make use of the QEMU binfmt_misc registrations, as their corresponding QEMU static binaries are fully pre-loaded by the kernel. * gnu/services/virtualization.scm (): Define using 'define-record-type*'. [flags]: New field, which defaults to "F" (fix binary). (%i386, %i486, %alpha, %arm, %armeb, %sparc, %sparc32plus, %ppc, %ppc64) (%ppc64le, %m68k, %mips, %mipsel, %mipsn32, %mipsn32el, %mips64, %mips64el) (%riscv32, %riscv64, %sh4, %sh4eb, %s390x, %aarch64, %hppa): Adjust. (qemu-binfmt-guix-chroot): Remove variable. (qemu-binfmt-service-type): Remove the qemu-binfmt-guix-chroot extension. * gnu/services/qemu-binfmt (qemu-platform->binfmt): Use the static output of QEMU. * doc/contributing.texi (Submitting Patches): Update doc. * doc/guix.texi (Virtualization Services): Update doc. --- doc/contributing.texi | 1 - doc/guix.texi | 12 --- gnu/services/virtualization.scm | 227 +++++++++++++++++++++++----------------- 3 files changed, 129 insertions(+), 111 deletions(-) (limited to 'gnu') diff --git a/doc/contributing.texi b/doc/contributing.texi index c9dd7d6c04..e105467480 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1016,7 +1016,6 @@ your @code{operating-system} configuration: (service qemu-binfmt-service-type (qemu-binfmt-configuration (platforms (lookup-qemu-platforms "arm" "aarch64")) - (guix-support? #t))) @end lisp Then reconfigure your system. diff --git a/doc/guix.texi b/doc/guix.texi index 3e7ffc81bc..e6ef7dbe03 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -28723,13 +28723,6 @@ This is the configuration for the @code{qemu-binfmt} service. The list of emulated QEMU platforms. Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below). -@item @code{guix-support?} (default: @code{#t}) -When it is true, QEMU and all its dependencies are added to the build -environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, -@option{--chroot-directory} option}). This allows the @code{binfmt_misc} -handlers to be used within the build environment, which in turn means -that you can transparently build programs for another architecture. - For example, let's suppose you're on an x86_64 machine and you have this service: @@ -28737,7 +28730,6 @@ service: (service qemu-binfmt-service-type (qemu-binfmt-configuration (platforms (lookup-qemu-platforms "arm")) - (guix-support? #t))) @end lisp You can run: @@ -28752,10 +28744,6 @@ build}, transparently using QEMU to emulate the ARMv7 CPU@. Pretty handy if you'd like to test a package build for an architecture you don't have access to! -When @code{guix-support?} is set to @code{#f}, programs for other -architectures can still be executed transparently, but invoking commands -like @command{guix build -s armhf-linux @dots{}} will fail. - @item @code{qemu} (default: @code{qemu}) The QEMU package to use. @end table diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index a45da14a80..36e9feb05c 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -554,13 +554,14 @@ potential infinite waits blocking libvirt.")) ;;; ;; Platforms that QEMU can emulate. -(define-record-type - (qemu-platform name family magic mask) +(define-record-type* + qemu-platform make-qemu-platform qemu-platform? (name qemu-platform-name) ;string (family qemu-platform-family) ;string (magic qemu-platform-magic) ;bytevector - (mask qemu-platform-mask)) ;bytevector + (mask qemu-platform-mask) ;bytevector + (flags qemu-platform-flags (default "F"))) ;string (define-syntax bv (lambda (s) @@ -577,125 +578,173 @@ potential infinite waits blocking libvirt.")) ;;; 'scripts/qemu-binfmt-conf.sh' in QEMU. (define %i386 - (qemu-platform "i386" "i386" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00") - (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "i386") + (family "i386") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %i486 - (qemu-platform "i486" "i386" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00") - (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "i486") + (family "i386") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %alpha - (qemu-platform "alpha" "alpha" - (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90") - (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "alpha") + (family "alpha") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90")) + (mask (bv "\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %arm - (qemu-platform "arm" "arm" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "arm") + (family "arm") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %armeb - (qemu-platform "armeb" "arm" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "armeb") + (family "arm") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %sparc - (qemu-platform "sparc" "sparc" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02") - (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "sparc") + (family "sparc") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %sparc32plus - (qemu-platform "sparc32plus" "sparc" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12") - (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "sparc32plus") + (family "sparc") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %ppc - (qemu-platform "ppc" "ppc" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "ppc") + (family "ppc") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %ppc64 - (qemu-platform "ppc64" "ppc" - (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "ppc64") + (family "ppc") + (magic (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %ppc64le - (qemu-platform "ppc64le" "ppcle" - (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00"))) + (qemu-platform + (name "ppc64le") + (family "ppcle") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00")))) (define %m68k - (qemu-platform "m68k" "m68k" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04") - (bv "\xff\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "m68k") + (family "m68k") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) ;; XXX: We could use the other endianness on a MIPS host. (define %mips - (qemu-platform "mips" "mips" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "mips") + (family "mips") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %mipsel - (qemu-platform "mipsel" "mips" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "mipsel") + (family "mips") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %mipsn32 - (qemu-platform "mipsn32" "mips" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "mipsn32") + (family "mips") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %mipsn32el - (qemu-platform "mipsn32el" "mips" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "mipsn32el") + (family "mips") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %mips64 - (qemu-platform "mips64" "mips" - (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "mips64") + (family "mips") + (magic (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %mips64el - (qemu-platform "mips64el" "mips" - (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "mips64el") + (family "mips") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %riscv32 - (qemu-platform "riscv32" "riscv" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "riscv32") + (family "riscv") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %riscv64 - (qemu-platform "riscv64" "riscv" - (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "riscv64") + (family "riscv") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %sh4 - (qemu-platform "sh4" "sh4" - (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "sh4") + (family "sh4") + (magic (bv "\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %sh4eb - (qemu-platform "sh4eb" "sh4" - (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a") - (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "sh4eb") + (family "sh4") + (magic (bv "\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %s390x - (qemu-platform "s390x" "s390x" - (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16") - (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "s390x") + (family "s390x") + (magic (bv "\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %aarch64 - (qemu-platform "aarch64" "arm" - (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"))) + (qemu-platform + (name "aarch64") + (family "arm") + (magic (bv "\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff")))) (define %hppa - (qemu-platform "hppa" "hppa" - (bv "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x0f") - (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff"))) + (qemu-platform + (name "hppa") + (family "hppa") + (magic (bv "\x7f\x45\x4c\x46\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x0f")) + (mask (bv "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff")))) (define %qemu-platforms (list %i386 %i486 %alpha %arm %sparc32plus %ppc %ppc64 %ppc64le %m68k @@ -715,9 +764,7 @@ potential infinite waits blocking libvirt.")) (qemu qemu-binfmt-configuration-qemu (default qemu)) (platforms qemu-binfmt-configuration-platforms - (default '())) ;safest default - (guix-support? qemu-binfmt-configuration-guix-support? - (default #t))) + (default '()))) ;safest default (define (qemu-platform->binfmt qemu platform) "Return a gexp that evaluates to a binfmt string for PLATFORM, using the @@ -733,14 +780,13 @@ given QEMU package." (bytevector->u8-list bv)))) (match platform - (($ name family magic mask) + (($ name family magic mask flags) ;; See 'Documentation/binfmt_misc.txt' in the kernel. #~(string-append ":qemu-" #$name ":M::" #$(bytevector->binfmt-string magic) ":" #$(bytevector->binfmt-string mask) - ":" #$(file-append qemu "/bin/qemu-" name) - ":" ;FLAGS go here - )))) + ":" #$qemu:static "/bin/qemu-" #$name + ":" #$flags)))) (define %binfmt-mount-point (file-system-mount-point %binary-format-file-system)) @@ -779,19 +825,6 @@ given QEMU package." '#$(map qemu-platform-name platforms)) #f))))))) -(define qemu-binfmt-guix-chroot - (match-lambda - ;; Add QEMU and its dependencies to the guix-daemon chroot so that our - ;; binfmt_misc handlers work in the chroot (otherwise 'execve' would fail - ;; with ENOENT.) - ;; - ;; The 'F' flag of binfmt_misc is meant to address this problem by loading - ;; the interpreter upfront rather than lazily, but apparently that is - ;; insufficient (perhaps it loads the 'qemu-ARCH' binary upfront but looks - ;; up its dependencies lazily?). - (($ qemu platforms guix?) - (if guix? (list qemu) '())))) - (define qemu-binfmt-service-type ;; TODO: Make a separate binfmt_misc service out of this? (service-type (name 'qemu-binfmt) @@ -800,9 +833,7 @@ given QEMU package." (const (list %binary-format-file-system))) (service-extension shepherd-root-service-type - qemu-binfmt-shepherd-services) - (service-extension guix-service-type - qemu-binfmt-guix-chroot))) + qemu-binfmt-shepherd-services))) (default-value (qemu-binfmt-configuration)) (description "This service supports transparent emulation of binaries -- cgit 1.4.1 From d15fdb66f33b5abf5f719bc87c27c94c206fc542 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 28 Nov 2020 00:33:13 -0500 Subject: gnu: qemu: Update to 5.2.0. * gnu/packages/virtualization.scm (qemu): Update to 5.2.0. [source]: Re-indent and break long lines, to appease 'guix lint'. [arguments]{disable-unusable-tests}: Adjust for the new Meson build system. Remove patching for a test workaround that has been resolved in 5.2.0. {patch-test-shebangs, patch-/bin/sh-references}: Combine into... {patch-embedded-shebangs}: ... this new phase. Patch the SHELL variable in the Makefile. {fix-optionrom-makefile}: New phase. {install-user-static}: Adjust as the binaries are now symbolic links pointing to their actual build path. [native-inputs]: Add ninja. * gnu/packages/patches/qemu-build-info-manual.patch: Update patch. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/patches/qemu-build-info-manual.patch | 201 ++++++++++------------ gnu/packages/virtualization.scm | 51 +++--- 2 files changed, 120 insertions(+), 132 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packages/patches/qemu-build-info-manual.patch index d57b26ea00..c837040d45 100644 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ b/gnu/packages/patches/qemu-build-info-manual.patch @@ -1,90 +1,29 @@ -From 07303a0a4daa83a0555ac4abad7a5d65584307ad Mon Sep 17 00:00:00 2001 +From 2793f47c066ed396b38893c10533202fceb1a05f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 17 Sep 2020 13:28:19 -0400 -Subject: [PATCH] build: Build and install the info manual. +Subject: [PATCH] build: Build and install a Texinfo version of the manual. Take advantage of the Sphinx texinfo backend to generate a QEMU info -manual. The texinfo format allows for more structure and info readers +manual. The Texinfo format allows for more structure and info readers provide more advanced navigation capabilities compared to manpages readers. -* configure (infodir): Add the --infodir option, which allows +* configure (infodir): Add an --infodir option, which allows configuring the directory under which the info manuals are installed. -* docs/index.rst: Include the top level documents to prevent -warnings (treated as errors by sphinx-build). -* Makefile (sphinxdocs-info, $(MANUAL_BUILDDIR)/QEMU.texi)): New targets. -(info): Depend on sphinxdocs-info. -(install-doc): Install the info manual. +* docs/meson.build (texi, info): New targets. + +Signed-off-by: Maxim Cournoyer --- - Makefile | 13 +++++++++++-- - configure | 7 +++++++ - docs/index.rst | 2 ++ - 3 files changed, 20 insertions(+), 2 deletions(-) + configure | 7 ++++++- + docs/meson.build | 21 +++++++++++++++++++++ + meson.build | 2 ++ + 3 files changed, 29 insertions(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index 13dd708c..da78612d 100644 ---- a/Makefile -+++ b/Makefile -@@ -864,12 +864,14 @@ endef - # Note that we deliberately do not install the "devel" manual: it is - # for QEMU developers, and not interesting to our users. - .PHONY: install-sphinxdocs --install-sphinxdocs: sphinxdocs -+install-sphinxdocs: sphinxdocs sphinxdocs-info - $(call install-manual,interop) - $(call install-manual,specs) - $(call install-manual,system) - $(call install-manual,tools) - $(call install-manual,user) -+ $(INSTALL_DIR) "$(DESTDIR)$(infodir)" -+ $(INSTALL_DATA) $(MANUAL_BUILDDIR)/QEMU.info "$(DESTDIR)$(infodir)" - - install-doc: $(DOCS) install-sphinxdocs - $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" -@@ -1067,6 +1069,13 @@ sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html \ - $(MANUAL_BUILDDIR)/tools/index.html \ - $(MANUAL_BUILDDIR)/user/index.html - -+# Build the complete info manual. -+.PHONE: sphinxdocs-info -+sphinxdocs-info: $(MANUAL_BUILDDIR)/QEMU.info -+ -+$(MANUAL_BUILDDIR)/QEMU.texi: $(call manual-deps,*) $(wildcard $(SRC_PATH)/docs/*.rst) -+ $(call build-manual,,texinfo) -+ - # Canned command to build a single manual - # Arguments: $1 = manual name, $2 = Sphinx builder ('html' or 'man') - # Note the use of different doctree for each (manual, builder) tuple; -@@ -1126,7 +1135,7 @@ docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi - @cp -p $< $@ - - html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs --info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info -+info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info sphinxdocs-info - pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf - txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt - diff --git a/configure b/configure -index 2acc4d14..3691bd2e 100755 +index 18c26e0389..d1ab2c19d1 100755 --- a/configure +++ b/configure -@@ -415,6 +415,7 @@ LDFLAGS_SHARED="-shared" - modules="no" - module_upgrades="no" - prefix="/usr/local" -+infodir="\${prefix}/share/info" - mandir="\${prefix}/share/man" - datadir="\${prefix}/share" - firmwarepath="\${prefix}/share/qemu-firmware" -@@ -987,6 +988,7 @@ if test "$mingw32" = "yes" ; then - LIBS="-liberty $LIBS" - fi - prefix="c:/Program Files/QEMU" -+ infodir="\${prefix}" - mandir="\${prefix}" - datadir="\${prefix}" - qemu_docdir="\${prefix}" -@@ -1087,6 +1089,8 @@ for opt do +@@ -948,6 +948,8 @@ for opt do static="yes" QEMU_PKG_CONFIG_FLAGS="--static $QEMU_PKG_CONFIG_FLAGS" ;; @@ -93,47 +32,89 @@ index 2acc4d14..3691bd2e 100755 --mandir=*) mandir="$optarg" ;; --bindir=*) bindir="$optarg" -@@ -1780,6 +1784,7 @@ Advanced options (experts only): +@@ -975,7 +977,7 @@ for opt do + --host=*|--build=*|\ + --disable-dependency-tracking|\ + --sbindir=*|--sharedstatedir=*|\ +- --oldincludedir=*|--datarootdir=*|--infodir=*|\ ++ --oldincludedir=*|--datarootdir=*|\ + --htmldir=*|--dvidir=*|--pdfdir=*|--psdir=*) + # These switches are silently ignored, for compatibility with + # autoconf-generated configure scripts. This allows QEMU's +@@ -1540,6 +1542,7 @@ includedir="${includedir:-$prefix/include}" + if test "$mingw32" = "yes" ; then + mandir="$prefix" + datadir="$prefix" ++ infodir="$prefix" + docdir="$prefix" + bindir="$prefix" + sysconfdir="$prefix" +@@ -1547,6 +1550,7 @@ if test "$mingw32" = "yes" ; then + else + mandir="${mandir:-$prefix/share/man}" + datadir="${datadir:-$prefix/share}" ++ infodir="${infodir:-$datadir/info}" + docdir="${docdir:-$prefix/share/doc}" + bindir="${bindir:-$prefix/bin}" + sysconfdir="${sysconfdir:-$prefix/etc}" +@@ -1683,6 +1687,7 @@ Advanced options (experts only): --smbd=SMBD use specified smbd [$smbd] --with-git=GIT use specified git [$git] --static enable static build [$static] + --infodir=PATH install info manual in PATH --mandir=PATH install man pages in PATH - --datadir=PATH install firmware in PATH$confsuffix - --docdir=PATH install documentation in PATH$confsuffix -@@ -6836,6 +6841,7 @@ echo "include directory $(eval echo $includedir)" - echo "config directory $(eval echo $sysconfdir)" - if test "$mingw32" = "no" ; then - echo "local state directory $(eval echo $local_statedir)" -+echo "Info manual directory $(eval echo $infodir)" - echo "Manual directory $(eval echo $mandir)" - echo "ELF interp prefix $interp_prefix" - else -@@ -7059,6 +7065,7 @@ echo "bindir=$bindir" >> $config_host_mak - echo "libdir=$libdir" >> $config_host_mak - echo "libexecdir=$libexecdir" >> $config_host_mak - echo "includedir=$includedir" >> $config_host_mak -+echo "infodir=$infodir" >> $config_host_mak - echo "mandir=$mandir" >> $config_host_mak - echo "sysconfdir=$sysconfdir" >> $config_host_mak - echo "qemu_confdir=$qemu_confdir" >> $config_host_mak -diff --git a/docs/index.rst b/docs/index.rst -index 763e3d04..4f155b51 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -9,6 +9,7 @@ Welcome to QEMU's documentation! - .. toctree:: - :maxdepth: 2 - :caption: Contents: -+ :glob: + --datadir=PATH install firmware in PATH/$qemu_suffix + --localedir=PATH install translation in PATH/$qemu_suffix +diff --git a/docs/meson.build b/docs/meson.build +index ebd85d59f9..1243839461 100644 +--- a/docs/meson.build ++++ b/docs/meson.build +@@ -114,4 +114,25 @@ if build_docs + alias_target('sphinxdocs', sphinxdocs) + alias_target('html', sphinxdocs) + alias_target('man', sphinxmans) ++ ++ # Generate a Texinfo version of the QEMU manual. ++ makeinfo = find_program(['texi2any', 'makeinfo']) ++ if makeinfo.found() ++ sphinxtexi = custom_target( ++ 'QEMU manual generated texinfo source', ++ output: ['QEMU.texi', 'sphinxtexi.stamp'], ++ depfile: 'sphinxtexi.d', ++ command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', ++ '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo', ++ meson.current_source_dir(), meson.current_build_dir()]) ++ sphinxinfo = custom_target( ++ 'QEMU info manual', ++ input: sphinxtexi, ++ output: 'QEMU.info', ++ install: true, ++ install_dir: get_option('infodir'), ++ command: [makeinfo, '@INPUT0@', '--output=@OUTPUT@']) ++ alias_target('texi', sphinxtexi) ++ alias_target('info', sphinxinfo) ++ endif + endif +diff --git a/meson.build b/meson.build +index e3386196ba..d64a125ad9 100644 +--- a/meson.build ++++ b/meson.build +@@ -32,6 +32,7 @@ endif + qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix') + qemu_datadir = get_option('datadir') / get_option('qemu_suffix') + qemu_docdir = get_option('docdir') / get_option('qemu_suffix') ++qemu_infodir = get_option('infodir') / get_option('qemu_suffix') + qemu_moddir = get_option('libdir') / get_option('qemu_suffix') - system/index - user/index -@@ -16,3 +17,4 @@ Welcome to QEMU's documentation! - interop/index - specs/index - devel/index -+ * + qemu_desktopdir = get_option('datadir') / 'applications' +@@ -1995,6 +1996,7 @@ else + summary_info += {'local state directory': 'queried at runtime'} + endif + summary_info += {'Doc directory': get_option('docdir')} ++summary_info += {'Info directory': get_option('infodir')} + summary_info += {'Build directory': meson.current_build_dir()} + summary_info += {'Source path': meson.current_source_dir()} + summary_info += {'GIT binary': config_host['GIT']} -- -2.28.0 +2.30.1 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 98aca1e301..0558861173 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) @@ -135,7 +137,7 @@ (define-public qemu (package (name "qemu") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) @@ -143,9 +145,9 @@ version ".tar.xz")) (sha256 (base32 - "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9")) - (patches (search-patches "qemu-build-info-manual.patch" - "qemu-CVE-2021-20203.patch")) + "1g0pvx4qbirpcn9mni704y03n3lvkmw2c0rbcwvydyr8ns4xh66b")) + (patches (search-patches "qemu-CVE-2021-20203.patch" + "qemu-build-info-manual.patch")) (modules '((guix build utils))) (snippet '(begin @@ -161,7 +163,7 @@ (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) (string-append indent "target_ifreq_size = " "thunk_type_size(ifreq_max_type, 0);"))))))) - (outputs '("out" "static" "doc")) ;4.7 MiB of HTML docs + (outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs (build-system gnu-build-system) (arguments ;; FIXME: Disable tests on i686 to work around @@ -214,33 +216,37 @@ (string-append match "9"))))) (add-after 'unpack 'disable-unusable-tests (lambda _ - (substitute* "tests/Makefile.include" + (substitute* "tests/meson.build" ;; Comment out the test-qga test, which needs /sys and ;; fails within the build environment. - (("check-unit-.* tests/test-qga" all) + (("tests.*test-qga.*$" all) (string-append "# " all)) ;; Comment out the test-char test, which needs networking and ;; fails within the build environment. (("check-unit-.* tests/test-char" all) - (string-append "# " all))) - (substitute* "tests/qtest/Makefile.include" - ;; Disable the following test, which triggers a crash on some - ;; x86 CPUs (see https://issues.guix.info/43048 and - ;; https://bugs.launchpad.net/qemu/+bug/1896263). - (("check-qtest-i386-y \\+= bios-tables-test" all) (string-append "# " all))))) - (add-after 'unpack 'patch-test-shebangs - (lambda _ - (substitute* "tests/qemu-iotests/check" - (("#!/usr/bin/env python3") - (string-append "#!" (which "python3")))))) - (add-after 'patch-source-shebangs 'patch-/bin/sh-references + (add-after 'patch-source-shebangs 'patch-embedded-shebangs (lambda _ ;; Ensure the executables created by these source files reference ;; /bin/sh from the store so they work inside the build container. (substitute* '("block/cloop.c" "migration/exec.c" "net/tap.c" "tests/qtest/libqtest.c") - (("/bin/sh") (which "sh"))))) + (("/bin/sh") (which "sh"))) + (substitute* "Makefile" + (("SHELL = /usr/bin/env bash -o pipefail") + "SHELL = bash -o pipefail")) + (substitute* "tests/qemu-iotests/check" + (("#!/usr/bin/env python3") + (string-append "#!" (which "python3")))))) + (add-before 'configure 'fix-optionrom-makefile + (lambda _ + ;; Work around the inability of the rules defined in this + ;; Makefile to locate the firmware files (e.g.: No rule to make + ;; target 'multiboot.bin') by extending the VPATH. + (substitute* "pc-bios/optionrom/Makefile" + (("^VPATH = \\$\\(SRC_DIR\\)") + "VPATH = $(SRC_DIR):$(TOPSRC_DIR)/pc-bios")))) + ;; XXX ./configure is being re-run at beginning of build phase... (replace 'configure (lambda* (#:key inputs outputs configure-flags #:allow-other-keys) ;; The `configure' script doesn't understand some of the @@ -249,7 +255,7 @@ (setenv "SHELL" (which "bash")) ;; Ensure config.status gets the correct shebang off the bat. ;; The build system gets confused if we change it later and - ;; attempts to re-run the whole configury, and fails. + ;; attempts to re-run the whole configuration, and fails. (substitute* "configure" (("#!/bin/sh") (string-append "#!" (which "sh")))) @@ -288,7 +294,7 @@ (bin (string-append static "/bin"))) (with-directory-excursion "../user-static" (for-each (cut install-file <> bin) - (append-map (cut find-files <> "^qemu-") + (append-map (cut find-files <> "^qemu-" #:stat stat) (scandir "." (cut string-suffix? "-linux-user" <>)))))))) @@ -345,6 +351,7 @@ exec smbd $@"))) ("perl" ,perl) ("flex" ,flex) ("bison" ,bison) + ("ninja" ,ninja) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) ("python-sphinx" ,python-sphinx) -- cgit 1.4.1 From 74fdd0fea08fde451ad1a9d43abeeab27c422383 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 8 Mar 2021 22:02:38 -0500 Subject: gnu: dbus-c++: Fix command name in description. * gnu/packages/glib.scm (dbus-c++)[description]: Fix command prefix in description, and mention the second command installed as well. --- 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 0d265e8687..1b9cd71785 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -995,8 +995,8 @@ This package provides the library for GLib applications.") #t))))) (synopsis "D-Bus API for C++") (description "This package provides D-Bus client API bindings for the C++ -programming language. It also contains the utility -@command{dbuscxx-xml2cpp}.") +programming language. It also provides the @command{dbusxx-xml2cpp} and +@command{dbusxx-introspect} commands.") (home-page "https://sourceforge.net/projects/dbus-cplusplus/") (license license:lgpl2.1+))) -- cgit 1.4.1 From 821e6439212f8e94580674eaaff2ce6752cd3b18 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:08:55 +0100 Subject: gnu: r-limma: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-limma): Move from here... * gnu/packages/bioconductor.scm (r-limma): ...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 d611f3a491..379b6c30c0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1850,6 +1850,25 @@ Enrichment Analysis} (GSEA).") the Human Protein Atlas project.") (license license:artistic2.0))) +(define-public r-limma + (package + (name "r-limma") + (version "3.46.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "limma" version)) + (sha256 + (base32 + "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) + (build-system r-build-system) + (home-page "http://bioinf.wehi.edu.au/limma") + (synopsis "Package for linear models for microarray and RNA-seq data") + (description "This package can be used for the analysis of gene expression +studies, especially the use of linear models for analysing designed experiments +and the assessment of differential expression. The analysis methods apply to +different technologies, including microarrays, RNA-seq, and quantitative PCR.") + (license license:gpl2+))) + (define-public r-rbgl (package (name "r-rbgl") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d9afe2c56f..9774b442a3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,25 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-limma - (package - (name "r-limma") - (version "3.46.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "limma" version)) - (sha256 - (base32 - "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) - (build-system r-build-system) - (home-page "http://bioinf.wehi.edu.au/limma") - (synopsis "Package for linear models for microarray and RNA-seq data") - (description "This package can be used for the analysis of gene expression -studies, especially the use of linear models for analysing designed experiments -and the assessment of differential expression. The analysis methods apply to -different technologies, including microarrays, RNA-seq, and quantitative PCR.") - (license license:gpl2+))) - (define-public r-xvector (package (name "r-xvector") -- cgit 1.4.1 From e56b3db82ea81e88632a15994a5792849ecb0c5c Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:08:56 +0100 Subject: gnu: r-xvector: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-xvector): Move from here... * gnu/packages/bioconductor.scm (r-xvector): ...to here. --- gnu/packages/bioconductor.scm | 36 ++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 36 ------------------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 379b6c30c0..fdb2f7c7ac 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2108,6 +2108,42 @@ annotation infrastructure.") coding changes and predict coding outcomes.") (license license:artistic2.0))) +(define-public r-xvector + (package + (name "r-xvector") + (version "0.30.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "XVector" version)) + (sha256 + (base32 + "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) + (properties + `((upstream-name . "XVector"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/XVector") + (synopsis "Representation and manpulation of external sequences") + (description + "This package provides memory efficient S4 classes for storing sequences +\"externally\" (behind an R external pointer, or on disk).") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9774b442a3..65db983461 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,42 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-xvector - (package - (name "r-xvector") - (version "0.30.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "XVector" version)) - (sha256 - (base32 - "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) - (properties - `((upstream-name . "XVector"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (inputs - `(("zlib" ,zlib))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://bioconductor.org/packages/XVector") - (synopsis "Representation and manpulation of external sequences") - (description - "This package provides memory efficient S4 classes for storing sequences -\"externally\" (behind an R external pointer, or on disk).") - (license license:artistic2.0))) - (define-public r-genomicranges (package (name "r-genomicranges") -- cgit 1.4.1 From f3f09b99cd32f46c47db30f0afb632614c43172d Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:08:57 +0100 Subject: gnu: r-genomicranges: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-genomicranges): Move from here... * gnu/packages/bioconductor.scm (r-genomicranges): ...to here. --- gnu/packages/bioconductor.scm | 31 +++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 31 ------------------------------- 2 files changed, 31 insertions(+), 31 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index fdb2f7c7ac..ec273cae70 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1770,6 +1770,37 @@ translation between different chromosome sequence naming conventions (e.g., names in their natural, rather than lexicographic, order.") (license license:artistic2.0))) +(define-public r-genomicranges + (package + (name "r-genomicranges") + (version "1.42.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomicRanges" version)) + (sha256 + (base32 + "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) + (properties + `((upstream-name . "GenomicRanges"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GenomicRanges") + (synopsis "Representation and manipulation of genomic intervals") + (description + "This package provides tools to efficiently represent and manipulate +genomic annotations and alignments is playing a central role when it comes to +analyzing high-throughput sequencing data (a.k.a. NGS data). The +GenomicRanges package defines general purpose containers for storing and +manipulating genomic intervals and variables defined along a genome.") + (license license:artistic2.0))) + (define-public r-gostats (package (name "r-gostats") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 65db983461..4889c148e4 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,37 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-genomicranges - (package - (name "r-genomicranges") - (version "1.42.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "GenomicRanges" version)) - (sha256 - (base32 - "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) - (properties - `((upstream-name . "GenomicRanges"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GenomicRanges") - (synopsis "Representation and manipulation of genomic intervals") - (description - "This package provides tools to efficiently represent and manipulate -genomic annotations and alignments is playing a central role when it comes to -analyzing high-throughput sequencing data (a.k.a. NGS data). The -GenomicRanges package defines general purpose containers for storing and -manipulating genomic intervals and variables defined along a genome.") - (license license:artistic2.0))) - (define-public r-biobase (package (name "r-biobase") -- cgit 1.4.1 From 457de7f401300085066a0426068fe75f8df85943 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:08:58 +0100 Subject: gnu: r-biobase: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biobase): Move from here... * gnu/packages/bioconductor.scm (r-biobase): ...to here. --- gnu/packages/bioconductor.scm | 22 ++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ec273cae70..b7308848c0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1570,6 +1570,28 @@ microarrays.") databases. Packages produced are intended to be used with AnnotationDbi.") (license license:artistic2.0))) +(define-public r-biobase + (package + (name "r-biobase") + (version "2.50.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biobase" version)) + (sha256 + (base32 + "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) + (properties + `((upstream-name . "Biobase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/Biobase") + (synopsis "Base functions for Bioconductor") + (description + "This package provides functions that are needed by many other packages +on Bioconductor or which replace R functions.") + (license license:artistic2.0))) + (define-public r-category (package (name "r-category") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4889c148e4..b73862ff86 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,28 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biobase - (package - (name "r-biobase") - (version "2.50.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biobase" version)) - (sha256 - (base32 - "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) - (properties - `((upstream-name . "Biobase"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/Biobase") - (synopsis "Base functions for Bioconductor") - (description - "This package provides functions that are needed by many other packages -on Bioconductor or which replace R functions.") - (license license:artistic2.0))) - (define-public r-annotationdbi (package (name "r-annotationdbi") -- cgit 1.4.1 From 16c7e79ebbe911a1e8cb7ad8d9cb1c5d8ede34c7 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:08:59 +0100 Subject: gnu: r-annotationdbi: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-annotationdbi): Move from here... * gnu/packages/bioconductor.scm (r-annotationdbi): ...to here. --- gnu/packages/bioconductor.scm | 29 +++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 29 ----------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index b7308848c0..2ae212dfac 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1538,6 +1538,35 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-annotationdbi + (package + (name "r-annotationdbi") + (version "1.52.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "AnnotationDbi" version)) + (sha256 + (base32 + "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) + (properties + `((upstream-name . "AnnotationDbi"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-dbi" ,r-dbi) + ("r-iranges" ,r-iranges) + ("r-rsqlite" ,r-rsqlite) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/AnnotationDbi") + (synopsis "Annotation database interface") + (description + "This package provides user interface and database connection code for +annotation data packages using SQLite data storage.") + (license license:artistic2.0))) + (define-public r-annotationforge (package (name "r-annotationforge") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b73862ff86..a45196bc5b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,35 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-annotationdbi - (package - (name "r-annotationdbi") - (version "1.52.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "AnnotationDbi" version)) - (sha256 - (base32 - "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) - (properties - `((upstream-name . "AnnotationDbi"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-dbi" ,r-dbi) - ("r-iranges" ,r-iranges) - ("r-rsqlite" ,r-rsqlite) - ("r-s4vectors" ,r-s4vectors))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/AnnotationDbi") - (synopsis "Annotation database interface") - (description - "This package provides user interface and database connection code for -annotation data packages using SQLite data storage.") - (license license:artistic2.0))) - (define-public r-biomart (package (name "r-biomart") -- cgit 1.4.1 From c11b541fba8131e701b55c5c7ef1a412bb4d1fc8 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:09:00 +0100 Subject: gnu: r-biomart: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biomart): Move from here... * gnu/packages/bioconductor.scm (r-biomart): ...to here. --- gnu/packages/bioconductor.scm | 38 ++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 38 -------------------------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2ae212dfac..897e85dfe3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1621,6 +1621,44 @@ databases. Packages produced are intended to be used with AnnotationDbi.") on Bioconductor or which replace R functions.") (license license:artistic2.0))) +(define-public r-biomart + (package + (name "r-biomart") + (version "2.46.3") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "biomaRt" version)) + (sha256 + (base32 + "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) + (properties + `((upstream-name . "biomaRt"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biocfilecache" ,r-biocfilecache) + ("r-httr" ,r-httr) + ("r-openssl" ,r-openssl) + ("r-progress" ,r-progress) + ("r-rappdirs" ,r-rappdirs) + ("r-stringr" ,r-stringr) + ("r-xml" ,r-xml) + ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/biomaRt") + (synopsis "Interface to BioMart databases") + (description + "biomaRt provides an interface to a growing collection of databases +implementing the @url{BioMart software suite, http://www.biomart.org}. The +package enables retrieval of large amounts of data in a uniform way without +the need to know the underlying database schemas or write complex SQL queries. +Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, +Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt +users direct access to a diverse set of data and enable a wide range of +powerful online queries from gene annotation to database mining.") + (license license:artistic2.0))) + (define-public r-category (package (name "r-category") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a45196bc5b..289a96f572 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,44 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biomart - (package - (name "r-biomart") - (version "2.46.3") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "biomaRt" version)) - (sha256 - (base32 - "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) - (properties - `((upstream-name . "biomaRt"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biocfilecache" ,r-biocfilecache) - ("r-httr" ,r-httr) - ("r-openssl" ,r-openssl) - ("r-progress" ,r-progress) - ("r-rappdirs" ,r-rappdirs) - ("r-stringr" ,r-stringr) - ("r-xml" ,r-xml) - ("r-xml2" ,r-xml2))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/biomaRt") - (synopsis "Interface to BioMart databases") - (description - "biomaRt provides an interface to a growing collection of databases -implementing the @url{BioMart software suite, http://www.biomart.org}. The -package enables retrieval of large amounts of data in a uniform way without -the need to know the underlying database schemas or write complex SQL queries. -Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, -Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt -users direct access to a diverse set of data and enable a wide range of -powerful online queries from gene annotation to database mining.") - (license license:artistic2.0))) - (define-public r-biocparallel (package (name "r-biocparallel") -- cgit 1.4.1 From eab9807fb38b70e203ac965f2705c76adaedcc07 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:09:01 +0100 Subject: gnu: r-biocparallel: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biocparallel): Move from here... * gnu/packages/bioconductor.scm (r-biocparallel): ...to here. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 897e85dfe3..6482d8e4c1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1659,6 +1659,33 @@ users direct access to a diverse set of data and enable a wide range of powerful online queries from gene annotation to database mining.") (license license:artistic2.0))) +(define-public r-biocparallel + (package + (name "r-biocparallel") + (version "1.24.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocParallel" version)) + (sha256 + (base32 + "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) + (properties + `((upstream-name . "BiocParallel"))) + (build-system r-build-system) + (propagated-inputs + `(("r-futile-logger" ,r-futile-logger) + ("r-snow" ,r-snow) + ("r-bh" ,r-bh))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocParallel") + (synopsis "Bioconductor facilities for parallel evaluation") + (description + "This package provides modified versions and novel implementation of +functions for parallel evaluation, tailored to use with Bioconductor +objects.") + (license (list license:gpl2+ license:gpl3+)))) + (define-public r-category (package (name "r-category") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 289a96f572..af3fa36b19 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,33 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biocparallel - (package - (name "r-biocparallel") - (version "1.24.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocParallel" version)) - (sha256 - (base32 - "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) - (properties - `((upstream-name . "BiocParallel"))) - (build-system r-build-system) - (propagated-inputs - `(("r-futile-logger" ,r-futile-logger) - ("r-snow" ,r-snow) - ("r-bh" ,r-bh))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocParallel") - (synopsis "Bioconductor facilities for parallel evaluation") - (description - "This package provides modified versions and novel implementation of -functions for parallel evaluation, tailored to use with Bioconductor -objects.") - (license (list license:gpl2+ license:gpl3+)))) - (define-public r-biostrings (package (name "r-biostrings") -- cgit 1.4.1 From b1a19ab6e28277f0f9c72961be3cf709bd14e6e2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:09:02 +0100 Subject: gnu: r-biostrings: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-biostrings): Move from here... * gnu/packages/bioconductor.scm (r-biostrings): ...to here. --- gnu/packages/bioconductor.scm | 27 +++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 27 --------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6482d8e4c1..2b7d65023d 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1686,6 +1686,33 @@ functions for parallel evaluation, tailored to use with Bioconductor objects.") (license (list license:gpl2+ license:gpl3+)))) +(define-public r-biostrings + (package + (name "r-biostrings") + (version "2.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biostrings" version)) + (sha256 + (base32 + "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) + (properties + `((upstream-name . "Biostrings"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-crayon" ,r-crayon) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/Biostrings") + (synopsis "String objects and algorithms for biological sequences") + (description + "This package provides memory efficient string containers, string +matching algorithms, and other utilities, for fast manipulation of large +biological sequences or sets of sequences.") + (license license:artistic2.0))) + (define-public r-category (package (name "r-category") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index af3fa36b19..415210085e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,33 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-biostrings - (package - (name "r-biostrings") - (version "2.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biostrings" version)) - (sha256 - (base32 - "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) - (properties - `((upstream-name . "Biostrings"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-crayon" ,r-crayon) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/Biostrings") - (synopsis "String objects and algorithms for biological sequences") - (description - "This package provides memory efficient string containers, string -matching algorithms, and other utilities, for fast manipulation of large -biological sequences or sets of sequences.") - (license license:artistic2.0))) - (define-public r-rsamtools (package (name "r-rsamtools") -- cgit 1.4.1 From adf45daae93219a31dbabd8dd80a806cc747aa81 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:09:03 +0100 Subject: gnu: r-rsamtools: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-rsamtools): Move from here... * gnu/packages/bioconductor.scm (r-rsamtools): ...to here. --- gnu/packages/bioconductor.scm | 43 +++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 43 ----------------------------------------- 2 files changed, 43 insertions(+), 43 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 2b7d65023d..c659bdd09e 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2147,6 +2147,49 @@ reports together for a particular project that can be viewed in a web browser.") (license license:artistic2.0))) +(define-public r-rsamtools + (package + (name "r-rsamtools") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Rsamtools" version)) + (sha256 + (base32 + "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) + (properties + `((upstream-name . "Rsamtools"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bitops" ,r-bitops) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-rhtslib" ,r-rhtslib) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") + (synopsis "Interface to samtools, bcftools, and tabix") + (description + "This package provides an interface to the @code{samtools}, +@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence +Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed +tab-delimited (tabix) files.") + (license license:expat))) + (define-public r-shortread (package (name "r-shortread") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 415210085e..05805d1a8b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,49 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-rsamtools - (package - (name "r-rsamtools") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Rsamtools" version)) - (sha256 - (base32 - "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) - (properties - `((upstream-name . "Rsamtools"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biostrings" ,r-biostrings) - ("r-bitops" ,r-bitops) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-rhtslib" ,r-rhtslib) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") - (synopsis "Interface to samtools, bcftools, and tabix") - (description - "This package provides an interface to the @code{samtools}, -@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence -Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed -tab-delimited (tabix) files.") - (license license:expat))) - (define-public r-delayedarray (package (name "r-delayedarray") -- cgit 1.4.1 From d99a18252c31fb2c19e3e7ae65bb36e85c3aa1af Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 19:09:04 +0100 Subject: gnu: r-delayedarray: Move to (gnu packages bioconductor). * gnu/packages/bioinformatics.scm (r-delayedarray): Move from here... * gnu/packages/bioconductor.scm (r-delayedarray): ...to here. --- gnu/packages/bioconductor.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 33 --------------------------------- 2 files changed, 33 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index c659bdd09e..9212165706 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1212,6 +1212,39 @@ data. In addition, provides numerous plotting functions for commonly used visualizations.") (license license:artistic2.0))) +(define-public r-delayedarray + (package + (name "r-delayedarray") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "DelayedArray" version)) + (sha256 + (base32 + "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + (properties + `((upstream-name . "DelayedArray"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-matrixgenerics" ,r-matrixgenerics))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DelayedArray") + (synopsis "Delayed operations on array-like objects") + (description + "Wrapping an array-like object (typically an on-disk object) in a +@code{DelayedArray} object allows one to perform common array operations on it +without loading the object in memory. In order to reduce memory usage and +optimize performance, operations on the object are either delayed or executed +using a block processing mechanism. Note that this also works on in-memory +array-like objects like @code{DataFrame} objects (typically with Rle columns), +@code{Matrix} objects, and ordinary arrays and data frames.") + (license license:artistic2.0))) + (define-public r-bluster (package (name "r-bluster") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 05805d1a8b..bc342b5de8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,39 +7691,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-delayedarray - (package - (name "r-delayedarray") - (version "0.16.2") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "DelayedArray" version)) - (sha256 - (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) - (properties - `((upstream-name . "DelayedArray"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors) - ("r-iranges" ,r-iranges) - ("r-matrix" ,r-matrix) - ("r-matrixgenerics" ,r-matrixgenerics))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DelayedArray") - (synopsis "Delayed operations on array-like objects") - (description - "Wrapping an array-like object (typically an on-disk object) in a -@code{DelayedArray} object allows one to perform common array operations on it -without loading the object in memory. In order to reduce memory usage and -optimize performance, operations on the object are either delayed or executed -using a block processing mechanism. Note that this also works on in-memory -array-like objects like @code{DataFrame} objects (typically with Rle columns), -@code{Matrix} objects, and ordinary arrays and data frames.") - (license license:artistic2.0))) - (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") -- cgit 1.4.1 From 8f9fd9b70c7bf166d96a4b1dc8b427f8cdf040b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 23:31:58 +0100 Subject: gnu: r-biocparallel: Build reproducibly. * gnu/packages/bioconductor.scm (r-biocparallel)[arguments]: Add phase "make-reproducible". --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 9212165706..166d30be0f 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1705,6 +1705,34 @@ powerful online queries from gene annotation to database mining.") (properties `((upstream-name . "BiocParallel"))) (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + ;; Remove generated documentation. + (for-each delete-file + '("inst/doc/BiocParallel_BatchtoolsParam.pdf" + "inst/doc/Introduction_To_BiocParallel.pdf" + "inst/doc/Errors_Logs_And_Debugging.pdf" + "inst/doc/BiocParallel_BatchtoolsParam.R" + "inst/doc/Introduction_To_BiocParallel.R" + "inst/doc/Errors_Logs_And_Debugging.R")) + + ;; Remove time-dependent macro + (substitute* '("inst/doc/BiocParallel_BatchtoolsParam.Rnw" + "inst/doc/Introduction_To_BiocParallel.Rnw" + "inst/doc/Errors_Logs_And_Debugging.Rnw" + "vignettes/BiocParallel_BatchtoolsParam.Rnw" + "vignettes/Introduction_To_BiocParallel.Rnw" + "vignettes/Errors_Logs_And_Debugging.Rnw") + (("\\today") "later")) + + ;; Initialize the random number generator seed when building. + (substitute* "R/internal_rng_stream.R" + (("\"L'Ecuyer-CMRG\"\\)" m) + (string-append + m "; if (!is.na(Sys.getenv(\"SOURCE_DATE_EPOCH\"))) {set.seed(100)}\n")))))))) (propagated-inputs `(("r-futile-logger" ,r-futile-logger) ("r-snow" ,r-snow) -- cgit 1.4.1 From 8ec0ca8faff62f19426f22aeb1bd59a8950ca05a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 Mar 2021 19:48:52 -0400 Subject: Revert some commits that caused `guix pull` to fail. This reverts commits 821e6439212f8e94580674eaaff2ce6752cd3b18 through 8f9fd9b70c7bf166d96a4b1dc8b427f8cdf040b5. Specifically, these commits caused the build failure of guix-package-cache.drv like this: ------ (repl-version 0 1 1) Generating package cache for '/gnu/store/vyz7q26kxxd4z70m24rkkqqhaizdla7g-profile'... (exception unbound-variable (value #f) (value "Unbound variable: ~S") (value (r-biobase)) (value #f)) --- gnu/packages/bioconductor.scm | 333 ---------------------------------------- gnu/packages/bioinformatics.scm | 305 ++++++++++++++++++++++++++++++++++++ 2 files changed, 305 insertions(+), 333 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 166d30be0f..d611f3a491 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1212,39 +1212,6 @@ data. In addition, provides numerous plotting functions for commonly used visualizations.") (license license:artistic2.0))) -(define-public r-delayedarray - (package - (name "r-delayedarray") - (version "0.16.2") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "DelayedArray" version)) - (sha256 - (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) - (properties - `((upstream-name . "DelayedArray"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors) - ("r-iranges" ,r-iranges) - ("r-matrix" ,r-matrix) - ("r-matrixgenerics" ,r-matrixgenerics))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DelayedArray") - (synopsis "Delayed operations on array-like objects") - (description - "Wrapping an array-like object (typically an on-disk object) in a -@code{DelayedArray} object allows one to perform common array operations on it -without loading the object in memory. In order to reduce memory usage and -optimize performance, operations on the object are either delayed or executed -using a block processing mechanism. Note that this also works on in-memory -array-like objects like @code{DataFrame} objects (typically with Rle columns), -@code{Matrix} objects, and ordinary arrays and data frames.") - (license license:artistic2.0))) - (define-public r-bluster (package (name "r-bluster") @@ -1571,35 +1538,6 @@ structure.") microarrays.") (license license:artistic2.0))) -(define-public r-annotationdbi - (package - (name "r-annotationdbi") - (version "1.52.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "AnnotationDbi" version)) - (sha256 - (base32 - "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) - (properties - `((upstream-name . "AnnotationDbi"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-dbi" ,r-dbi) - ("r-iranges" ,r-iranges) - ("r-rsqlite" ,r-rsqlite) - ("r-s4vectors" ,r-s4vectors))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/AnnotationDbi") - (synopsis "Annotation database interface") - (description - "This package provides user interface and database connection code for -annotation data packages using SQLite data storage.") - (license license:artistic2.0))) - (define-public r-annotationforge (package (name "r-annotationforge") @@ -1632,148 +1570,6 @@ annotation data packages using SQLite data storage.") databases. Packages produced are intended to be used with AnnotationDbi.") (license license:artistic2.0))) -(define-public r-biobase - (package - (name "r-biobase") - (version "2.50.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biobase" version)) - (sha256 - (base32 - "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) - (properties - `((upstream-name . "Biobase"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/Biobase") - (synopsis "Base functions for Bioconductor") - (description - "This package provides functions that are needed by many other packages -on Bioconductor or which replace R functions.") - (license license:artistic2.0))) - -(define-public r-biomart - (package - (name "r-biomart") - (version "2.46.3") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "biomaRt" version)) - (sha256 - (base32 - "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) - (properties - `((upstream-name . "biomaRt"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biocfilecache" ,r-biocfilecache) - ("r-httr" ,r-httr) - ("r-openssl" ,r-openssl) - ("r-progress" ,r-progress) - ("r-rappdirs" ,r-rappdirs) - ("r-stringr" ,r-stringr) - ("r-xml" ,r-xml) - ("r-xml2" ,r-xml2))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/biomaRt") - (synopsis "Interface to BioMart databases") - (description - "biomaRt provides an interface to a growing collection of databases -implementing the @url{BioMart software suite, http://www.biomart.org}. The -package enables retrieval of large amounts of data in a uniform way without -the need to know the underlying database schemas or write complex SQL queries. -Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, -Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt -users direct access to a diverse set of data and enable a wide range of -powerful online queries from gene annotation to database mining.") - (license license:artistic2.0))) - -(define-public r-biocparallel - (package - (name "r-biocparallel") - (version "1.24.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocParallel" version)) - (sha256 - (base32 - "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) - (properties - `((upstream-name . "BiocParallel"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-reproducible - (lambda _ - ;; Remove generated documentation. - (for-each delete-file - '("inst/doc/BiocParallel_BatchtoolsParam.pdf" - "inst/doc/Introduction_To_BiocParallel.pdf" - "inst/doc/Errors_Logs_And_Debugging.pdf" - "inst/doc/BiocParallel_BatchtoolsParam.R" - "inst/doc/Introduction_To_BiocParallel.R" - "inst/doc/Errors_Logs_And_Debugging.R")) - - ;; Remove time-dependent macro - (substitute* '("inst/doc/BiocParallel_BatchtoolsParam.Rnw" - "inst/doc/Introduction_To_BiocParallel.Rnw" - "inst/doc/Errors_Logs_And_Debugging.Rnw" - "vignettes/BiocParallel_BatchtoolsParam.Rnw" - "vignettes/Introduction_To_BiocParallel.Rnw" - "vignettes/Errors_Logs_And_Debugging.Rnw") - (("\\today") "later")) - - ;; Initialize the random number generator seed when building. - (substitute* "R/internal_rng_stream.R" - (("\"L'Ecuyer-CMRG\"\\)" m) - (string-append - m "; if (!is.na(Sys.getenv(\"SOURCE_DATE_EPOCH\"))) {set.seed(100)}\n")))))))) - (propagated-inputs - `(("r-futile-logger" ,r-futile-logger) - ("r-snow" ,r-snow) - ("r-bh" ,r-bh))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocParallel") - (synopsis "Bioconductor facilities for parallel evaluation") - (description - "This package provides modified versions and novel implementation of -functions for parallel evaluation, tailored to use with Bioconductor -objects.") - (license (list license:gpl2+ license:gpl3+)))) - -(define-public r-biostrings - (package - (name "r-biostrings") - (version "2.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biostrings" version)) - (sha256 - (base32 - "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) - (properties - `((upstream-name . "Biostrings"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-crayon" ,r-crayon) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/Biostrings") - (synopsis "String objects and algorithms for biological sequences") - (description - "This package provides memory efficient string containers, string -matching algorithms, and other utilities, for fast manipulation of large -biological sequences or sets of sequences.") - (license license:artistic2.0))) - (define-public r-category (package (name "r-category") @@ -1974,37 +1770,6 @@ translation between different chromosome sequence naming conventions (e.g., names in their natural, rather than lexicographic, order.") (license license:artistic2.0))) -(define-public r-genomicranges - (package - (name "r-genomicranges") - (version "1.42.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "GenomicRanges" version)) - (sha256 - (base32 - "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) - (properties - `((upstream-name . "GenomicRanges"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GenomicRanges") - (synopsis "Representation and manipulation of genomic intervals") - (description - "This package provides tools to efficiently represent and manipulate -genomic annotations and alignments is playing a central role when it comes to -analyzing high-throughput sequencing data (a.k.a. NGS data). The -GenomicRanges package defines general purpose containers for storing and -manipulating genomic intervals and variables defined along a genome.") - (license license:artistic2.0))) - (define-public r-gostats (package (name "r-gostats") @@ -2085,25 +1850,6 @@ Enrichment Analysis} (GSEA).") the Human Protein Atlas project.") (license license:artistic2.0))) -(define-public r-limma - (package - (name "r-limma") - (version "3.46.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "limma" version)) - (sha256 - (base32 - "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) - (build-system r-build-system) - (home-page "http://bioinf.wehi.edu.au/limma") - (synopsis "Package for linear models for microarray and RNA-seq data") - (description "This package can be used for the analysis of gene expression -studies, especially the use of linear models for analysing designed experiments -and the assessment of differential expression. The analysis methods apply to -different technologies, including microarrays, RNA-seq, and quantitative PCR.") - (license license:gpl2+))) - (define-public r-rbgl (package (name "r-rbgl") @@ -2208,49 +1954,6 @@ reports together for a particular project that can be viewed in a web browser.") (license license:artistic2.0))) -(define-public r-rsamtools - (package - (name "r-rsamtools") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Rsamtools" version)) - (sha256 - (base32 - "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) - (properties - `((upstream-name . "Rsamtools"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biostrings" ,r-biostrings) - ("r-bitops" ,r-bitops) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-rhtslib" ,r-rhtslib) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") - (synopsis "Interface to samtools, bcftools, and tabix") - (description - "This package provides an interface to the @code{samtools}, -@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence -Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed -tab-delimited (tabix) files.") - (license license:expat))) - (define-public r-shortread (package (name "r-shortread") @@ -2386,42 +2089,6 @@ annotation infrastructure.") coding changes and predict coding outcomes.") (license license:artistic2.0))) -(define-public r-xvector - (package - (name "r-xvector") - (version "0.30.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "XVector" version)) - (sha256 - (base32 - "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) - (properties - `((upstream-name . "XVector"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (inputs - `(("zlib" ,zlib))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://bioconductor.org/packages/XVector") - (synopsis "Representation and manpulation of external sequences") - (description - "This package provides memory efficient S4 classes for storing sequences -\"externally\" (behind an R external pointer, or on disk).") - (license license:artistic2.0))) - (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index bc342b5de8..d9afe2c56f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7691,6 +7691,311 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) +(define-public r-limma + (package + (name "r-limma") + (version "3.46.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "limma" version)) + (sha256 + (base32 + "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) + (build-system r-build-system) + (home-page "http://bioinf.wehi.edu.au/limma") + (synopsis "Package for linear models for microarray and RNA-seq data") + (description "This package can be used for the analysis of gene expression +studies, especially the use of linear models for analysing designed experiments +and the assessment of differential expression. The analysis methods apply to +different technologies, including microarrays, RNA-seq, and quantitative PCR.") + (license license:gpl2+))) + +(define-public r-xvector + (package + (name "r-xvector") + (version "0.30.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "XVector" version)) + (sha256 + (base32 + "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) + (properties + `((upstream-name . "XVector"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/XVector") + (synopsis "Representation and manpulation of external sequences") + (description + "This package provides memory efficient S4 classes for storing sequences +\"externally\" (behind an R external pointer, or on disk).") + (license license:artistic2.0))) + +(define-public r-genomicranges + (package + (name "r-genomicranges") + (version "1.42.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomicRanges" version)) + (sha256 + (base32 + "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) + (properties + `((upstream-name . "GenomicRanges"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GenomicRanges") + (synopsis "Representation and manipulation of genomic intervals") + (description + "This package provides tools to efficiently represent and manipulate +genomic annotations and alignments is playing a central role when it comes to +analyzing high-throughput sequencing data (a.k.a. NGS data). The +GenomicRanges package defines general purpose containers for storing and +manipulating genomic intervals and variables defined along a genome.") + (license license:artistic2.0))) + +(define-public r-biobase + (package + (name "r-biobase") + (version "2.50.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biobase" version)) + (sha256 + (base32 + "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) + (properties + `((upstream-name . "Biobase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/Biobase") + (synopsis "Base functions for Bioconductor") + (description + "This package provides functions that are needed by many other packages +on Bioconductor or which replace R functions.") + (license license:artistic2.0))) + +(define-public r-annotationdbi + (package + (name "r-annotationdbi") + (version "1.52.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "AnnotationDbi" version)) + (sha256 + (base32 + "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) + (properties + `((upstream-name . "AnnotationDbi"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-dbi" ,r-dbi) + ("r-iranges" ,r-iranges) + ("r-rsqlite" ,r-rsqlite) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/AnnotationDbi") + (synopsis "Annotation database interface") + (description + "This package provides user interface and database connection code for +annotation data packages using SQLite data storage.") + (license license:artistic2.0))) + +(define-public r-biomart + (package + (name "r-biomart") + (version "2.46.3") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "biomaRt" version)) + (sha256 + (base32 + "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) + (properties + `((upstream-name . "biomaRt"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biocfilecache" ,r-biocfilecache) + ("r-httr" ,r-httr) + ("r-openssl" ,r-openssl) + ("r-progress" ,r-progress) + ("r-rappdirs" ,r-rappdirs) + ("r-stringr" ,r-stringr) + ("r-xml" ,r-xml) + ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/biomaRt") + (synopsis "Interface to BioMart databases") + (description + "biomaRt provides an interface to a growing collection of databases +implementing the @url{BioMart software suite, http://www.biomart.org}. The +package enables retrieval of large amounts of data in a uniform way without +the need to know the underlying database schemas or write complex SQL queries. +Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, +Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt +users direct access to a diverse set of data and enable a wide range of +powerful online queries from gene annotation to database mining.") + (license license:artistic2.0))) + +(define-public r-biocparallel + (package + (name "r-biocparallel") + (version "1.24.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocParallel" version)) + (sha256 + (base32 + "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) + (properties + `((upstream-name . "BiocParallel"))) + (build-system r-build-system) + (propagated-inputs + `(("r-futile-logger" ,r-futile-logger) + ("r-snow" ,r-snow) + ("r-bh" ,r-bh))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocParallel") + (synopsis "Bioconductor facilities for parallel evaluation") + (description + "This package provides modified versions and novel implementation of +functions for parallel evaluation, tailored to use with Bioconductor +objects.") + (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-biostrings + (package + (name "r-biostrings") + (version "2.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biostrings" version)) + (sha256 + (base32 + "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) + (properties + `((upstream-name . "Biostrings"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-crayon" ,r-crayon) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/Biostrings") + (synopsis "String objects and algorithms for biological sequences") + (description + "This package provides memory efficient string containers, string +matching algorithms, and other utilities, for fast manipulation of large +biological sequences or sets of sequences.") + (license license:artistic2.0))) + +(define-public r-rsamtools + (package + (name "r-rsamtools") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Rsamtools" version)) + (sha256 + (base32 + "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) + (properties + `((upstream-name . "Rsamtools"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bitops" ,r-bitops) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-rhtslib" ,r-rhtslib) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") + (synopsis "Interface to samtools, bcftools, and tabix") + (description + "This package provides an interface to the @code{samtools}, +@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence +Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed +tab-delimited (tabix) files.") + (license license:expat))) + +(define-public r-delayedarray + (package + (name "r-delayedarray") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "DelayedArray" version)) + (sha256 + (base32 + "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + (properties + `((upstream-name . "DelayedArray"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-matrixgenerics" ,r-matrixgenerics))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DelayedArray") + (synopsis "Delayed operations on array-like objects") + (description + "Wrapping an array-like object (typically an on-disk object) in a +@code{DelayedArray} object allows one to perform common array operations on it +without loading the object in memory. In order to reduce memory usage and +optimize performance, operations on the object are either delayed or executed +using a block processing mechanism. Note that this also works on in-memory +array-like objects like @code{DataFrame} objects (typically with Rle columns), +@code{Matrix} objects, and ordinary arrays and data frames.") + (license license:artistic2.0))) + (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") -- cgit 1.4.1 From 3679286bb4a69322048e1b8c17b161c4ad386769 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Mon, 15 Mar 2021 23:07:34 +0100 Subject: gnu: glances: Update to 3.1.6. * gnu/packages/python-xyz.scm (glances): Update to 3.1.6. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2114503ff3..2098f00d85 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2016 Dylan Jeffers ;;; Copyright © 2016 David Craven ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke -;;; Copyright © 2016, 2017 Stefan Reichör +;;; Copyright © 2016, 2017, 2021 Stefan Reichör ;;; Copyright © 2016, 2017, 2019 Alex Vong ;;; Copyright © 2016, 2017, 2018 Arun Isaac ;;; Copyright © 2016, 2017, 2018, 2020, 2021 Julien Lepiller @@ -14542,13 +14542,13 @@ command @command{natsort} that exposes this functionality in the command line.") (define-public glances (package (name "glances") - (version "3.1.4") + (version "3.1.6") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 - (base32 "0dc47gbvp9a3wxppdqihxpglxxaxbj3hcvzgcxxq8zcsciah3plq")) + (base32 "11xbm8jgcxha191ly7q76nab1ilabiz14mqf6i3y6aw5xvgg017c")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From e5fcfb82e0eaf591fa6e8e390dbda842d239ef7c Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Mon, 15 Mar 2021 23:02:20 +0100 Subject: gnu: tmsu: Improve installation. * gnu/packages/file-systems.scm (tmsu)[arguments]: Don't install go source files. Install binary as tmsu instead of TMSU. Signed-off-by: Efraim Flashner --- gnu/packages/file-systems.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index e7d78e41fb..198653c639 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020 Morgan Smith ;;; Copyright © 2021 raid5atemyhomework +;;; Copyright © 2021 Stefan Reichör ;;; ;;; This file is part of GNU Guix. ;;; @@ -1174,7 +1175,16 @@ local file system using FUSE.") (build-system go-build-system) (arguments `(#:import-path "github.com/oniony/TMSU" - #:unpack-path "..")) + #:unpack-path ".." + #:install-source? #f + #:phases + (modify-phases %standard-phases + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + ;; The go build system produces /bin/TMSU -> install as /bin/tmsu + (rename-file (string-append out "/bin/TMSU") + (string-append out "/bin/tmsu")))))))) (inputs `(("go-github-com-mattn-go-sqlite3" ,go-github-com-mattn-go-sqlite3) ("go-github-com-hanwen-fuse" ,go-github-com-hanwen-fuse))) -- cgit 1.4.1 From a01bfa7deed1d556fc75ab5588517442054bc5a9 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 08:56:51 +0100 Subject: gnu: python-urllib3: Update to 1.26.4 [fixes CVE-2021-28363]. * gnu/packages/python-web.scm (python-urllib3/fixed): New variable. (python-urllib3)[replacement]: Graft. --- gnu/packages/python-web.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e327b3b030..fe79537a63 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2726,6 +2726,7 @@ authenticated session objects providing things like keep-alive.") (sha256 (base32 "024yldjwjavps39yb77sc422z8fa9bn20wcqrcncjwrqjab8y60r")))) + (replacement python-urllib3/fixed) (build-system python-build-system) (arguments `(#:tests? #f)) (propagated-inputs @@ -2744,6 +2745,17 @@ supports url redirection and retries, and also gzip and deflate decoding.") (properties `((python2-variant . ,(delay python2-urllib3)))) (license license:expat))) +(define python-urllib3/fixed + (package/inherit python-urllib3 + (version "1.26.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urllib3" version)) + (sha256 + (base32 + "0dw9w9bs3hmr5dp3r3h43jyzzb1g1046ag7lj8pqf58i4kvj3c77")))))) + ;; Some software requires an older version of urllib3, notably Docker. (define-public python-urllib3-1.24 (package (inherit python-urllib3) -- cgit 1.4.1 From db87d6ddafd26c5ad657178cf7fdab524d05c522 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 09:25:02 +0100 Subject: gnu: python2-urllib3: Update to 1.26.4 [fixes CVE-2021-28363]. * gnu/packages/python-web.scm (python2-urllib3)[base]: Base off of python-urllib3/fixed. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index fe79537a63..ea75fa9390 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2769,7 +2769,7 @@ supports url redirection and retries, and also gzip and deflate decoding.") (define-public python2-urllib3 - (let ((base (package-with-python2 (strip-python2-variant python-urllib3)))) + (let ((base (package-with-python2 (strip-python2-variant python-urllib3/fixed)))) (package/inherit base (propagated-inputs -- cgit 1.4.1 From ab9629b7c91ff7d6392a03512cfe442823267777 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 10:52:11 +0100 Subject: gnu: git: Update to 2.31.0. * gnu/packages/version-control.scm (git): Update to 2.31.0. --- 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 d85b5352fa..11e266cada 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -170,14 +170,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.30.2") + (version "2.31.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "1ajz6lng6yldqm66lhrjfgbbxk09rq8cngv7hz9nqizrf46dkxs1")))) + "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) -- cgit 1.4.1 From 0ee5d4f7a8e25be437297f88ed7013c4f37abafb Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 10:58:36 +0100 Subject: gnu: git: Fix git-manpages native input's hash. This is a follow-up to commit ab9629b7c91ff7d6392a03512cfe442823267777. * gnu/packages/version-control.scm (git)[native-inputs]: Fix git-manpages's hash. --- 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 11e266cada..ecb2ec7c6a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -194,7 +194,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1aiabqbc6mg23r19g2cwd4iajf55cpkxqylwn14hgpg64piaqr2y")))) + "1v40wwj130k76xf2w6vwhvfpkk765q1gcy5bqcrqssxf66ydqp8q")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From 097cf21d1d34f4f66a403c3fb6e15b6709c4dd8a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 12 Mar 2021 01:59:10 +0100 Subject: gnu: Remove MongoDB. mongodb 3.4.10 has unpatched CVEs and mongodb 3.4.24 has some files in the release tarball under the SSPL, therefore we cannot provide mongodb while upholding to good security standards. It turns out feff80cec3c97a3df2c20d300be12d67f79d4f22 was right since while the main license file wasnt altered to SSPL, some files in the tree contain SSPL headers. * gnu/packages/databases.scm (go-gopkg.in-mgo.v2): Remove. * gnu/packages/databases.scm (mongo-tools): Remove. * doc/guix.texi (mongodb-service-type): Remove. * gnu/tests/databases.scm (%test-mongodb, %mongodb-os, run-mongodb-test): Remove. * gnu/services/databases.scm (mongodb-configuration, mongodb-configuration?, mongodb-configuration-mongodb, mongodb-configuration-config-file, mongodb-configuration-data-directory, mongodb-service-type, %default-mongodb-configuration-file, %mongodb-accounts, mongodb-activation, mongodb-shepherd-service): Remove. * gnu/packages/databases.scm (mongodb): Remove. --- doc/guix.texi | 28 ----- gnu/packages/databases.scm | 298 --------------------------------------------- gnu/services/databases.scm | 88 ------------- gnu/tests/databases.scm | 83 ------------- 4 files changed, 497 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index e6ef7dbe03..410670e639 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19810,34 +19810,6 @@ Additional command line options to pass to @code{memcached}. @end table @end deftp -@subsubheading MongoDB - -@defvr {Scheme Variable} mongodb-service-type -This is the service type for @uref{https://www.mongodb.com/, MongoDB}. -The value for the service type is a @code{mongodb-configuration} object. -@end defvr - -@lisp -(service mongodb-service-type) -@end lisp - -@deftp {Data Type} mongodb-configuration -Data type representing the configuration of mongodb. - -@table @asis -@item @code{mongodb} (default: @code{mongodb}) -The MongoDB package to use. - -@item @code{config-file} (default: @code{%default-mongodb-configuration-file}) -The configuration file for MongoDB. - -@item @code{data-directory} (default: @code{"/var/lib/mongodb"}) -This value is used to create the directory, so that it exists and is -owned by the mongodb user. It should match the data-directory which -MongoDB is configured to use through the configuration file. -@end table -@end deftp - @subsubheading Redis @defvr {Scheme Variable} redis-service-type diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8705cd2be4..5249aa0d10 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -193,52 +193,6 @@ either single machines or networked clusters.") (license license:gpl3+))) -(define-public go-gopkg.in-mgo.v2 - (package - (name "go-gopkg.in-mgo.v2") - (version "2016.08.01") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/go-mgo/mgo") - (commit (string-append "r" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0rwbi1z63w43b0z9srm8m7iz1fdwx7bq7n2mz862d6liiaqa59jd")))) - (build-system go-build-system) - (arguments - `(#:import-path "gopkg.in/mgo.v2" - ;; TODO: The tests fail as MongoDB fails to start - ;; Error parsing command line: unrecognised option '--chunkSize' - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'reset-gzip-timestamps) - (add-before 'check 'start-mongodb - (lambda* (#:key tests? #:allow-other-keys) - (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) - (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) - ("daemontools" ,daemontools))) - (synopsis "@code{mgo} offers a rich MongoDB driver for Go.") - (description - "@code{mgo} (pronounced as mango) is a MongoDB driver for the Go language. -It implements a rich selection of features under a simple API following -standard Go idioms.") - (home-page "https://labix.org/mgo") - (license license:bsd-2))) - (define-public ephemeralpg (package (name "ephemeralpg") @@ -661,143 +615,6 @@ replacement for the code@{python-memcached} library.") (define-public python2-pylibmc (package-with-python2 python-pylibmc)) -;; There is a point at which mongodb switched to the Server Side Public -;; License (SSPL), which is not a FOSS license. As such, be careful -;; when updating this package. -(define-public mongodb - (package - (name "mongodb") - (version "3.4.24") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/mongodb/mongo/archive/r" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0y1669sqj8wyf0y0njhxs4qhn1qzjhrs2h2qllya5samxrlrjhkg")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each (lambda (dir) - (delete-file-recursively - (string-append "src/third_party/" dir))) - '("pcre-8.42" "scons-2.5.0" "snappy-1.1.3" - "valgrind-3.11.0" "wiredtiger" - "yaml-cpp-0.6.2" "zlib-1.2.11")) - #t)))) - (build-system scons-build-system) - (inputs - `(("openssl" ,openssl-1.0) - ("pcre" ,pcre) - ,@(match (%current-system) - ((or "x86_64-linux" "aarch64-linux" "mips64el-linux") - `(("wiredtiger" ,wiredtiger))) - (_ `())) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("snappy" ,snappy))) - (native-inputs - `(("valgrind" ,valgrind) - ("perl" ,perl) - ("python" ,python-2) - ("python2-pymongo" ,python2-pymongo) - ("python2-pyyaml" ,python2-pyyaml) - ("tzdata" ,tzdata-for-tests))) - (arguments - `(#:scons ,scons-python2 - #:phases - (let ((common-options - `(;; "--use-system-tcmalloc" TODO: Missing gperftools - "--use-system-pcre" - ;; wiredtiger is 64-bit only - ,,(if (any (cute string-prefix? <> (or (%current-target-system) - (%current-system))) - '("i686-linux" "armhf-linux")) - ``"--wiredtiger=off" - ``"--use-system-wiredtiger") - ;; TODO - ;; build/opt/mongo/db/fts/unicode/string.o failed: Error 1 - ;; --use-system-boost - "--use-system-snappy" - "--use-system-zlib" - "--use-system-valgrind" - ;; "--use-system-stemmer" TODO: Missing relevant package - "--use-system-yaml" - "--disable-warnings-as-errors" - ,(format #f "--jobs=~a" (parallel-job-count)) - "--ssl"))) - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - ;; Remove use of GNU extensions in parse_number_test.cpp, to - ;; allow compiling with GCC 7 or later - ;; https://jira.mongodb.org/browse/SERVER-28063 - (substitute* "src/mongo/base/parse_number_test.cpp" - (("0xabcab\\.defdefP-10") - "687.16784283419838")) - #t)) - (add-after 'unpack 'scons-propagate-environment - (lambda _ - ;; Modify the SConstruct file to arrange for - ;; environment variables to be propagated. - (substitute* "SConstruct" - (("^env = Environment\\(") - "env = Environment(ENV=os.environ, ")) - #t)) - (add-after 'unpack 'create-version-file - (lambda _ - (call-with-output-file "version.json" - (lambda (port) - (display ,(simple-format #f "{ - \"version\": \"~A\" -}" version) port))) - #t)) - (replace 'build - (lambda _ - (apply invoke `("scons" - ,@common-options - "mongod" "mongo" "mongos")))) - (replace 'check - (lambda* (#:key tests? inputs #:allow-other-keys) - (setenv "TZDIR" - (string-append (assoc-ref inputs "tzdata") - "/share/zoneinfo")) - (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* (#: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)) - #t)))))) - (home-page "https://www.mongodb.org/") - (synopsis "High performance and high availability document database") - (description - "Mongo is a high-performance, high availability, schema-free -document-oriented database. A key goal of MongoDB is to bridge the gap -between key/value stores (which are fast and highly scalable) and traditional -RDBMS systems (which are deep in functionality).") - (license (list license:agpl3 - ;; Some parts are licensed under the Apache License - license:asl2.0)))) - (define-public mycli (package (name "mycli") @@ -3686,121 +3503,6 @@ transforms idiomatic python function calls to well-formed SQL queries.") the SQL language using a syntax that reflects the resulting query.") (license license:asl2.0))) -(define-public mongo-tools - (package - (name "mongo-tools") - (version "3.4.0") - (source - (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/mongodb/mongo-tools") - (commit (string-append "r" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1bcsz5cvj39a7nsxsfqmz9igrw33j6yli9kffigqyscs52amw7x1")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/mongodb/mongo-tools" - #:modules ((srfi srfi-1) - (guix build go-build-system) - (guix build utils)) - #:install-source? #f - #:phases - (let ((all-tools - '("bsondump" "mongodump" "mongoexport" "mongofiles" - "mongoimport" "mongooplog" "mongorestore" - "mongostat" "mongotop"))) - (modify-phases %standard-phases - (add-after 'unpack 'delete-bundled-source-code - (lambda _ - (delete-file-recursively - "src/github.com/mongodb/mongo-tools/vendor") - #t)) - (add-after 'delete-bundled-source-code 'patch-source - (lambda _ - ;; Remove a redundant argument that causes compilation to fail. - (substitute* - "src/github.com/mongodb/mongo-tools/mongorestore/filepath.go" - (("skipping restore of system.profile collection\", db)") - "skipping restore of system.profile collection\")")) - #t)) - (replace 'build - (lambda _ - (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" - (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 (assoc-ref outputs "out") - "/bin"))) - 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) - ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) - ("go-gopkg.in-mgo.v2" ,go-gopkg.in-mgo.v2) - ("go-gopkg.in-tomb.v2" ,go-gopkg.in-tomb.v2) - ("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go) - ("go-github.com-smartystreets-goconvey" ,go-github.com-smartystreets-goconvey))) - (home-page "https://github.com/mongodb/mongo-tools") - (synopsis "Various tools for interacting with MongoDB and BSON") - (description - "This package includes a collection of tools related to MongoDB. -@table @code -@item bsondump -Display BSON files in a human-readable format -@item mongoimport -Convert data from JSON, TSV or CSV and insert them into a collection -@item mongoexport -Write an existing collection to CSV or JSON format -@item mongodump/mongorestore -Dump MongoDB backups to disk in the BSON format -@item mongorestore -Read MongoDB backups in the BSON format, and restore them to a live database -@item mongostat -Monitor live MongoDB servers, replica sets, or sharded clusters -@item mongofiles -Read, write, delete, or update files in GridFS -@item mongooplog -Replay oplog entries between MongoDB servers -@item mongotop -Monitor read/write activity on a mongo server -@end table") - (license license:asl2.0))) - ;; There are many wrappers for this in other languages. When touching, please ;; be sure to ensure all dependencies continue to build. (define-public apache-arrow diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm index 979f3dd6c8..a841e7a50e 100644 --- a/gnu/services/databases.scm +++ b/gnu/services/databases.scm @@ -79,13 +79,6 @@ memcached-configuration-udp-port memcached-configuration-additional-options - mongodb-configuration - mongodb-configuration? - mongodb-configuration-mongodb - mongodb-configuration-config-file - mongodb-configuration-data-directory - mongodb-service-type - mysql-service mysql-service-type mysql-configuration @@ -521,87 +514,6 @@ created after the PostgreSQL database is started."))) (const %memcached-accounts)))) (default-value (memcached-configuration)))) - -;;; -;;; MongoDB -;;; - -(define %default-mongodb-configuration-file - (plain-file - "mongodb.yaml" - "# GNU Guix: MongoDB default configuration file -processManagement: - pidFilePath: /var/run/mongodb/pid -storage: - dbPath: /var/lib/mongodb -")) - - -(define-record-type* - mongodb-configuration make-mongodb-configuration - mongodb-configuration? - (mongodb mongodb-configuration-mongodb - (default mongodb)) - (config-file mongodb-configuration-config-file - (default %default-mongodb-configuration-file)) - (data-directory mongodb-configuration-data-directory - (default "/var/lib/mongodb"))) - -(define %mongodb-accounts - (list (user-group (name "mongodb") (system? #t)) - (user-account - (name "mongodb") - (group "mongodb") - (system? #t) - (comment "Mongodb server user") - (home-directory "/var/lib/mongodb") - (shell (file-append shadow "/sbin/nologin"))))) - -(define mongodb-activation - (match-lambda - (($ mongodb config-file data-directory) - #~(begin - (use-modules (guix build utils)) - (let ((user (getpwnam "mongodb"))) - (for-each - (lambda (directory) - (mkdir-p directory) - (chown directory - (passwd:uid user) (passwd:gid user))) - '("/var/run/mongodb" #$data-directory))))))) - -(define mongodb-shepherd-service - (match-lambda - (($ mongodb config-file data-directory) - (shepherd-service - (provision '(mongodb)) - (documentation "Run the Mongodb daemon.") - (requirement '(user-processes loopback)) - (start #~(make-forkexec-constructor - `(,(string-append #$mongodb "/bin/mongod") - "--config" - ,#$config-file) - #:user "mongodb" - #:group "mongodb" - #:pid-file "/var/run/mongodb/pid" - #:log-file "/var/log/mongodb.log")) - (stop #~(make-kill-destructor)))))) - -(define mongodb-service-type - (service-type - (name 'mongodb) - (description "Run the MongoDB document database server.") - (extensions - (list (service-extension shepherd-root-service-type - (compose list - mongodb-shepherd-service)) - (service-extension activation-service-type - mongodb-activation) - (service-extension account-service-type - (const %mongodb-accounts)))) - (default-value - (mongodb-configuration)))) - ;;; ;;; MySQL. diff --git a/gnu/tests/databases.scm b/gnu/tests/databases.scm index e831d69f5a..4bfe4ee282 100644 --- a/gnu/tests/databases.scm +++ b/gnu/tests/databases.scm @@ -30,7 +30,6 @@ #:use-module (guix gexp) #:use-module (guix store) #:export (%test-memcached - %test-mongodb %test-postgresql %test-mysql)) @@ -127,88 +126,6 @@ (description "Connect to a running MEMCACHED server.") (value (run-memcached-test)))) -(define %mongodb-os - (operating-system - (inherit - (simple-operating-system - (service dhcp-client-service-type) - (service mongodb-service-type))) - (packages (cons* mongodb - %base-packages)))) - -(define* (run-mongodb-test #:optional (port 27017)) - "Run tests in %MONGODB-OS, forwarding PORT." - (define os - (marionette-operating-system - %mongodb-os - #:imported-modules '((gnu services herd) - (guix combinators)))) - - (define vm - (virtual-machine - (operating-system os) - (memory-size 1024) - (disk-image-size (* 1024 (expt 2 20))) - (port-forwardings `((27017 . ,port))))) - - (define test - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (srfi srfi-11) (srfi srfi-64) - (gnu build marionette) - (ice-9 popen) - (ice-9 rdelim)) - - (define marionette - (make-marionette (list #$vm))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "mongodb") - - (test-assert "service running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (match (start-service 'mongodb) - (#f #f) - (('service response-parts ...) - (match (assq-ref response-parts 'running) - ((pid) (number? pid)))))) - marionette)) - - (test-eq "test insert" - 0 - (system* (string-append #$mongodb "/bin/mongo") - "test" - "--eval" - "db.testCollection.insert({data: 'test-data'})")) - - (test-equal "test find" - "test-data" - (let* ((port (open-pipe* - OPEN_READ - (string-append #$mongodb "/bin/mongo") - "test" - "--quiet" - "--eval" - "db.testCollection.findOne().data")) - (output (read-line port)) - (status (close-pipe port))) - output)) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) - - (gexp->derivation "mongodb-test" test)) - -(define %test-mongodb - (system-test - (name "mongodb") - (description "Connect to a running MONGODB server.") - (value (run-mongodb-test)))) - ;;; ;;; The PostgreSQL service. -- cgit 1.4.1 From fcf8c6c5652cac87647d87e87dede3a7b154716b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Mar 2021 11:03:58 +0100 Subject: gnu: hisat2: Update to 2.2.1. * gnu/packages/bioinformatics.scm (hisat2): Update to 2.2.1. [source]: Fetch from git repository on Github. [arguments]: Add phase to build manual; remove trailing #t from other phases. [native-inputs]: Remove unzip. [home-page]: Update. [inputs]: Add python-wrapper. --- gnu/packages/bioinformatics.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d9afe2c56f..90e81354a5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -3819,15 +3819,17 @@ particular, reads spanning multiple exons.") (define-public hisat2 (package (name "hisat2") - (version "2.0.5") + (version "2.2.1") (source (origin - (method url-fetch) - (uri (string-append "ftp://ftp.ccb.jhu.edu/pub/infphilo/hisat2" - "/downloads/hisat2-" version "-source.zip")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/DaehwanKimLab/hisat2/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lywnr8kijwsc2aw10dwxic0n0yvip6fl3rjlvc8zzwahamy4x7g")))) + "0lmzdhzjkvxw7n5w40pbv5fgzd4cz0f9pxczswn3d4cr0k10k754")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target @@ -3840,9 +3842,12 @@ particular, reads spanning multiple exons.") (add-after 'unpack 'make-deterministic (lambda _ (substitute* "Makefile" - (("`date`") "0")) - #t)) + (("`date`") "0")))) (delete 'configure) + (add-before 'build 'build-manual + (lambda _ + (mkdir-p "doc") + (invoke "make" "doc"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -3853,13 +3858,13 @@ particular, reads spanning multiple exons.") (find-files "." "hisat2(-(build|align|inspect)(-(s|l)(-debug)*)*)*$")) (mkdir-p doc) - (install-file "doc/manual.inc.html" doc)) - #t))))) + (install-file "doc/manual.inc.html" doc))))))) (native-inputs - `(("unzip" ,unzip) ; needed for archive from ftp - ("perl" ,perl) + `(("perl" ,perl) ("pandoc" ,pandoc))) ; for documentation - (home-page "https://ccb.jhu.edu/software/hisat2/index.shtml") + (inputs + `(("python" ,python-wrapper))) + (home-page "https://daehwankimlab.github.io/hisat2/") (synopsis "Graph-based alignment of genomic sequencing reads") (description "HISAT2 is a fast and sensitive alignment program for mapping next-generation sequencing reads (both DNA and RNA) to a population of human -- cgit 1.4.1 From 9bab0950f761a4e628fd8804e3b263751456c524 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 15 Mar 2021 22:48:35 -0400 Subject: gnu: libmemcached: Disable test suite. * gnu/packages/databases.scm (libmemcached): Disable test suite. Removing trailing #t. [phases]{fix-configure}: Remove useless group in pattern. {disable-failing-tests}: Remove phase. {build-and-install-html-doc}: Order after the build phase. [home-page]: Please 'guix lint'. Reported-by: Simon Tournier --- gnu/packages/databases.scm | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5249aa0d10..8be83f5cbe 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2017 Kristofer Buffington ;;; Copyright © 2018 Amirouche Boubekki ;;; Copyright © 2018 Joshua Sierles, Nextjournal -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2021 Maxim Cournoyer ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Gábor Boskovits @@ -526,7 +526,8 @@ applications.") ("cyrus-sasl" ,cyrus-sasl))) (outputs '("out" "doc")) (arguments - '(#:phases + '(#:tests? #f ;many tests fail and use too much time + #:phases (modify-phases %standard-phases (add-before 'bootstrap 'fix-configure.ac ;; Move the AC_CONFIG_AUX_DIR macro use under AC_INIT, otherwise we @@ -538,24 +539,9 @@ applications.") (delete-file "bootstrap.sh") ;not useful in the context of Guix (substitute* "configure.ac" (("^AC_CONFIG_AUX_DIR\\(\\[build-aux\\]\\).*") "") - (("(^AC_INIT.*)" anchor) - (string-append anchor "AC_CONFIG_AUX_DIR([build-aux])\n"))) - #t)) - (add-before 'bootstrap 'disable-failing-tests - ;; See: https://bugs.launchpad.net/libmemcached/+bug/1803926 - (lambda _ - ;; Mark some heavily failing test suites as expected to fail. - (substitute* "Makefile.am" - (("(XFAIL_TESTS =[^\n]*)" xfail_tests) - (string-append xfail_tests " tests/testudp" - " tests/libmemcached-1.0/testapp" - " tests/libmemcached-1.0/testsocket"))) - ;; Disable two tests of the unittest test suite. - (substitute* "libtest/unittest.cc" - ((".*echo_fubar_BINARY \\},.*") "") - ((".*application_doesnotexist_BINARY \\},.*") "")) - #t)) - (add-after 'disable-dns-tests 'build-and-install-html-doc + (("^AC_INIT.*" anchor) + (string-append anchor "AC_CONFIG_AUX_DIR([build-aux])\n"))))) + (add-before 'build 'build-and-install-html-doc (lambda* (#:key outputs #:allow-other-keys) (let ((html (string-append (assoc-ref outputs "doc") "/share/doc/libmemcached/html/"))) @@ -563,9 +549,8 @@ applications.") ;; Cleanup useless files. (for-each delete-file-recursively (map (lambda (x) (string-append html x)) - '("_sources" ".doctrees" ".buildinfo")))) - #t))))) - (home-page "https://libmemcached.org/") + '("_sources" ".doctrees" ".buildinfo"))))))))) + (home-page "https://libmemcached.org/libMemcached.html") (synopsis "C++ library for memcached") (description "libMemcached is a library to use memcached in C/C++ applications. It comes with a complete reference guide and documentation of -- cgit 1.4.1 From 451f23df5e7a1798f85d58d1720387677444761a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Mar 2021 10:06:13 +0200 Subject: gnu: b4: Fix setup.py version incompatibility. * gnu/packages/version-control.scm (b4)[source]: Add snippet to not require too specific of a version. Reported-by: Kyle Meyer --- gnu/packages/version-control.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ecb2ec7c6a..46dba5db61 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, 2019 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner -;;; Copyright © 2015, 2018, 2020 Kyle Meyer +;;; Copyright © 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2016, 2017, 2018 Nikita @@ -2347,7 +2347,15 @@ based on a manifest file published by servers.") (method url-fetch) (uri (pypi-uri "b4" version)) (sha256 - (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")))) + (base32 "1j904dy9cwxl85k2ngc498q5cdnqwsmw3jibjr1m55w8aqdck68z")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fixes issue with dependency requirements being too strict. See upstream commit: + ;; https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=31348a14afdb1d39e7faf9576eaddea1ced76e19 + (substitute* "setup.py" + (("~=") ">=")) + #t)))) (build-system python-build-system) (arguments '(#:tests? #f)) ; No tests. (inputs -- cgit 1.4.1 From 335af327cd4f8e47e53fec0f1cd92174d418e32a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Mar 2021 14:06:40 +0100 Subject: gnu: asymptote: Update to 2.70. * gnu/packages/plotutils.scm (asymptote): Update to 2.70. --- gnu/packages/plotutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4e044fab75..7f59bae770 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -206,14 +206,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.69") + (version "2.70") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "17gp9n0cgwlbsy16jya07cjw18drbg2gqhdghlvmkybpfh3mcr26")))) + (base32 "0gqcm0m916kjzyfswlplhyyvmqhg9hsishmbg4pyjcwchlx93k7m")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not -- cgit 1.4.1 From c954f795f90502188a572d98108b82efa7fb1e3c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Mar 2021 14:09:06 +0100 Subject: gnu: python-pikepdf: Update to 2.9.0. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2098f00d85..cbbd424f9e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5858,13 +5858,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.8.0.post2") + (version "2.9.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "0ya9bir41bz61y2njlcr5ni8l6cjsy0h5vg9ayxhw7dzgcibj0yp")))) + (base32 "1dx84gvxf8js5988b20dwpg0xd7by2bczjlrdh3cpppwaaxx5nx9")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 2724f1b23141fdc66b09ec5a3adbccccbc53b459 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Mar 2021 14:10:17 +0100 Subject: gnu: emacs-leaf: Update to 4.4.0. * gnu/packages/emacs-xyz.scm (emacs-leaf): Update to 4.4.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dabac3c287..3496c699a8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12118,14 +12118,14 @@ performance-oriented and tidy.") (define-public emacs-leaf (package (name "emacs-leaf") - (version "4.3.2") + (version "4.4.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "leaf-" version ".tar")) (sha256 - (base32 "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi")))) + (base32 "0wgf3ksrk6b77fvy3sr9hqazq0snbvqyrrql6v1hryqjfq5nwfx7")))) (build-system emacs-build-system) (home-page "https://github.com/conao3/leaf.el") (synopsis "Simplify your init.el configuration, extended use-package") -- cgit 1.4.1 From 55ef497479745be85c1f0bf370c1c974fe7f2a34 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 16 Mar 2021 14:11:14 +0100 Subject: gnu: emacs-easy-kill: Update to 0.9.4. * gnu/packages/emacs-xyz.scm (emacs-easy-kill): Update to 0.9.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3496c699a8..bedfd61fc7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14255,14 +14255,14 @@ and shell-command prompts that are based on Bash completion.") (define-public emacs-easy-kill (package (name "emacs-easy-kill") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/easy-kill-" version ".tar")) (sha256 (base32 - "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb")))) + "1pqqv4dhfm00wqch4wy3n2illsvxlz9r6r64925cvq3i7wq4la1x")))) (build-system emacs-build-system) (home-page "https://github.com/leoliu/easy-kill") (synopsis "Kill and mark things easily in Emacs") -- cgit 1.4.1 From c9006a0ee107208c27769e4e4eb042ead0c2a62f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Mar 2021 14:16:44 +0100 Subject: gnu: Add python-amply. * gnu/packages/python-xyz.scm (python-amply): New variable. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cbbd424f9e..3e33debe10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7983,6 +7983,30 @@ of the structure, dynamics, and functions of complex networks.") Python.") (license license:lgpl2.1+))) +(define-public python-amply + (package + (name "python-amply") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "amply" version)) + (sha256 + (base32 + "0f1db9zp0rsfzxvaz55xwh8h5rfdgr9a2a715g06ic8nknsdq4nb")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-pyparsing" ,python-pyparsing))) + (native-inputs + `(("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/willu47/amply") + (synopsis "Load and manipulate AMPL/GLPK data as Python data structures") + (description + "Amply allows you to load and manipulate AMPL/GLPK data as Python data +structures.") + (license license:epl1.0))) + (define-public snakemake (package (name "snakemake") -- cgit 1.4.1 From fa0a18522d5c382f82a391e2eca3c1ca48b60834 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Mar 2021 14:16:57 +0100 Subject: gnu: Add python-pulp. * gnu/packages/python-xyz.scm (python-pulp): New variable. --- gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3e33debe10..ca00a8dc97 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8007,6 +8007,28 @@ Python.") structures.") (license license:epl1.0))) +(define-public python-pulp + (package + (name "python-pulp") + (version "2.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PuLP" version)) + (sha256 + (base32 + "1dammrg0f1v0r028i3rpxbf2bsyxmjq0q6ihb4x2wsdki44z3bxj")))) + (build-system python-build-system) + (propagated-inputs + `(("python-amply" ,python-amply))) + (home-page "https://github.com/coin-or/pulp") + (synopsis "Linear Programming modeler") + (description + "PuLP is a Linear Programming modeler written in Python. PuLP can +generate MPS or LP files and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to +solve linear problems.") + (license license:expat))) + (define-public snakemake (package (name "snakemake") -- cgit 1.4.1 From 08447ab7cdb4031d7e41870176e375911f4a0917 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Mar 2021 14:17:07 +0100 Subject: gnu: Add python-toposort. * gnu/packages/python-xyz.scm (python-toposort): New variable. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ca00a8dc97..0c865dff33 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8029,6 +8029,25 @@ generate MPS or LP files and call GLPK, COIN CLP/CBC, CPLEX, and GUROBI to solve linear problems.") (license license:expat))) +(define-public python-toposort + (package + (name "python-toposort") + (version "1.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toposort" version)) + (sha256 + (base32 + "1b2hppzjg3p006qya3yfdnp76dwq8frl97lypdam0kw4xxb8yhm7")))) + (build-system python-build-system) + (home-page "https://gitlab.com/ericvsmith/toposort") + (synopsis "Topological sort algorithm") + (description + "This package provides an implementation of a topological sort +algorithm.") + (license license:asl2.0))) + (define-public snakemake (package (name "snakemake") -- cgit 1.4.1 From 4f02c4c4a9ffa51049d72bc422c6eda8b507c04d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 16 Mar 2021 14:17:13 +0100 Subject: gnu: snakemake: Add missing inputs. * gnu/packages/python-xyz.scm (snakemake)[propagated-inputs]: Add python-nbformat, python-pulp, and python-toposort. --- gnu/packages/python-xyz.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c865dff33..b98b0666cf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8082,11 +8082,14 @@ algorithm.") ("python-gitpython" ,python-gitpython) ("python-jinja2" ,python-jinja2) ("python-jsonschema" ,python-jsonschema) + ("python-nbformat" ,python-nbformat) ("python-networkx" ,python-networkx) ("python-psutil" ,python-psutil) + ("python-pulp" ,python-pulp) ("python-pyyaml" ,python-pyyaml) ("python-ratelimiter" ,python-ratelimiter) ("python-requests" ,python-requests) + ("python-toposort" ,python-toposort) ("python-wrapt" ,python-wrapt))) (home-page "https://snakemake.readthedocs.io") (synopsis "Python-based execution environment for make-like workflows") -- cgit 1.4.1 From 09b5cdf80dbbc7166deb2318f1aca266fda6ad26 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Mar 2021 15:26:33 +0200 Subject: gnu: tor: Update to 0.4.5.7 [security fixes]. * gnu/packages/tor.scm (tor): Update to 0.4.5.7. --- 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 86ae5d0ea4..d85c11aec0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019, 2021 Eric Bavier @@ -54,14 +54,14 @@ (define-public tor (package (name "tor") - (version "0.4.5.6") + (version "0.4.5.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "0cz78pjw2bc3kl3ziip1nhhbq89crv315rf1my3zmmgd9xws7jr2")))) + "0x7hhl0svfc4yh9xvq7kkzgmwjcw1ak9i0794wjg4biy2fmclzs4")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 82a9538ea01596a57bf642d729500f15bcd17f84 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 16 Mar 2021 18:41:34 +0100 Subject: gnu: varnish-modules: Update to 0.17.1 [fixes CVE-2021-28543]. * gnu/packages/web.scm (varnish-modules): Update to 0.17.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 4a14046d42..643de6ad6a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5938,14 +5938,14 @@ configuration language.") (package (name "varnish-modules") (home-page "https://github.com/varnish/varnish-modules") - (version "0.17.0") + (version "0.17.1") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0zg8y2sgkygdani70zp9rbx278431fmssj26d47c5qsiw939i519")))) + "1mzkad9r4rpm1fi7j7skwrsyzzbwcapfnlvvl1ls3rng2djcqb5j")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 109f58444beecd1b9b7c502f2a687a6b91c62dc0 Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Tue, 16 Mar 2021 12:03:12 -0400 Subject: gnu: mpg321: Fix CVE-2019-14247. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/mpg321-CVE-2019-14247.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/mp3.scm (mpg321)[source]: Apply it. Signed-off-by: Léo Le Bouter Signed-off-by: Leo Famulari --- gnu/local.mk | 1 + gnu/packages/mp3.scm | 4 +++- gnu/packages/patches/mpg321-CVE-2019-14247.patch | 23 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mpg321-CVE-2019-14247.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index cf8849cf59..abb1e2140d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1404,6 +1404,7 @@ dist_patch_DATA = \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mit-krb5-qualify-short-hostnames.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ + %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/module-init-tools-moduledir.patch \ %D%/packages/patches/monero-use-system-miniupnpc.patch \ %D%/packages/patches/mono-mdoc-timestamping.patch \ diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 34390d3696..dba3e17558 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -408,7 +408,9 @@ command-line tool as well as a C library, libmpg123.") version "/mpg321-" version ".tar.gz")) (sha256 (base32 - "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5")))) + "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5")) + (patches + (search-patches "mpg321-CVE-2019-14247.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-alsa"))) (inputs diff --git a/gnu/packages/patches/mpg321-CVE-2019-14247.patch b/gnu/packages/patches/mpg321-CVE-2019-14247.patch new file mode 100644 index 0000000000..03afaccc67 --- /dev/null +++ b/gnu/packages/patches/mpg321-CVE-2019-14247.patch @@ -0,0 +1,23 @@ +This patch was downloaded from https://sourceforge.net/p/mpg321/bugs/51/ and +fixes CVE-2019-14247. + +Description: Handle illegal bitrate value +Author: Chrysostomos Nanakos +Bug-Debian: https://bugs.debian.org/870406 +Bug-Debian: https://bugs.debian.org/887057 + +--- mpg321-0.3.2.orig/mad.c ++++ mpg321-0.3.2/mad.c +@@ -574,6 +574,12 @@ void scan(void const *ptr, ssize_t len, + + if (!is_vbr) + { ++ if (header.bitrate <= 0) ++ { ++ fprintf(stderr, "Illegal bit allocation value\n"); ++ return; ++ } ++ + double time = (len * 8.0) / (header.bitrate); /* time in seconds */ + double timefrac = (double)time - ((long)(time)); + long nsamples = 32 * MAD_NSBSAMPLES(&header); /* samples per frame */ -- cgit 1.4.1 From f4259f93ea6ecb5fa0e2e27697708499af18233f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Mar 2021 14:19:43 -0400 Subject: gnu: Add meson-next. * gnu/packages/build-tools.scm (meson-next): New variable. --- gnu/packages/build-tools.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index ae3debd87f..3e453cca82 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2021 qblade +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -313,6 +314,19 @@ resembles Python.") (base32 "1070kjiirxxdfppmrhi3wsc6rykay1zlciqrzayjhjg0hkw42mrv")))))) +(define-public meson-next + (package + (inherit meson) + (version "0.57.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/mesonbuild/meson/" + "releases/download/" version "/meson-" + version ".tar.gz")) + (sha256 + (base32 + "19n8alcpzv6npgp27iqljkmvdmr7s2c7zm8y997j1nlvpa1cgqbj")))))) + (define-public meson-for-build (package (inherit meson) -- cgit 1.4.1 From 15423d38c57d04bc1bbc70c7bd79eaf8cf82d513 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 16 Mar 2021 14:20:39 -0400 Subject: gnu: qemu: Enable reproducible builds. Fixes . The solution was suggested by bonzini on OFTC's #qemu channel. * gnu/packages/virtualization.scm (qemu)[snippet]: Delete bundled meson copy. [native-inputs]: Add meson-next. --- gnu/packages/virtualization.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 0558861173..fabac5b984 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -43,6 +43,7 @@ #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -162,7 +163,9 @@ "{ MK_STRUCT(STRUCT_ifmap_ifreq) };\n")) (("^([[:blank:]]*)target_ifreq_size[[:blank:]]=.*$" _ indent) (string-append indent "target_ifreq_size = " - "thunk_type_size(ifreq_max_type, 0);"))))))) + "thunk_type_size(ifreq_max_type, 0);"))) + ;; Delete the bundled meson copy. + (delete-file-recursively "meson"))))) (outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs (build-system gnu-build-system) (arguments @@ -351,6 +354,8 @@ exec smbd $@"))) ("perl" ,perl) ("flex" ,flex) ("bison" ,bison) + ;; Using meson 0.57.1 enables reproducible QEMU builds. + ("meson" ,meson-next) ("ninja" ,ninja) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) -- cgit 1.4.1 From c3fe23d0de5d6095ef67fe513823e1aad256dd73 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 16 Mar 2021 19:53:49 -0400 Subject: gnu: gnome-shell: Add 'lint-hidden-cve' property. * gnu/packages/gnome.scm (gnome-shell)[properties]: New field, marking CVE-2019-3820 as fixed. --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index db7941bb98..a3c3c75024 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8593,6 +8593,9 @@ properties, screen resolution, and other GNOME parameters.") ;; Missing propagation? See also: ("librsvg" ,librsvg) ("geoclue" ,geoclue))) + ;; CVE-2019-3820 was fixed before GNOME 3.34 was released, in upstream + ;; commit f0a7395b3006360905ccdc642982f9fc67378927. + (properties '((lint-hidden-cve . ("CVE-2019-3820")))) (synopsis "Desktop shell for GNOME") (home-page "https://wiki.gnome.org/Projects/GnomeShell") (description -- cgit 1.4.1 From d9f501b61997e1dd4bfa01db3d6e6a502e43adba Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 16 Mar 2021 19:57:21 -0400 Subject: gnu: gvfs: Add 'lint-hidden-cve' property. * gnu/packages/gnome.scm (gvfs)[properties]: New field, marking CVE-2019-12447, CVE-2019-12448, and CVE-2019-12449 as fixed. --- gnu/packages/gnome.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a3c3c75024..c5223e7b3f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6515,6 +6515,10 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") ("openssh" ,openssh) ("polkit" ,polkit) ("udisks" ,udisks))) + ;; CVE-2019-{12447,12448,12449} are fixed in the 1.40.2 release. + (properties '((lint-hidden-cve . ("CVE-2019-12447" + "CVE-2019-12448" + "CVE-2019-12449")))) (home-page "https://wiki.gnome.org/gvfs/") (synopsis "Userspace virtual file system for GIO") (description -- cgit 1.4.1 From 1a265842e634656411bc7304c4648273f174f65e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 17 Mar 2021 03:42:12 -0400 Subject: gnu: Use PACKAGE/INHERIT in more places. * gnu/packages/algebra.scm (fftwf, fftw-openmpi), gnu/packages/audio.scm (ztoolkit-rsvg), gnu/packages/bioinformatics.scm (python2-dendropy), gnu/packages/boost.scm (boost-with-python2), gnu/packages/check.scm (python2-mock, python2-pytest-mock), gnu/packages/cups.scm (hplip-minimal), gnu/packages/freedesktop.scm (libinput-minimal), gnu/packages/gettext.scm (gnu-gettext), gnu/packages/glib.scm (python2-pygobject), gnu/packages/gnome.scm (gdl-minimal, libsoup-minimal, python2-pyatspi), gnu/packages/groff.scm (groff-minimal), gnu/packages/jami.scm (ffmpeg-jami), gnu/packages/libcanberra.scm (libcanberra/gtk+-2), gnu/packages/lirc.scm (python2-lirc), gnu/packages/llvm.scm (clang-runtime-3.5), gnu/packages/mpi.scm (java-openmpi, openmpi-thread-multiple), gnu/packages/node.scm (libnode), gnu/packages/onc-rpc.scm (libtirpc/hurd), gnu/packages/python-compression.scm (bitshuffle-for-snappy), gnu/packages/python-crypto.scm (python2-pycrypto, python2-cryptography) (python2-cryptography, python2-m2crypto), gnu/packages/python-web.scm (python2-html2text, python2-tornado) (python2-terminado, python2-ndg-httpsclient, python2-websocket-client) (python2-rauth, python2-url, python2-s3transfer), gnu/packages/python-xyz.scm (python2-psutil, python2-serpent) (python2-humanfriendly, python2-empy, python2-parse-type, python2-polib) (python2-jsonschema, python2-pystache, python2-cython, python2-numpydoc) (python2-ipyparallel, python2-traitlets, python2-dbus) (python2-beautifulsoup4, python2-pep517, python2-flake8, python2-llfuse) (python2-tlsh, python-file, python2-notebook, python-jupyter-console-minimal) (python2-contextlib2, python2-promise, python2-anyjson, python2-amqp) (python2-kombu, python2-billiard, python2-celery, python2-whoosh) (python2-jellyfish, python-rope, ptpython-2, python2-binaryornot) (python2-setproctitle, python2-argcomplete, python2-xopen, python2-isort) (python2-radon, python2-rfc6555, python2-activepapers, python2-send2trash) (python2-cloudpickle, python2-reparser), gnu/packages/python.scm (python2-called-python), gnu/packages/qt.scm (python2-sip, python-pyqt-without-qtwebkit, python2-pyqt) (python-qscintilla, python-pyqt+qscintilla), gnu/packages/scanner.scm (sane-backends), gnu/packages/sdl.scm (guile3.0-sdl2), gnu/packages/selinux.scm (checkpolicy, libselinux, libsemanage, secilc) (python-sepolgen, policycoreutils), gnu/packages/serialization.scm (lua5.1-libmpack, lua5.2-libmpack), gnu/packages/simulation.scm (fenics), gnu/packages/statistics.scm (python2-statsmodels), gnu/packages/texinfo.scm (info-reader), gnu/packages/wxwidgets.scm (wxwidgets-gtk2, wxwidgets-gtk2-3.1), gnu/packages/xml.scm (xmlsec-nss), gnu/packages/xorg.scm (uim-gtk, uim-qt), guix/build-system/python.scm (package-with-explicit-python) (strip-python2-variant): Use PACKAGE/INHERIT. --- gnu/packages/algebra.scm | 4 +- gnu/packages/audio.scm | 3 +- gnu/packages/bioinformatics.scm | 3 +- gnu/packages/boost.scm | 3 +- gnu/packages/check.scm | 4 +- gnu/packages/cups.scm | 3 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gettext.scm | 3 +- gnu/packages/glib.scm | 51 ++++++------ gnu/packages/gnome.scm | 9 +- gnu/packages/groff.scm | 3 +- gnu/packages/jami.scm | 3 +- gnu/packages/libcanberra.scm | 2 +- gnu/packages/lirc.scm | 3 +- gnu/packages/llvm.scm | 3 +- gnu/packages/mpi.scm | 5 +- gnu/packages/node.scm | 3 +- gnu/packages/onc-rpc.scm | 8 +- gnu/packages/python-compression.scm | 3 +- gnu/packages/python-crypto.scm | 6 +- gnu/packages/python-web.scm | 20 ++--- gnu/packages/python-xyz.scm | 162 +++++++++++++++--------------------- gnu/packages/python.scm | 3 +- gnu/packages/qt.scm | 10 +-- gnu/packages/scanner.scm | 3 +- gnu/packages/sdl.scm | 3 +- gnu/packages/selinux.scm | 12 +-- gnu/packages/serialization.scm | 4 +- gnu/packages/simulation.scm | 2 +- gnu/packages/statistics.scm | 2 +- gnu/packages/texinfo.scm | 3 +- gnu/packages/wxwidgets.scm | 4 +- gnu/packages/xml.scm | 3 +- gnu/packages/xorg.scm | 6 +- guix/build-system/python.scm | 6 +- 35 files changed, 158 insertions(+), 209 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index d2caa13d0e..129d922751 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -794,7 +794,7 @@ cosine/ sine transforms or DCT/DST).") (license license:gpl2+))) (define-public fftwf - (package (inherit fftw) + (package/inherit fftw (name "fftwf") (arguments (substitute-keyword-arguments (package-arguments fftw) @@ -812,7 +812,7 @@ cosine/ sine transforms or DCT/DST).") " Single-precision version.")))) (define-public fftw-openmpi - (package (inherit fftw) + (package/inherit fftw (name "fftw-openmpi") (inputs `(("openmpi" ,openmpi) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 67a3e57dd9..8b23f04fe5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4918,8 +4918,7 @@ edited, converted, compressed and saved.") (license license:lgpl2.1))) (define-public ztoolkit-rsvg - (package - (inherit ztoolkit) + (package/inherit ztoolkit (name "ztoolkit-rsvg") (arguments `(#:configure-flags `("-Denable_rsvg=true"))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 90e81354a5..eb466868d1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2744,8 +2744,7 @@ trees (phylogenies) and characters.") (define-public python2-dendropy (let ((base (package-with-python2 python-dendropy))) - (package - (inherit base) + (package/inherit base (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index b1ab8a4ec9..1323e28278 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -200,8 +200,7 @@ across a broad spectrum of applications.") "Some components have other similar licences.")))) (define-public boost-with-python2 - (package - (inherit boost) + (package/inherit boost (name "boost-python2") (native-inputs `(("python" ,python-2) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cfda247d67..21514d1bc4 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -836,7 +836,7 @@ have been used.") (define-public python2-mock (let ((base (package-with-python2 (strip-python2-variant python-mock)))) - (package (inherit base) + (package/inherit base (propagated-inputs `(("python2-functools32" ,python2-functools32) ("python2-funcsigs" ,python2-funcsigs) @@ -1240,7 +1240,7 @@ same arguments.") (define-public python2-pytest-mock (let ((base (package-with-python2 (strip-python2-variant python-pytest-mock)))) - (package (inherit base) + (package/inherit base (propagated-inputs `(("python2-mock" ,python2-mock) ,@(package-propagated-inputs base)))))) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 2edd5d245c..b18273109e 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -676,8 +676,7 @@ should only be used as part of the Guix cups-pk-helper service.") ("pkg-config" ,pkg-config))))) (define-public hplip-minimal - (package - (inherit hplip) + (package/inherit hplip (name "hplip-minimal") (arguments (substitute-keyword-arguments (package-arguments hplip) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e5f9ea71b6..4105dd7ca0 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -508,7 +508,7 @@ other applications that need to directly deal with input devices.") (license license:x11))) (define-public libinput-minimal - (package (inherit libinput) + (package/inherit libinput (name "libinput-minimal") (inputs (fold alist-delete (package-inputs libinput) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index bee33f2685..21228694d7 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -139,8 +139,7 @@ translated messages from the catalogs. Nearly all GNU packages use Gettext.") ;; module when there's a #:renamer, and that module may be empty at that point ;; in case or circular dependencies. (define-public gnu-gettext - (package - (inherit gettext-minimal) + (package/inherit gettext-minimal (name "gettext") (arguments (substitute-keyword-arguments (package-arguments gettext-minimal) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1b9cd71785..5f710a4a38 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -833,32 +833,33 @@ useful for C++.") (properties `((python2-variant . ,(delay python2-pygobject)))))) (define-public python2-pygobject - (package (inherit (strip-python2-variant python-pygobject)) - (name "python2-pygobject") + (let ((base (strip-python2-variant python-pygobject))) + (package/inherit base + (name "python2-pygobject") - ;; Note: We use python-build-system here, because Meson only supports - ;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it - ;; difficult to use for Python 2 projects. - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-broken-tests - (lambda _ - ;; FIXME: this test freezes and times out. - (delete-file "tests/test_mainloop.py") - ;; FIXME: this test fails with this kind of error: - ;; AssertionError: != != Date: Wed, 17 Mar 2021 10:58:29 +0100 Subject: gnu: pzstd: Update to 1.4.9 [fixes CVE-2021-24032]. * gnu/packages/compression.scm (pzstd): Use 'package/inherit' over zstd so any graft applied to zstd cascades onto pzstd which is built from the same source. --- gnu/packages/compression.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 827ad43dc2..2d065046ee 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1486,11 +1486,9 @@ speed.") ((#:tests? _ #t) #f))))) (define-public pzstd - (package + (package/inherit zstd (name "pzstd") - (version (package-version zstd)) - (source (package-source zstd)) - (build-system gnu-build-system) + (outputs '("out")) (inputs `(,@(if (%current-target-system) `(("googletest" ,googletest)) -- cgit 1.4.1 From f194fbf50eecc9f38045520db0d1a719175172ae Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 17 Mar 2021 11:39:01 +0100 Subject: gnu: gnome-autoar: Update to 0.3.1 [fixes CVE-2021-28650]. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.3.1. --- 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 e738b8fc1f..49412a87cc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8654,7 +8654,7 @@ core C library, and bindings for Python (PyGTK).") (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8662,7 +8662,7 @@ core C library, and bindings for Python (PyGTK).") name "-" version ".tar.xz")) (sha256 (base32 - "0ssqckfkyldwld88zizy446y2359rg40lnrcm3sjpjhc2b015hgj")))) + "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f")))) (build-system glib-or-gtk-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From fe96f64110676f28b948f0d31a1726501abdae0e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Mar 2021 22:27:18 +0100 Subject: gnu: hwloc: Add 'release-monitoring-url' property. * gnu/packages/mpi.scm (hwloc-1)[properties]: New field. --- gnu/packages/mpi.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 9a4dc6dc64..e5a45d751c 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -66,6 +66,12 @@ (sha256 (base32 "0za1b9lvrm3rhn0lrxja5f64r0aq1qs4m0pxn1ji2mbi8ndppyyx")))) + + (properties + ;; Tell the 'generic-html' updater to monitor this URL for updates. + `((release-monitoring-url + . "https://www-lb.open-mpi.org/software/hwloc/current"))) + (build-system gnu-build-system) (outputs '("out" ;'lstopo' & co., depends on Cairo, libx11, etc. "lib" ;small closure -- cgit 1.4.1 From d45d779e2a14f757c4b560f61758a5774cc80a55 Mon Sep 17 00:00:00 2001 From: LibreMiami Date: Thu, 11 Mar 2021 23:49:11 -0500 Subject: gnu: tig: Update to 2.5.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (tig): Update to 2.5.3. Co-authored-by: jgart Co-authored-by: donotshake Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 46dba5db61..7c93337625 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -36,6 +36,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Léo Le Bouter +;;; Copyright © 2021 LibreMiami ;;; ;;; This file is part of GNU Guix. ;;; @@ -2196,7 +2197,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") (define-public tig (package (name "tig") - (version "2.5.1") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append @@ -2204,7 +2205,7 @@ from Subversion to any supported Distributed Version Control System (DVCS).") version "/tig-" version ".tar.gz")) (sha256 (base32 - "0r4y9hyvpkplaxrzslws3asz652d83qh3bjwvmp8assga8s5s3ah")))) + "1p1575yh4daxjifywxkd0hgyfwciylqcm2qakawvwn6mk620ca75")))) (build-system gnu-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit 1.4.1 From fef91c0cc8770c6c4fce08bd748e6f241a8cd682 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 15 Mar 2021 20:43:41 +0100 Subject: gnu: Move lolcode to esolangs. * gnu/packages/lolcode.scm (lci): Move from here... * gnu/packages/esolangs.scm (lolcode-lci): ... to here. * gnu/packages/lolcode.scm: Delete file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. --- gnu/local.mk | 1 - gnu/packages/esolangs.scm | 37 +++++++++++++++++++++++++++++ gnu/packages/lolcode.scm | 60 ----------------------------------------------- 3 files changed, 37 insertions(+), 61 deletions(-) delete mode 100644 gnu/packages/lolcode.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index abb1e2140d..0422beac82 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -353,7 +353,6 @@ GNU_SYSTEM_MODULES = \ %D%/packages/logging.scm \ %D%/packages/logo.scm \ %D%/packages/loko.scm \ - %D%/packages/lolcode.scm \ %D%/packages/lsof.scm \ %D%/packages/lua.scm \ %D%/packages/lxde.scm \ diff --git a/gnu/packages/esolangs.scm b/gnu/packages/esolangs.scm index 676b355e65..45feedfa28 100644 --- a/gnu/packages/esolangs.scm +++ b/gnu/packages/esolangs.scm @@ -1,4 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 Nikita +;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Hendursaga ;;; Copyright © 2020 Leo Prikler ;;; @@ -22,6 +24,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages ncurses) + #:use-module (gnu packages python) + #:use-module (gnu packages readline) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -56,6 +60,39 @@ written in C. It supports several @dfn{fingerprints} (opt-in language extension identified by unique ID codes).") (license license:gpl3))) +(define-public lolcode-lci + (package + (name "lolcode-lci") + (version "0.11.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/justinmeza/lci") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0syw60b93iajgh91ffchirwwhm2kix2753ibx845kyrhzggmdh2l")))) + (build-system cmake-build-system) + (inputs + `(("readline" ,readline))) + (native-inputs + `(("python-2" ,python-2))) ; for the tests + (synopsis "LOLCODE interpreter written in C") + (description + "@code{lci} is a LOLCODE interpreter written in C and is designed to be +correct, portable, fast, and precisely documented. +@enumerate +@item correct: Every effort has been made to test lci's conformance to the +LOLCODE language specification. Unit tests come packaged with the lci source code. +@item portable: lci follows the widely ported ANSI C specification allowing it +to compile on a broad range of systems. +@item fast: Much effort has gone into producing simple and efficient code +whenever possible to the extent that the above points are not compromized. +@end enumerate") + (home-page "http://lolcode.org/") + (license license:gpl3+))) + (define-public shakespeare-spl (package (name "shakespeare-spl") diff --git a/gnu/packages/lolcode.scm b/gnu/packages/lolcode.scm deleted file mode 100644 index cdbff1f4b6..0000000000 --- a/gnu/packages/lolcode.scm +++ /dev/null @@ -1,60 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016 Nikita -;;; Copyright © 2019 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 lolcode) - #:use-module (gnu packages) - #:use-module (gnu packages python) - #:use-module (gnu packages readline) - #:use-module (guix build-system cmake) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages)) - -(define-public lci - (package - (name "lci") - (version "0.11.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/justinmeza/lci") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0syw60b93iajgh91ffchirwwhm2kix2753ibx845kyrhzggmdh2l")))) - (build-system cmake-build-system) - (inputs - `(("readline" ,readline))) - (native-inputs - `(("python-2" ,python-2))) ; for the tests - (synopsis "LOLCODE interpreter written in C") - (description - "@code{lci} is a LOLCODE interpreter written in C and is designed to be -correct, portable, fast, and precisely documented. -@enumerate -@item correct: Every effort has been made to test lci's conformance to the -LOLCODE language specification. Unit tests come packaged with the lci source code. -@item portable: lci follows the widely ported ANSI C specification allowing it -to compile on a broad range of systems. -@item fast: Much effort has gone into producing simple and efficient code -whenever possible to the extent that the above points are not compromized. -@end enumerate") - (home-page "http://lolcode.org/") - (license license:gpl3+))) -- cgit 1.4.1 From 284864df9192a41e8edf89175388409ff95cd054 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Wed, 17 Mar 2021 14:20:39 +0100 Subject: gnu: komikku: Update to 0.27.0. * gnu/packages/gnome.scm (komikku): Update to 0.27.0. [inputs]: Add python-brotli and webkitgtk. --- 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 49412a87cc..adb036d5e5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -166,6 +166,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-compression) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -11949,7 +11950,7 @@ integrated profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.26.1") + (version "0.27.0") (source (origin (method git-fetch) @@ -11959,7 +11960,7 @@ integrated profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "1mas409c14p6g0v10w4cf5hsjbs0922h6h9k9pyj9s8y7yi2ikz2")))) + "0mj4bsy7jp9wjj1dqz9zdq5aj0ib813wkz5k1481k80jp9dnlqnv")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -11991,6 +11992,7 @@ integrated profiler via Sysprof, debugging support, and more.") ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-brotli" ,python-brotli) ("python-dateparser" ,python-dateparser) ("python-keyring" ,python-keyring) ("python-lxml" ,python-lxml) @@ -12000,7 +12002,8 @@ integrated profiler via Sysprof, debugging support, and more.") ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) ("python-requests" ,python-requests) - ("python-unidecode" ,python-unidecode))) + ("python-unidecode" ,python-unidecode) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ("gettext" ,gettext-minimal) -- cgit 1.4.1 From d79d63e7829d53f6a501d8df7e264ff70033abca Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 17 Mar 2021 14:32:45 +0100 Subject: gnu: emacs-marginalia: Update to 0.4. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 0.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index bedfd61fc7..ca65f5c55d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7359,7 +7359,7 @@ list of candidates.") (define-public emacs-marginalia (package (name "emacs-marginalia") - (version "0.3") + (version "0.4") (source (origin (method git-fetch) @@ -7368,7 +7368,7 @@ list of candidates.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qihw1vq9sysrl6ha23ggycp0n2n1dx1ajkaqfm5vmv8480al07i")))) + (base32 "0piwzxp1zmwp876kyca0xcgyxgn8bn4wh5fnn88dkvdzi8mcgmkh")))) (build-system emacs-build-system) (home-page "https://github.com/minad/marginalia") (synopsis "Marginalia in the minibuffer completions") -- cgit 1.4.1 From cb424bad32892f6f4a743ca52d92416d166fd796 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Wed, 17 Mar 2021 18:45:39 +0300 Subject: gnu: Add emacs-kotlin-mode. * gnu/packages/emacs-xyz.scm (emacs-kotlin-mode): New variable. --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ca65f5c55d..4ff97eab3b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14636,6 +14636,32 @@ navigation with the grails mode.") from @code{groovy-mode} for editing Jenkins declarative pipeline files.") (license license:gpl3+)))) +(define-public emacs-kotlin-mode + (let ((commit "0e4bafb31d1fc2a0a420a521c2723d5526646c0b") + (revision "1")) + (package + (name "emacs-kotlin-mode") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09inpgwmnnqaakyn4r4xs8kax8b89dw94kvl521x6d43h9zl5i70")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner" "-L" "." "-L" "test"))) + (native-inputs `(("emacs-ert-runner" ,emacs-ert-runner))) + (home-page "https://github.com/Emacs-Kotlin-Mode-Maintainers/kotlin-mode") + (synopsis "Major major-mode for editing Kotlin files") + (description + "This package provides a @code{kotlin-mode} for editing Kotlin files.") + (license license:gpl3+)))) + (define-public emacs-org-tree-slide (let ((commit "036a36eec1cf712d3db155572aed325daa372eb5") (revision "2")) -- cgit 1.4.1 From 2691f57678725e229ceb1e94456b3ad0b44fbd60 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 17 Mar 2021 18:36:47 +0100 Subject: gnu: python-pygments: Update to 2.7.4 [fixes CVE-2021-27291]. * gnu/packages/python-xyz.scm (python-pygments/fixed): New variable. (python-pygments)[replacement]: Graft. --- gnu/packages/python-xyz.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2cd6f55f4d..79eac0ec7f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3701,6 +3701,7 @@ text styles of documentation.") (sha256 (base32 "05mps9r966r3dpqw6zrs1nlwjdf5y4960hl9m7abwb3qyfnarwyc")))) + (replacement python-pygments/fixed) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. @@ -3712,6 +3713,17 @@ text styles of documentation.") (license license:bsd-2) (properties `((python2-variant . ,(delay python2-pygments)))))) +(define python-pygments/fixed + (package/inherit python-pygments + (version "2.7.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Pygments" version)) + (sha256 + (base32 + "0dy35ry5qa8dpklk4fkj9kfpw2qb4mh5ha9866kw30wf96dx0jfz")))))) + ;; Pygments 2.6 and later does not support Python 2. (define-public python2-pygments (let ((base (package-with-python2 (strip-python2-variant python-pygments)))) -- cgit 1.4.1 From f4f677f2237915d64ca4eb4b1bb8e31ec61d0476 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Mar 2021 21:33:01 +0200 Subject: gnu: lua.scm: Sort package module imports alphabetically. * gnu/packages/lua.scm: Sort package module imports alphabetically. --- gnu/packages/lua.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 16996572d7..edb3f85109 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -41,23 +41,22 @@ #:use-module (guix build-system meson) #:use-module (guix build-system trivial) #:use-module (gnu packages) - #:use-module (gnu packages gcc) + #:use-module (gnu packages boost) #:use-module (gnu packages build-tools) - #:use-module (gnu packages readline) - #:use-module (gnu packages m4) - #:use-module (gnu packages tls) - #:use-module (gnu packages xml) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) + #:use-module (gnu packages m4) + #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages boost) + #:use-module (gnu packages re2c) + #:use-module (gnu packages readline) #:use-module (gnu packages tls) - #:use-module (gnu packages ncurses) #:use-module (gnu packages vim) - #:use-module (gnu packages re2c) - #:use-module (gnu packages xorg) - #:use-module (gnu packages gtk)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg)) (define-public lua (package -- cgit 1.4.1 From d7b4ccefa9452033dc8f6875ef40b108591ad5b4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 17 Mar 2021 20:15:15 +0000 Subject: gnu: libtirpc/hurd: Fix package source. Amend the changes in 1a265842e634656411bc7304c4648273f174f65e to properly access the origin patches from libtirpc. I noticed this as guix weather didn't work for this package. * gnu/packages/onc-rpc.scm (libtirpc/hurd)[source]: Call origin-patches on (package-source libtirpc) rather than the libtirpc package. --- gnu/packages/onc-rpc.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/onc-rpc.scm b/gnu/packages/onc-rpc.scm index c58bdb1dfc..3b29335d90 100644 --- a/gnu/packages/onc-rpc.scm +++ b/gnu/packages/onc-rpc.scm @@ -78,7 +78,7 @@ IPv4 and IPv6. ONC RPC is notably used by the network file system (NFS).") (package/inherit libtirpc (name "libtirpc-hurd") (source (origin (inherit (package-source libtirpc)) - (patches (append (origin-patches libtirpc) + (patches (append (origin-patches (package-source libtirpc)) (search-patches "libtirpc-hurd.patch" "libtirpc-hurd-client.patch"))))) (arguments -- cgit 1.4.1 From 841e5fb4ddff7f29c06cf9faea65cfe5626fde20 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Mar 2021 19:56:59 +0100 Subject: gnu: scdoc: Don't use unstable tarball. The autogenerated tarball was modified upstream. * gnu/packages/man.scm (scdoc)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/man.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 21a9c73892..d6ace365fc 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -293,13 +293,13 @@ automatically.") (version "1.10.1") (source (origin - (method url-fetch) - (uri (string-append "https://git.sr.ht/%7Esircmpwn/scdoc/archive/" version - ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/scdoc") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "13x7g1r56bshvfmlvapvz35ywnbgsh337kywb5kcv8nc6b3j3q40")))) + (base32 "1xmh6fnp378xmiycslg4migs1vx7yly4i1cf2vbbnwim9c9g0aw7")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 24f1ce9e71a4f2fc7370cefb42c04cb669397fcf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Mar 2021 20:09:18 +0100 Subject: gnu: scdoc: Cross-compile. * gnu/packages/man.scm (scdoc)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/man.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index d6ace365fc..c021a1e2e4 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -31,6 +31,7 @@ #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system ruby) + #:use-module (guix utils) #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -303,7 +304,8 @@ automatically.") (build-system gnu-build-system) (arguments `(#:make-flags - (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (delete 'configure)))) -- cgit 1.4.1 From ce10e2b3e93476a89cf85838fa21bb8b54268b1f Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 22 Feb 2021 16:43:10 +0100 Subject: gnu: Use autoconf instead of autoconf-wrapper when possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should reduce confusion on when to use the "autoconf" package and when to use "autoconf-wrapper" instead in package definitions. Fixes . * gnu/packages/autotools.scm (autoconf-wrapper): advise to use the "autoconf" package instead where possible. * gnu/packages/game-development.scm (tsukundere)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gimp.scm (glimpse)[native-inputs]: likewise. (gimp-resynthesizer)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/gnunet.scm (gnunet)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gnupg.scm (signing-party)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/guile-xyz.scm (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/libevent.scm (libuv)[native-inputs]: indicates "autoconf-wrapper" needs to be replaced with "autoconf" on core-updates. * gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/mail.scm (libetpan)[native-inputs]: likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza)[native-inputs]: add comment on why "autoconf-wrapper" is used. (mate-screensaver)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/package-management.scm (guix)[native-inputs]: likewise. * gnu/packages/sawfish.scm (librep)[native-inputs]: likewise. * gnu/packages/video.scm (motion)[native-inputs]: likewise. * gnu/packages/zile.scm (zile)[native-inputs]: likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/autotools.scm | 2 ++ gnu/packages/game-development.scm | 2 +- gnu/packages/gimp.scm | 4 +++- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 2 ++ gnu/packages/guile-xyz.scm | 8 ++++---- gnu/packages/libevent.scm | 1 + gnu/packages/logging.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 4 +++- gnu/packages/package-management.scm | 2 +- gnu/packages/sawfish.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/zile.scm | 2 +- 14 files changed, 23 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index e999688894..12a36a4709 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -267,6 +267,8 @@ exec ~a --no-auto-compile \"$0\" \"$@\" ;; Do not show it in the UI since it's meant for internal use. (properties '((hidden? . #t))))) +;; Only use this package when autoconf is not usable, +;; see . (define-public autoconf-wrapper (make-autoconf-wrapper autoconf)) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7e17142b9e..6d88c3d73b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -529,7 +529,7 @@ clone.") all))) #t)))))) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("guile" ,guile-3.0) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ddd9158f56..5d005e0378 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -518,6 +518,8 @@ MyPaint.") (mkdir-p target) #t)))))) (native-inputs + ;; avoid ./autogen.sh: ./configure: /bin/sh: bad interpreter: + ;; No such file or directory `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("glib" ,glib "bin") ; glib-gettextize @@ -590,7 +592,7 @@ transferring the style of an image.") (format port "for dir in '~a'.split(':'):~%" pythonpath) (format port " site.addsitedir(dir)~%"))))))))) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 80e4aba29b..d261f42dcc 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -368,7 +368,7 @@ kinds of basic applications for the foundation of a GNU internet.") "0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake))) (inputs `(("guile" ,guile-2.0) ("gnunet" ,gnunet))) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f97dd6c4a7..bb611bdb89 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -695,6 +695,8 @@ PGP keysigning parties.") "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5")))) (build-system gnu-build-system) (native-inputs + ;; autoconf-wrapper is required due to the non-standard + ;; 'configure phase. `(("autoconf" ,autoconf-wrapper) ("automake" ,automake))) (inputs `(("perl" ,perl) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2e02f6f482..6493fe6048 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -393,7 +393,7 @@ dictionary and suggesting spelling corrections.") (string-append "--libdir=" (assoc-ref %outputs "out") "/lib/bash")))) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. @@ -660,7 +660,7 @@ is not available for Guile 2.0.") "1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) @@ -1723,7 +1723,7 @@ provides tight coupling to Guix.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. @@ -1856,7 +1856,7 @@ users and in some situations.") "1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("libtool" ,libtool) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index dab574a155..7109d9a88d 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -115,6 +115,7 @@ limited support for fork events.") '(#:configure-flags '("--disable-static") ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) + ;; TODO replace with autoconf on core-updates (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 87283f3752..eafc23b2e6 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -99,7 +99,7 @@ staying as close to their API as is reasonable.") #t))))) (native-inputs `(("perl" ,perl) ;for tests - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) (synopsis "C++ logging library") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b02f547e03..239ddb0eb0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1476,7 +1476,7 @@ useful features.") (sha256 (base32 "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn")))) (build-system gnu-build-system) - (native-inputs `(("autoconf" ,autoconf-wrapper) + (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index a9635d90fe..fbb1a74d09 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -176,6 +176,8 @@ actions.") (setenv "CONFIG_SHELL" (which "sh")) (invoke "sh" "autogen.sh")))))) (native-inputs + ;; autoconf-wrapper is required due to the non-standard + ;; 'autoconf phase. `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("intltool" ,intltool) @@ -1201,7 +1203,7 @@ Re-decorates windows on un-maximise. (("dbus-1") "")))))))) (native-inputs `(("automake" ,automake) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("gettext" ,gettext-minimal) ("intltool" ,intltool) ("mate-common" ,mate-common) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 49067850c1..6a7285f33e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -379,7 +379,7 @@ $(prefix)/etc/init.d\n"))) ;; XXX: Keep the development inputs here even though ;; they're unnecessary, just so that 'guix environment ;; guix' always contains them. - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 26d8eba3b6..4162fe43cd 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -53,7 +53,7 @@ `(("makeinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) (inputs diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index eb1c329c1b..dbe042c0d9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4265,7 +4265,7 @@ It counts more than 100 plugins.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 6169815520..c28bc1bdd1 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -120,7 +120,7 @@ default Emacs configuration, but it carries a much lighter feature set.") ,@(package-inputs zile))) (native-inputs `(("m4" ,m4) ;for 'bootstrap' - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ;; For some reason, 'bootstrap' insists on having these. -- cgit 1.4.1 From 966e61fb8f3ae1313545db7ed9994bc290666ee9 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 7 Mar 2021 02:31:07 +0000 Subject: gnu: Add libucl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (libucl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 9c5938bd87..3d85392394 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -2371,3 +2372,31 @@ shows a notification for the user on the screen.") for wayland conceptually based on the X11 window manager @command{ratpoison}.") (license license:expat))) + +(define-public libucl + (package + (name "libucl") + (version "0.8.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vstakhov/libucl/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h52ldxankyhbbm1qbqz1f2q0j03c1b4mig7343bs3mc6fpm18gf")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("libtool" ,libtool))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f)) ;; no tests + (home-page "https://github.com/vstakhov/libucl") + (synopsis "Universal configuration language (UCL) parser") + (description "libucl implements a configuration language that is easy to +read and write, and compatible with JSON.") + (license license:bsd-2))) -- cgit 1.4.1 From aacfbb8c243026e55a9c484dfcdd824fcd37bab6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:48:08 -0400 Subject: gnu: linux-libre: Update to 5.11.7. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.7. (linux-libre-5.11-pristine-source): 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 80168c8ae9..b917e5938e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.6") +(define-public linux-libre-5.11-version "5.11.7") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "02dcq7cqll5c39z8dh9f0xy68hh4a8jsab5k4n9calfldrm7jw79"))) + (hash (base32 "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From e0dcafc1c25d47d24e18f3cd262ab5d53ad94394 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:52:27 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.24. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.24. (linux-libre-5.10-pristine-source): 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 b917e5938e..47f6dbf29c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.23") +(define-public linux-libre-5.10-version "5.10.24") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0snvkrs95wbx611kcnap59whfiz6h6mzsnbwswk5py3gxh1irqpn"))) + (hash (base32 "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 1de35e80360dddf0a39ce10c9c8b7763ee5bf92b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:52:49 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.106. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.106. (linux-libre-5.4-pristine-source): 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 47f6dbf29c..d992410168 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.105") +(define-public linux-libre-5.4-version "5.4.106") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1dmq1zkr4idbbvh7wln5hn5sl4d0mcfm1af5bvsmsa44c78lqki4"))) + (hash (base32 "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 1ff0377a529714538f4a483dd0aee180f0572a8f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:53:09 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.181. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.181. (linux-libre-4.19-pristine-source): 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 d992410168..8b6f2aab3a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.180") +(define-public linux-libre-4.19-version "4.19.181") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0pxvnyhbcmbbkdrqsrf5hhaz36x9l07s0xmzrmc4ipcdhdy5va0x"))) + (hash (base32 "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From d72347deecec2f3409de1f4556eab66fcbc6fe21 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:53:27 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.226. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.226. (linux-libre-4.14-pristine-source): 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 8b6f2aab3a..28f934def1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.225") +(define-public linux-libre-4.14-version "4.14.226") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "09kik0jbfpijb4kylayphr8r2qxx4rlgsnmq300wzcjhxw5yxy3c"))) + (hash (base32 "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From c3504337cccfaa48fd1b5037c8ad72693236304b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:53:43 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.262. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.262. (linux-libre-4.9-pristine-source): 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 28f934def1..b3ff734f4b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.261") +(define-public linux-libre-4.9-version "4.9.262") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0r5822mj2gk9s8rbc8bazg34y8bwr7svn3nbgcq57y2qch8nych4"))) + (hash (base32 "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 334c6850c64b3f037bc2a25bf9d184a2cf2c609b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 17 Mar 2021 14:53:57 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.262. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.262. (linux-libre-4.4-pristine-source): 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 b3ff734f4b..d932c3583a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.261") +(define-public linux-libre-4.4-version "4.4.262") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0d9j4j72n8fl3s93qm82cydwk8lvwhvl2357rcsai2vsk5l0k1mc"))) + (hash (base32 "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 2e0ff59f0cd836b156f1ef2e78791d864ce3cfcd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 18 Mar 2021 11:13:18 +0100 Subject: gnu: imagemagick/fixed: Redirect old sonames to new sonames. * gnu/packages/imagemagick.scm (imagemagick/fixed)[arguments]: Add 'fix-compat-cheat-rename-so phase to redirect old soname paths (expected without grafting) to new sonames introduced by ImageMagick 6.9.12-0 and later. These sonames are probably not forward compatible but most probably backwards compatible so it should suffice until we remove the graft. --- gnu/packages/imagemagick.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 9ac15361b4..a3562f2e13 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -143,7 +143,29 @@ text, lines, polygons, ellipses and Bézier curves.") "6.9.12-2.tar.xz")) (sha256 (base32 - "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))))) + "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))) + (arguments + (substitute-keyword-arguments (package-arguments imagemagick) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'fix-compat-cheat-rename-so + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") + "/lib") + (symlink "libMagick++-6.Q16.so.9.0.0" + "libMagick++-6.Q16.so.8.0.0") + (symlink "libMagick++-6.Q16.so.9" + "libMagick++-6.Q16.so.8") + (symlink "libMagickCore-6.Q16.so.7.0.0" + "libMagickCore-6.Q16.so.6.0.0") + (symlink "libMagickCore-6.Q16.so.7" + "libMagickCore-6.Q16.so.6") + (symlink "libMagickWand-6.Q16.so.7.0.0" + "libMagickWand-6.Q16.so.6.0.0") + (symlink "libMagickWand-6.Q16.so.7" + "libMagickWand-6.Q16.so.6")) + #t)))))))) (define-public perl-image-magick (package -- cgit 1.4.1 From 45695cc8a7b56b711baf664ceedaa66124d6de26 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 18 Mar 2021 11:26:11 +0100 Subject: Revert "gnu: python2-urllib3: Update to 1.26.4 [fixes CVE-2021-28363]." In response to commit 1a265842e634656411bc7304c4648273f174f65e we should no longer need this. Also see . This reverts commit db87d6ddafd26c5ad657178cf7fdab524d05c522. --- gnu/packages/python-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index c79b4eb937..0f67046f75 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2766,7 +2766,7 @@ supports url redirection and retries, and also gzip and deflate decoding.") (define-public python2-urllib3 - (let ((base (package-with-python2 (strip-python2-variant python-urllib3/fixed)))) + (let ((base (package-with-python2 (strip-python2-variant python-urllib3)))) (package/inherit base (propagated-inputs -- cgit 1.4.1 From 898489f48e436e45e86e1ba0fcdb6df5cd5a051a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 16 Mar 2021 21:36:36 -0400 Subject: services: Enable "protected hardlinks" and "protected symlinks" by default. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit References: https://sysctl-explorer.net/fs/protected_hardlinks/ https://sysctl-explorer.net/fs/protected_symlinks/ * gnu/services/sysctl.scm (%default-sysctl-settings): New public variable. (): Use %default-sysctl-settings as the default value. * gnu/services/base.scm (%base-services): Add sysctl-service-type. * doc/guix.texi (Miscellaneous Services): Document the new defaults. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 22 +++++++++++++++++++++- gnu/services/base.scm | 3 +++ gnu/services/sysctl.scm | 10 ++++++++-- 3 files changed, 32 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 0a70ac7f11..73757be887 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -31378,6 +31378,21 @@ instantiated as: (sysctl-configuration (settings '(("net.ipv4.ip_forward" . "1"))))) @end lisp + +Since @code{sysctl-service-type} is used in the default lists of +services, @code{%base-services} and @code{%desktop-services}, you can +use @code{modify-services} to change its configuration and add the +kernel parameters that you want (@pxref{Service Reference, +@code{modify-services}}). + +@lisp +(modify-services %base-services + (sysctl-service-type config => + (sysctl-configuration + (settings (append '(("net.ipv4.ip_forward" . "1")) + %default-sysctl-settings))))) +@end lisp + @end defvr @deftp {Data Type} sysctl-configuration @@ -31387,11 +31402,16 @@ The data type representing the configuration of @command{sysctl}. @item @code{sysctl} (default: @code{(file-append procps "/sbin/sysctl"}) The @command{sysctl} executable to use. -@item @code{settings} (default: @code{'()}) +@item @code{settings} (default: @code{%default-sysctl-settings}) An association list specifies kernel parameters and their values. @end table @end deftp +@defvr {Scheme Variable} %default-sysctl-settings +An association list specifying the default @command{sysctl} parameters +on Guix System. +@end defvr + @cindex pcscd @subsubheading PC/SC Smart Card Daemon Service diff --git a/gnu/services/base.scm b/gnu/services/base.scm index f6a490f712..f50bcfdcb4 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -35,6 +35,7 @@ #:use-module (gnu services) #:use-module (gnu services admin) #:use-module (gnu services shepherd) + #:use-module (gnu services sysctl) #:use-module (gnu system pam) #:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system uuid) @@ -2532,6 +2533,8 @@ to handle." (udev-configuration (rules (list lvm2 fuse alsa-utils crda)))) + (service sysctl-service-type) + (service special-files-service-type `(("/bin/sh" ,(file-append bash "/bin/sh")) ("/usr/bin/env" ,(file-append coreutils "/bin/env")))))) diff --git a/gnu/services/sysctl.scm b/gnu/services/sysctl.scm index eb7a61b2a9..aaea7cc30d 100644 --- a/gnu/services/sysctl.scm +++ b/gnu/services/sysctl.scm @@ -25,20 +25,26 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (sysctl-configuration - sysctl-service-type)) + sysctl-service-type + %default-sysctl-settings)) ;;; ;;; System Control Service. ;;; +(define %default-sysctl-settings + ;; Default kernel parameters enabled with sysctl. + '(("fs.protected_hardlinks" . "1") + ("fs.protected_symlinks" . "1"))) + (define-record-type* sysctl-configuration make-sysctl-configuration sysctl-configuration? (sysctl sysctl-configuration-sysctl ; path of the 'sysctl' command (default (file-append procps "/sbin/sysctl"))) (settings sysctl-configuration-settings ; alist of string pairs - (default '()))) + (default %default-sysctl-settings))) (define (sysctl-configuration-settings->sysctl.conf settings) "Return a file for @command{sysctl} to set kernel parameters as specified by -- cgit 1.4.1 From 94f03125463ee0dba2f7916fcd43fd19d4b6c892 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 18 Mar 2021 12:32:03 +0100 Subject: gnu: guix: Update to ec7fb66 [security]. This updates the 'guix' package so that it provides the fix for . * gnu/packages/package-management.scm (guix): Update to ec7fb66. --- 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 6a7285f33e..f45c2f65e3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "c8887a5c6e8f6a19d54ffa428c6fe88a797b867a") - (revision 16)) + (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") + (revision 17)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1fhli6h196chkd8b5j2qcyq5kj7pniw5n03jd502jm7kjzvkw18p")) + "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 000e27b3d78d6408ce93ab2116737757655d6e9b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:30:49 +0100 Subject: gnu: bind: Update to 9.16.13. * gnu/packages/dns.scm (isc-bind): Update to 9.16.13. --- 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 bb19175b1a..5d0d9f8396 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -319,7 +319,7 @@ and BOOTP/TFTP for network booting of diskless machines.") ;; When updating, check whether isc-dhcp's bundled copy should be as well. ;; The BIND release notes are available here: ;; https://www.isc.org/bind/ - (version "9.16.12") + (version "9.16.13") (source (origin (method url-fetch) (uri (string-append @@ -327,7 +327,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "0zys8hk08zzrw57x0vmzv6zx0a7vjj6qk5qh8jmrqd7x269sy54r")))) + "026cliyj570wxvvij96mrzsxyf421xv9a80gc5gv6savza9wfk55")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit 1.4.1 From 2baae75e82c58fc83f1ec4ff3131f37b8a7289bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:39:34 +0100 Subject: gnu: isc-dhcp: Update bundled bind to 9.11.29. * gnu/packages/admin.scm (isc-dhcp)[inputs]: Update bundled bind to 9.11.29. --- 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 407ab4165c..e25693430c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1044,7 +1044,7 @@ connection alive.") (define-public isc-dhcp (let* ((bind-major-version "9") (bind-minor-version "11") - (bind-patch-version "28") + (bind-patch-version "29") (bind-release-type "") ; for patch release, use "-P" (bind-release-version "") ; for patch release, e.g. "6" (bind-version (string-append bind-major-version @@ -1181,7 +1181,7 @@ connection alive.") "/bind-" bind-version ".tar.gz")) (sha256 (base32 - "0x2yjy0d8p7i5mr2s5y65fdax0jjgvd8fn07s42c8dxsrbkcp40h")))) + "01vvkvlhsxz4ffz2fw86z0fsf170b93jjnn5710ai6vfri8wgfy7")))) ("coreutils*" ,coreutils) ("sed*" ,sed))) -- cgit 1.4.1 From e999ea12ea7813a7b46d1e3d965894ffff8f230d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:40:22 +0100 Subject: gnu: di: Update to 4.49. * gnu/packages/admin.scm (di): Update to 4.49. [source]: Update URL. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e25693430c..d5cb9bf8e5 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2923,13 +2923,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.48.0.1") + (version "4.49") (source (origin (method url-fetch) - (uri (string-append "https://gentoo.com/di/di-" version ".tar.gz")) + (uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz")) (sha256 - (base32 "0rxli3bcm6vlcfx2jminviv8aawwczrpp9kja5zniawy6528al30")))) + (base32 "1y38jhp2bpwbwzdzjlhgfqc7bxxz9cwapxd61799zjf54jkslkf0")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures -- cgit 1.4.1 From d9bdd6fa928945e697d11a36678cfdedf45e39f5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:45:17 +0100 Subject: gnu: goffice: Update to 0.10.49. * gnu/packages/gnome.scm (goffice): Update to 0.10.49. --- 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 adb036d5e5..34cd0fa992 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4134,14 +4134,14 @@ Hints specification (EWMH).") (define-public goffice (package (name "goffice") - (version "0.10.48") + (version "0.10.49") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/goffice/" (version-major+minor version) "/" "goffice-" version ".tar.xz")) (sha256 - (base32 "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4")))) + (base32 "1s87ngs3g3nfvcn96aq4lgzx5cscbfg4n9f6ns2zpvc5ngdiiz2z")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 4.0 MiB of gtk-doc -- cgit 1.4.1 From c2265e0285f82ac32b77116e6c1b476461241390 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:45:26 +0100 Subject: gnu: elixir: Update to 1.11.4. * gnu/packages/elixir.scm (elixir): Update to 1.11.4. --- gnu/packages/elixir.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 389b2bb29c..b87337855f 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017 Pjotr Prins ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 nee -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nikita ;;; Copyright © 2021 Oskar Köök ;;; @@ -34,7 +34,7 @@ (define-public elixir (package (name "elixir") - (version "1.11.3") + (version "1.11.4") (source (origin (method git-fetch) @@ -43,7 +43,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ivah4117z75pinvb3gr22d05ihfwcdgw5zvvpv7kbgiqaj8ma8f")) + (base32 "1y8fbhli29agf84ja0fwz6gf22a46738b50nwy26yvcl2n2zl9d8")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From b6df89efb03b0db7f74dd3c49ec233dd5ae14514 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 15:54:43 +0100 Subject: gnu: dhewm3: Update to 1.5.1. * gnu/packages/game-development.scm (dhewm3): Update to 1.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 6d88c3d73b..ea879568f5 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2394,7 +2394,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") (define-public dhewm3 (package (name "dhewm3") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (string-append @@ -2402,7 +2402,7 @@ game engine. id Tech 2 is the engine originally behind Quake 2.") version "/dhewm3-" version "-src.tar.xz")) (sha256 (base32 - "0dmd1876az5q8gbjrd1jk8zidz11ydj607z3m8m5kvw2yj136jzv")))) + "0s2brx6wyljhjbpli97iy4lc4fqqsvdc09raz8njg0vgzcsiyrri")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No tests. -- cgit 1.4.1 From bfaeee56756ae31957fa62a1f2d489172d596d4b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 18 Mar 2021 17:35:22 +0100 Subject: gnu: emacs-leaf: Update to 4.4.4. * gnu/packages/emacs-xyz.scm (emacs-leaf): Update to 4.4.4. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4ff97eab3b..d9c6b976a7 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12118,14 +12118,14 @@ performance-oriented and tidy.") (define-public emacs-leaf (package (name "emacs-leaf") - (version "4.4.0") + (version "4.4.4") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "leaf-" version ".tar")) (sha256 - (base32 "0wgf3ksrk6b77fvy3sr9hqazq0snbvqyrrql6v1hryqjfq5nwfx7")))) + (base32 "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1")))) (build-system emacs-build-system) (home-page "https://github.com/conao3/leaf.el") (synopsis "Simplify your init.el configuration, extended use-package") -- cgit 1.4.1 From a398e06cadc8f76759eed3942729a580cba9b79b Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 14 Mar 2021 17:22:34 -0400 Subject: gnu: emacs-flymake-shellcheck: Update to 0.1-1.ac534e9 * gnu/packages/emacs-xyz.scm (emacs-flymake-shellcheck): Update to 0.1-1.ac534e9 Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d9c6b976a7..28400c0573 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1306,8 +1306,8 @@ provides an optional IDE-like error list.") (define-public emacs-flymake-shellcheck ;; No tag, version grabbed from source .el file. - (let ((commit "78956f0e5bb9c4d35989657a55929e8e3f5691e6") - (revision "0")) + (let ((commit "ac534e9ef15c82ac86ae65fe5004d29dbc8c92c7") + (revision "1")) (package (name "emacs-flymake-shellcheck") (version (git-version "0.1" revision commit)) @@ -1319,7 +1319,7 @@ provides an optional IDE-like error list.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix")))) + (base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl")))) (build-system emacs-build-system) (home-page "https://github.com/federicotdn/flymake-shellcheck") (synopsis "Flymake backend for Bash/Sh powered by ShellCheck") -- cgit 1.4.1 From efe7a17406ef3161da1d2bf3069ed456d811ae2f Mon Sep 17 00:00:00 2001 From: Ryan Prior via Guix-patches via Date: Mon, 15 Mar 2021 00:41:04 +0000 Subject: gnu: Add countdown. * gnu/packages/time.scm (countdown): New variable. Also adds copyright, adds necessary module dependencies, and sorts them alphabetically. Signed-off-by: Nicolas Goaziou --- gnu/packages/time.scm | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 73e7f04834..20ce76d8d0 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2020 Lars-Dominik Braun ;;; Copyright © 2020 Tanguy Le Carrour +;;; Copyright © 2021 Ryan Prior ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,18 +36,22 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages time) - #:use-module (guix licenses) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) - #:use-module (guix build-system gnu) - #:use-module (guix build-system python) - #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages golang) #:use-module (gnu packages perl) #:use-module (gnu packages python) - #:use-module (gnu packages python-xyz)) + #:use-module (gnu packages python-xyz) + #:use-module (gnu packages terminals) + #:use-module (gnu packages textutils) + #:use-module (gnu packages) + #:use-module (guix build-system gnu) + #:use-module (guix build-system go) + #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix licenses) + #:use-module (guix packages)) (define-public time (package @@ -510,3 +515,30 @@ datetime type.") modifies the @code{time}, @code{gettimeofday} and @code{clock_gettime} system calls.") (license gpl2))) + +(define-public countdown + (package + (name "countdown") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/antonmedv/countdown") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pdaw1krr0bsl4amhwx03v2b02iznvwvqn7af5zp4fkzjaj14cdw")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/antonmedv/countdown")) + (native-inputs + `(("runewidth" ,go-github.com-mattn-go-runewidth) + ("termbox" ,go-github.com-nsf-termbox-go))) + (home-page "https://github.com/antonmedv/countdown") + (synopsis "Counts to zero with a text user interface") + (description + "Countdown provides a fancy text display while it counts down to zero +from a starting point you provide. The user can pause and resume the +countdown from the text user interface.") + (license expat))) -- cgit 1.4.1 From bb8a0d8057be204ff507ef01a082335a1620f075 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 21:05:58 +0100 Subject: gnu: emacsy-minimal: Fix build. * gnu/packages/guile-xyz.scm (emacsy-minimal)[native-inputs]: Add autoconf, automake, gettext-minimal, libtool, pkg-config, and texinfo. --- gnu/packages/guile-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6493fe6048..d89b9954de 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nikita -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -3306,6 +3306,13 @@ in C using Gtk+-3 and WebKitGtk.") (sha256 (base32 "03ym14g9qhjqmryr5z065kynqm8yhmvnbs2djl6vp3i9cmqln8cl")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("makeinfo" ,texinfo) + ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) ("guile-lib" ,guile2.2-lib) -- cgit 1.4.1 From 1155a88308df7649fe74bd5bb8279a4d103ce386 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 19 Mar 2021 00:13:42 +0100 Subject: gnu: ungoogled-chromium: Update to 89.0.4389.90-1. * gnu/packages/patches/ungoogled-chromium-system-opus.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 89. (%chromium-version): Remove variable. (%ungoogled-revision): Set to 89.0.4389.90-1. (%ungoogled-origin): Conditionally set file name based on commit/tag. (%guix-patches): Add the new file. (libvpx/chromium): Update to 1.9.0-104-gb5d77a48d. (ungoogled-chromium)[version]: Use %UNGOOGLED-REVISION. [source]: Update hash. [arguments]: Adjust #:configure-flags for build system changes. Don't build with external WebRTC SSL library. Remove obsolete substitution. [inputs]: Remove OPENSSL. Change from PIPEWIRE to PIPEWIRE-0.3. --- gnu/local.mk | 1 + gnu/packages/chromium.scm | 64 +++++++++------------- .../patches/ungoogled-chromium-system-opus.patch | 27 +++++++++ 3 files changed, 55 insertions(+), 37 deletions(-) create mode 100644 gnu/packages/patches/ungoogled-chromium-system-opus.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0422beac82..afd9c17f9c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1725,6 +1725,7 @@ dist_patch_DATA = \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ %D%/packages/patches/ungoogled-chromium-system-nspr.patch \ + %D%/packages/patches/ungoogled-chromium-system-opus.patch \ %D%/packages/patches/unison-fix-ocaml-4.08.patch \ %D%/packages/patches/unknown-horizons-python-3.8-distro.patch \ %D%/packages/patches/unzip-CVE-2014-8139.patch \ diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index b81a773c3d..de7c887061 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -65,7 +65,6 @@ #:use-module (gnu packages regex) #:use-module (gnu packages serialization) #:use-module (gnu packages speech) - #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) #:use-module (gnu packages vulkan) #:use-module (gnu packages video) @@ -96,7 +95,6 @@ "net/third_party/quiche" ;BSD-3 "net/third_party/uri_template" ;ASL2.0 "third_party/abseil-cpp" ;ASL2.0 - "third_party/adobe/flash/flapper_version.h" ;no license, trivial "third_party/angle" ;BSD-3 "third_party/angle/src/common/third_party/base" ;BSD-3 "third_party/angle/src/common/third_party/smhasher" ;Public domain @@ -105,10 +103,6 @@ "third_party/angle/src/third_party/libXNVCtrl" ;Expat "third_party/angle/src/third_party/trace_event" ;BSD-3 "third_party/angle/src/third_party/volk" ;Expat - "third_party/angle/third_party/vulkan-headers" ;ASL2.0 - "third_party/angle/third_party/vulkan-loader" ;ASL2.0 - "third_party/angle/third_party/vulkan-tools" ;ASL2.0 - "third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0 "third_party/apple_apsl" ;APSL2.0 "third_party/axe-core" ;MPL2.0 "third_party/blink" ;BSD-3, LGPL2+ @@ -161,7 +155,6 @@ "third_party/emoji-segmenter" ;ASL2.0 "third_party/flatbuffers" ;ASL2.0 "third_party/fusejs" ;ASL2.0 - "third_party/glslang" ;BSD-3, Expat, ASL2.0 "third_party/google_input_tools" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library" ;ASL2.0 "third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat @@ -189,6 +182,8 @@ "third_party/libsrtp" ;BSD-3 "third_party/libsync" ;ASL2.0 "third_party/libudev" ;LGPL2.1+ + "third_party/liburlpattern" ;Expat + "third_party/libva_protected_content" ;Expat ;; FIXME: build/linux/unbundle/libvpx.gn does not work for all users. "third_party/libvpx" ;BSD-3 @@ -203,6 +198,7 @@ "third_party/markupsafe" ;BSD-3 "third_party/mesa_headers" ;Expat, SGI "third_party/metrics_proto" ;BSD-3 + "third_party/minigbm" ;BSD-3 "third_party/modp_b64" ;BSD-3 "third_party/nasm" ;BSD-2 "third_party/nearby" ;ASL2.0 @@ -220,7 +216,8 @@ "third_party/pdfium/third_party/skia_shared" ;BSD-3 "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType "third_party/perfetto" ;ASL2.0 - "third_party/pffft" ;the "FFTPACK" license, similar to BSD-3 + "third_party/perfetto/protos/third_party/chromium" ;BSD-3 + "third_party/pffft" ;the "FFTPACK" license "third_party/ply" ;BSD-3 "third_party/polymer" ;BSD-3 "third_party/private_membership" ;ASL2.0 @@ -236,7 +233,6 @@ "third_party/s2cellid" ;ASL2.0 "third_party/schema_org" ;CC-BY-SA3.0 "third_party/securemessage" ;ASL2.0 - "third_party/shaka-player" ;ASL2.0 "third_party/shell-encryption" ;ASL2.0 "third_party/skia" ;BSD-3 "third_party/skia/include/third_party/skcms" ;BSD-3 @@ -244,8 +240,6 @@ "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat "third_party/smhasher" ;Expat, public domain "third_party/speech-dispatcher" ;GPL2+ - "third_party/spirv-headers" ;ASL2.0 - "third_party/SPIRV-Tools" ;ASL2.0 "third_party/sqlite" ;Public domain "third_party/swiftshader" ;ASL2.0 "third_party/swiftshader/third_party/astc-encoder" ;ASL2.0 @@ -258,6 +252,7 @@ "third_party/ukey2" ;ASL2.0 "third_party/usb_ids" ;BSD-3 "third_party/usrsctp" ;BSD-2 + "third_party/vulkan-deps" ;ASL2.0, BSD-3, Expat "third_party/vulkan_memory_allocator" ;Expat "third_party/wayland/protocol" ;Expat "third_party/wayland/stubs" ;BSD-3, Expat @@ -310,8 +305,7 @@ (string-append "ungoogled-chromium-" category "-" name)))) (sha256 (base32 hash)))) -(define %chromium-version "88.0.4324.182") -(define %ungoogled-revision "b98f2d51406c84a75df96f0da9dee3c0d790963d") +(define %ungoogled-revision "89.0.4389.90-1") (define %debian-revision "debian/84.0.4147.105-1") (define %debian-patches @@ -326,15 +320,20 @@ (uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium") (commit %ungoogled-revision))) (file-name (git-file-name "ungoogled-chromium" - (string-take %ungoogled-revision 7))) + (if (= 40 (string-length %ungoogled-revision)) + (string-take %ungoogled-revision 7) + %ungoogled-revision))) (sha256 (base32 - "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay")))) + "0pr756d1b4wc67d61b21yszi7mx1hsjy14i44j0kvcwm05pgnf79")))) (define %guix-patches (list (local-file (assume-valid-file-name (search-patch "ungoogled-chromium-system-nspr.patch"))) + (local-file + (assume-valid-file-name + (search-patch "ungoogled-chromium-system-opus.patch"))) (local-file (assume-valid-file-name (search-patch "ungoogled-chromium-extension-search-path.patch"))))) @@ -418,7 +417,7 @@ (define libvpx/chromium (package (inherit libvpx) - (version "1.9.0-88-g12059d956") + (version "1.9.0-104-gb5d77a48d") (source (origin (inherit (package-source libvpx)) (uri (git-reference @@ -427,7 +426,7 @@ (file-name (git-file-name "libvpx" version)) (sha256 (base32 - "14knnvfaskfz97vs3lfqrdpcbcx22s6qp16213wdnvnsf4c1lx1b")))))) + "07nkpx8myw5nd4bkaj6l4wr5ipk2c6lg9cwirz0i5qbr659051rk")))))) ;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need ;; this trick to make it wrap 'lld'. @@ -457,17 +456,17 @@ (define-public ungoogled-chromium (package (name "ungoogled-chromium") - (version (string-append %chromium-version "-0." - (string-take %ungoogled-revision 7))) + (version %ungoogled-revision) (synopsis "Graphical web browser") (source (origin (method url-fetch) (uri (string-append "https://commondatastorage.googleapis.com" "/chromium-browser-official/chromium-" - %chromium-version ".tar.xz")) + (string-drop-right %ungoogled-revision 2) + ".tar.xz")) (sha256 (base32 - "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h")) + "16i7bgk2jbcqs2p28nk5mlf0k6wah594pcsfm8b154nxbyf0iihi")) (modules '((guix build utils))) (snippet (force ungoogled-chromium-snippet)))) (build-system gnu-build-system) @@ -488,9 +487,6 @@ ;; Use the "official" release optimizations, as opposed to ;; a developer build. "is_official_build=true" - (string-append "max_jobs_per_link=" - ;; Respect the default cap of 8 jobs. - (number->string (min 8 (parallel-job-count)))) "clang_use_chrome_plugins=false" "chrome_pgo_phase=0" "use_sysroot=false" @@ -533,7 +529,6 @@ "use_system_zlib=true" "use_gnome_keyring=false" ;deprecated by libsecret - "use_openh264=true" "use_pulseaudio=true" "link_pulseaudio=true" "icu_use_data_file=false" @@ -548,6 +543,10 @@ '("use_vaapi=true") '()) + "media_use_ffmpeg=true" + "media_use_libvpx=true" + "media_use_openh264=true" + ;; Do not artifically restrict formats supported by system ffmpeg. "proprietary_codecs=true" "ffmpeg_branding=\"Chrome\"" @@ -556,17 +555,15 @@ "rtc_use_h264=true" "rtc_use_pipewire=true" "rtc_link_pipewire=true" + "rtc_pipewire_version=\"0.3\"" ;; Don't use bundled sources. "rtc_build_json=true" ;FIXME: libc++ std::string ABI difference "rtc_build_libevent=false" "rtc_build_libvpx=false" "rtc_build_opus=false" - "rtc_build_ssl=false" "rtc_build_libsrtp=true" ;FIXME: fails to find headers "rtc_build_usrsctp=true" ;TODO: package this - (string-append "rtc_ssl_root=\"" - (assoc-ref %build-inputs "openssl") - "/include/openssl\"")) + "rtc_build_ssl=true") ;XXX: the bundled BoringSSL is required? #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-stuff @@ -604,12 +601,6 @@ (("third_party/icu/source/(common|i18n)/") "")) - ;; Fix faulty ICU call. Likely fixed in M89. - (substitute* - "third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc" - (("ideographicSpaceCharacter") - "kIdeographicSpaceCharacter")) - ;; XXX: Should be unnecessary when use_system_lcms2=true. (substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h" (("include \"third_party/lcms/include/lcms2\\.h\"") @@ -865,11 +856,10 @@ ("nss" ,nss) ("openh264" ,openh264) ("openjpeg" ,openjpeg) ;PDFium only - ("openssl" ,openssl) ("opus" ,opus+custom) ("pango" ,pango) ("pciutils" ,pciutils) - ("pipewire" ,pipewire) + ("pipewire" ,pipewire-0.3) ("pulseaudio" ,pulseaudio) ("snappy" ,snappy) ("speech-dispatcher" ,speech-dispatcher) diff --git a/gnu/packages/patches/ungoogled-chromium-system-opus.patch b/gnu/packages/patches/ungoogled-chromium-system-opus.patch new file mode 100644 index 0000000000..6f887a31a4 --- /dev/null +++ b/gnu/packages/patches/ungoogled-chromium-system-opus.patch @@ -0,0 +1,27 @@ +Add missing build dependency on Opus so that system headers are found. + +Taken from upstream: +https://chromium-review.googlesource.com/c/chromium/src/+/2644623 + +diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn +--- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn ++++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn +@@ -65,6 +65,7 @@ blink_modules_sources("webcodecs") { + "//media/mojo/clients", + "//media/mojo/mojom", + "//third_party/libyuv:libyuv", ++ "//third_party/opus", + ] + if (media_use_openh264) { + deps += [ "//third_party/openh264:encoder" ] +diff --git a/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS +--- a/third_party/blink/renderer/modules/webcodecs/DEPS ++++ b/third_party/blink/renderer/modules/webcodecs/DEPS +@@ -19,6 +19,7 @@ include_rules = [ + + "+third_party/libyuv", + "+third_party/openh264", ++ "+third_party/opus", + + "+ui/gfx/color_space.h", + "+ui/gfx/geometry/rect.h", -- cgit 1.4.1 From c1245f01efdc126e37a0bf432a8a1b315ccb33a5 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 19 Mar 2021 11:44:41 +0100 Subject: gnu: ruby-kramdown: Update to 2.3.1 [fixes CVE-2021-28834]. * gnu/packages/ruby.scm (ruby-kramdown): Update to 2.3.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 c138f18f7e..806c6cf873 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -11096,13 +11096,13 @@ functionality from Prawn.") (define-public ruby-kramdown (package (name "ruby-kramdown") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (rubygems-uri "kramdown" version)) (sha256 (base32 - "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7")))) + "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar")))) (build-system ruby-build-system) (arguments `(#:tests? #f)); FIXME: some test failures (native-inputs -- cgit 1.4.1 From 572528e7ddcf6af213c78e70eb60953a82b96a96 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 19 Mar 2021 11:56:38 +0100 Subject: gnu: busybox: Fix CVE-2021-28831. * gnu/packages/patches/busybox-CVE-2021-28831.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/busybox.scm (busybox): Apply it. --- gnu/local.mk | 1 + gnu/packages/busybox.scm | 3 +- gnu/packages/patches/busybox-CVE-2021-28831.patch | 57 +++++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/busybox-CVE-2021-28831.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index afd9c17f9c..8325c071bd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -872,6 +872,7 @@ dist_patch_DATA = \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ %D%/packages/patches/blender-2.79-python-3.8-fix.patch \ %D%/packages/patches/bpftrace-disable-bfd-disasm.patch \ + %D%/packages/patches/busybox-CVE-2021-28831.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/cairo-CVE-2018-19876.patch \ %D%/packages/patches/cairo-CVE-2020-35492.patch \ diff --git a/gnu/packages/busybox.scm b/gnu/packages/busybox.scm index 5af67e084d..17c90c3c65 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -41,7 +41,8 @@ version ".tar.bz2")) (sha256 (base32 - "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx")))) + "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx")) + (patches (search-patches "busybox-CVE-2021-28831.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/busybox-CVE-2021-28831.patch b/gnu/packages/patches/busybox-CVE-2021-28831.patch new file mode 100644 index 0000000000..da3107fbb1 --- /dev/null +++ b/gnu/packages/patches/busybox-CVE-2021-28831.patch @@ -0,0 +1,57 @@ +From f25d254dfd4243698c31a4f3153d4ac72aa9e9bd Mon Sep 17 00:00:00 2001 +From: Samuel Sapalski +Date: Wed, 3 Mar 2021 16:31:22 +0100 +Subject: decompress_gunzip: Fix DoS if gzip is corrupt + +On certain corrupt gzip files, huft_build will set the error bit on +the result pointer. If afterwards abort_unzip is called huft_free +might run into a segmentation fault or an invalid pointer to +free(p). + +In order to mitigate this, we check in huft_free if the error bit +is set and clear it before the linked list is freed. + +Signed-off-by: Samuel Sapalski +Signed-off-by: Peter Kaestle +Signed-off-by: Denys Vlasenko +--- + archival/libarchive/decompress_gunzip.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/archival/libarchive/decompress_gunzip.c b/archival/libarchive/decompress_gunzip.c +index eb3b64930..e93cd5005 100644 +--- a/archival/libarchive/decompress_gunzip.c ++++ b/archival/libarchive/decompress_gunzip.c +@@ -220,10 +220,20 @@ static const uint8_t border[] ALIGN1 = { + * each table. + * t: table to free + */ ++#define BAD_HUFT(p) ((uintptr_t)(p) & 1) ++#define ERR_RET ((huft_t*)(uintptr_t)1) + static void huft_free(huft_t *p) + { + huft_t *q; + ++ /* ++ * If 'p' has the error bit set we have to clear it, otherwise we might run ++ * into a segmentation fault or an invalid pointer to free(p) ++ */ ++ if (BAD_HUFT(p)) { ++ p = (huft_t*)((uintptr_t)(p) ^ (uintptr_t)(ERR_RET)); ++ } ++ + /* Go through linked list, freeing from the malloced (t[-1]) address. */ + while (p) { + q = (--p)->v.t; +@@ -289,8 +299,6 @@ static unsigned fill_bitbuffer(STATE_PARAM unsigned bitbuffer, unsigned *current + * or a valid pointer to a Huffman table, ORed with 0x1 if incompete table + * is given: "fixed inflate" decoder feeds us such data. + */ +-#define BAD_HUFT(p) ((uintptr_t)(p) & 1) +-#define ERR_RET ((huft_t*)(uintptr_t)1) + static huft_t* huft_build(const unsigned *b, const unsigned n, + const unsigned s, const struct cp_ext *cp_ext, + unsigned *m) +-- +cgit v1.2.1 + -- cgit 1.4.1 From 60d629d777a29b7708d5ced162beced74e1af2dc Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 19 Mar 2021 12:00:13 +0100 Subject: gnu: busybox: Update to 1.33.0. * gnu/packages/busybox.scm (busybox): Update to 1.33.0. --- 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 17c90c3c65..7ede3ee330 100644 --- a/gnu/packages/busybox.scm +++ b/gnu/packages/busybox.scm @@ -33,7 +33,7 @@ (define-public busybox (package (name "busybox") - (version "1.32.1") + (version "1.33.0") (source (origin (method url-fetch) (uri (string-append @@ -41,7 +41,7 @@ version ".tar.bz2")) (sha256 (base32 - "1vhd59qmrdyrr1q7rvxmyl96z192mxl089hi87yl0hcp6fyw8mwx")) + "1gcg7ggg79apdlp5qnrh9pbjl10fx30yn33p21kxqpm8j4f6hs6m")) (patches (search-patches "busybox-CVE-2021-28831.patch")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 14aa86e50c3d931eb3714ca7bb91f861173169c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 18 Mar 2021 15:17:48 +0100 Subject: gnu: openmpi: Add 'release-monitoring-url' property. * gnu/packages/mpi.scm (openmpi)[properties]: New field. --- gnu/packages/mpi.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index e5a45d751c..b878cc7019 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -203,6 +203,12 @@ bind processes, and much more.") (sha256 (base32 "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5")) (patches (search-patches "openmpi-mtl-priorities.patch")))) + + (properties + ;; Tell the 'generic-html' updater to monitor this URL for updates. + `((release-monitoring-url + . "https://www.open-mpi.org/software/ompi/current"))) + (build-system gnu-build-system) (inputs `(("hwloc" ,hwloc-2 "lib") -- cgit 1.4.1 From ee21803288cb2fd4dcfa9091d4fe4080a795a1ab Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 19 Mar 2021 13:21:43 +0100 Subject: gnu: openmpi: Update to 4.1.0. * gnu/packages/mpi.scm (openmpi): Update to 4.1.0. --- gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index b878cc7019..c958ef3398 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -193,7 +193,7 @@ bind processes, and much more.") (define-public openmpi (package (name "openmpi") - (version "4.0.5") + (version "4.1.0") (source (origin (method url-fetch) @@ -201,7 +201,7 @@ bind processes, and much more.") (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5")) + (base32 "1dfmkyilgml9w9s5p0jmfj3xcdwdccwqbjw5iim9p0chf2vnz1kk")) (patches (search-patches "openmpi-mtl-priorities.patch")))) (properties -- cgit 1.4.1 From 7b79ca0a056acd1ac67149c158fcb3f4b7c2c36f Mon Sep 17 00:00:00 2001 From: "Boris A. Dekshteyn" Date: Fri, 19 Mar 2021 01:25:31 +1200 Subject: gnu: swi-prolog: Update to 8.3.20. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/prolog.scm (swi-prolog): Update to 8.3.20. Signed-off-by: Ludovic Courtès --- gnu/packages/prolog.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 9e0fe2a829..a5c57cd37c 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -86,7 +86,7 @@ manner. It also features an interactive interpreter.") (define-public swi-prolog (package (name "swi-prolog") - (version "8.3.10") + (version "8.3.20") (source (origin (method git-fetch) (uri (git-reference @@ -96,7 +96,7 @@ manner. It also features an interactive interpreter.") (file-name (git-file-name name version)) (sha256 (base32 - "15q40qpxz472lp190zbk0lyap2xgaxzib55l0c3qwgf9haz46j1p")))) + "1g0v9cmz8zvzc1n0si7sn6522xwzbhj2b8967ibs6prinrpjc8d6")))) (build-system cmake-build-system) (arguments `(#:parallel-build? #t -- cgit 1.4.1 From b6f0c9920146c3d3d125b96ea18226d691c549c0 Mon Sep 17 00:00:00 2001 From: jgart Date: Fri, 12 Mar 2021 10:39:14 -0500 Subject: gnu: vis: Update to 0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (vis): Update to 0.7. [home-page, source]: Use sourcehut upstream URIs instead of github. Signed-off-by: Ludovic Courtès --- gnu/packages/text-editors.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 59286ce033..c671095793 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -80,15 +80,15 @@ (define-public vis (package (name "vis") - (version "0.6") ; also update the vis-test input + (version "0.7") ; also update the vis-test input (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/martanne/vis") + (url "https://git.sr.ht/~martanne/vis") (commit (string-append "v" version)))) (sha256 - (base32 "1zjm89cn3rfq8fxpwp66khy53s6vqlmw6q103qyyvix8ydzxdmsh")) + (base32 "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -136,10 +136,10 @@ ,(origin (method git-fetch) (uri (git-reference - (url "https://github.com/martanne/vis-test") - (commit "4c4f6645de77f697a45899e8645e0c2bbdc7208a"))) + (url "https://git.sr.ht/~martanne/vis-test") + (commit "bbd2f34ff788e87a51a74069069273ad83c44f1f"))) (sha256 - (base32 "10vh1pxsqw88a5xwh5irkm85xr66dbycmgpmabyw9h0vm14cvcz2")) + (base32 "1jsvg2lg3xqfgi79x08kx94mc34mh62ivca10vsci6fqsk68jbd0")) (file-name (git-file-name "vis-test" version)))))) (inputs `(("lua" ,lua) ("ncurses" ,ncurses) -- cgit 1.4.1 From 9991b5e3e572fcc6ede775e298949263541d05fc Mon Sep 17 00:00:00 2001 From: Yoav Marco Date: Fri, 12 Mar 2021 03:26:20 +0200 Subject: gnu: Add dragon-drop. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (dragon-drop): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gtk.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9fc4967181..5b1c4481fd 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2082,6 +2082,53 @@ 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+))) +(define-public dragon-drop + (package + (name "dragon-drop") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/mwh/dragon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fgzz39007fdjwq72scp0qygp2v3zc5f1xkm0sxaa8zxm25g1bra")))) + (build-system gnu-build-system) + (inputs `(("gtk+" ,gtk+))) + (native-inputs `(("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ; no check + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + ;; makefile uses PREFIX for the binary location + (string-append "PREFIX=" (assoc-ref %outputs "out") + "/bin")) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (synopsis "Drag and drop source/target for X") + (description + "Dragon is a lightweight drag-and-drop source for X where you can run: + +@example +dragon file.tar.gz +@end example + +to get a window with just that file in it, ready to be dragged where you need it. +What if you need to drag into something? Using: + +@example +dragon --target +@end example + +you get a window you can drag files and text into. Dropped items are +printed to standard output.") + (home-page "https://github.com/mwh/dragon") + (license license:gpl3+))) + (define-public libdbusmenu (package (name "libdbusmenu") -- cgit 1.4.1 From 1521775bcb5f1b33efd3f469fefd8ed935fe6010 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 01:38:58 -0500 Subject: gnu: Add psi. * gnu/packages/messaging.scm (psi): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7ab6d028a3..af649f6321 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -78,10 +78,12 @@ #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages kde) #:use-module (gnu packages kerberos) #:use-module (gnu packages less) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libidn) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages lua) @@ -104,6 +106,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages ruby) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) @@ -131,6 +134,62 @@ #:use-module (guix packages) #:use-module (guix utils)) +(define-public psi + (package + (name "psi") + (version "1.5") + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://sourceforge/psi/Psi/" + version "/psi-" version ".tar.xz")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "3rdparty"))) + (sha256 + (base32 "1dxmm1d1zr0pfs51lba732ipm6hm2357jlfb934lvarzsh7karri")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:configure-flags + (list + "-DUSE_ENCHANT=ON" + "-DUSE_CCACHE=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "cmake/modules/FindHunspell.cmake" + (("hunspell-1.6") + "hunspell-1.7")) + #t))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby))) + (inputs + `(("aspell" ,aspell) + ("enchant" ,enchant-1.6) + ("hunspell" ,hunspell) + ("libidn" ,libidn) + ("qca" ,qca) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("x11" ,libx11) + ("xext" ,libxext) + ("xcb" ,libxcb) + ("zlib" ,zlib))) + (synopsis "Qt-based XMPP Client") + (description "Psi is a capable XMPP client aimed at experienced users. +Its design goals are simplicity and stability.") + (home-page "https://psi-im.org") + (license license:gpl2+))) + (define-public libgnt (package (name "libgnt") -- cgit 1.4.1 From 1ab03fb74505458e7754dce338a5da29dc754d80 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Fri, 19 Mar 2021 11:56:03 -0400 Subject: gnu: srt2vtt: Update to 0.2. * gnu/packages/video.scm (srt2vtt): Update to 0.2. Wrap executable. --- gnu/packages/video.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index dbe042c0d9..2a213a10cf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2646,7 +2646,7 @@ device without having to bother about the decryption.") (define-public srt2vtt (package (name "srt2vtt") - (version "0.1") + (version "0.2") (source (origin (method url-fetch) (uri (string-append @@ -2654,10 +2654,29 @@ device without having to bother about the decryption.") version ".tar.gz")) (sha256 (base32 - "16b377znjm6qlga5yb8aj7b7bcisa1ghcnj2lrb1d30lvxp4liif")))) + "1ravl635x81fcai4h2xnsn926i69pafgr6zkghq6319iprkw8ffv")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-srt2vtt + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (version ,(let ((v (package-version guile-3.0))) + (string-append (car (string-split v #\.)) + ".0"))) + (site (string-append out "/share/guile/site/" version)) + (compiled (string-append + out "/lib/guile/" version + "/site-ccache"))) + (wrap-program (string-append bin "/srt2vtt") + `("GUILE_LOAD_PATH" ":" prefix (,site)) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,compiled))))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-2.0))) + `(("guile" ,guile-3.0))) (synopsis "SubRip to WebVTT subtitle converter") (description "srt2vtt converts SubRip formatted subtitles to WebVTT format for use with HTML5 video.") -- cgit 1.4.1 From 369d0e7f5c7d5b81543bc053ea9a51fd921102ec Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 6 Mar 2021 10:28:02 +0100 Subject: gnu: Add git2cl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/version-control.scm (git2cl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/version-control.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7c93337625..137c7c8336 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Léo Le Bouter ;;; Copyright © 2021 LibreMiami +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -600,6 +601,31 @@ everything from small to very large projects with speed and efficiency.") ("perl" ,perl) ("zlib" ,zlib))))) +(define-public git2cl + (let ((commit "1d74d4c0d933fc69ed5cec838c73502584dead05")) + (package + (name "git2cl") + (version (string-append "20120919." (string-take commit 7))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.nongnu.org/git/git2cl.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wnnbm2sjvfj0qrksj89jlnl69miwl0vk3wrrvgvpclgys3na2g1")))) + (build-system copy-build-system) + (inputs + `(("perl" ,perl))) + (arguments + `(#:install-plan '(("git2cl" "bin/git2cl")))) + (home-page "https://savannah.nongnu.org/projects/git2cl") + (synopsis "Convert Git logs to GNU ChangeLog format") + (description "@code{git2cl} is a command line tool for converting Git +logs to GNU ChangeLog format.") + (license license:gpl2+)))) + (define-public gitless (package (name "gitless") -- cgit 1.4.1 From f08a60bbecc46b7918986bb79a34caf537751693 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Mon, 8 Feb 2021 14:08:27 -0300 Subject: gnu: Add fzf. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (fzf): New variable, which inherits from the existing go-github-com-junegunn-fzf package, but also install other binary, and completion for direct usage. Signed-off-by: Ludovic Courtès --- gnu/packages/terminals.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index f4c97e0002..3fe580589d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -824,6 +824,43 @@ programmer to write text-based user interfaces.") usable with any list--including files, command history, processes and more.") (license license:expat))) +(define-public fzf + (package + (inherit go-github-com-junegunn-fzf) + (name "fzf") + (arguments + (ensure-keyword-arguments + (package-arguments go-github-com-junegunn-fzf) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'copy-binaries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (install-file "bin/fzf-tmux" + (string-append out "/bin")))))) + (add-after 'copy-binaries 'wrap-programs + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses"))) + (wrap-program (string-append out "/bin/fzf-tmux") + `("PATH" ":" prefix (,(string-append ncurses "/bin"))))))) + (add-after 'install 'install-completions + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bash-completion (string-append out "/etc/bash_completion.d")) + (zsh-completion (string-append out "/share/zsh/site-functions"))) + (with-directory-excursion "src/github.com/junegunn/fzf" + (mkdir-p bash-completion) + (copy-file "shell/completion.bash" + (string-append bash-completion "/fzf")) + (mkdir-p zsh-completion) + (copy-file "shell/completion.zsh" + (string-append zsh-completion "/_fzf")))))))))) + (inputs + `(,@(package-inputs go-github-com-junegunn-fzf) + ("ncurses" ,ncurses))))) + (define-public go-github.com-howeyc-gopass (let ((commit "bf9dde6d0d2c004a008c27aaee91170c786f6db8") (revision "0")) -- cgit 1.4.1 From c4d616f7c665921e1329c75cd2d0cf05094b1306 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 1 Feb 2021 14:01:11 +0000 Subject: gnu: abseil-cpp: Update to 20200923.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (abseil-cpp): Update to 20200923.3. [arguments]: Enable external googletest. * gnu/packages/patches/abseil-cpp-fix.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/cpp.scm | 7 +++++-- gnu/packages/patches/abseil-cpp-fix.patch | 16 ++++++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/abseil-cpp-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8325c071bd..c4535daae9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -786,6 +786,7 @@ dist_patch_DATA = \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ + %D%/packages/patches/abseil-cpp-fix.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 02a82091b8..ba361ba5ca 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -678,7 +678,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225.2") + (version "20200923.3") (source (origin (method git-fetch) (uri (git-reference @@ -687,11 +687,14 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y")))) + "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl")) + ;; Remove after next googletest release and update. + (patches (search-patches "abseil-cpp-fix.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" "-DABSL_RUN_TESTS=ON" + "-DABSL_USE_EXTERNAL_GOOGLETEST=ON" ;; Needed, else we get errors like: ;; ;; ld: CMakeFiles/absl_periodic_sampler_test.dir/internal/periodic_sampler_test.cc.o: diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-fix.patch new file mode 100644 index 0000000000..38971448f3 --- /dev/null +++ b/gnu/packages/patches/abseil-cpp-fix.patch @@ -0,0 +1,16 @@ +The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest +in commit 0b024bd9 on master. It has been used in an abseil-cpp release before +a googletest release. + +--- a/absl/container/internal/unordered_map_modifiers_test.h ++++ b/absl/container/internal/unordered_map_modifiers_test.h +@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test { + } + }; + ++#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST + GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest); ++#endif + + TYPED_TEST_SUITE_P(UniquePtrModifiersTest); + -- cgit 1.4.1 From 6457985e39d794c0f44d953d475aa19c41025d00 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 11 Mar 2021 20:53:15 +0000 Subject: gnu: abseil-cpp: Patch sterror_test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/abseil-cpp-fix-gtest.patch: Renamed file. * gnu/packages/patches/abseil-cpp-fix-strerror_test.patch: New file. * gnu/local.mk (dist_patch_DATA): Rename / add files. * gnu/packages/cpp.scm (abseil-cpp)[source]: Use files. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 3 +- gnu/packages/cpp.scm | 5 ++- gnu/packages/patches/abseil-cpp-fix-gtest.patch | 16 +++++++++ .../patches/abseil-cpp-fix-strerror_test.patch | 42 ++++++++++++++++++++++ gnu/packages/patches/abseil-cpp-fix.patch | 16 --------- 5 files changed, 64 insertions(+), 18 deletions(-) create mode 100644 gnu/packages/patches/abseil-cpp-fix-gtest.patch create mode 100644 gnu/packages/patches/abseil-cpp-fix-strerror_test.patch delete mode 100644 gnu/packages/patches/abseil-cpp-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c4535daae9..3d4147a879 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -786,7 +786,8 @@ dist_patch_DATA = \ %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/ableton-link-system-libraries-debian.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ - %D%/packages/patches/abseil-cpp-fix.patch \ + %D%/packages/patches/abseil-cpp-fix-gtest.patch \ + %D%/packages/patches/abseil-cpp-fix-strerror_test.patch \ %D%/packages/patches/adb-add-libraries.patch \ %D%/packages/patches/aegis-constness-error.patch \ %D%/packages/patches/aegis-perl-tempdir1.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index ba361ba5ca..2233d2e993 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -689,7 +689,10 @@ point and then, after each tween step, plugging back the result.") (base32 "1p4djhm1f011ficbjjxx3n8428p8481p20j4glpaawnpsi362hkl")) ;; Remove after next googletest release and update. - (patches (search-patches "abseil-cpp-fix.patch")))) + (patches + (search-patches + "abseil-cpp-fix-gtest.patch" + "abseil-cpp-fix-strerror_test.patch")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" diff --git a/gnu/packages/patches/abseil-cpp-fix-gtest.patch b/gnu/packages/patches/abseil-cpp-fix-gtest.patch new file mode 100644 index 0000000000..38971448f3 --- /dev/null +++ b/gnu/packages/patches/abseil-cpp-fix-gtest.patch @@ -0,0 +1,16 @@ +The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest +in commit 0b024bd9 on master. It has been used in an abseil-cpp release before +a googletest release. + +--- a/absl/container/internal/unordered_map_modifiers_test.h ++++ b/absl/container/internal/unordered_map_modifiers_test.h +@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test { + } + }; + ++#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST + GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest); ++#endif + + TYPED_TEST_SUITE_P(UniquePtrModifiersTest); + diff --git a/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch new file mode 100644 index 0000000000..726149b015 --- /dev/null +++ b/gnu/packages/patches/abseil-cpp-fix-strerror_test.patch @@ -0,0 +1,42 @@ +From e2b1bab19a782cb62bb010d1c2925ab7314fb113 Mon Sep 17 00:00:00 2001 +diff --git a/absl/base/internal/strerror.cc b/absl/base/internal/strerror.cc +index d66ba120..0d6226fd 100644 +--- a/absl/base/internal/strerror.cc ++++ b/absl/base/internal/strerror.cc +@@ -51,7 +51,6 @@ const char* StrErrorAdaptor(int errnum, char* buf, size_t buflen) { + } + + std::string StrErrorInternal(int errnum) { +- absl::base_internal::ErrnoSaver errno_saver; + char buf[100]; + const char* str = StrErrorAdaptor(errnum, buf, sizeof buf); + if (*str == '\0') { +@@ -76,6 +75,7 @@ std::array* NewStrErrorTable() { + } // namespace + + std::string StrError(int errnum) { ++ absl::base_internal::ErrnoSaver errno_saver; + static const auto* table = NewStrErrorTable(); + if (errnum >= 0 && errnum < static_cast(table->size())) { + return (*table)[errnum]; +diff --git a/absl/base/internal/strerror_test.cc b/absl/base/internal/strerror_test.cc +index a53da97f..e32d5b5c 100644 +--- a/absl/base/internal/strerror_test.cc ++++ b/absl/base/internal/strerror_test.cc +@@ -62,12 +62,14 @@ TEST(StrErrorTest, MultipleThreads) { + ++counter; + errno = ERANGE; + const std::string value = absl::base_internal::StrError(i); ++ // EXPECT_* could change errno. Stash it first. ++ int check_err = errno; ++ EXPECT_THAT(check_err, Eq(ERANGE)); + // Only the GNU implementation is guaranteed to provide the + // string "Unknown error nnn". POSIX doesn't say anything. + if (!absl::StartsWith(value, "Unknown error ")) { +- EXPECT_THAT(absl::base_internal::StrError(i), Eq(expected_strings[i])); ++ EXPECT_THAT(value, Eq(expected_strings[i])); + } +- EXPECT_THAT(errno, Eq(ERANGE)); + } + }; + diff --git a/gnu/packages/patches/abseil-cpp-fix.patch b/gnu/packages/patches/abseil-cpp-fix.patch deleted file mode 100644 index 38971448f3..0000000000 --- a/gnu/packages/patches/abseil-cpp-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -The GTEST_ALLOW_UNINSTANTIATED_PARAMTERIZED_TEST macro was added to googletest -in commit 0b024bd9 on master. It has been used in an abseil-cpp release before -a googletest release. - ---- a/absl/container/internal/unordered_map_modifiers_test.h -+++ b/absl/container/internal/unordered_map_modifiers_test.h -@@ -286,7 +286,9 @@ class UniquePtrModifiersTest : public ::testing::Test { - } - }; - -+#ifdef GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST - GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UniquePtrModifiersTest); -+#endif - - TYPED_TEST_SUITE_P(UniquePtrModifiersTest); - -- cgit 1.4.1 From aa45673746bac3b770f2c04fa5e118345ab185bc Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 14:39:50 +0100 Subject: gnu: Add go-github-com-akosmarton-papipes. * gnu/packages/golang.scm (go-github-com-akosmarton-papipes): New variable. --- gnu/packages/golang.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 849227d693..06a581ed7e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2020 raingloom ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Ricardo Wurmus +;;; Copyright © 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -51,14 +52,15 @@ #:use-module (guix build-system go) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages base) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) - #:use-module (gnu packages base) - #:use-module (gnu packages perl) - #:use-module (gnu packages pkg-config) - #:use-module (gnu packages pcre) #:use-module (gnu packages lua) #:use-module (gnu packages mp3) + #:use-module (gnu packages pcre) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) @@ -6773,3 +6775,41 @@ compressed streams in Go.") (description "Package ed25519 implements the Ed25519 signature algorithm.") (license license:bsd-3)))) + +(define-public go-github-com-akosmarton-papipes + (let ((commit "3c63b4919c769c9c2b2d07e69a98abb0eb47fe64") + (revision "0")) + (package + (name "go-github-com-akosmarton-papipes") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/akosmarton/papipes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16p77p3d1v26qd3knxn087jqlad2qm23q8m796cdr66hrdc0gahq")))) + (build-system go-build-system) + (inputs + `(("pulseaudio" ,pulseaudio))) + (arguments + `(#:import-path "github.com/akosmarton/papipes" + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/github.com/akosmarton/papipes/common.go" + "src/github.com/akosmarton/papipes/sink.go" + "src/github.com/akosmarton/papipes/source.go") + (("exec.Command\\(\"pactl\"") + (string-append "exec.Command(\"" + (assoc-ref inputs "pulseaudio") + "/bin/pactl\"")))))))) + (home-page "https://github.com/akosmarton/papipes") + (synopsis "Pulseaudio client library for Go") + (description + "This is a Pulseaudio client library in Golang for creating virtual +sinks and sources.") + (license license:expat)))) -- cgit 1.4.1 From efbc8db0f06566cf14aa3127e5bbf2dfae721e6e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:00:57 +0100 Subject: gnu: Add go-github-com-mesilliac-pulse-simple. * gnu/packages/golang.scm (go-github-com-mesilliac-pulse-simple): 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 06a581ed7e..30a36540f4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6813,3 +6813,31 @@ algorithm.") "This is a Pulseaudio client library in Golang for creating virtual sinks and sources.") (license license:expat)))) + +(define-public go-github-com-mesilliac-pulse-simple + (let ((commit "75ac54e19fdff88f4fbd82f45125134b602230b0") + (revision "0")) + (package + (name "go-github-com-mesilliac-pulse-simple") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mesilliac/pulse-simple") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1awwczsa9yy99p035ckajqfs8m6mab0lz82mzlj1c5cj9lnmwplj")))) + (build-system go-build-system) + (propagated-inputs + `(("pkg-config" ,pkg-config) + ("pulseaudio" ,pulseaudio))) + (arguments + '(#:import-path "github.com/mesilliac/pulse-simple")) + (home-page "https://github.com/mesilliac/pulse-simple") + (synopsis "Cgo bindings to PulseAudio's Simple API") + (description + "This packages provides Cgo bindings to PulseAudio's Simple API, to play +or capture raw audio.") + (license license:expat)))) -- cgit 1.4.1 From 3554527c53f02aeafbbf18515fae88430578f27a Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:13:12 +0100 Subject: gnu: Add go-github-com-pborman-getopt. * gnu/packages/golang.scm (go-github-com-pborman-getopt): New variable. --- gnu/packages/golang.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 30a36540f4..0d434f8bea 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6841,3 +6841,26 @@ sinks and sources.") "This packages provides Cgo bindings to PulseAudio's Simple API, to play or capture raw audio.") (license license:expat)))) + +(define-public go-github-com-pborman-getopt + (package + (name "go-github-com-pborman-getopt") + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pborman/getopt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sacv6g8cxfibxd3gnfjnzp7fynrnc4s2aaz5wbxivqqhvflc22l")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/pborman/getopt")) + (home-page "https://github.com/pborman/getopt") + (synopsis "Getopt style option parsing for Go") + (description + "This package provides traditional getopt processing for implementing +programs that use traditional command lines.") + (license license:bsd-3))) -- cgit 1.4.1 From 32c979675ece13753c0c91980e921785bac4623d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:24:03 +0100 Subject: gnu: Add go-go-uber-org-atomic. * gnu/packages/golang.scm (go-go-uber-org-atomic): 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 0d434f8bea..3729a46c4e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6864,3 +6864,29 @@ or capture raw audio.") "This package provides traditional getopt processing for implementing programs that use traditional command lines.") (license license:bsd-3))) + +(define-public go-go-uber-org-atomic + (package + (name "go-go-uber-org-atomic") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uber-go/atomic") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxvb5sixh76cl9j8dpa97gznj0p8pmg2cdw0ypfwhd3ipx9wph1")))) + (build-system go-build-system) + (arguments + '(#:import-path "go.uber.org/atomic")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew))) + (home-page "https://go.uber.org/atomic") + (synopsis "Wrapper types for sync/atomic") + (description + "This package provides simple wrappers for primitive types to enforce +atomic access.") + (license license:expat))) -- cgit 1.4.1 From 08c3614125c0ebce9dc61b19fcd3d9d4ca6b6d8f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:29:46 +0100 Subject: gnu: Add go-go-uber-org-multierr. * gnu/packages/golang.scm (go-go-uber-org-multierr): 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 3729a46c4e..a3f33678fa 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6890,3 +6890,29 @@ programs that use traditional command lines.") "This package provides simple wrappers for primitive types to enforce atomic access.") (license license:expat))) + +(define-public go-go-uber-org-multierr + (package + (name "go-go-uber-org-multierr") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uber-go/multierr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "162941s8f6a9x2w04qm4qa3zz0zylwag9149hywrj9ibp2nzcsqz")))) + (build-system go-build-system) + (arguments + '(#:import-path "go.uber.org/multierr")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify))) + (propagated-inputs + `(("go-go-uber-org-atomic" ,go-go-uber-org-atomic))) + (home-page "https://go.uber.org/multierr") + (synopsis "Error combination fo Go") + (description + "@code{multierr} allows combining one or more Go errors together.") + (license license:expat))) -- cgit 1.4.1 From 81976123b2da8609efff9b5dec4baf86bdd0b8fd Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:45:34 +0100 Subject: gnu: Add go-golang-org-x-lint. * gnu/packages/golang.scm (go-golang-org-x-lint): 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 a3f33678fa..413c491b8d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6916,3 +6916,31 @@ atomic access.") (description "@code{multierr} allows combining one or more Go errors together.") (license license:expat))) + +(define-public go-golang-org-x-lint + (let ((commit "83fdc39ff7b56453e3793356bcff3070b9b96445") + (revision "0")) + (package + (name "go-golang-org-x-lint") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/lint") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ms3rs5hvpnm9bxbr5f9743i7hn2bbmqdmvzxq6nmi0f24ypv1l3")))) + (build-system go-build-system) + (arguments + '(#:import-path "golang.org/x/lint" + #:tests? #f)) ;; TODO: Fix tests + (propagated-inputs + `(("go-golang-org-x-tools" ,go-golang-org-x-tools))) + (home-page "https://golang.org/x/lint") + (synopsis "Linter for Go source code") + (description + "This is a linter for Go source code. Unlike gofmt, it doesn't +reformat the source code, it only prints out style mistakes.") + (license license:bsd-3)))) -- cgit 1.4.1 From 81aa7cea643099c8fa0b458d1319e9f412177881 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 15:50:34 +0100 Subject: gnu: Add go-github-com-kisielk-gotool. * gnu/packages/golang.scm (go-github-com-kisielk-gotool): 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 413c491b8d..4c2fb2acb7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6944,3 +6944,27 @@ atomic access.") "This is a linter for Go source code. Unlike gofmt, it doesn't reformat the source code, it only prints out style mistakes.") (license license:bsd-3)))) + +(define-public go-github-com-kisielk-gotool + (package + (name "go-github-com-kisielk-gotool") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kisielk/gotool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/kisielk/gotool")) + (home-page "https://github.com/kisielk/gotool") + (synopsis "Go library of utility functions") + (description + "This package contains utility functions used to implement the standard +@code{cmd/go} tool, provided as a convenience to developers who want to write +tools with similar semantics.") + (license license:expat))) -- cgit 1.4.1 From 05d261b88e6fb86abeaa321a7ce44d9f7798cbd5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 19 Mar 2021 16:14:51 +0100 Subject: gnu: Add go-honnef-co-go-tools. * gnu/packages/golang.scm (go-honnef-co-go-tools): New variable. --- gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4c2fb2acb7..1ad1e149a7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6968,3 +6968,36 @@ reformat the source code, it only prints out style mistakes.") @code{cmd/go} tool, provided as a convenience to developers who want to write tools with similar semantics.") (license license:expat))) + +(define-public go-honnef-co-go-tools + (package + (name "go-honnef-co-go-tools") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dominikh/go-tools") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n")))) + (build-system go-build-system) + (arguments + `(#:import-path "honnef.co/go/tools" + #:tests? #f + ;; Source-only package + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (propagated-inputs + `(("go-golang-org-x-tools" ,go-golang-org-x-tools) + ("go-github-com-kisielk-gotool",go-github-com-kisielk-gotool) + ("go-github-com-burntsushi-toml" ,go-github-com-burntsushi-toml))) + (home-page "https://honnef.co/go/tools") + (synopsis "Staticcheck advanced Go linter") + (description + "Staticcheck is a state of the art linter for the Go programming language. +Using static analysis, it finds bugs and performance issues, offers +simplifications, and enforces style rules.") + (license license:expat))) -- cgit 1.4.1 From caf3209a8fbe83bd1953d7d3e3b6bfe0277ed493 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 20 Mar 2021 09:48:34 +0100 Subject: gnu: Add go-go-uber-org-zap. * gnu/packages/golang.scm (go-go-uber-org-zap): New variable. --- gnu/packages/golang.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1ad1e149a7..d9988cd7ad 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7001,3 +7001,36 @@ tools with similar semantics.") Using static analysis, it finds bugs and performance issues, offers simplifications, and enforces style rules.") (license license:expat))) + +(define-public go-go-uber-org-zap + (package + (name "go-go-uber-org-zap") + (version "1.16.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uber-go/zap") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05ix5wg1r8pgi7fb6084lg4x7mrkvzkh1nxa7zj337w5b9xj0myr")))) + (build-system go-build-system) + (arguments + '(#:import-path "go.uber.org/zap" + #:tests? #f)) ; TODO: Fix tests + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-golang-org-x-lint" ,go-golang-org-x-lint) + ("go-honnef-co-go-tools" ,go-honnef-co-go-tools))) + (propagated-inputs + `(("go-github-com-pkg-errors" ,go-github-com-pkg-errors) + ("go-go-uber-org-atomic" ,go-go-uber-org-atomic) + ("go-go-uber-org-multierr" ,go-go-uber-org-multierr) + ("go-gopkg-in-yaml-v2" ,go-gopkg-in-yaml-v2))) + (home-page "https://go.uber.org/zap") + (synopsis "Logging library for Go") + (description + "This package provides a library for fast, structured, leveled logging in +Go.") + (license license:expat))) -- cgit 1.4.1 From 5adfaa6853213c7125f1dcac378b7c8f77c97ef3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 20 Mar 2021 10:12:25 +0100 Subject: gnu: Add kappanhang. * gnu/packages/radio.scm (kappanhang): New variable. --- gnu/packages/radio.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 32a642f8f8..3378b36adb 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages golang) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -78,6 +79,7 @@ #: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) #:use-module (guix build-system python) #:use-module (guix build-system qt)) @@ -1356,3 +1358,45 @@ intended for people who want to learn receiving and sending morse code.") "This program contains algorithms to demodulate and decode AIS (Automatic Identification System) messages sent by ships and coast stations.") (license license:gpl2+))) + +(define-public kappanhang + (package + (name "kappanhang") + (version "1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nonoo/kappanhang") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/nonoo/kappanhang" + #:install-source? #f)) + (inputs + `(("go-github-com-akosmarton-papipes",go-github-com-akosmarton-papipes) + ("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-github-com-google-goterm" ,go-github-com-google-goterm) + ("go-github-com-mattn-go-isatty" ,go-github-com-mattn-go-isatty) + ("go-github-com-mesilliac-pulse-simple" + ,go-github-com-mesilliac-pulse-simple) + ("go-github-com-pborman-getopt" ,go-github-com-pborman-getopt) + ("go-go-uber-org-multierr" ,go-go-uber-org-multierr) + ("go-go-uber-org-zap" ,go-go-uber-org-zap))) + (home-page "https://github.com/nonoo/kappanhang") + (synopsis "Client for Icom RS-BA1 server") + (description + "Kappanhang remotely opens audio channels and a serial port to an Icom +RS-BA1 server. The application is mainly developed for connecting to the Icom +IC-705 transceiver, which has built-in WiFi and RS-BA1 server. + +Compatible hardware/software: +@itemize +@item Icom RS-BA1 server software, +@item Icom IC-705 +@item Icom IC-9700 +@end itemize\n") + (license license:expat))) -- cgit 1.4.1 From f5e69549ba5d6efcd03f4f50f771a8a76ed73c5b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Feb 2021 16:02:10 -0500 Subject: gnu: Add usrsctp. * gnu/packages/networking.scm (usrsctp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/networking.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e95e4870e9..3f6023c966 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -142,6 +142,35 @@ #:use-module (gnu packages xml) #:use-module (ice-9 match)) +(define-public usrsctp + (package + (name "usrsctp") + (version "0.9.5.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/sctplab/usrsctp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10ndzkip8blgkw572n3dicl6mgjaa7kygwn3vls80liq92vf1sa9")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("which" ,which))) + (home-page "https://github.com/sctplab/usrsctp/") + (synopsis "SCTP user-land implementation") + (description "UsrSCTP is a portable SCTP userland stack. SCTP is a message +oriented, reliable transport protocol with direct support for multihoming that +runs on top of IP or UDP, and supports both v4 and v6 versions.") + (license license:bsd-3))) + (define-public axel (package (name "axel") -- cgit 1.4.1 From 7f7ad800b08a89bcfe451085d8a93179d684b03c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Feb 2021 19:45:04 -0500 Subject: gnu: Add qhttp. * gnu/packages/web.scm (qhttp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/web.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 643de6ad6a..b3be3b734e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -77,6 +77,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -170,6 +171,79 @@ #:use-module (gnu packages xml) #:use-module ((srfi srfi-1) #:select (delete-duplicates))) +(define-public qhttp + (package + (name "qhttp") + (version "3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/azadkuh/qhttp") + (commit (string-append "version-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cx23g4y4k4v9p5ph6h7gfhp8sfy1gcdv1g6bl44hppar1y0zfdq")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no target + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "commondir.pri" + (("\\$\\$PRJDIR/xbin") + (string-append (assoc-ref outputs "out") "/lib")) + (("-L") + "-lhttp_parser -L") + (("\\$\\$PRJDIR/3rdparty") + "")) + (substitute* "src/src.pro" + (("SOURCES \\+= \\$\\$PRJDIR/3rdparty/http-parser/http_parser.c") + "") + (("HEADERS \\+= \\$\\$PRJDIR/3rdparty/http-parser/http_parser.h") + "")) + (substitute* '("src/private/qhttpbase.hpp" "src/qhttpabstracts.cpp") + (("http-parser/http_parser.h") + "http_parser.h")) + #t)) + (replace 'configure + (lambda _ (invoke "qmake"))) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "include" + #:include-regexp ("\\.hpp$"))) + args))) + (add-after 'install 'remove-examples + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/lib") + (for-each delete-file + (list + "basic-server" + "helloworld" + "postcollector"))) + #t))))) + (inputs + `(("http-parser" ,http-parser) + ("qtbase" ,qtbase))) + (home-page "https://github.com/azadkuh/qhttp/") + (synopsis "Qt-based HTTP Library") + (description + "Qhttp is a light-weight and asynchronous HTTP library +(both server & client) in Qt5 and C++14.") + (license license:expat))) + (define-public httpd (package (name "httpd") -- cgit 1.4.1 From 54fd3167ff4db4f18de154ff9d78e7dd0168ce40 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 26 Feb 2021 16:16:02 -0500 Subject: gnu: Add qite. * gnu/packages/qt.scm (qite): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/qt.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d58609e547..d718b520bd 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -105,6 +105,39 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-1)) +(define-public qite + (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a") + (revision "74")) + (package + (name "qite") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/Ri0n/qite") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jmmgy9pvk9hwwph1nwy7hxhczy8drhl4ymhnjjn6yx7bckssvsq")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; no target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "libqite") + #t))))) + (inputs + `(("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia))) + (home-page "https://github.com/Ri0n/qite/") + (synopsis "Qt Interactive Text Elements") + (description "Qite allows to manage interactive elements on QTextEdit.") + (license license:asl2.0)))) + (define-public qt5ct (package (name "qt5ct") -- cgit 1.4.1 From b09967bc587dd61c638da3d6fb5bbda7e87ed85c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 7 Mar 2021 01:47:19 -0500 Subject: gnu: Add psi-plus. * gnu/packages/messaging.scm (psi-plus): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index af649f6321..c282080361 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2777,4 +2777,139 @@ as phones, embedded computers or microcontrollers.") ;; Dual licensed. (license (list license:epl1.0 license:edl1.0)))) +(define-public psi-plus + (package + (name "psi-plus") + (version "1.5.1482") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/psi-plus/psi-plus-snapshots") + (commit version))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "3rdparty"))) + (sha256 + (base32 "0lcx616hchwf492m1dm8ddb4qd2pmgf703ajnnb0y9ky99kgg8q2")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + (,@%qt-build-system-modules + (guix build glib-or-gtk-build-system)) + #:modules + ((guix build qt-build-system) + ((guix build glib-or-gtk-build-system) + #:prefix glib-or-gtk:) + (guix build utils)) + #:configure-flags + (list + "-DBUILD_PSIMEDIA=ON" ; For A/V support + "-DENABLE_PLUGINS=ON" + "-DUSE_HUNSPELL=OFF" ; Use Enchant instead + "-DUSE_ENCHANT=ON" + "-DUSE_CCACHE=OFF") ; Not required + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/http-parser/http_parser.h") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/qhttp.pro") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/qite.pro") + "") + (("add_subdirectory\\( 3rdparty \\)") + "")) + (substitute* "src/CMakeLists.txt" + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/libqite") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/http-parser") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/src/private") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qhttp/src") + "") + (("\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty") + "") + (("add_dependencies\\(\\$\\{PROJECT_NAME\\} qhttp\\)") + "target_link_libraries(${PROJECT_NAME} qhttp)")) + (substitute* "src/src.cmake" + (("include\\(\\$\\{PROJECT_SOURCE_DIR\\}/3rdparty/qite/libqite/libqite.cmake\\)") + "list(APPEND EXTRA_LIBS qite)")) + (substitute* '("src/filesharingmanager.h" "src/widgets/psirichtext.cpp" + "src/filesharingmanager.cpp" "src/widgets/psitextview.cpp" + "src/chatview_te.cpp" "src/msgmle.cpp") + (("qite.h") + "qite/qite.h") + (("qiteaudio.h") + "qite/qiteaudio.h") + (("qiteaudiorecorder.h") + "qite/qiteaudiorecorder.h")) + #t)) + (add-after 'install 'wrap-env + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each + (lambda (name) + (let ((file (string-append out "/bin/" name)) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program file + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))) + '("psi-plus"))) + #t)) + (add-after 'wrap-env 'glib-or-gtk-compile-schemas + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) + (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap + (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python-wrapper) + ("ruby" ,ruby))) + (inputs + `(("blake2" ,libb2) + ("dbus" ,dbus) + ("enchant" ,enchant) + ("glib" ,glib) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("http-parser" ,http-parser) + ("libgcrypt" ,libgcrypt) + ("libgpg-error" ,libgpg-error) + ("libidn" ,libidn) + ("libotr" ,libotr) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libtidy" ,tidy-html) + ("openssl" ,openssl) + ("qca" ,qca) + ("qhttp" ,qhttp) + ("qite" ,qite) + ("qtbase" ,qtbase) + ("qtkeychain" ,qtkeychain) + ("qtmultimedia" ,qtmultimedia) + ("qtsvg" ,qtsvg) + ("qtx11extras" ,qtx11extras) + ("usrsctp" ,usrsctp) + ("x11" ,libx11) + ("xext" ,libxext) + ("xcb" ,libxcb) + ("xss" ,libxscrnsaver) + ("zlib" ,zlib))) + (home-page "https://psi-plus.com/") + (synopsis "Qt-based XMPP Client") + (description + "Psi+ is a spin-off of Psi XMPP client. It is a powerful XMPP client +designed for experienced users.") + (license license:gpl2+))) + ;;; messaging.scm ends here -- cgit 1.4.1 From bb804a0d58687dcb3f3ba904dcb958c84b8b84d5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Mar 2021 18:21:58 +0100 Subject: gnu: glib: Increase timeout for armhf builds. * gnu/packages/glib.scm (glib)[arguments]: Increase timeout for armhf builds. --- gnu/packages/glib.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5f710a4a38..a62a31a87b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -235,7 +235,7 @@ shared NFS home directories.") (lambda _ (substitute* "meson.build" (("test_timeout = 60") - "test_timeout = 90") + "test_timeout = 120") (("test_timeout_slow = 120") "test_timeout_slow = 180"))))) '()) @@ -391,9 +391,10 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) -(define glib/fixed +(define-public glib/fixed (package (inherit glib) + (properties '()) (source (origin (inherit (package-source glib)) (patches -- cgit 1.4.1 From 13953f0e7ec230e701faa679bcf2c1d6a3ab4693 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 20 Mar 2021 18:25:44 +0100 Subject: gnu: glib: Partially revert bb804a0d58687dcb3f3ba904dcb958c84b8b84d5. It contained some changes used during tests that should not have been commited. * gnu/packages/glib (glib/fixed): Do not make public. --- gnu/packages/glib.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a62a31a87b..9c3cd75624 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -391,10 +391,9 @@ dynamic loading, and an object system.") (home-page "https://developer.gnome.org/glib/") (license license:lgpl2.1+))) -(define-public glib/fixed +(define glib/fixed (package (inherit glib) - (properties '()) (source (origin (inherit (package-source glib)) (patches -- cgit 1.4.1 From cec4f5f556246dd48c89234d635f0a7124f57a55 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Mar 2021 16:20:22 -0500 Subject: gnu: guile-lib: Update to 0.2.7. * gnu/packages/guile-xyz.scm (guile-lib): Remove trailing #t. [source]: Remove snippet and modules field. [phases]{patch-for-cross-compilation}: Remove phase. [native-inputs]: Add pkg-config. --- gnu/packages/guile-xyz.scm | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d89b9954de..9f4118f083 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2021 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier @@ -2192,46 +2192,19 @@ library.") (define-public guile-lib (package (name "guile-lib") - (version "0.2.6.1") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/guile-lib/guile-lib-" version ".tar.gz")) (sha256 (base32 - "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Work around miscompilation on Guile 3.0.0 at -O2: - ;; . - (substitute* "src/md5.scm" - (("\\(define f-ash ash\\)") - "(define f-ash (@ (guile) ash))\n") - (("\\(define f-add \\+\\)") - "(define f-add (@ (guile) +))\n")) - #t)))) + "1ph4z4a64m75in36pdb4dw63dzdq3hdgh16gq33q460jby23pvz4")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0") ; to prevent guild errors + '(#:make-flags '("GUILE_AUTO_COMPILE=0") ;placate guild warnings #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-for-cross-compilation - (lambda _ - (substitute* "configure.ac" - (("GUILE_FLAGS") - "GUILE_FLAGS -if test \"$cross_compiling\" != no; then - GUILE_TARGET=\"--target=$host_alias\" - AC_SUBST([GUILE_TARGET]) -fi -")) - (substitute* "am/guile.mk" - (("guild compile") "guild compile $(GUILE_TARGET)")) - (delete-file "configure") ; trigger the bootstrap phase to run - ; autoreconf - #t)) (add-before 'configure 'patch-module-dir (lambda _ (substitute* "src/Makefile.in" @@ -2239,8 +2212,7 @@ fi "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") (("^godir = ([[:graph:]]+)") "godir = \ -$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) - #t))))) +$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2248,7 +2220,7 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-3.0))) + `(("guile" ,guile-3.0))) ;for cross-compilation (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -2256,7 +2228,6 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) modules, allowing for people to cooperate integrating their generic Guile modules into a coherent library. Think \"a down-scaled, limited-scope CPAN for Guile\".") - ;; The whole is under GPLv3+, but some modules are under laxer ;; distribution terms such as LGPL and public domain. See `COPYING' for ;; details. -- cgit 1.4.1 From 81d45a66d57158ec1d07723d99eb0b9e789b8ec2 Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 30 Jan 2021 15:47:06 +0100 Subject: gnu: julia-adapt: Set file-name according to standards. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-adapt)[source]: Change 'file-name'. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 34dba958ce..c9e1d0df8c 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -32,7 +32,7 @@ (uri (git-reference (url "https://github.com/JuliaGPU/Adapt.jl") (commit (string-append "v" version)))) - (file-name "Adapt") + (file-name (git-file-name name version)) (sha256 (base32 "1lks6k3a1gvwlplld47nh6xfy3nnlpc0vhkzg6zg0qn33qdmavrg")))) (build-system julia-build-system) -- cgit 1.4.1 From 03010d5d3efd4ac19c4bddea67cbfe09c129db8d Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 30 Jan 2021 15:47:29 +0100 Subject: gnu: Add julia-benchmarktools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-benchmarktools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index c9e1d0df8c..09043c593b 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -44,6 +44,28 @@ acts like @code{convert(T, x)}, but without the restriction of returning a be GPU compatible without throwing away the wrapper.") (license license:expat))) +(define-public julia-benchmarktools + (package + (name "julia-benchmarktools") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaCI/BenchmarkTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nsx21m3i5h22lkgyrmfj6r085va6ag40khwssqs8y7l0wz98lvp")))) + (build-system julia-build-system) + (propagated-inputs `(("julia-json" ,julia-json))) + (home-page "https://github.com/JuliaCI/BenchmarkTools.jl") + (synopsis "Benchmarking framework for the Julia language") + (description "@code{BenchmarkTools.jl} makes performance tracking of Julia +code easy by supplying a framework for writing and running groups of +benchmarks as well as comparing benchmark results.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit 1.4.1 From a06db9c1ee8b36021d384e7552f1cf1c41208517 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 11:23:10 +0100 Subject: gnu: Add julia-jllwrappers. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-jllwrappers): New variable. * doc/guix.texi (julia-build-system): Document how to use jllwrappers to use to guix binary packages. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 29 +++++++++++++++++++++++++---- gnu/packages/julia-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 843f2cfb87..94ecd2c247 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7752,10 +7752,31 @@ The Julia package name is read from the file @file{Project.toml}. This value can be overridden by passing the argument @code{#:julia-package-name} (which must be correctly capitalized). -For packages requiring shared library dependencies, you may need to write the -@file{/deps/deps.jl} file manually. It's usually a line of @code{const -variable = /gnu/store/library.so} for each dependency, plus a void function -@code{check_deps() = nothing}. +Julia packages usually manage they binary dependencies via +@code{JLLWrappers.jl}, a Julia package that creates a module (named +after the wrapped library followed by @code{_jll.jl}. + +To add the binary path @code{_jll.jl} packages, you need to patch the +files under @file{src/wrappers/}, replacing the call to the macro +@code{JLLWrappers.@@generate_wrapper_header}, adding as a secound +argument containing the store path the binary. + +As an example, in the MbedTLS Julia package, we add a build phase +(@pxref{Build Phases}) to insert the absolute file name of the wrapped +MbedTLS package: + +@lisp +(add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"MbedTLS\", \"" + (assoc-ref inputs "mbedtls-apache") "\")\n")))) + ;; There's a Julia file for each platform, override them all. + (find-files "src/wrappers/" "\\.jl$")))) +@end lisp Some older packages that aren't using @file{Package.toml} yet, will require this file to be created, too. The function @code{julia-create-package-toml} diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 09043c593b..b89733c412 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -147,6 +147,49 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-jllwrappers + (package + (name "julia-jllwrappers") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaPackaging/JLLWrappers.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sj3mi2dcc13apqfpy401wic5n0pgbck1p98b2g3zw0mln9s83m4")))) + (arguments + ;; Wants to download stuff + '(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'custom-override-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Make @generate_wrapper_header take an optional argument that + ;; guix packagers can pass to override the default "override" + ;; binary path. This won't be needed when something like + ;; https://github.com/JuliaPackaging/JLLWrappers.jl/pull/27 + ;; will be merged. + (substitute* "src/wrapper_generators.jl" + (("generate_wrapper_header.*") + "generate_wrapper_header(src_name, override_path = nothing)\n") + (("pkg_dir = .*" all) + (string-append + all "\n" "override = something(override_path," + "joinpath(dirname(pkg_dir), \"override\"))\n")) + (("@static if isdir.*") "@static if isdir($override)\n") + (("return joinpath.*") "return $override\n")) + #t))))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaPackaging/JLLWrappers.jl") + (synopsis "Julia macros used by JLL packages") + (description "This package contains Julia macros that enable JLL packages +to generate themselves. It is not intended to be used by users, but rather is +used in autogenerated packages via @code{BinaryBuilder.jl}.") + (license license:expat))) + (define-public julia-json (package (name "julia-json") -- cgit 1.4.1 From 3291e4ba97e94d09a35615d79ca07c43fa679403 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 11:23:37 +0100 Subject: gnu: Add julia-mbedtls-jll. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-mbedtls-jll): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b89733c412..ab3497700a 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -20,7 +20,8 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) - #:use-module (guix build-system julia)) + #:use-module (guix build-system julia) + #:use-module (gnu packages tls)) (define-public julia-adapt (package @@ -215,6 +216,46 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") and printing JSON documents.") (license license:expat))) +(define-public julia-mbedtls-jll + (package + (name "julia-mbedtls-jll") + ;; version 2.25.0+0 is not compatible with current mbedtls 2.23.0, + ;; upgrade this when mbedtls is updated in guix + (version "2.24.0+1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl") + (commit (string-append "MbedTLS-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0kk9dlxdh7yms21npgrdfmjbj8q8ng6kdhrzw3jr2d7rp696kp99")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; No runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"MbedTLS\", \"" + (assoc-ref inputs "mbedtls-apache") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs `(("mbedtls-apache" ,mbedtls-apache))) + (propagated-inputs `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/MbedTLS_jll.jl") + (synopsis "Apache's mbed TLS binary wrappers") + (description "This Julia module provides @code{mbed TLS} libraries and +wrappers.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit 1.4.1 From a72d3ca844cf92030c63a46860cdd7746c383e9a Mon Sep 17 00:00:00 2001 From: nixo Date: Wed, 27 Jan 2021 00:35:20 +0100 Subject: gnu: Add julia-mbedtls. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-mbedtls): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ab3497700a..9e0e41c844 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -216,6 +216,36 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") and printing JSON documents.") (license license:expat))) +(define-public julia-mbedtls + (package + (name "julia-mbedtls") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaLang/MbedTLS.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zjzf2r57l24n3k0gcqkvx3izwn5827iv9ak0lqix0aa5967wvfb")))) + (build-system julia-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'disable-network-tests + ;; Tries to connect to httpbin.org + (lambda _ + (substitute* "test/runtests.jl" + (("testhost =") "return #")) + #t))))) + (propagated-inputs `(("julia-mbedtls-jll" ,julia-mbedtls-jll))) + (home-page "https://github.com/JuliaLang/MbedTLS.jl") + (synopsis "Apache's mbed TLS library wrapper") + (description "@code{MbedTLS.jl} provides a wrapper around the @code{mbed +TLS} and cryptography C libary for Julia.") + (license license:expat))) + (define-public julia-mbedtls-jll (package (name "julia-mbedtls-jll") -- cgit 1.4.1 From 8f59a9fb6d11c1a5ee178ebebc977ca442f6893b Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 11:44:51 +0100 Subject: gnu: Add julia-uris. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-uris): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9e0e41c844..6021a6ff7a 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -352,3 +352,37 @@ languages like Fortran.") (description "@code{Parsers.jl} is a collection of type parsers and utilities for Julia.") (license license:expat))) + +(define-public julia-uris + (package + (name "julia-uris") + (version "1.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaWeb/URIs.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fqyagsqks5za7m0czafr34m2xh5501f689k9cn5x3npajdnh2r3")))) + (build-system julia-build-system) + (arguments + '(#:julia-package-name "URIs" ;required to run tests + #:phases + (modify-phases %standard-phases + (add-before 'check 'change-dir + ;; Tests must be run from the testdir + (lambda* (#:key source outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (chdir + (string-append out "/share/julia/packages/URIs/test"))) + #t))))) + ;; required for tests + (inputs `(("julia-json" ,julia-json))) + (home-page "https://github.com/JuliaWeb/URIs.jl") + (synopsis "URI parsing in Julia") + (description "@code{URIs.jl} is a Julia package that allows parsing and +working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC +3986.") + (license license:expat))) -- cgit 1.4.1 From fc781578588436a68ad0e5afd9dad994c60e6a49 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 12:02:38 +0100 Subject: gnu: Add julia-inifile. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-inifile): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 6021a6ff7a..738060f865 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -148,6 +148,26 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-inifile + (package + (name "julia-inifile") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaIO/IniFile.jl") + (commit "8ba59958495fa276d6489d2c3903e765d75e0bc0"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11h6f99jpbg729lplw841m68jprka7q3n8yw390bndlmcdsjabpd")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaIO/IniFile.jl") + (synopsis "Reading Windows-style INI files") + (description "This is a Julia package that defines an IniFile type that +allows to interface with @file{.ini} files.") + (license license:expat))) + (define-public julia-jllwrappers (package (name "julia-jllwrappers") -- cgit 1.4.1 From 52d09b1f14ad98d1c1e611173acf7fc04bd653b7 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 12:08:27 +0100 Subject: gnu: Add julia-bufferedstreams. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-bufferedstreams): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 738060f865..a3c5c55a86 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -67,6 +67,34 @@ code easy by supplying a framework for writing and running groups of benchmarks as well as comparing benchmark results.") (license license:expat))) +(define-public julia-bufferedstreams + (package + (name "julia-bufferedstreams") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/BioJulia/BufferedStreams.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sf4sxbq55mg2pwxyxf0c839z1lk0yxg8nmb7617bfbvw31cp88z")))) + (build-system julia-build-system) + ;; The package is old and tests are using undefined functions. They also + ;; freeze, see + ;; https://travis-ci.org/BioJulia/BufferedStreams.jl/jobs/491050182 + (arguments + '(#:tests? #f + #:julia-package-name "BufferedStreams")) + (propagated-inputs `(("julia-compat" ,julia-compat))) + (home-page "https://github.com/BioJulia/BufferedStreams.jl") + (synopsis "Fast composable IO streams") + (description "@code{BufferedStreams.jl} provides buffering for IO +operations. It can wrap any @code{IO} type automatically making incremental +reading and writing faster.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit 1.4.1 From d4987a50cef3983c4bd68c1c2c52270946c4f113 Mon Sep 17 00:00:00 2001 From: nixo Date: Tue, 19 Jan 2021 13:29:00 +0100 Subject: gnu: Add julia-http. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-http): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index a3c5c55a86..0d35cbde57 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -176,6 +176,64 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-http + (package + (name "julia-http") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaWeb/HTTP.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ij0yci13c46p92m4zywvcs02nn8pm0abyfffiyhxvva6hq48lyl")))) + (build-system julia-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'install 'disable-network-tests + (lambda _ + (substitute* "test/runtests.jl" + (("\"async.jl") "# \"async.jl") + (("\"client.jl") "# \"client.jl")) + (substitute* "test/aws4.jl" + (("@testset.*HTTP.request with AWS authentication.*" all) + (string-append all "return\n"))) + (substitute* "test/insert_layers.jl" + (("@testset.*Inserted final layer runs handler.*" all) + (string-append all "return\n"))) + (substitute* "test/multipart.jl" + (("@testset \"Setting of Content-Type.*" all) + (string-append all "return\n")) + (("@testset \"Deprecation of .*" all) + (string-append all "return\n"))) + (substitute* "test/websockets.jl" + (("@testset.*External Host.*" all) + (string-append all "return\n"))) + (substitute* "test/messages.jl" + (("@testset.*Read methods.*" all) + (string-append all "return\n")) + (("@testset.*Body - .*" all) + (string-append all "return\n")) + (("@testset.*Write to file.*" all) + (string-append all "return\n"))) + #t))))) + (propagated-inputs + `(("julia-inifile" ,julia-inifile) + ("julia-mbedtls" ,julia-mbedtls) + ("julia-uris" ,julia-uris))) + ;; required for tests + (inputs + `(("julia-json" ,julia-json) + ("julia-bufferedstreams" ,julia-bufferedstreams))) + (home-page "https://juliaweb.github.io/HTTP.jl/") + (synopsis "HTTP support for Julia") + (description "@code{HTTP.jl} is a Julia library for HTTP Messages, +implementing both a client and a server.") + (license license:expat))) + (define-public julia-inifile (package (name "julia-inifile") -- cgit 1.4.1 From ece9fba60e1382f1fd214954d6934feef703bb5a Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 20 Mar 2021 17:38:06 -0700 Subject: gnu: Add linux-libre-arm64-generic at version 5.10. * gnu/packages/linux.scm (linux-libre-arm64-generic-5.10): New variable. --- gnu/packages/linux.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d932c3583a..021e972a89 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1033,6 +1033,27 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_AXP20X_ADC" . m)) %default-extra-linux-options))) +(define-public linux-libre-arm64-generic-5.10 + (make-linux-libre* linux-libre-5.10-version + linux-libre-5.10-source + '("aarch64-linux") + #:defconfig "defconfig" + #:extra-version "arm64-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t) + ;; Pinebook display, battery, charger and usb + ("CONFIG_DRM_ANALOGIX_ANX6345" . m) + ("CONFIG_CHARGER_AXP20X" . m) + ("CONFIG_INPUT_AXP20X_PEK" . m) + ("CONFIG_CHARGER_AXP20X" . m) + ("CONFIG_BATTERY_AXP20X" . m) + ("CONFIG_PINCTRL_AXP209" . m) + ("CONFIG_AXP20X_POWER" . m) + ("CONFIG_AXP20X_ADC" . m)) + %default-extra-linux-options))) + (define-public linux-libre-arm64-generic-5.4 (make-linux-libre* linux-libre-5.4-version linux-libre-5.4-source -- cgit 1.4.1 From ba0dc1dbc150a95746ffb89596862533e533c2c9 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 20 Mar 2021 17:44:59 -0700 Subject: gnu: Add linux-libre-arm-generic at version 5.10. * gnu/packages/linux.scm (linux-libre-arm-generic-5.10): New variable. --- gnu/packages/linux.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 021e972a89..2bb3900495 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -965,6 +965,18 @@ It has been modified to remove all non-free binary blobs.") (define-public linux-libre-arm-veyron (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) +(define-public linux-libre-arm-generic-5.10 + (make-linux-libre* linux-libre-5.10-version + linux-libre-5.10-source + '("armhf-linux") + #:defconfig "multi_v7_defconfig" + #:extra-version "arm-generic" + #:extra-options + (append + `(;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t)) + %default-extra-linux-options))) + (define-public linux-libre-arm-generic-5.4 (make-linux-libre* linux-libre-5.4-version linux-libre-5.4-source -- cgit 1.4.1 From ff34334cfca2c32feebe8d1d9efa632dece0f826 Mon Sep 17 00:00:00 2001 From: Vinícius dos Santos Oliveira Date: Wed, 17 Mar 2021 18:03:31 -0300 Subject: gnu: emilua: Update to 0.3.0. * gnu/packages/lua.scm (emilua): Update to 0.3.0. [arguments]: Add guix version suffix, enable http module. Disable manpages. [inputs]: Add fmt. [search-paths]: New field. Signed-off-by: Efraim Flashner --- gnu/packages/lua.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index edb3f85109..0a1ca19a6f 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -51,6 +51,7 @@ #:use-module (gnu packages m4) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages re2c) #:use-module (gnu packages readline) #:use-module (gnu packages tls) @@ -1107,14 +1108,14 @@ shell command executions.") (define-public emilua (package (name "emilua") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/emilua/emilua.git") (commit (string-append "v" version)) - ;; Current version requires bundled CLI11 and fmt, but at some - ;; future release the ones found in the system could be used + ;; Current version requires bundled CLI11, but at some future + ;; release the one found in the system could be used ;; instead. Current version also requires Trial.Protocol and ;; the HTTP lib developed as part of GSoC 2014 for Boost, but ;; these are dependencies unlikely to be "unbundled" in future @@ -1123,13 +1124,17 @@ shell command executions.") (file-name (git-file-name name version)) (sha256 (base32 - "1d6k5v6x85fbvz2ijq1imnfdwvqmsav4xp021a5v3ah4mgy7yann")))) + "124fj73722c03znwdyqp1i0jygwv3s11f6s1j9rzym513qrf7fnd")))) (build-system meson-build-system) (arguments `(#:meson ,meson-0.55 ;; Tests are disabled for now due to an issue that affecs guix: ;; - #:configure-flags '("-Denable_http=false" "-Denable_tests=false"))) + #:configure-flags + (list "-Denable_http=true" + "-Denable_tests=false" + "-Denable_manpages=false" + "-Dversion_suffix=-guix1"))) (native-inputs `(("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs ("luajit-lua52-openresty" ,luajit-lua52-openresty) @@ -1139,6 +1144,7 @@ shell command executions.") (inputs `(("boost" ,boost) ("boost-static" ,boost-static) + ("fmt" ,fmt) ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty ;; fork. Emilua is severely affected by this limit, so the upstream package ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT @@ -1150,6 +1156,12 @@ shell command executions.") ("luajit-lua52-openresty" ,luajit-lua52-openresty) ("ncurses" ,ncurses) ("openssl" ,openssl))) + (native-search-paths + (list + (search-path-specification + (variable "EMILUA_PATH") + (files + (list (string-append "lib/emilua-" (version-major+minor version))))))) (home-page "https://gitlab.com/emilua/emilua") (synopsis "Lua execution engine") (description -- cgit 1.4.1 From e559288c1b4f3792582f85b23cae3564890f8902 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Mar 2021 10:10:42 +0100 Subject: gnu: fet: Update to 5.49.1. * gnu/packages/education.scm (fet): Update to 5.49.1. --- 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 365bb9864f..a1f1b0dfba 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -614,14 +614,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.49.0") + (version "5.49.1") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "011bgr46bfi41hah1gr54va6arvr5zsvkk9zq2gfgavynwfnmny4")))) + (base32 "1aa8xnhwvbhvp7yigcdk7qdwqh59yyfknqbpn3ybgjljc22m8w5n")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From f156a07d4379f1ec09b4d2cb11cbf97c167eed61 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Mar 2021 10:11:22 +0100 Subject: gnu: emacs-ebuild-mode: Update to 1.52. * gnu/packages/emacs-xyz.scm (emacs-ebuild-mode): Update to 1.52. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 28400c0573..c5f75da3dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10297,7 +10297,7 @@ Lua programming language}.") (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.51") + (version "1.52") (source (origin (method url-fetch) @@ -10306,7 +10306,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "0sfmd6ns2qdmybcynlvc4fqzkbkzmm54rn87wyirdcqnpy0x03i2")))) + (base32 "10nikbbwh612qlnms2i31963a0h3ccyg85vrxlizdpsqs4cjpg6h")))) (build-system emacs-build-system) (arguments '(#:phases -- cgit 1.4.1 From aa24d2d44c8ed972e4b233f7e6712293352a019c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 21 Mar 2021 10:12:52 +0100 Subject: gnu: python-pikepdf: Update to 2.9.1. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.9.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79eac0ec7f..88c472d50f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5865,13 +5865,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.9.0") + (version "2.9.1") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1dx84gvxf8js5988b20dwpg0xd7by2bczjlrdh3cpppwaaxx5nx9")))) + (base32 "1n53fhdgnq9yxvm2m039vl8l2kg3fkln3pm0wv4rzj0gvpq9rhcr")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From 4cd88522f233dcb9affa3d3b0eada154439487c1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 9 Mar 2021 14:39:24 -0500 Subject: gnu: Add guile-quickcheck. * gnu/packages/guile-xyz.scm (guile-quickcheck): New variable. --- gnu/packages/guile-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f4118f083..28e7c798a7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019, 2020 Amar Singh -;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019, 2021 Timothy Sample ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; Copyright © 2020 Jack Hill @@ -4619,3 +4619,28 @@ binary which is smaller and faster to generate and parse. This package provides a Guile implementation of CBOR.") (home-page "https://inqlab.net/git/guile-cbor.git") (license license:gpl3+))) + +(define-public guile-quickcheck + (package + (name "guile-quickcheck") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/" + "guile-quickcheck/guile-quickcheck-" + version ".tar.gz")) + (sha256 + (base32 + "03mwi1l3354x52nar0zwhcm0x29yai9xjln4p4gbchwvx5dsr6fb")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0))) + (home-page "https://ngyro.com/software/guile-quickcheck.html") + (synopsis "Randomized property-based testing for Guile") + (description "Guile-Quickcheck is a library for random testing of program +properties inspired by ghc-quickcheck. You can use it to express properties, +which functions should satisfy, as Scheme code and then check whether they hold +in a large number of randomly generated test cases.") + (license license:gpl3+))) -- cgit 1.4.1 From 06bdb640cee866da0d6443a1fcc0ea7ea36a93cd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 21 Mar 2021 12:33:28 +0100 Subject: gnu: Add movim-desktop. * gnu/packages/messaging.scm (movim-desktop): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index c282080361..26000c48b8 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2777,6 +2777,49 @@ as phones, embedded computers or microcontrollers.") ;; Dual licensed. (license (list license:epl1.0 license:edl1.0)))) +(define-public movim-desktop + (let ((commit "83d583b83629dbd2ec448da9a1ffd81f6c1fb295") + (revision "3")) + (package + (name "movim-desktop") + (version + (git-version "0.14.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/movim/movim_desktop") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lsa3k3wx1d2lk0qs0k5jc5bmapnmpzwynprjf2wihh8c8y3iwlz")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ; No target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key outputs #:allow-other-keys) + (substitute* `("CMakeLists.txt" "movim.desktop") + (("/usr") + (assoc-ref outputs "out")) + (("\"build") + "\"../build")) + #t))))) + (inputs + `(("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel))) + (propagated-inputs + `(("qtwebengine" ,qtwebengine))) + (home-page "https://movim.eu/") + (synopsis "Desktop Application for Movim") + (description + "Movim-Desktop is a desktop application, relying on Qt, for the Movim +social and chat platform.") + (license license:gpl3+)))) + (define-public psi-plus (package (name "psi-plus") -- cgit 1.4.1 From 177dcce76eedffc315a8706922fb4cf6de6c650e Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 21 Mar 2021 15:04:55 +0100 Subject: gnu: emacs-package-lint: Install missing data. The `package-lint-symbol-info' constant in this package depends on the stdlib-changes file being installed. * gnu/packages/emacs-xyz.scm (emacs-package-lint)[arguments]: Add the #:include argument. --- gnu/packages/emacs-xyz.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index c5f75da3dc..7085318e58 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19512,6 +19512,8 @@ image, rotate it, save modified images, and more.") (sha256 (base32 "1zifiqmpj9j14fnrm3jxapady25m1nlm514nfry0jfrhhikvj6i8")))) + (arguments + '(#:include (cons "^data/" %default-include))) (build-system emacs-build-system) (home-page "https://github.com/purcell/package-lint") (synopsis "Linting library for elisp package authors") -- cgit 1.4.1 From d31db5cff392e6263ac07bb47cffaea8fd1f0120 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:11:56 +0100 Subject: gnu: youtube-dl: Update to 2021.03.14. * gnu/packages/video.scm (youtube-dl): Update to 2021.03.14. --- 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 2a213a10cf..c818b22451 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.03") + (version "2021.03.14") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "11z2v8mdii0bl13850mc6hgz80d0kgzb4hdxyikc3wa4jqfwrq7f")) + "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From 37b2e9c3b681484adf7ba51aaaa10f93e7df1fc9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:12:09 +0100 Subject: gnu: synthv1: Update to 0.9.21. * gnu/packages/music.scm (synthv1): Update to 0.9.21. --- 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 1e12bbe1a2..2da400dcd1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1965,7 +1965,7 @@ users to select LV2 plugins and run them with jalv.") (define-public synthv1 (package (name "synthv1") - (version "0.9.20") + (version "0.9.21") (source (origin (method url-fetch) (uri @@ -1973,7 +1973,7 @@ users to select LV2 plugins and run them with jalv.") "/synthv1-" version ".tar.gz")) (sha256 (base32 - "1g2i79gkl1j7i49djz6igkbvdmfwxhcg6kx97n63bcqcvvy03rqz")))) + "0wg4ywkqf307vln0y923p083xacb5ahr2ghzvb9gmqyszd7k2v15")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From 945d9cea185729875bc4031cb7c8434cb30d4a43 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:12:15 +0100 Subject: gnu: drumkv1: Update to 0.9.21. * gnu/packages/music.scm (drumkv1): Update to 0.9.21. --- 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 2da400dcd1..fb409af16d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1997,7 +1997,7 @@ oscillators and stereo effects.") (define-public drumkv1 (package (name "drumkv1") - (version "0.9.20") + (version "0.9.21") (source (origin (method url-fetch) (uri @@ -2005,7 +2005,7 @@ oscillators and stereo effects.") "/drumkv1-" version ".tar.gz")) (sha256 (base32 - "0y6njh1n0yai4g9dhg24hwc9khba44l4n5xizqcs6i4q7lyr9z48")))) + "1ym7kns7hfgxdwm2nzvpdm5vjxpkwb9dssjiic6rrpicv1p2v59m")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From aa1f2945f01d5b232dc2780f668be2fc663d4f50 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:12:20 +0100 Subject: gnu: samplv1: Update to 0.9.21. * gnu/packages/music.scm (samplv1): Update to 0.9.21. --- 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 fb409af16d..0afc6fcc0c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2030,7 +2030,7 @@ effects.") (define-public samplv1 (package (name "samplv1") - (version "0.9.20") + (version "0.9.21") (source (origin (method url-fetch) (uri @@ -2038,7 +2038,7 @@ effects.") "/samplv1-" version ".tar.gz")) (sha256 (base32 - "06nni00dgn8fvbyam1v44aq4yfns1vf7hw1mwmwzv2vxapdbpngn")))) + "1kz8hcpzhrkvxpah6irz5gbah4m7knjhi4rk5hs1kwiikn7p6vgk")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From e83faf04faec42025bd1aed6cd4edb3104217278 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:12:25 +0100 Subject: gnu: padthv1: Update to 0.9.21. * gnu/packages/music.scm (padthv1): Update to 0.9.21. --- 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 0afc6fcc0c..5c62ab8655 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2063,7 +2063,7 @@ effects.") (define-public padthv1 (package (name "padthv1") - (version "0.9.20") + (version "0.9.21") (source (origin (method url-fetch) (uri @@ -2071,7 +2071,7 @@ effects.") "/padthv1-" version ".tar.gz")) (sha256 (base32 - "1x3qjkby29xd7y0dg22ms19c8h8drqf55m9nxz6jlc58sfha2ss0")))) + "0s28l8vp9b85s4bdm18qm57dh8dx8rx7659r05p44828g4053ipl")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; there are no tests -- cgit 1.4.1 From 2ac2a57f37f136c4e16ae7762baa23382d0a834a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:12:32 +0100 Subject: gnu: qtractor: Update to 0.9.21. * gnu/packages/music.scm (qtractor): Update to 0.9.21. --- 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 5c62ab8655..06632986ab 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3039,14 +3039,14 @@ from the command line.") (define-public qtractor (package (name "qtractor") - (version "0.9.19") + (version "0.9.21") (source (origin (method url-fetch) (uri (string-append "https://downloads.sourceforge.net/qtractor/" "qtractor-" version ".tar.gz")) (sha256 (base32 - "0gdr1hvda56vmv4998z9xcqsp7da6lplj00f217x9g2i2snyvkzp")))) + "12hn17hqs3jndv6238wj8yhw07n99s0zachab4kfvhwa0qfflsbl")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no "check" target -- cgit 1.4.1 From f03a2e99fad1827e0b4bdf68b7ec21bdb8d77525 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 14:15:11 +0100 Subject: gnu: inxi-minimal: Update to 3.3.03-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.3.03-1. --- 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 d5cb9bf8e5..6949edd00c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3743,7 +3743,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.3.01-1") + (version "3.3.03-1") (source (origin (method git-fetch) @@ -3752,7 +3752,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "06r5iq78ldrvr5fmmb5mchaaji49195fsgx9ysr1mjs122rp13y1")))) + (base32 "1pahns10i5farw47v9v8cykrk5arq8218vpsa8c0bmaia0rf2n1q")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit 1.4.1 From ebe967e1b7dec34b89199136ab9c0fb95092009a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 15:15:36 +0100 Subject: gnu: vim: Update to 8.2.2632. * gnu/packages/vim.scm (vim): Update to 8.2.2632. [arguments]: Disable another test (Test_combining_double_width). --- gnu/packages/vim.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index d559364d32..9a3547bbc9 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 HiPhish ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019, 2020 Jakub Kądziołka @@ -71,7 +71,7 @@ (define-public vim (package (name "vim") - (version "8.2.2067") + (version "8.2.2632") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "02cd953h69k9klrcwi756namwg39ka7if9ccc399ihb1l5f3kr66")))) + "0f80im1swja58n99696zslyzapsx8pyf545pmpzvy173ymnvm6nq")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -132,6 +132,8 @@ ((".*Test_open_term_from_cmd.*" line) (string-append line "return\n")) ((".*Test_terminal_postponed_scrollback.*" line) + (string-append line "return\n")) + ((".*Test_combining_double_width.*" line) (string-append line "return\n"))) (substitute* "src/testdir/test_popupwin.vim" ((".*Test_popup_drag_termwin.*" line) -- cgit 1.4.1 From b8b398a7d3e824550519f2ec266339f472c85516 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 15:24:33 +0100 Subject: gnu: fluidsynth: Update to 2.1.8. * gnu/packages/audio.scm (fluidsynth): Update to 2.1.8. --- 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 8b23f04fe5..a84d72bb59 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1622,7 +1622,7 @@ follower.") (define-public fluidsynth (package (name "fluidsynth") - (version "2.1.5") + (version "2.1.8") (source (origin (method git-fetch) (uri (git-reference @@ -1631,7 +1631,7 @@ follower.") (file-name (git-file-name name version)) (sha256 (base32 - "0ccpq4p1h1g53ng3961g3lh590qnwvpzwdzpl6ai4j6iazq0bh73")))) + "0r944ndn138ak9s3ivgd1wgkwkh6zp7jjnxd30hryczc6kbhkpmr")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target -- cgit 1.4.1 From 7244ec07a2c790c15bbbd084771c38e4b6733d10 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 15:24:47 +0100 Subject: gnu: jasper: Update to 2.0.27. * gnu/packages/image.scm (jasper): Update to 2.0.27. --- 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 de6872b9b2..835060c041 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1408,7 +1408,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (define-public jasper (package (name "jasper") - (version "2.0.26") + (version "2.0.27") (source (origin (method git-fetch) (uri (git-reference @@ -1417,7 +1417,7 @@ convert, manipulate, filter and display a wide variety of image formats.") (file-name (git-file-name name version)) (sha256 (base32 - "0zh239v6gj1ndrsk4ds5faiiyakpddmbpcy4v6p6shicfbr04snf")))) + "0mrnazk8qla7nn59xad86gmrf5fzqcv74j5xhcdrxbgfw67l17zd")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo))) -- cgit 1.4.1 From 660208cfd5545a0884150854863ac50f0359b0bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 15:34:49 +0100 Subject: gnu: gnumeric: Update to 1.12.49. * gnu/packages/gnome.scm (gnumeric): Update to 1.12.49. --- 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 34cd0fa992..6661942eb5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4198,7 +4198,7 @@ Hints specification (EWMH).") (define-public gnumeric (package (name "gnumeric") - (version "1.12.48") + (version "1.12.49") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnumeric/" @@ -4206,7 +4206,7 @@ Hints specification (EWMH).") "gnumeric-" version ".tar.xz")) (sha256 (base32 - "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p")))) + "0mzdhhpa7kwkc51l344g6vgqwaxkjdf03s7zasqh0bn3jpn75h4i")))) (build-system glib-or-gtk-build-system) (arguments `(;; The gnumeric developers don't worry much about failing tests. -- cgit 1.4.1 From 5229d56db0a02f25946898a5fbde0d9d88ed4966 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 15:35:02 +0100 Subject: gnu: wcslib: Update to 7.5. * gnu/packages/astronomy.scm (wcslib): Update to 7.5. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index f623274136..6105ef2590 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -167,7 +167,7 @@ feature detection and cosmetic corrections.") (define-public wcslib (package (name "wcslib") - (version "7.4") + (version "7.5") (source (origin (method url-fetch) @@ -175,7 +175,7 @@ feature detection and cosmetic corrections.") "ftp://ftp.atnf.csiro.au/pub/software/wcslib/wcslib-" version ".tar.bz2")) (sha256 - (base32 "072i1id4zk08mwi2c1zpy8zxrabl8dqyklx9ikbd2nh56r0rc752")))) + (base32 "1536gmcpm6pckn9xrb6j8s4pm1vryjhzvhfaj9wx3jwxcpbdy0dw")))) (inputs `(("cfitsio" ,cfitsio))) (build-system gnu-build-system) -- cgit 1.4.1 From 7b01a59d85301954c366d1f728f69709cbeeeece Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Mar 2021 22:50:12 -0400 Subject: gnu: linux-libre: Update to 5.11.8. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.8. (linux-libre-5.11-pristine-source): 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 2bb3900495..23c1adf650 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.7") +(define-public linux-libre-5.11-version "5.11.8") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "1cd87v6j8nk89pjqqsaviyzx9lj0d51j46n1in7cjlg18wng3da9"))) + (hash (base32 "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 0a202d0b442087a0be1fd8c9801bd485234fa40e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Mar 2021 22:50:40 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.25. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.25. (linux-libre-5.10-pristine-source): 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 23c1adf650..4a05842c9f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.24") +(define-public linux-libre-5.10-version "5.10.25") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0gvnplip90gvlzw9rm0cg66z54cfa82gk23icf5xdickb17d1p66"))) + (hash (base32 "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 06017698c64e988871ebf0ee831a9bde076355ef Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Mar 2021 22:52:53 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.107. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.107. (linux-libre-5.4-pristine-source): 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 4a05842c9f..c67c1c0302 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.106") +(define-public linux-libre-5.4-version "5.4.107") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1ny8b69ngydh0iw53jwlmqlgv31wjhkybkgnqi5kv0n174n3p1yc"))) + (hash (base32 "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 46479ec5583ac0e587894e74dad688addb3c3413 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 20 Mar 2021 22:53:13 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.182. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.182. (linux-libre-4.19-pristine-source): 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 c67c1c0302..6d2939adca 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.181") +(define-public linux-libre-4.19-version "4.19.182") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1kd967azsq6w41ch8iwpv0i4yjkpijzn5avcipi1141dx4ryw62j"))) + (hash (base32 "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 9a757283186766aabd9e179ad8516e724ec16fa1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Mar 2021 22:18:51 +0200 Subject: gnu: python-httpretty: Update to 1.0.5. * gnu/packages/web.scm (python-httpretty): Update to 1.0.5. [arguments]: Disable tests. Add custom 'check phase. [propagated-inputs]: Remove field. [native-inputs]: Remove python-httplib2, python-mock, python-nose-randomly, python-urllib3. Add python-eventlet. --- gnu/packages/web.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b3be3b734e..cbeb916f93 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2015 Eric Dvorsak ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016 Jelle Licht -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Rene Saavedra ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Clément Lassieur @@ -6311,27 +6311,31 @@ message stream (in a web server that is per connection).") (define-public python-httpretty (package (name "python-httpretty") - (version "0.9.6") + (version "1.0.5") (source (origin (method url-fetch) (uri (pypi-uri "httpretty" version)) (sha256 - (base32 "1p1rb4mpngh0632xrmdfhvc8yink519yfkqz97d2ww3y0x2jvd81")))) + (base32 "1dg0nfl7i9kjnq98ww98x2afzav4mpgiwzvjc43ily1x9my94g75")))) (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six))) + (arguments + `(#:tests? #f ; Tests require network access. + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "nosetests")) + #t))))) (native-inputs `(("python-coverage" ,python-coverage) - ("python-httplib2" ,python-httplib2) - ("python-mock" ,python-mock) + ("python-eventlet" ,python-eventlet) ("python-nose" ,python-nose) - ("python-nose-randomly" ,python-nose-randomly) ("python-rednose" ,python-rednose) ("python-requests" ,python-requests) ("python-sure" ,python-sure) - ("python-tornado" ,python-tornado) - ("python-urllib3" ,python-urllib3))) + ("python-tornado" ,python-tornado))) (home-page "https://httpretty.readthedocs.io") (synopsis "HTTP client mock for Python") (description "@code{httpretty} is a helper for faking web requests, -- cgit 1.4.1 From c721e00ef19b3eb86c8eca78102cbe7d31ea27af Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 21 Mar 2021 22:24:27 +0200 Subject: gnu: python-pygithub: Update to 1.54.1. * gnu/packages/python-xyz.scm (python-pygithub): Update to 1.54.1. [arguments]: Remove 'disable-failing-tests, 'prepare-for-tests phases. Add custom 'check phase. [propagated-inputs]: Add python-cryptography. [native-inputs]: Add python-httpretty, python-pytest. --- gnu/packages/python-xyz.scm | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 88c472d50f..bbe52ff5eb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3815,7 +3815,7 @@ to deprecate classes, functions or methods.") (define-public python-pygithub (package (name "python-pygithub") - (version "1.43.8") + (version "1.54.1") (source ;; We fetch from the Git repo because there are no tests in the PyPI ;; archive. @@ -3826,30 +3826,24 @@ to deprecate classes, functions or methods.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw")))) + (base32 "1nl74bp5ikdnrc8xq0qr25ryl1mvarf0xi43k8w5jzlrllhq0nkq")))) (build-system python-build-system) (arguments - `(#:phases (modify-phases %standard-phases - ;; Some tests rely on the network. - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/Issue142.py" - (("testDecodeJson") "disabled_testDecodeJson")) - #t)) - (add-before 'check 'prepare-for-tests - (lambda _ - (for-each (lambda (f) - (chmod f #o666)) - (find-files "./tests")) - (system* "python" "-m" "lib2to3" "-w" "-n" "tests") - (setenv "PYTHONPATH" - (string-append "./tests:" (getenv "PYTHONPATH"))) - #t))))) + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest")) + #t))))) (propagated-inputs - `(("python-deprecated" ,python-deprecated) + `(("python-cryptography" ,python-cryptography) + ("python-deprecated" ,python-deprecated) ("python-pyjwt" ,python-pyjwt) ("python-requests" ,python-requests))) - (native-inputs `(("python-httpretty" ,python-httpretty))) + (native-inputs + `(("python-httpretty" ,python-httpretty) + ("python-pytest" ,python-pytest))) (home-page "https://pygithub.readthedocs.io/en/latest/") (synopsis "Python library for the GitHub API") (description "This library allows managing GitHub resources such as -- cgit 1.4.1 From 8ce8ff7db97fff803c569f0768f35f9cdbef706d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:11:58 +0100 Subject: gnu: perl-net-http: Update to 6.21. * gnu/packages/web.scm (perl-net-http): Update to 6.21. --- 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 cbeb916f93..ef11cb6a1c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4071,7 +4071,7 @@ is limited to http and https.") (define-public perl-net-http (package (name "perl-net-http") - (version "6.20") + (version "6.21") (source (origin (method url-fetch) (uri (string-append @@ -4079,7 +4079,7 @@ is limited to http and https.") "Net-HTTP-" version ".tar.gz")) (sha256 (base32 - "07lzfycza7qqxli18xgsnqwiwxapl0b64z33wfw62aai4hm7nllj")))) + "1i7fk6q1iaxzgf82mjd5hg77hvy7dbb79488cijg16dyfrds6nip")))) (build-system perl-build-system) (propagated-inputs `(("perl-io-socket-ssl" ,perl-io-socket-ssl) -- cgit 1.4.1 From cf5a4b2e454db400cffbf7d1ee42b19a64dc50ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:23:35 +0100 Subject: gnu: mbpfan: Update to 2.2.1. * gnu/packages/linux.scm (mbpfan): Update to 2.2.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 6d2939adca..3343f4618f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7001,7 +7001,7 @@ interface to this kernel feature.") (define-public mbpfan (package (name "mbpfan") - (version "2.1.1") + (version "2.2.1") (source (origin (method git-fetch) @@ -7010,7 +7010,7 @@ interface to this kernel feature.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0aijyxrqh01x0s80yr4cgxgd001iiqqph65pxvby7f0wz8lnxnqj")))) + (base32 "0gc9ypxi55vxs77nx8ihhh9zk7fr9v0m0zfm76q7x0bi6jz11mbr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; tests ask to be run as root -- cgit 1.4.1 From bba6d1521032f7a50649d3f0fc91d84a8c09ca21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:23:54 +0100 Subject: gnu: haveged: Update to 1.9.14. * gnu/packages/linux.scm (haveged): Update to 1.9.14. --- 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 3343f4618f..69e573d26b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5797,7 +5797,7 @@ cpufreq sub-system is enabled or not.") (define-public haveged (package (name "haveged") - (version "1.9.13") + (version "1.9.14") (source (origin (method git-fetch) @@ -5806,7 +5806,7 @@ cpufreq sub-system is enabled or not.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0g3hcvpky76cabgcfqh65fay7nnjkms32sgmlf33q969833hijqz")))) + (base32 "050hmnh5s2s4mb83f4d1fk23mk27pprg840c1aagc6v1sz6x5dhq")))) (build-system gnu-build-system) (home-page "https://www.issihosts.com/haveged") (synopsis "Entropy source for the Linux random number generator") -- cgit 1.4.1 From 43ed895379c34797981c9736d7312e5100887e9c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:24:05 +0100 Subject: gnu: rng-tools: Update to 6.12. * gnu/packages/linux.scm (rng-tools): Update to 6.12. --- 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 69e573d26b..a044819236 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -5688,7 +5688,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.11") + (version "6.12") (source (origin (method git-fetch) (uri (git-reference (url home-page) @@ -5696,7 +5696,7 @@ The collection contains a set of bandwidth and latency benchmark such as: (file-name (git-file-name name version)) (sha256 (base32 - "0wwvi8a8k2ahhmwln4w970b8gd3in3g13jkbsapkpnspwmlqj5xa")))) + "0z4j3kqh9k3zsrx6257hwh4fa51vqg79c6dnfrj6lhpcll0wh0hm")))) (build-system gnu-build-system) (arguments `(;; Disable support for various hardware entropy sources as they need -- cgit 1.4.1 From 35c55931bf656f9097d683ab542b85e4c36ee5e5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:24:11 +0100 Subject: gnu: xfsprogs: Update to 5.11.0. * gnu/packages/linux.scm (xfsprogs): Update to 5.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 a044819236..0eaf014b5c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7207,7 +7207,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC (define-public xfsprogs (package (name "xfsprogs") - (version "5.10.0") + (version "5.11.0") (source (origin (method url-fetch) (uri (string-append @@ -7215,7 +7215,7 @@ compatible with Python's ConfigParser style of .INI files, including RFC "xfsprogs-" version ".tar.gz")) (sha256 (base32 - "1wcvcv9fl955g3zl68057hq7pp9bm7i733vc7j6xr6wnfd8qf6sr")))) + "1byj53qdwsii35d0f11nz0dl618mpvwy5aa44pc9zg281g2r27ab")))) (build-system gnu-build-system) (outputs (list "out" "python")) (arguments -- cgit 1.4.1 From b3c29d90a637bbfd50ae4de6bd34d8c440a41aa9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:24:23 +0100 Subject: gnu: openresolv: Update to 3.12.0. * gnu/packages/dns.scm (openresolv): Update to 3.12.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 5d0d9f8396..953933d880 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1287,14 +1287,14 @@ and TCP-capable recursive DNS server for finding domains on the internet.") (define-public openresolv (package (name "openresolv") - (version "3.10.0") + (version "3.12.0") (source (origin (method url-fetch) (uri (string-append "https://roy.marples.name/downloads/openresolv/" "openresolv-" version ".tar.xz")) (sha256 (base32 - "01ms6c087la4hk0f0w6n2vpsb7dg4kklah2rqyhz88p0vr9bqy20")) + "15qvp5va2yrqpz0ba54clvn8cbc66v4sl7k3bi9ji8jpx040bcs2")) (patches (search-patches "openresolv-restartcmd-guix.patch")))) (build-system gnu-build-system) -- cgit 1.4.1 From 759e9acd8f09e48ae20d4ee7985274d72331ccad Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 17:24:32 +0100 Subject: gnu: webkitgtk: Update to 2.30.6. * gnu/packages/webkit.scm (webkitgtk): Update to 2.30.6. --- gnu/packages/webkit.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index bda05cc715..89eee74def 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 David Hashe ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Mark H Weaver -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Marius Bakke ;;; @@ -226,14 +226,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.30.5") + (version "2.30.6") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "07vzbbnvz69rn9pciji4axfpclp98bpj4a0br2z0gbn5wc4an3bx")) + "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) -- cgit 1.4.1 From a0b3d968beb1c2f81b87d8176c51236c664d88e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 18:05:22 +0100 Subject: gnu: msmtp: Update to 1.8.15. * gnu/packages/mail.scm (msmtp): Update to 1.8.15. --- 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 239ddb0eb0..84fcbeab05 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1593,14 +1593,14 @@ addons which can add many functionalities to the base client.") (define-public msmtp (package (name "msmtp") - (version "1.8.14") + (version "1.8.15") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/msmtp/releases/" "/msmtp-" version ".tar.xz")) (sha256 - (base32 "1d3knxpwpglg20z4zcsi82mqv9285ah1b1b16k1fk1hlf5fhcvym")))) + (base32 "1klrj2a77671xb6xa0a0iyszhjb7swxhmzpzd4qdybmzkrixqr92")))) (build-system gnu-build-system) (inputs `(("libsecret" ,libsecret) -- cgit 1.4.1 From 5f9b28b231e17749d14a1b95ae9cad68d7315a1e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 21 Mar 2021 18:06:03 +0100 Subject: gnu: balsa: Update to 2.6.2. * gnu/packages/mail.scm (balsa): Update to 2.6.2. [inputs]: Add libassuan. Upgrade gtksourceview. --- gnu/packages/mail.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 84fcbeab05..b2a66f8513 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3624,14 +3624,14 @@ tools and applications: (define-public balsa (package (name "balsa") - (version "2.6.1") + (version "2.6.2") (source (origin (method url-fetch) (uri (string-append "https://pawsa.fedorapeople.org/balsa/" "balsa-" version ".tar.bz2")) (sha256 - (base32 "1xkxx801p7sbfkn0bh3cz85wra4xf1z1zhjqqc80z1z1nln7fhb4")))) + (base32 "1w0239i01mw4wwwy7xh8gz7zgl5khwvfm5wy35x0swvvax021mai")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -3653,8 +3653,9 @@ tools and applications: ("gnutls" ,gnutls) ("gpgme" ,gpgme) ("gtk+" ,gtk+) - ("gtksourceview" ,gtksourceview-3) + ("gtksourceview" ,gtksourceview) ("gtkspell3" ,gtkspell3) + ("libassuan" ,libassuan) ; in gpgme.pc Requires ("libcanberra" ,libcanberra) ("libesmtp" ,libesmtp) ("libical" ,libical) -- cgit 1.4.1 From d30f8f3a97b6ec2755ce76b2fe2d727fc025428e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 21 Mar 2021 22:52:53 +0100 Subject: gnu: poke: Update to 1.1. * gnu/packages/engineering.scm (poke): Update to 1.1. --- gnu/packages/engineering.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9358b2fd49..f3c6e6f3cd 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2968,18 +2968,14 @@ GUI.") (define-public poke (package (name "poke") - (version "1.0") + (version "1.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 (base32 - "02jvla69xd0nnlg2bil2vxxxglqgylswml6h5hy2nxy0023hp4yy")))) - - ;; XXX: Version 1.0 only supports 64-bit systems. - (supported-systems '("x86_64-linux" "aarch64-linux")) - + "1mkaq19a8d951n9l6d3f8rwq45a7gkr05snb285idd21qxixys6d")))) (build-system gnu-build-system) ;; The GUI, which we elide, requires tcl and tk. (native-inputs `(;; Requires bison 3.6+ but we currently only have 3.5. -- cgit 1.4.1 From 17b408e6a219d64643717cfde16ce04eea0a4590 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 21 Mar 2021 10:10:03 +0100 Subject: gnu: oil: Update to 0.8.8. * gnu/packages/shells.scm (oil): Update to 0.8.8. Signed-off-by: Leo Famulari --- 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 c348bfde94..62b7dc75fd 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -825,14 +825,14 @@ Shell (pdksh).") (define-public oil (package (name "oil") - (version "0.8.7") + (version "0.8.8") (source (origin (method url-fetch) (uri (string-append "https://www.oilshell.org/download/oil-" version ".tar.gz")) (sha256 - (base32 "0yxd020jkwhhvq2l8hd9npp2vn6fvm11f0izfzwdl2npbnc976jr")))) + (base32 "1g3xk160x9k5smfc9k8nnxcj7w1nacmnhnpmm72am9rjp1vpv9h1")))) (build-system gnu-build-system) (arguments `(#:strip-binaries? #f ; strip breaks the binary -- cgit 1.4.1 From ccb7d1340d51b54ec6c916bd2a32b8ac3d334e51 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 09:19:27 +0200 Subject: gnu: python-pytest-django: Build with pytest-6. * gnu/packages/django.scm (python-pytest-django)[propagated-inputs]: Replace python-pytest with python-pytest-6. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 66287599f1..7122ba3071 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Hartmut Goebel -;;; Copyright © 2016, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ricardo Wurmus @@ -346,7 +346,7 @@ size and quality.") ;; For tests. ("python-pytest-xdist" ,python-pytest-xdist))) (propagated-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest-6))) (home-page "https://pytest-django.readthedocs.org/") (synopsis "Django plugin for py.test") (description "Pytest-django is a plugin for py.test that provides a set of -- cgit 1.4.1 From 4d0fe40f65e096a4d07f4cc8c95139a4dda96c53 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 09:54:02 +0200 Subject: gnu: sequoia4pEp: Move to sequoia.scm. Don't have cross module package inheritance. * gnu/packages/pep.scm (sequoia4pEp): Move to ... * gnu/packages/sequoia.scm (sequoia4pEp): ... here. Hide package. --- gnu/packages/pep.scm | 15 --------------- gnu/packages/sequoia.scm | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index 2bcedf9979..289796a377 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -81,21 +81,6 @@ shell provides options to redirect the output into a pipe or a file.") (file-name (string-append name "-" version)) (sha256 (base32 checksum))))))) -(define sequoia4pEp - ;; Currently pEp Engine requires sequoia in not-so-current version - (package/inherit sequoia - (name "sequoia") - (version "0.15.0-pEp") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/sequoia-pgp/sequoia.git") - (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) - (sha256 - (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) - (file-name (git-file-name name version)))))) - (define-public pep-engine (package (name "pep-engine") diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index bd8c6248d9..c8b4abf0f5 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -203,3 +203,19 @@ several crates, providing both a low-level and a high-level API for dealing with OpenPGP data.") (license license:gpl2+))) + +(define-public sequoia4pEp + ;; Currently pEp Engine requires sequoia in not-so-current version + (package/inherit sequoia + (name "sequoia") + (version "0.15.0-pEp") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sequoia-pgp/sequoia.git") + (commit "0eb1b6cd846ea8c36b3dfdf01ec88383fc64f2fe"))) + (sha256 + (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) + (file-name (git-file-name name version)))) + (properties `((hidden? . #t))))) -- cgit 1.4.1 From 2d24b80f3c1fe1e510c7fe161ffced4cd12f59db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:27:52 +0200 Subject: gnu: rust-log-0.4: Fix inputs. * gnu/packages/crates-io.scm (rust-log-0.4)[arguments]: Don't skip build. Skip tests. [cargo-inputs]: Replace rust-cfg-if-0.1 with 1. [cargo-development-inputs]: Add rust-serde-1, rust-serde-test-1, rust-sval-1, rust-value-bag-1. --- gnu/packages/crates-io.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 299a2d1443..537b9c4955 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22050,11 +22050,16 @@ by inspecting the system for user preference.") (base32 "04175hv0v62shd82qydq58a48k3bjijmk54v38zgqlbxqkkbpfai")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Not all test files included in release. #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + (("rust-cfg-if" ,rust-cfg-if-1) ("rust-serde" ,rust-serde-1) ("rust-sval" ,rust-sval-1) + ("rust-value-bag" ,rust-value-bag-1)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-sval" ,rust-sval-1) ("rust-value-bag" ,rust-value-bag-1)))) (home-page "https://github.com/rust-lang/log") (synopsis "Lightweight logging facade for Rust") -- cgit 1.4.1 From d177db7997bc2ff8d132fd20785c8b49b616037d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:29:42 +0200 Subject: gnu: Add rust-capnp-0.10. * gnu/packages/crates-io.scm (rust-capnp-0.10): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 537b9c4955..2b31f2a1bf 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6300,6 +6300,27 @@ spreadsheet file.") encoding.") (license license:expat))) +(define-public rust-capnp-0.10 + (package + (inherit rust-capnp-0.13) + (name "rust-capnp") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17hsnmlcrzksjjpwpz51y8g36xzq8042i2cwns0lsg7rixfw2rxq")))) + (arguments + `(#:cargo-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-quickcheck" ,rust-quickcheck-0.2)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.2)))))) + (define-public rust-capnp-futures-0.13 (package (name "rust-capnp-futures") -- cgit 1.4.1 From eed0e6173a77e30043b945aa9bdecabcee2e3fcd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:34:37 +0200 Subject: gnu: rust-capnp-0.13: Fix build. * gnu/packages/crates-io.scm (rust-capnp-0.13)[arguments]: Don't skip build. [cargo-inputs]: Remove rust-futures-0.1. Replace rust-quickcheck-0.2 with 0.9. [cargo-development-inputs]: Replace rust-quickcheck-0.2 with 0.9. --- gnu/packages/crates-io.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b31f2a1bf..f7e84f36ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6288,12 +6288,10 @@ spreadsheet file.") (base32 "1bx2pj0ysmyd1ryd5s43m3c7n5k067x1aciqiiyg4kjswlcs6xjf")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-futures" ,rust-futures-0.1) - ("rust-quickcheck" ,rust-quickcheck-0.2)) + `(#:cargo-inputs + (("rust-quickcheck" ,rust-quickcheck-0.9)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.2)))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))) (home-page "https://github.com/capnproto/capnproto-rust") (synopsis "Runtime library for Cap'n Proto data encoding") (description "This package provides a runtime library for Cap'n Proto data -- cgit 1.4.1 From af402f42b4f8d9e8c61d9d8d0a371311530ea166 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:37:42 +0200 Subject: gnu: Add rust-capnpc-0.10. * gnu/packages/crates-io.scm (rust-capnpc-0.10): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f7e84f36ef..061ca65002 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6393,6 +6393,24 @@ remote procedure call protocol") (description "Cap'n Proto code generation") (license license:expat))) +(define-public rust-capnpc-0.10 + (package + (inherit rust-capnpc-0.13) + (name "rust-capnpc") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnpc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zxbmdkr0xfzkfq9p8zn7pp9jjq275qhr8fh9a0cc0ab37yfvbyj")))) + (arguments + `(#:cargo-inputs + (("rust-capnp" ,rust-capnp-0.10)))))) + (define-public rust-caps-0.3 (package (name "rust-caps") -- cgit 1.4.1 From a6d87015740b42ea6bbad42d48c7a9adc00c1535 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:38:35 +0200 Subject: gnu: Add rust-capnp-futures-0.10. * gnu/packages/crates-io.scm (rust-capnp-futures-0.10): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 061ca65002..f847b2b1ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6345,6 +6345,28 @@ encoding.") messages.") (license license:expat))) +(define-public rust-capnp-futures-0.10 + (package + (inherit rust-capnp-futures-0.13) + (name "rust-capnp-futures") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp-futures" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qdiqkp9mh4acpa0dqhpzv2gwf949rj3m85mgwl1rih6gvgbh1zs")))) + (arguments + `(#:cargo-inputs + (("rust-capnp" ,rust-capnp-0.10) + ("rust-futures" ,rust-futures-0.1)) + #:cargo-development-inputs + (("rust-capnp" ,rust-capnp-0.10) + ("rust-quickcheck" ,rust-quickcheck-0.2)))))) + (define-public rust-capnp-rpc-0.13 (package (name "rust-capnp-rpc") -- cgit 1.4.1 From e055e2d5f78db314674de0d14ad0b30d32b85667 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:39:26 +0200 Subject: gnu: Add rust-capnp-rpc-0.10: New variable. * gnu/packages/crates-io.scm (rust-capnp-rpc-0.10): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f847b2b1ef..9f9460f1b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6395,6 +6395,27 @@ messages.") remote procedure call protocol") (license license:expat))) +(define-public rust-capnp-rpc-0.10 + (package + (inherit rust-capnp-rpc-0.13) + (name "rust-capnp-rpc") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp-rpc" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1j6xg7yays1hlm1045wviyn1642yvvi2p4kba26yk07a0kafr3jn")))) + (arguments + `(#:cargo-inputs + (("rust-capnp" ,rust-capnp-0.10) + ("rust-capnp-futures" ,rust-capnp-futures-0.10) + ("rust-capnpc" ,rust-capnpc-0.10) + ("rust-futures" ,rust-futures-0.1)))))) + (define-public rust-capnpc-0.13 (package (name "rust-capnpc") -- cgit 1.4.1 From 7bc7398c28bcf7e4cbc8ec427ef00f1b05076224 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:43:09 +0200 Subject: gnu: rust-capnp-futures-0.13: Fix build. * gnu/packages/crates-io.scm (rust-capnp-futures-0.13)[arguments]: Don't skip build. [cargo-inputs]: Replace rust-futures-0.1 with 0.3. [cargo-development-inputs]: Replace rust-quickcheck-0.2 with 0.9. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f9460f1b3..f82fd62501 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6332,13 +6332,12 @@ encoding.") (base32 "18q93ncbfcnjq7zhvy9idnifypmi2qcp775q7454y3r4lvvdcyyw")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.13) - ("rust-futures" ,rust-futures-0.1)) + ("rust-futures" ,rust-futures-0.3)) #:cargo-development-inputs (("rust-capnp" ,rust-capnp-0.13) - ("rust-quickcheck" ,rust-quickcheck-0.2)))) + ("rust-quickcheck" ,rust-quickcheck-0.9)))) (home-page "https://github.com/capnproto/capnproto-rust") (synopsis "Async serialization for Cap'n Proto messages") (description "This package provides async serialization for Cap'n Proto -- cgit 1.4.1 From 87bd8ae928c2b5a653c85d13b5a825d0861cb8ec Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 10:44:23 +0200 Subject: gnu: rust-capnp-rpc-0.13: Fix build. * gnu/packages/crates-io.scm (rust-capnp-rpc-0.13)[arguments]: Don't skip build. [cargo-inputs]: Replace rust-futures-0.1 with 0.3. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f82fd62501..72625a91cd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6381,11 +6381,10 @@ messages.") (native-inputs `(("capnproto" ,capnproto))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.13) ("rust-capnp-futures" ,rust-capnp-futures-0.13) - ("rust-futures" ,rust-futures-0.1)) + ("rust-futures" ,rust-futures-0.3)) #:cargo-development-inputs (("rust-capnpc" ,rust-capnpc-0.13)))) (home-page "https://github.com/capnproto/capnproto-rust") -- cgit 1.4.1 From bf3033ef9c7cd0862d5bfa39fe54e3261628f546 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 11:02:11 +0200 Subject: gnu: Add rust-rusqlite-0.19. * gnu/packages/crates-io.scm (rust-rusqlite-0.19): New variable. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 72625a91cd..ff1b3d953f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33627,6 +33627,44 @@ please consider using @code{async-std} or @code{tokio}.") (native-inputs `(("pkg-config" ,pkg-config))))) +(define-public rust-rusqlite-0.19 + (package + (inherit rust-rusqlite-0.23) + (name "rust-rusqlite") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusqlite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19xq7s0kzhlljm3hqx0vidr91ia8hl49r4m5gwdj9dyywgks5g3f")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-csv" ,rust-csv-1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.2) + ("rust-fallible-streaming-iterator" + ,rust-fallible-streaming-iterator-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.15) + ("rust-lru-cache" ,rust-lru-cache-0.1) + ("rust-memchr" ,rust-memchr-2) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-time" ,rust-time-0.1) + ("rust-url" ,rust-url-1) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-unicase" ,rust-unicase-2) + ("rust-uuid" ,rust-uuid-0.7)))) + (inputs + `(("sqlite" ,sqlite))))) + (define-public rust-rust-argon2-0.7 (package (name "rust-rust-argon2") -- cgit 1.4.1 From dd70fa810892d5751ac8d534af1c9f9389930164 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 11:12:18 +0200 Subject: gnu: rust-syn-1: Update to 1.0.64. * gnu/packages/crates-io.scm (rust-syn-1): Update to 1.0.64. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ff1b3d953f..7d4edd9204 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40589,14 +40589,14 @@ browsers.") (define-public rust-syn-1 (package (name "rust-syn") - (version "1.0.60") + (version "1.0.64") (source (origin (method url-fetch) (uri (crate-uri "syn" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1080gw6mlja7yl26crya3k403wjdp7v3wx9mxcmpcnlar9z5j067")))) + (base32 "0vsx3448kyym7s5kybrl0qixgya33gzjxaidahya00k1jzlx3n9z")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From ff1c7e40252337cb2c992c2d41e0ed4cefe56df0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 22 Mar 2021 11:20:17 +0200 Subject: gnu: sequoia4pEp: Adjust inputs. * gnu/packages/sequoia.scm (sequoia4pEp)[arguments]: Override inherited cargo-inputs, cargo-development-inputs. Replace inherited 'unpin-deps phase. --- gnu/packages/sequoia.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index c8b4abf0f5..b75a622c64 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Hartmut Goebel +;;; Copyright © 2021 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +23,7 @@ #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages check) ;; python-pytest #:use-module (gnu packages crates-io) @@ -218,4 +220,62 @@ with OpenPGP data.") (sha256 (base32 "06dqs9whwp9lfibwp8dqm0aw4nm3s3v4jp2n4fz51zcvsld40nfh")) (file-name (git-file-name name version)))) + (arguments + (substitute-keyword-arguments (package-arguments sequoia) + ((#:cargo-inputs _) + `(("rust-anyhow" ,rust-anyhow-1) + ("rust-base64" ,rust-base64-0.11) + ("rust-bzip2" ,rust-bzip2-0.3) + ("rust-capnp" ,rust-capnp-0.10) + ("rust-capnp-rpc" ,rust-capnp-rpc-0.10) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-2) + ("rust-crossterm" ,rust-crossterm-0.13) + ("rust-dirs" ,rust-dirs-2) + ("rust-flate2" ,rust-flate2-1) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-futures" ,rust-futures-0.1) + ("rust-http" ,rust-http-0.1) + ("rust-hyper" ,rust-hyper-0.12) + ("rust-hyper-tls" ,rust-hyper-tls-0.3) + ("rust-idna" ,rust-idna-0.2) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-lalrpop" ,rust-lalrpop-0.17) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.17) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memsec" ,rust-memsec-0.5) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-nettle" ,rust-nettle-7) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-prettytable-rs" ,rust-prettytable-rs-0.8) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-quote" ,rust-quote-1) + ("rust-rand" ,rust-rand-0.7) + ("rust-regex" ,rust-regex-1) + ("rust-rpassword" ,rust-rpassword-4) + ("rust-rusqlite" ,rust-rusqlite-0.19) + ("rust-sha2" ,rust-sha2-0.8) + ("rust-syn" ,rust-syn-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-0.1) + ("rust-tokio-core" ,rust-tokio-core-0.1) + ("rust-tokio-io" ,rust-tokio-io-0.1) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1) + ("rust-url" ,rust-url-2) + ("rust-zbase32" ,rust-zbase32-0.1))) + ((#:cargo-development-inputs _) + `(("rust-assert-cli" ,rust-assert-cli-0.6) + ("rust-colored" ,rust-colored-1) + ("rust-filetime" ,rust-filetime-0.2))) + ((#:phases phases) + `(modify-phases ,phases + (replace 'unpin-deps + (lambda _ + (substitute* (find-files "." "Cargo.toml") + (("= \"<") "= \"") + (("= \"=") "= \"")) + #t)))))) (properties `((hidden? . #t))))) -- cgit 1.4.1 From 8e92c58bc350dbed4a8c1f7cc33cd45ab3f64149 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 22 Mar 2021 13:16:36 +0100 Subject: gnu: sbcl: Update to 2.1.2. * gnu/packages/lisp.scm (sbcl): Update to 2.1.2. --- 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 c91bf55ac5..29b32956db 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -400,14 +400,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.1.0") + (version "2.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "0k12m2z60fnq64m8dgivprs2mvrsnmp7c5ipzx7jzkprcsymdvh5")))) + (base32 "02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit 1.4.1 From a2f3a456bec357394fe550d927c26bbbdaa7ba6e Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 22 Mar 2021 13:18:23 +0100 Subject: gnu: nyxt: Update to 2-pre-release-6. * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-6. --- gnu/packages/web-browsers.scm | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 4e78c7555d..e5e726ad19 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -591,40 +591,12 @@ 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+))) -;; Nyxt 2 pre-release 5 is incompatible with the new nickname "class*" of defclass-star. -;; Use the older commit then. -(define sbcl-hu.dwim.defclass-star--no-nickname - (let ((commit "2cf30b37006824ec912cf7732fe6c4f4b414597f")) - (package - (name "sbcl-hu.dwim.defclass-star") - ;; We used to set version from the date when it was a darcs repo, so we - ;; keep the year so that package gets updated on previous installs. - (version (git-version "2015-07-09" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hu-dwim/hu.dwim.defclass-star") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zmzvwgcp6lpkqxnfphd05v20xqsvz392mx1v98469kavh4zd7hf")))) - (build-system asdf-build-system/sbcl) - (native-inputs - `(("hu.dwim.asdf" ,sbcl-hu.dwim.asdf))) - (arguments - '(#:tests? #f)) - (home-page "https://github.com/hu-dwim/hu.dwim.defclass-star") - (synopsis "See sbcl-hu.dwim.defclass-star") - (description "See sbcl-hu.dwim.defclass-star.") - (license license:public-domain)))) - (define-public nyxt (package (name "nyxt") ;; Package the pre-release because latest stable 1.5.0 does not build ;; anymore. - (version "2-pre-release-5") + (version "2-pre-release-6") (source (origin (method git-fetch) @@ -635,7 +607,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "1sdafyhiicasd4wyzqnzdyrr16mz55y4b2hf5ya6i7nvm2vyhywl")) + "0kcqp3p070i6x2jj27h8pxzvmhrzsl4kl3vkc8m76abkxc9lvn03")) (file-name (git-file-name "nyxt" version)))) (build-system gnu-build-system) (arguments @@ -696,6 +668,8 @@ driven and does not detract you from your daily work.") ("cl-calispel" ,sbcl-calispel) ("cl-containers" ,sbcl-cl-containers) ("cl-css" ,sbcl-cl-css) + ("cl-custom-hash-table" ,sbcl-custom-hash-table) + ("cl-html-diff" ,sbcl-cl-html-diff) ("cl-json" ,sbcl-cl-json) ("cl-markup" ,sbcl-cl-markup) ("cl-ppcre" ,sbcl-cl-ppcre) @@ -704,16 +678,15 @@ driven and does not detract you from your daily work.") ("cluffer" ,sbcl-cluffer) ("dexador" ,sbcl-dexador) ("enchant" ,sbcl-enchant) + ("file-attributes" ,sbcl-file-attributes) ("fset" ,sbcl-fset) - ;; TODO: Use latest upstream for 2 pre-release 6 onward. - ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star--no-nickname) + ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star) ("iolib" ,sbcl-iolib) ("local-time" ,sbcl-local-time) ("log4cl" ,sbcl-log4cl) ("mk-string-metrics" ,sbcl-mk-string-metrics) ("moptilities" ,sbcl-moptilities) ("named-readtables" ,sbcl-named-readtables) - ("osicat" ,sbcl-osicat) ("parenscript" ,sbcl-parenscript) ("plump" ,sbcl-plump) ("quri" ,sbcl-quri) @@ -726,7 +699,6 @@ driven and does not detract you from your daily work.") ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames) ("trivial-types" ,sbcl-trivial-types) ("unix-opts" ,sbcl-unix-opts) - ("usocket" ,sbcl-usocket) ;; WebKitGTK deps ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) ("cl-webkit" ,sbcl-cl-webkit) -- cgit 1.4.1 From 1f958631efd01f7f2ee475117d5ed13a91daae9c Mon Sep 17 00:00:00 2001 From: Hong Li Date: Mon, 22 Mar 2021 14:21:21 +0100 Subject: gnu: Add r-chromstardata. * gnu/packages/bioconductor.scm (r-chromstardata): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioconductor.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index d611f3a491..2b22c510ea 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Peter Lo ;;; Copyright © 2020, 2021 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Hong Li ;;; ;;; This file is part of GNU Guix. ;;; @@ -927,6 +928,26 @@ All datasets are restricted to protein coding genes.") from Illumina 450k methylation arrays.") (license license:artistic2.0))) +(define-public r-chromstardata + (package + (name "r-chromstardata") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "chromstaRData" version 'experiment)) + (sha256 + (base32 + "0ph80d53598635bb8g61acg5rqwnj8644a0gh297r4hgbvwlflab")))) + (properties `((upstream-name . "chromstaRData"))) + (build-system r-build-system) + (home-page "https://bioconductor.org/packages/chromstaRData/") + (synopsis "ChIP-seq data for demonstration purposes") + (description + "This package provides ChIP-seq data for demonstration purposes in the +chromstaR package.") + (license license:gpl3))) + (define-public r-genelendatabase (package (name "r-genelendatabase") -- cgit 1.4.1 From 0ff888108a6afce6965a445960087ab6b1c79f2a Mon Sep 17 00:00:00 2001 From: Hong Li Date: Mon, 22 Mar 2021 14:21:47 +0100 Subject: gnu: Add r-chromstar. * gnu/packages/bioconductor.scm (r-chromstar): New variable. Co-authored-by: Ricardo Wurmus --- 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 2b22c510ea..0bcd9a67cd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10643,6 +10643,44 @@ large-scale and fully automated analysis.") the earlier snpMatrix package, allowing for uncertainty in genotypes.") (license license:gpl3))) +(define-public r-chromstar + (package + (name "r-chromstar") + (version "1.16.0") + (source + (origin + (method url-fetch) + (uri (bioconductor-uri "chromstaR" version)) + (sha256 + (base32 + "0vgpb7g2cncdn82hia2yzzachyns2zbd7906662g990qjnp2xlm1")))) + (properties `((upstream-name . "chromstaR"))) + (build-system r-build-system) + (propagated-inputs + `(("r-bamsignals" ,r-bamsignals) + ("r-biocgenerics" ,r-biocgenerics) + ("r-chromstardata" ,r-chromstardata) + ("r-doparallel" ,r-doparallel) + ("r-foreach" ,r-foreach) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicalignments" ,r-genomicalignments) + ("r-genomicranges" ,r-genomicranges) + ("r-ggplot2" ,r-ggplot2) + ("r-iranges" ,r-iranges) + ("r-mvtnorm" ,r-mvtnorm) + ("r-reshape2" ,r-reshape2) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/ataudt/chromstaR") + (synopsis "Chromatin state analysis for ChIP-Seq data") + (description + "This package implements functions for combinatorial and differential +analysis of ChIP-seq data. It includes uni- and multivariate peak-calling, +export to genome browser viewable files, and functi ons for enrichment +analyses.") + (license license:artistic2.0))) + (define-public r-sushi (package (name "r-sushi") -- cgit 1.4.1 From dd4670d40d59c058e140c32d92085f6d02b1cadb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 22 Mar 2021 14:22:28 +0100 Subject: gnu: Add r-lsa. * gnu/packages/cran.scm (r-lsa): 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 5617383cbc..b9842ca954 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26204,6 +26204,32 @@ statistical analysis that share the underlying design philosophy, grammar, and data structures of the tidyverse.") (license license:gpl3))) +(define-public r-lsa + (package + (name "r-lsa") + (version "0.73.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "lsa" version)) + (sha256 + (base32 + "1a33irqa6qvbc02z12rgbgv8kxq2gmahy7j5bg8b23lvvaxif06b")))) + (properties `((upstream-name . "lsa"))) + (build-system r-build-system) + (propagated-inputs + `(("r-snowballc" ,r-snowballc))) + (home-page "https://cran.r-project.org/package=lsa") + (synopsis "Latent semantic analysis") + (description + "The basic idea of latent semantic analysis (LSA) is, that text do have a +higher order (=latent semantic) structure which, however, is obscured by word +usage (e.g. through the use of synonyms or polysemy). By using conceptual +indices that are derived statistically via a truncated singular value +decomposition (a two-mode factor analysis) over a given document-term matrix, +this variability problem can be overcome.") + (license license:gpl2+))) + (define-public r-mlecens (package (name "r-mlecens") -- cgit 1.4.1 From ee4fc3b662994e9d041027c4d0799a173a12d35a Mon Sep 17 00:00:00 2001 From: Hong Li Date: Mon, 22 Mar 2021 14:26:13 +0100 Subject: gnu: Add r-signac. * gnu/packages/bioinformatics.scm (r-signac): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/bioinformatics.scm | 62 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eb466868d1..a81c873371 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2020 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Tim Howes +;;; Copyright © 2021 Hong Li ;;; ;;; This file is part of GNU Guix. ;;; @@ -15353,3 +15354,64 @@ biological processes. SBML is useful for models of metabolism, cell signaling, and more. It continues to be evolved and expanded by an international community.") (license license:lgpl2.1+))) + +(define-public r-signac + (let ((commit "e0512d348adeda4a3f23a2e8f56d1fe09840e03c") + (revision "1")) + (package + (name "r-signac") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/timoast/signac/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yihhrv7zs87ax61la1nb4y12lg3knraw4b20k5digbcwm8488lb")))) + (properties `((upstream-name . "Signac"))) + (build-system r-build-system) + (inputs `(("zlib" ,zlib))) + (propagated-inputs + `(("r-annotationfilter" ,r-annotationfilter) + ("r-biocgenerics" ,r-biocgenerics) + ("r-biostrings" ,r-biostrings) + ("r-biovizbase" ,r-biovizbase) + ("r-data-table" ,r-data-table) + ("r-dplyr" ,r-dplyr) + ("r-fastmatch" ,r-fastmatch) + ("r-future" ,r-future) + ("r-future-apply" ,r-future-apply) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-ggbio" ,r-ggbio) + ("r-ggforce" ,r-ggforce) + ("r-ggplot2" ,r-ggplot2) + ("r-ggrepel" ,r-ggrepel) + ("r-ggseqlogo" ,r-ggseqlogo) + ("r-iranges" ,r-iranges) + ("r-irlba" ,r-irlba) + ("r-lsa" ,r-lsa) + ("r-matrix" ,r-matrix) + ("r-patchwork" ,r-patchwork) + ("r-pbapply" ,r-pbapply) + ("r-rcpp" ,r-rcpp) + ("r-rcpproll" ,r-rcpproll) + ("r-rsamtools" ,r-rsamtools) + ("r-s4vectors" ,r-s4vectors) + ("r-scales" ,r-scales) + ("r-seurat" ,r-seurat) + ("r-seuratobject" ,r-seuratobject) + ("r-stringi" ,r-stringi) + ("r-tidyr" ,r-tidyr))) + (home-page "https://github.com/timoast/signac/") + (synopsis "Analysis of single-cell chromatin data") + (description + "This package provides a framework for the analysis and exploration of +single-cell chromatin data. The Signac package contains functions for +quantifying single-cell chromatin data, computing per-cell quality control +metrics, dimension reduction and normalization, visualization, and DNA +sequence motif analysis.") + (license license:expat)))) -- cgit 1.4.1 From e2757be5d5f07af7aefd5a264fe9a60fc5bbd688 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 22 Mar 2021 15:43:15 +0100 Subject: gnu: gtk-layer-shell: Update to 0.6.0. * gnu/packages/gtk.scm (gtk-layer-shell): Update to 0.6.0. [source]: Switch to git-fetch because release tarballs are no longer provided by upstream. [arguments]<#:configure-flags>: Add "-Dtests=true" otherwise tests are not built for 'check phase to work. --- gnu/packages/gtk.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5b1c4481fd..cf9116214c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2192,16 +2192,18 @@ displayed on the other side of the bus.") (define-public gtk-layer-shell (package (name "gtk-layer-shell") - (version "0.1.0") + (version "0.6.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/wmww/gtk-layer-shell/releases/download/v" - version "/gtk-layer-shell-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/wmww/gtk-layer-shell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0ncklk3z0fzlz6p76jdcrr1ykyp1f4ykjjch4x2hfp9bwsnl4a3m")))) + (base32 "1kcp4p3s7sdh9lwniybjdarfy8z69j2j23hfrw98amhwhq39gdcc")))) (build-system meson-build-system) + (arguments `(#:configure-flags (list "-Dtests=true"))) (native-inputs `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection))) (inputs `(("wayland" ,wayland) -- cgit 1.4.1 From ce995d520694c4898028415b9118d711f5bcf125 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Mon, 22 Mar 2021 15:45:33 +0100 Subject: gnu: mate-panel: Add missing inputs for Wayland support. * gnu/packages/mate.scm (mate-panel)[inputs]: Add gtk-layer-shell and wayland. --- gnu/packages/mate.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index fbb1a74d09..44420147a3 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -681,6 +681,7 @@ mate-volume-control, a MATE volume control application and applet.") `(("dconf" ,dconf) ("cairo" ,cairo) ("dbus-glib" ,dbus-glib) + ("gtk-layer-shell" ,gtk-layer-shell) ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) ("libice" ,libice) @@ -695,7 +696,8 @@ mate-volume-control, a MATE volume control application and applet.") ("mate-desktop" ,mate-desktop) ("mate-menus" ,mate-menus) ("pango" ,pango) - ("tzdata" ,tzdata))) + ("tzdata" ,tzdata) + ("wayland" ,wayland))) (home-page "https://mate-desktop.org/") (synopsis "Panel for MATE") (description -- cgit 1.4.1 From b246420e40c80affddd21ba152d019af1f48297f Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Wed, 17 Mar 2021 11:03:22 +0300 Subject: gnu: Add emacs-ivy-avy. * gnu/packages/emacs-xyz.scm (emacs-ivy-avy): New variable. Signed-off-by: Jelle Licht --- gnu/packages/emacs-xyz.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7085318e58..17ca645858 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -90,7 +90,7 @@ ;;; Copyright © 2020 Jonathan Rostran ;;; Copyright © 2020, 2021 Noah Evans ;;; Copyright © 2020 Brit Butler -;;; Copyright © 2021 Alexandr Vityazev +;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2021 Yurii Kholodkov ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Xinglu Chen @@ -27253,3 +27253,25 @@ and prefered services can easily be configured.") "This package provides an Elisp wrapper around the Java @command{keytool} command and major mode for viewing Java keystores.") (license license:expat)))) + +(define-public emacs-ivy-avy + (package + (name "emacs-ivy-avy") + (version "0.13.4") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/" + "ivy-avy-" version ".tar")) + (sha256 + (base32 "1q5caxm4rnh4jy5n88dhkdbx1afsshmfki5dl8xsqbdb3y0zq7yi")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy) + ("emacs-avy" ,emacs-avy))) + (home-page "https://github.com/abo-abo/swiper") + (synopsis "Avy integration for Ivy") + (description + "This package adds a \"C-'\" binding to Ivy minibuffer that uses Avy.") + (license license:gpl3+))) -- cgit 1.4.1 From 6c1217c22c21e8c570ee9621ebec9d79b3b880f1 Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Wed, 17 Mar 2021 12:50:26 +0300 Subject: gnu: Add emacs-ivy-hydra. * gnu/packages/emacs-xyz.scm (emacs-ivy-hydra): New variable. Signed-off-by: Jelle Licht --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 17ca645858..640cae5c35 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27275,3 +27275,27 @@ and prefered services can easily be configured.") (description "This package adds a \"C-'\" binding to Ivy minibuffer that uses Avy.") (license license:gpl3+))) + +(define-public emacs-ivy-hydra + (package + (name "emacs-ivy-hydra") + (version "0.13.5") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/" + "ivy-hydra-" version ".tar")) + (sha256 + (base32 "06rln9bnq5hli5rqlm47fb68b8llpqrmzwqqv4rn7mx3854i9a5x")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-ivy" ,emacs-ivy) + ("emacs-hydra" ,emacs-hydra))) + (home-page "https://github.com/abo-abo/swiper") + (synopsis "Additional key bindings for Ivy") + (description + "This package provides the `hydra-ivy/body' command, which is a +quasi-prefix map, with many useful bindings. These bindings are +shorter than usual, using mostly unprefixed keys.") + (license license:gpl3+))) -- cgit 1.4.1 From 3de6fb621a26e848d2bca3caf82caf7df59521c9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Mar 2021 22:34:00 +0100 Subject: gnu: emacs-auctex: Update to 13.0.5. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.5. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 640cae5c35..7ce4bfe31c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2210,14 +2210,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.4") + (version "13.0.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "1362dqb8mcaddda9849gqsj6rzlfq18xprddb74j02884xl7hq65")))) + (base32 "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit 1.4.1 From 75a95ed95ffded86f41908fae103b3a8385e693e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 22 Mar 2021 22:36:43 +0100 Subject: gnu: python-duniterpy: Update to 0.62.0. * gnu/packages/finance.scm (python-duniterpy): Update to 0.62.0. --- 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 e6df40c168..6674452ab5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1109,13 +1109,13 @@ Luhn and family of ISO/IEC 7064 check digit algorithms. ") (define-public python-duniterpy (package (name "python-duniterpy") - (version "0.61.0") + (version "0.62.0") (source (origin (method url-fetch) (uri (pypi-uri "duniterpy" version)) (sha256 - (base32 "1dr5zx7hi1ps36p1zw2n66lmikp2frwi3sp4rf2zyd216dl3r1jp")))) + (base32 "1ldiw5j2g92cib9v06kgv4z8dw2zi0x1dmpisf8w78h4kg6712w1")))) (build-system python-build-system) (arguments ;; FIXME: Tests fail with: "TypeError: block_uid() missing 1 required -- cgit 1.4.1 From b9c150fc9af6704a44218a2d64028a8d5a1e3981 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sat, 20 Mar 2021 13:21:54 +0100 Subject: gnu: Add emacs-password-store-otp. * gnu/packages/emacs-xyz.scm (emacs-password-store-otp): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7ce4bfe31c..a147e81289 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15164,6 +15164,32 @@ close, copy, cut, paste, undo, redo.") standard Unix password manager\").") (license license:gpl2+)))) +(define-public emacs-password-store-otp + (package + (name "emacs-password-store-otp") + (version "0.1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/volrath/password-store-otp.el") + (commit version))) + (sha256 + (base32 "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-password-store" ,emacs-password-store) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/volrath/password-store-otp.el") + (synopsis + "Interact with the @code{pass-otp} extension for @code{pass} from Emacs") + (description "This package provides Emacs functions to interact with the +@code{pass-otp} extension for @code{pass}. It includes functions to import +OTP URIs from screenshots of QR codes, and to export them back to QR codes if +needed.") + (license license:gpl3+))) + (define-public emacs-auth-source-pass (let ((commit "847a1f54ed48856b4dfaaa184583ef2c84173edf") (revision "2")) -- cgit 1.4.1 From 4d2553e7b56eaeae83010f60ea87587860e431c0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Mar 2021 23:39:10 +0100 Subject: gnu: man-pages: Update to 5.11. * gnu/packages/man.scm (man-pages): Update to 5.11. --- gnu/packages/man.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index c021a1e2e4..8a548e6e56 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -224,7 +224,7 @@ the traditional flat-text whatis databases.") (define-public man-pages (package (name "man-pages") - (version "5.10") + (version "5.11") (source (origin (method url-fetch) @@ -234,7 +234,7 @@ the traditional flat-text whatis databases.") (string-append "mirror://kernel.org/linux/docs/man-pages/Archive/" "man-pages-" version ".tar.xz"))) (sha256 - (base32 "0ql7fqs0w2nbwv1b6ffnzyjz1sysvkhq8kb77wi2z7qip8sja43m")))) + (base32 "1aiwn6yi19idg4jbf7x4x5i06macjv7r8d5fgp1rwnc4a775vniy")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (delete 'configure)) -- cgit 1.4.1 From 98c3eed1d5676bcdd17a73fdd78a28bb54b52793 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Mar 2021 23:39:21 +0100 Subject: gnu: xchm: Update to 1.32. * gnu/packages/ebook.scm (xchm): Update to 1.32. --- gnu/packages/ebook.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 47bbd1a789..dfc3d9f2e6 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016, 2017 Alex Griffin ;;; Copyright © 2017, 2019, 2020 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> @@ -542,7 +542,7 @@ Some of the current features: (define-public xchm (package (name "xchm") - (version "1.31") + (version "1.32") (source (origin (method url-fetch) (uri (string-append "https://github.com/rzvncj/xCHM" @@ -550,7 +550,7 @@ Some of the current features: version "/xchm-" version ".tar.gz")) (sha256 (base32 - "0aw6bysqiwbw75n3ad229ihlmh7chqs1wlxm0398z3lfp2y6n7qf")))) + "0b12ym7cn65wy268kbksyhakicwb053c8xfn76q2dawrvbras9dj")))) (build-system gnu-build-system) (inputs `(("wxwidgets" ,wxwidgets) -- cgit 1.4.1 From 4cc2a2815748047856e7a64ba366c476e69be834 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Mar 2021 23:52:29 +0100 Subject: gnu: wesnoth: Update to 1.14.16. * gnu/packages/games.scm (wesnoth): Update to 1.14.16. --- 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 2f48a9fb75..10f00c9a18 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4083,7 +4083,7 @@ falling, themeable graphics and sounds, and replays.") (define-public wesnoth (package (name "wesnoth") - (version "1.14.15") + (version "1.14.16") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/wesnoth/wesnoth-" @@ -4092,7 +4092,7 @@ falling, themeable graphics and sounds, and replays.") "wesnoth-" version ".tar.bz2")) (sha256 (base32 - "05iapxj3nzaqh10y42yq1jf7spxgm4iwjw4qj1c4lnb25xp4mc2h")))) + "1d9hq3dcx0sgs2v4400rg2nw98v46m7bwiqqjv8z8n7vw8kx8lhg")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no check target -- cgit 1.4.1 From 897177c98e62ef53af52aeafc349c9e858b41389 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 00:09:32 +0100 Subject: gnu: celluloid: Update to 0.21. * gnu/packages/video.scm (celluloid): Update to 0.21. --- 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 c818b22451..b5a2aca980 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -707,7 +707,7 @@ old-fashioned output methods with powerful ascii-art renderer.") (define-public celluloid (package (name "celluloid") - (version "0.20") + (version "0.21") (source (origin (method url-fetch) @@ -715,7 +715,7 @@ old-fashioned output methods with powerful ascii-art renderer.") "/releases/download/v" version "/celluloid-" version ".tar.xz")) (sha256 - (base32 "0kjjv2pcdvwcn4yi8kbpsca7pnx6cx6xdznv7ppqm0fssx68qyb3")))) + (base32 "1dvyf21iv9hrgv99szc24386vkacmhidm5b4d31hqqjs3b6di692")))) (build-system glib-or-gtk-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From ca5420d3b27dcefa9ada704db0d694ff62238b73 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 9 Mar 2021 11:49:24 -0500 Subject: gnu: Add disarchive. * gnu/packages/backup.scm (disarchive): New variable. --- gnu/packages/backup.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 78c5b31bb5..860e1abe23 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Marcin Karpezo ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages gperf) #:use-module (gnu packages guile) + #:use-module (gnu packages guile-xyz) #:use-module (gnu packages linux) #:use-module (gnu packages mcrypt) #:use-module (gnu packages ncurses) @@ -1083,3 +1085,35 @@ interactive mode.") to reduce network traffic and the amount of space that is used by each backup.") (license license:agpl3))) + +(define-public disarchive + (package + (name "disarchive") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/disarchive/" + "disarchive-" version ".tar.gz")) + (sha256 + (base32 + "12d4r4i7vi8fxilr2aww6kzq56jax5ymhjfm3cpgx26vj4c70kb6")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config) + ("guile-quickcheck" ,guile-quickcheck))) + (inputs + `(("guile" ,guile-3.0) + ("zlib" ,zlib))) + (propagated-inputs + `(("guile-gcrypt" ,guile-gcrypt))) + (home-page "https://ngyro.com/software/disarchive.html") + (synopsis "Software archive disassembler") + (description "Disarchive can disassemble software archives into data +and metadata. The goal is to create a small amount of metadata that +can be used to recreate a software archive bit-for-bit from the +original files. For example, a software archive made using tar and +Gzip will need to describe the order of files in the tarball and the +compression parameters used by Gzip.") + (license license:gpl3+))) -- cgit 1.4.1 From 45dfcdba86ff5cf31bdf6e07d73b161f5d7fac42 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 22 Mar 2021 19:09:20 -0700 Subject: gnu: diffoscope: Update to 170. * gnu/packages/diffoscope.scm (diffoscope): Update to 170. [arguments]: Remove skip-dex-test-with-missing-procyon phase. --- gnu/packages/diffoscope.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index a2490330e0..20ba92709a 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "168") + (version "170") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "18rs4jfx50d7vkaqcc46r7pccgizp0is56267sq13vbfvz758dhh")))) + "0s1z4yc5d10ns4x28d2lm8py30r7sq4764q6b8yxcwxwfrjibmb0")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -121,13 +121,6 @@ ;; This requires /sbin to be in $PATH. (delete-file "tests/test_tools.py") #t)) - (add-before 'check 'skip-dex-test-with-missing-procyon - (lambda _ - ;; This test actually requires procyon decompiler - (substitute* "tests/comparators/test_dex.py" - (("skip_unless_tools_exist.\"enjarify\", \"zipinfo\", \"javap\"") - "skip_unless_tools_exist(\"enjarify\", \"zipinfo\", \"javap\", \"procyon\"")) - #t)) (add-after 'install 'install-man-page (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit 1.4.1 From e44b968bf6a8041095c3571a5ec71786969f8784 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 23 Mar 2021 12:24:39 +0200 Subject: gnu: rust-env-logger-0.8: Update to 0.8.3. * gnu/packages/crates-io.scm (rust-env-logger-0.8): Update to 0.8.3. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7d4edd9204..123a95a9f6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13071,14 +13071,14 @@ convert enum to u8 slice ref.") (define-public rust-env-logger-0.8 (package (name "rust-env-logger") - (version "0.8.2") + (version "0.8.3") (source (origin (method url-fetch) (uri (crate-uri "env-logger" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07k6m6igz02g2b1v7nims7vd8azwxrav43xl14a6rjmxnikcnvpj")))) + (base32 "0gwx1pvbv99fj9wpicknyv4p2vj997xpva8ac5dg03m35q0jlf8p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From b6670d5b3aabf92c582033183b6d839d5784261a Mon Sep 17 00:00:00 2001 From: la snesne Date: Tue, 23 Mar 2021 09:06:33 +0900 Subject: gnu: minetest: Update to 5.4.0. * gnu/packages/games (minetest, minetest-data): Update to 5.4.0. Signed-off-by: Leo Prikler --- 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 10f00c9a18..add8b58ab9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3464,7 +3464,7 @@ match, cannon keep, and grave-itation pit.") (define-public minetest (package (name "minetest") - (version "5.3.0") + (version "5.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -3473,7 +3473,7 @@ match, cannon keep, and grave-itation pit.") (file-name (git-file-name name version)) (sha256 (base32 - "03ga3j3cg38w4lg4d4qxasmnjdl8n3lbizidrinanvyfdyvznyh6")) + "1a17g6cmxrscnqwpwrd4w2ck3dgvplyfq4kzyimilfpqar1q69j9")) (modules '((guix build utils))) (snippet '(begin @@ -3541,7 +3541,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "1liciwlh013z5h08ib0psjbwn5wkvlr937ir7kslfk4vly984cjx")))) + "11dz36z0pj2r7i8xm8v5lskzws81ckj6sc0avlmvdl8qdc9x83w5")))) (build-system trivial-build-system) (native-inputs `(("source" ,source))) -- cgit 1.4.1 From 7fc1fac64a8d800d651f55a80ff158abd7a90ccb Mon Sep 17 00:00:00 2001 From: la snesne Date: Tue, 23 Mar 2021 09:28:05 +0900 Subject: gnu: minetest: Enable tests. * gnu/packages/games.scm (minetest)[arguments]: Remove #:tests?. Add #:phases. Co-authored-by: Leo Prikler --- gnu/packages/games.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index add8b58ab9..7366e6411e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3482,7 +3482,7 @@ match, cannon keep, and grave-itation pit.") #t)))) (build-system cmake-build-system) (arguments - '(#:configure-flags + `(#:configure-flags (list "-DRUN_IN_PLACE=0" "-DENABLE_FREETYPE=1" "-DENABLE_GETTEXT=1" @@ -3493,7 +3493,27 @@ match, cannon keep, and grave-itation pit.") (string-append "-DCURL_INCLUDE_DIR=" (assoc-ref %build-inputs "curl") "/include/curl")) - #:tests? #f)) ;no check target + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "src/CMakeLists.txt" + (("set\\(EXECUTABLE_OUTPUT_PATH .*\\)") "")) + (substitute* "src/unittest/test_servermodmanager.cpp" + ;; do no override MINETEST_SUBGAME_PATH + (("(un)?setenv\\(\"MINETEST_SUBGAME_PATH\".*\\);") + "(void)0;")) + (setenv "MINETEST_SUBGAME_PATH" + (string-append (getcwd) "/games")) ; for check + #t)) + (replace 'check + (lambda _ + ;; Thanks to our substitutions, the tests should also run + ;; when invoked on the target outside of `guix build'. + (unless ,(%current-target-system) + (setenv "HOME" "/tmp") + (invoke "src/minetest" "--run-unittests")) + #t))))) (native-search-paths (list (search-path-specification (variable "MINETEST_SUBGAME_PATH") -- cgit 1.4.1 From d1e1682749b2ad863a78ec3b1e1e840b1dbf5149 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 11:45:54 +0100 Subject: gnu: cuirass: Update to 1.0.0-1.0497e0d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-1.0497e0d. --- gnu/packages/ci.scm | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 8b1bb2986f..4fa85d0893 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,11 +66,11 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "88f3cf65e0b5974c6525d498ebffc607bc62baf0") - (revision "77")) + (let ((commit "0497e0d6c4184223034855b61312d38ffae0b766") + (revision "1")) (package (name "cuirass") - (version (git-version "0.0.1" revision commit)) + (version (git-version "1.0.0" revision commit)) (source (origin (method git-fetch) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1mwi6i400kjdkfccvbc49fka18dhkcl0rbiqylgpb7lh0pzss9j7")))) + "1y6030kx6c8h927gr30b78b3flwlqx15iakrc2lgw5xw0367gqhg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -88,6 +88,7 @@ (ice-9 rdelim) (ice-9 popen)) #:configure-flags '("--localstatedir=/var") ;for /var/log/cuirass + #:parallel-tests? #f #:phases (modify-phases %standard-phases (add-before 'check 'set-PATH-for-tests @@ -96,6 +97,12 @@ (path (getenv "PATH"))) (setenv "PATH" (string-append pg "/bin:" path)) #t))) + ;; Disable the remote tests that require a Guix daemon connection. + (add-before 'check 'disable-remote-tests + (lambda _ + (substitute* "Makefile.am" + (("tests/remote.scm") "")) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Wrap the 'cuirass' command to refer to the right modules. @@ -135,15 +142,11 @@ "/site-ccache:") 'suffix) 1))) - ;; Make sure 'cuirass' can find the 'evaluate' command, as - ;; well as the relevant Guile modules. - (for-each - (lambda (name) - (wrap-program (string-append out "/bin/" name) - `("PATH" ":" prefix (,(string-append out "/bin"))) - `("GUILE_LOAD_PATH" ":" prefix (,mods)) - `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,objs)))) - '("cuirass" "remote-server" "remote-worker")) + ;; Make sure 'cuirass' can find 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 (,objs))) #t)))))) (inputs `(("guile" ,guile-3.0/libgc-7) -- cgit 1.4.1 From 862af8c2ed131a23bdafdc22e7fbdd90765af6b4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 21 Mar 2021 15:35:34 +0100 Subject: ci: Change manifest argument type. * gnu/ci.scm (arguments->manifests): Change manifest argument type. --- gnu/ci.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index acd05a18b4..2dcd49ac80 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -423,16 +423,12 @@ valid." (define (arguments->manifests arguments channels) "Return the list of manifests extracted from ARGUMENTS." - (define (channel-name->checkout name) - (let ((channel (find (lambda (channel) - (eq? (channel-name channel) name)) - channels))) - (channel-url channel))) - - (map (match-lambda - ((name . path) - (let ((checkout (channel-name->checkout name))) - (in-vicinity checkout path)))) + (map (lambda (manifest) + (any (lambda (checkout) + (let ((path (in-vicinity checkout manifest))) + (and (file-exists? path) + path))) + (map channel-url channels))) arguments)) (define (manifests->packages store manifests) -- cgit 1.4.1 From 0efd68681dcec50d445a4fd080c315b999164828 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 12:01:23 +0100 Subject: gnu: cuirass: Update to 1.0.0-2.6f4a203. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-2.6f4a203. --- 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 4fa85d0893..e0c7238f2b 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -66,8 +66,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "0497e0d6c4184223034855b61312d38ffae0b766") - (revision "1")) + (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") + (revision "2")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1y6030kx6c8h927gr30b78b3flwlqx15iakrc2lgw5xw0367gqhg")))) + "120cnnjy4j2dinfmas1ddmqzzc7ikj9c76sl4li6g6dn8g7s8f69")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 9d4bc79b2adc69196cdc13a1e8ba70fe07feb0e4 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 23 Mar 2021 13:53:29 +0100 Subject: gnu: minetest-mineclone: Update to 0.71.0. * gnu/packages/games.scm (minetest-mineclone): Update to 0.71.0. --- 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 7366e6411e..3f909aad4b 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3586,7 +3586,7 @@ in different ways.") (define-public minetest-mineclone (package (name "minetest-mineclone") - (version "0.66.2") + (version "0.71.0") (source (origin (method git-fetch) (uri (git-reference @@ -3595,7 +3595,7 @@ in different ways.") (file-name (git-file-name name version)) (sha256 (base32 - "0miszzlzplpvaj0j1yii9867ydr42wsaqa9g6grxdrci75p05g00")))) + "0qm809dqvxc7pa1cr9skmglq9vrbq5hhm4c4m5yi46ldh1v96dgf")))) (build-system copy-build-system) (arguments `(#:install-plan -- cgit 1.4.1 From 688c066e351c3aa6480e6305caf95786118f790c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 12:54:54 +0100 Subject: gnu: xcb-imdkit: Update to 1.0.3. * gnu/packages/fcitx5.scm (xcb-imdkit): Update to 1.0.3. --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 17632ed9a6..8d0da3ee8c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -52,7 +52,7 @@ (define-public xcb-imdkit (package (name "xcb-imdkit") - (version "1.0.2") + (version "1.0.3") (source (origin (method url-fetch) @@ -60,7 +60,7 @@ "https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-" version ".tar.xz")) (sha256 - (base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0")) + (base32 "1s58vjkdrgr8h183jz4b4mjn7pbvdc9cli01cn66mgczl9p65hh9")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 3d5cca1a32b6dd9c24f0805acaea406917989994 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 12:55:01 +0100 Subject: gnu: libime: Update to 1.0.5. * gnu/packages/fcitx5.scm (libime): Update to 1.0.5. --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 8d0da3ee8c..eea60dc1e0 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -172,14 +172,14 @@ client.") (define-public libime (package (name "libime") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-" version "_dict.tar.xz")) (sha256 - (base32 "0bwl12cy7crpf62f669qn99rv4df1sjlggvcn80z64yabs36nhjr")))) + (base32 "1w3cxk11kbfmz7snivxq948zfav6dy2245j12ghlxcmdxjshrlhq")))) (build-system cmake-build-system) (inputs `(("fcitx5" ,fcitx5) -- cgit 1.4.1 From 8cb7854d271cb379724b9c41949b4c972f50b6e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 12:59:12 +0100 Subject: gnu: borg: Update to 1.1.16. * gnu/packages/backup.scm (borg): Update to 1.1.16. --- gnu/packages/backup.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 860e1abe23..35cd3cf7f3 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -572,13 +572,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.1.15") + (version "1.1.16") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "1g62sdzcw3zx4ccky125ciwnzx6z9kwyvskvp7ijmqxqk3nrxjs9")) + (base32 "0l1dqfwrd9l34rg30cmzmq5bs6yha6kg4vy313jq611jsqj94mmw")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 6cea2873a100f633370f11074603fa04af6f1dbb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:04:43 +0100 Subject: gnu: mpg123: Update to 1.26.5. * gnu/packages/mp3.scm (mpg123): Update to 1.26.5. --- gnu/packages/mp3.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index dba3e17558..675e18ed7e 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017, 2019, 2020 Pierre Langlois -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Michael Rohleder ;;; @@ -372,7 +372,7 @@ This package contains the binary.") (define-public mpg123 (package (name "mpg123") - (version "1.26.4") + (version "1.26.5") (source (origin (method url-fetch) @@ -382,7 +382,7 @@ This package contains the binary.") "https://www.mpg123.org/download/mpg123-" version ".tar.bz2"))) (sha256 - (base32 "0m34hjssgslcsns8lj1n7f32iyiw547qgba9j2r6d9pp1ma92688")))) + (base32 "01pgcqjbbi2r7nlg5118bkivl0gkv0hq0cw7v4vpxgimv7h9fajh")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-default-audio=pulse"))) (native-inputs -- cgit 1.4.1 From 1585452e1f4756421289e2784bc28395055e7670 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:04:54 +0100 Subject: gnu: wildmidi: Update to 0.4.4. * gnu/packages/audio.scm (wildmidi): Update to 0.4.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 a84d72bb59..73e8a79606 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -197,7 +197,7 @@ promoting the market for advanced audio.") (define-public wildmidi (package (name "wildmidi") - (version "0.4.3") + (version "0.4.4") (source (origin (method git-fetch) @@ -207,7 +207,7 @@ promoting the market for advanced audio.") (commit (string-append name "-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01f4a9c5xlap5a4pkfnlgkzk5pjlk43zkq6fnw615ghya04g6hrl")))) + (base32 "08fbbsvw6pkwwqarjwcvdp8mq4zn5sgahf025hynwc6rvf4sp167")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; No target -- cgit 1.4.1 From f119612d6457f61ad8017a22f300d3cd55f13710 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:05:39 +0100 Subject: gnu: cgal: Update to 5.2.1. * gnu/packages/graphics.scm (cgal): Update to 5.2.1. [source]: Remove patch. * gnu/packages/patches/cgal-security-pr-5371.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/graphics.scm | 6 +- gnu/packages/patches/cgal-security-pr-5371.patch | 1611 ---------------------- 3 files changed, 2 insertions(+), 1616 deletions(-) delete mode 100644 gnu/packages/patches/cgal-security-pr-5371.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3d4147a879..5c5555069e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,7 +887,6 @@ dist_patch_DATA = \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ - %D%/packages/patches/cgal-security-pr-5371.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index db04b93f20..4a301d387a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -718,7 +718,7 @@ more.") (define-public cgal (package (name "cgal") - (version "5.2") + (version "5.2.1") (source (origin (method url-fetch) (uri (string-append @@ -726,9 +726,7 @@ more.") "/CGAL-" version ".tar.xz")) (sha256 (base32 - "08sr2k2dm4zasfbvisqpvs6djqw3rywzwpzr701an870nvnqck3l")) - (patches (search-patches "cgal-security-pr-5371.patch")) - (patch-flags '("-p2")))) + "1rhrpjsp4081nn2q215h78kc4msrj0081zg65k1gfp5hl88bg03y")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target diff --git a/gnu/packages/patches/cgal-security-pr-5371.patch b/gnu/packages/patches/cgal-security-pr-5371.patch deleted file mode 100644 index dea53dceaf..0000000000 --- a/gnu/packages/patches/cgal-security-pr-5371.patch +++ /dev/null @@ -1,1611 +0,0 @@ -From 618b409b0fbcef7cb536a4134ae3a424ef5aae45 Mon Sep 17 00:00:00 2001 -From: Maxime Gimeno -Date: Mon, 18 Jan 2021 15:40:40 +0100 -Subject: [PATCH 1/8] Fix Nef_2 and Nef_S2 IO - ---- - Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 74 ++++++++++++--- - Nef_2/include/CGAL/Nef_polyhedron_2.h | 2 + - Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 106 ++++++++++++++++------ - 3 files changed, 142 insertions(+), 40 deletions(-) - -diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -index 85295f3d85a..9b84dd37fbe 100644 ---- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -+++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -@@ -200,6 +200,11 @@ bool PM_io_parser::read_vertex(Vertex_handle v) - !(in >> p) || - !check_sep("}") ) return false; - -+ if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - if (iso) v->set_face(Face_of[f]); - else v->set_halfedge(Halfedge_of[f]); - mark(v) = m; point(v) = p; -@@ -229,10 +234,14 @@ bool PM_io_parser::read_hedge(Halfedge_handle e) - !(in >> f) || !check_sep(",") || - !(in >> m) || !check_sep("}") ) - return false; -- CGAL_assertion_msg -- (eo >= 0 || (std::size_t) eo < en || epr >= 0 || (std::size_t) epr < en || ene >= 0 || (std::size_t) ene < en || -- v >= 0 || (std::size_t) v < vn || f >= 0 || (std::size_t) f < fn , -- "wrong index in read_hedge"); -+ -+ if(!(eo >= 0 && (std::size_t) eo < en && epr >= 0 && (std::size_t) epr < en && ene >= 0 && (std::size_t) ene < en && -+ v >= 0 && (std::size_t) v < vn && f >= 0 && (std::size_t) f < fn )) -+ { -+ in.clear(std::ios_base::badbit); -+ std::cerr<<"wrong index in read_hedge"<opposite()]); -@@ -267,14 +276,32 @@ bool PM_io_parser::read_face(Face_handle f) - int n, ei, vi; Mark m; - if ( !(in >> n) || !check_sep("{") ) return false; - if ( !(in >> ei) || !check_sep(",") ) return false; -- if (ei >= 0) f->set_halfedge(Halfedge_of[ei]); -+ if (ei >= 0 && ei < en) -+ { -+ f->set_halfedge(Halfedge_of[ei]); -+ } -+ else -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - while (in >> ei) { - CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); -+ if (!(ei >= 0 && ei < en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - f->store_fc(Halfedge_of[ei]); - } in.clear(); - if (!check_sep(",")) { return false; } - while (in >> vi) { - CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); -+ if (!(vi >= 0 && vi < vn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - f->store_iv(Vertex_of[vi]); - } in.clear(); - if (!check_sep(",") || !(in >> m) || !check_sep("}") ) -@@ -313,13 +340,26 @@ template - void PM_io_parser::read() - { - if ( !check_sep("Plane_map_2") ) -- CGAL_error_msg("PM_io_parser::read: no embedded_PM header."); -+ { -+ std::cerr<<"PM_io_parser::read: no embedded_PM header."<> vn)) ) -- CGAL_error_msg("PM_io_parser::read: wrong node line."); -+ { -+ std::cerr<<"PM_io_parser::read: wrong node line."<> en) && (en%2==0)) ) -- CGAL_error_msg("PM_io_parser::read: wrong edge line."); -+ { -+ std::cerr<<"PM_io_parser::read: wrong edge line."<> fn)) ) -- CGAL_error_msg("PM_io_parser::read: wrong face line."); -+ { -+ std::cerr<<"PM_io_parser::read: wrong face line."<::read() - - for(i=0; i> - std::cerr << "Nef_polyhedron_2 input corrupted." << std::endl; - NP = Nef_polyhedron_2(); - } -+ if(!is) -+ return is; - typename Nef_polyhedron_2::Topological_explorer D(NP.explorer()); - D.check_integrity_and_topological_planarity(); - return is; -diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -index 7bddd3036d5..631c63dc5dc 100644 ---- a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -+++ b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -@@ -203,8 +203,14 @@ bool SM_io_parser::read_vertex(SVertex_handle v) - !(in >> p) || - !check_sep("}") ) return false; - -- if (iso) set_face(v,SFace_of[f]); -- else set_first_out_edge(v,Edge_of[f]); -+ if(f<0 || (iso && f > fn) || (!iso && f > en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } -+ -+ if (iso) this->set_face(v,SFace_of[f]); -+ else this->set_first_out_edge(v,Edge_of[f]); - v->mark() = m; v->point() = p; - return true; - } -@@ -235,17 +241,21 @@ bool SM_io_parser::read_edge(SHalfedge_handle e) - !(in >> m) || !check_sep(",") || - !(in >> k) || !check_sep("}") ) - return false; -- CGAL_assertion_msg -+ if (! - (eo >= 0 && eo < en && epr >= 0 && epr < en && ene >= 0 && ene < en && -- v >= 0 && v < vn && f >= 0 && f < fn , -- "wrong index in read_edge"); -+ v >= 0 && v < vn && f >= 0 && f < fn )) -+ { -+ std::cerr<<"wrong index in read_edge"<twin()]); -- set_prev(e,Edge_of[epr]); -- set_next(e,Edge_of[ene]); -- set_source(e,SVertex_of[v]); -- set_face(e,SFace_of[f]); -+ this->set_prev(e,Edge_of[epr]); -+ this->set_next(e,Edge_of[ene]); -+ this->set_source(e,SVertex_of[v]); -+ this->set_face(e,SFace_of[f]); - e->mark() = m; - e->circle() = k; - return true; -@@ -274,7 +284,7 @@ bool SM_io_parser::read_loop(SHalfloop_handle l) - CGAL_assertion_msg( - (lo >= 0 && lo < 2 && f >= 0 && f < fn),"wrong index in read_edge"); - -- set_face(l,SFace_of[f]); -+ this->set_face(l,SFace_of[f]); - l->mark() = m; - l->circle() = k; - return true; -@@ -303,21 +313,33 @@ bool SM_io_parser::read_face(SFace_handle f) - int n, ei, vi, li; Mark m; - if ( !(in >> n) || !check_sep("{") ) return false; - while (in >> ei) { -- CGAL_assertion_msg(ei >= 0 && ei < en, -- "wrong index in face cycle list."); -- store_sm_boundary_object(Edge_of[ei],f); -+ if(!(ei >= 0 && ei < en)) -+ { -+ std::cerr<<"wrong index in face cycle list."<store_sm_boundary_object(Edge_of[ei],f); - } in.clear(); - if (!check_sep(",")) { return false; } - while (in >> vi) { -- CGAL_assertion_msg(vi >= 0 && vi < vn, -- "wrong index in iso vertex list."); -- store_sm_boundary_object(SVertex_of[vi],f); -+ if(!(vi >= 0 && vi < vn)) -+ { -+ std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(SVertex_of[vi],f); - } in.clear(); - if (!check_sep(",")) { return false; } - while (in >> li) { -- CGAL_assertion_msg(li >= 0 && li < 2, -- "wrong index in iso vertex list."); -- store_sm_boundary_object(Loop_of[li],f); -+ if(!(li >= 0 && li < 2)) -+ { -+ std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(Loop_of[li],f); - } in.clear(); - if (!check_sep(",") || !(in >> m) || !check_sep("}") ) - return false; -@@ -357,16 +379,36 @@ void SM_io_parser::print() const - template - void SM_io_parser::read() - { -+ if ( !check_sep("Nef_polyhedron_S2") ) -+ { -+ std::cerr<<"Missing line in header"<> vn)) ) -- CGAL_error_msg("SM_io_parser::read: wrong vertex line."); -+ { -+ std::cerr<<"SM_io_parser::read: wrong vertex line."<> en) && (en%2==0)) ) -- CGAL_error_msg("SM_io_parser::read: wrong edge line."); -+ { -+ std::cerr<<"SM_io_parser::read: wrong edge line."<> ln)) ) -- CGAL_error_msg("SM_io_parser::read: wrong loop line."); -+ { -+ std::cerr<<"SM_io_parser::read: wrong loop line."<> fn)) ) -- CGAL_error_msg("SM_io_parser::read: wrong face line."); -+ { -+ std::cerr<<"SM_io_parser::read: wrong face line."<::read() - - for(i=0; i -Date: Tue, 19 Jan 2021 12:24:08 +0100 -Subject: [PATCH 2/8] Fix Nef_3 - ---- - Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 195 ++++++++++++++++++++++- - 1 file changed, 188 insertions(+), 7 deletions(-) - -diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -index 5eee7528ee7..04d9d0ac8e8 100644 ---- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -+++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -@@ -1444,40 +1444,61 @@ void SNC_io_parser::read_items(int plus01) { - typename std::vector::iterator vi; - for(vi=Vertex_of.begin(); vi!=Vertex_of.end(); ++vi) { - if (!read_vertex(*vi)) -- CGAL_error_msg("SNC_io_parser::read: error in node line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in node line"<::iterator ei; - for(ei=Edge_of.begin(); ei!=Edge_of.end(); ++ei) { - if (!read_edge(*ei)) -- CGAL_error_msg("SNC_io_parser::read: error in edge line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in edge line"<::iterator vhf_iterator; - vhf_iterator fi; - for(fi=Halffacet_of.begin(); fi!=Halffacet_of.end(); ++fi) { - if (!read_facet(*fi)) -- CGAL_error_msg("SNC_io_parser::read: error in facet line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in facet line"<::iterator ci; - for(ci=Volume_of.begin()+plus01; ci!=Volume_of.end(); ++ci) { - if (!read_volume(*ci)) -- CGAL_error_msg("SNC_io_parser::read: error in volume line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in volume line"<::iterator sei; - for(sei=SEdge_of.begin(); sei!=SEdge_of.end(); ++sei) { - if (!read_sedge(*sei)) -- CGAL_error_msg("SNC_io_parser::read: error in sedge line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in sedge line"<::iterator sli; - for(sli=SLoop_of.begin(); sli!=SLoop_of.end(); ++sli) { - if (!read_sloop(*sli)) -- CGAL_error_msg("SNC_io_parser::read: error in sloop line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in sloop line"<::iterator sfi; - for(sfi=SFace_of.begin(); sfi!=SFace_of.end(); ++sfi) { - if (!read_sface(*sfi)) -- CGAL_error_msg("SNC_io_parser::read: error in sface line"); -+ { -+ std::cerr<<"SNC_io_parser::read: error in sface line"<sncp()); -@@ -1535,21 +1556,56 @@ read_vertex(Vertex_handle vh) { - vh->sncp() = this->sncp(); - - in >> index; -+ if(index >= int(en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->svertices_begin() = (index >= 0 ? Edge_of[index] : this->svertices_end()); - in >> index; -+ if(index >= int(en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->svertices_last() = index >= 0 ? Edge_of[index] : this->svertices_end(); - OK = OK && test_string(","); - in >> index; -+ if(index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->shalfedges_begin() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); - in >> index; -+ if(index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->shalfedges_last() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); - OK = OK && test_string(","); - in >> index; -+ if(index >= int(sfn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->sfaces_begin() = index >= 0 ? SFace_of[index] : this->sfaces_end(); - in >> index; -+ if(index >= int(sfn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->sfaces_last() = index >= 0 ? SFace_of[index] : this->sfaces_end(); - OK = OK && test_string(","); - in >> index; -+ if(index >= int(sln)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - vh->shalfloop() = index >= 0 ? SLoop_of[index] : this->shalfloops_end(); - OK = OK && test_string("|"); - #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT -@@ -1604,17 +1660,37 @@ read_edge(Halfedge_handle eh) { - OK = OK && test_string("{"); - - in >> index; -+ if(index < 0 || index >= int(en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - eh->twin() = Edge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(vn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - eh->center_vertex() = Vertex_of[index]; - OK = OK && test_string(","); - in >> index; - if(index == 0) { - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - eh->out_sedge() = SEdge_of[index]; - } else { - in >> index; -+ if(index < 0 || index >= int(sfn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - eh->incident_sface() = SFace_of[index]; - } - OK = OK && test_string("|"); -@@ -1669,6 +1745,11 @@ read_facet(Halffacet_handle fh) { - OK = OK && test_string("{"); - - in >> index; -+ if(index < 0 || index >= int(fn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - fh->twin() = Halffacet_of[index]; - OK = OK && test_string(","); - -@@ -1676,6 +1757,11 @@ read_facet(Halffacet_handle fh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - fh->boundary_entry_objects().push_back(make_object(SEdge_of[index])); - in >> cc; - } -@@ -1684,11 +1770,21 @@ read_facet(Halffacet_handle fh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -+ if(index < 0 || index >= int(sln)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - fh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); - in >> cc; - } - - in >> index; -+ if(index < 0 || index >= int(vn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - fh->incident_volume() = Volume_of[index+addInfiBox]; - OK = OK && test_string("|"); - #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT -@@ -1731,6 +1827,11 @@ read_volume(Volume_handle ch) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -+ if(index < 0 || index >= int(sfn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - ch->shell_entry_objects().push_back(make_object(SFace_of[index])); - in >> cc; - } -@@ -1781,27 +1882,67 @@ read_sedge(SHalfedge_handle seh) { - OK = OK && test_string("{"); - - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->twin() = SEdge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->sprev() = SEdge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->snext() = SEdge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(en)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->source() = Edge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(sfn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->incident_sface() = SFace_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->prev() = SEdge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(sen)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->next() = SEdge_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= int(fn)) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - seh->facet() = Halffacet_of[index]; - OK = OK && test_string("|"); - #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT -@@ -1852,12 +1993,27 @@ read_sloop(SHalfloop_handle slh) { - OK = OK && test_string("{"); - - in >> index; -+ if(index < 0 || index >= sln) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - slh->twin() = SLoop_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= sfn) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - slh->incident_sface() = SFace_of[index]; - OK = OK && test_string(","); - in >> index; -+ if(index < 0 || index >= fn) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - slh->facet() = Halffacet_of[index]; - OK = OK && test_string("|"); - #ifdef CGAL_NEF_NATURAL_COORDINATE_INPUT -@@ -1904,6 +2060,11 @@ read_sface(SFace_handle sfh) { - OK = OK && test_string("{"); - - in >> index; -+ if(index < 0 || index >= vn) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - sfh->center_vertex() = Vertex_of[index]; - OK = OK && test_string(","); - -@@ -1913,6 +2074,11 @@ read_sface(SFace_handle sfh) { - in >> index; - // sfh->boundary_entry_objects().push_back(SEdge_of[index]); - SM_decorator SD(&*sfh->center_vertex()); -+ if(index < 0 || index >= sen) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - SD.link_as_face_cycle(SEdge_of[index],sfh); - in >> cc; - } -@@ -1921,6 +2087,11 @@ read_sface(SFace_handle sfh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -+ if(index < 0 || index >= en) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - sfh->boundary_entry_objects().push_back(make_object(Edge_of[index])); - this->sncp()->store_sm_boundary_item(Edge_of[index], --(sfh->sface_cycles_end())); - in >> cc; -@@ -1930,12 +2101,22 @@ read_sface(SFace_handle sfh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -+ if(index < 0 || index >= sln) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - sfh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); - this->sncp()->store_sm_boundary_item(SLoop_of[index], --(sfh->sface_cycles_end())); - in >> cc; - } - - in >> index; -+ if(index < 0 || index >= vn) -+ { -+ in.clear(std::ios_base::badbit); -+ return false; -+ } - sfh->volume() = Volume_of[index+addInfiBox]; - OK = OK && test_string("}"); - in >> sfh->mark(); - -From 9e291e6bbfe23137fb2dd3a0f8d6461229ca2376 Mon Sep 17 00:00:00 2001 -From: Maxime Gimeno -Date: Tue, 19 Jan 2021 14:04:54 +0100 -Subject: [PATCH 3/8] replace cerr by CGAL_warning_msg - ---- - Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 14 +++--- - Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 53 ++++++++++++++++------- - Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 18 ++++---- - 3 files changed, 54 insertions(+), 31 deletions(-) - -diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -index 9b84dd37fbe..52bc830e115 100644 ---- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -+++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -@@ -341,23 +341,23 @@ void PM_io_parser::read() - { - if ( !check_sep("Plane_map_2") ) - { -- std::cerr<<"PM_io_parser::read: no embedded_PM header."<> vn)) ) - { -- std::cerr<<"PM_io_parser::read: wrong node line."<> en) && (en%2==0)) ) - { -- std::cerr<<"PM_io_parser::read: wrong edge line."<> fn)) ) - { -- std::cerr<<"PM_io_parser::read: wrong face line."<::read() - for(i=0; i - void SNC_io_parser::read() - { - if ( !check_sep("Selective Nef Complex") ) -- CGAL_error_msg("SNC_io_parser::read: no SNC header."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: no SNC header."); -+ returnl -+ } - std::string kernel_type; - in >> kernel_type; - CGAL_assertion(kernel_type == "standard" || kernel_type == "extended"); - if ( !(check_sep("vertices") && (in >> vn)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong vertex line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong vertex line."); -+ return; -+ } - if ( !(check_sep("halfedges") && (in >> en) && (en%2==0)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong edge line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong edge line."); -+ return; -+ } - if ( !(check_sep("facets") && (in >> fn) && (fn%2==0)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong facet line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong facet line."); -+ } - if ( !(check_sep("volumes") && (in >> cn)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong volume line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong volume line."); -+ return; -+ } - if ( !(check_sep("shalfedges") && (in >> sen)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong sedge line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sedge line."); -+ return; -+ } - if ( !(check_sep("shalfloops") && (in >> sln)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong sloop line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sloop line."); -+ return; -+ } - if ( !(check_sep("sfaces") && (in >> sfn)) ) -- CGAL_error_msg("SNC_io_parser::read: wrong sface line."); -+ { -+ CGAL_warning_msg(false, "SNC_io_parser::read: wrong sface line."); -+ return; -+ } - - addInfiBox = (kernel_type == "standard" && Infi_box::extended_kernel()); - -@@ -1445,7 +1468,7 @@ void SNC_io_parser::read_items(int plus01) { - for(vi=Vertex_of.begin(); vi!=Vertex_of.end(); ++vi) { - if (!read_vertex(*vi)) - { -- std::cerr<<"SNC_io_parser::read: error in node line"<::read_items(int plus01) { - for(ei=Edge_of.begin(); ei!=Edge_of.end(); ++ei) { - if (!read_edge(*ei)) - { -- std::cerr<<"SNC_io_parser::read: error in edge line"<::read_items(int plus01) { - for(fi=Halffacet_of.begin(); fi!=Halffacet_of.end(); ++fi) { - if (!read_facet(*fi)) - { -- std::cerr<<"SNC_io_parser::read: error in facet line"<::read_items(int plus01) { - for(ci=Volume_of.begin()+plus01; ci!=Volume_of.end(); ++ci) { - if (!read_volume(*ci)) - { -- std::cerr<<"SNC_io_parser::read: error in volume line"<::read_items(int plus01) { - for(sei=SEdge_of.begin(); sei!=SEdge_of.end(); ++sei) { - if (!read_sedge(*sei)) - { -- std::cerr<<"SNC_io_parser::read: error in sedge line"<::read_items(int plus01) { - for(sli=SLoop_of.begin(); sli!=SLoop_of.end(); ++sli) { - if (!read_sloop(*sli)) - { -- std::cerr<<"SNC_io_parser::read: error in sloop line"<::read_items(int plus01) { - for(sfi=SFace_of.begin(); sfi!=SFace_of.end(); ++sfi) { - if (!read_sface(*sfi)) - { -- std::cerr<<"SNC_io_parser::read: error in sface line"<::read() - { - if ( !check_sep("Nef_polyhedron_S2") ) - { -- std::cerr<<"Missing line in header"<> vn)) ) - { -- std::cerr<<"SM_io_parser::read: wrong vertex line."<> en) && (en%2==0)) ) - { -- std::cerr<<"SM_io_parser::read: wrong edge line."<> ln)) ) - { -- std::cerr<<"SM_io_parser::read: wrong loop line."<> fn)) ) - { -- std::cerr<<"SM_io_parser::read: wrong face line."<::read() - for(i=0; i::read() - for(i=0; i -Date: Wed, 20 Jan 2021 08:38:33 +0100 -Subject: [PATCH 4/8] Fix typo and use setstate - ---- - Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 10 ++-- - Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 66 +++++++++++------------ - Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h | 10 ++-- - 3 files changed, 43 insertions(+), 43 deletions(-) - -diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -index 52bc830e115..64a3e94916e 100644 ---- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -+++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -@@ -202,7 +202,7 @@ bool PM_io_parser::read_vertex(Vertex_handle v) - - if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - if (iso) v->set_face(Face_of[f]); -@@ -238,7 +238,7 @@ bool PM_io_parser::read_hedge(Halfedge_handle e) - if(!(eo >= 0 && (std::size_t) eo < en && epr >= 0 && (std::size_t) epr < en && ene >= 0 && (std::size_t) ene < en && - v >= 0 && (std::size_t) v < vn && f >= 0 && (std::size_t) f < fn )) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - std::cerr<<"wrong index in read_hedge"<::read_face(Face_handle f) - } - else - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - while (in >> ei) { - CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); - if (!(ei >= 0 && ei < en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - f->store_fc(Halfedge_of[ei]); -@@ -299,7 +299,7 @@ bool PM_io_parser::read_face(Face_handle f) - CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); - if (!(vi >= 0 && vi < vn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - f->store_iv(Vertex_of[vi]); -diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -index 21c54dd4133..e5530445153 100644 ---- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -+++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -@@ -1402,7 +1402,7 @@ void SNC_io_parser::read() - if ( !check_sep("Selective Nef Complex") ) - { - CGAL_warning_msg(false, "SNC_io_parser::read: no SNC header."); -- returnl -+ return; - } - std::string kernel_type; - in >> kernel_type; -@@ -1581,14 +1581,14 @@ read_vertex(Vertex_handle vh) { - in >> index; - if(index >= int(en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->svertices_begin() = (index >= 0 ? Edge_of[index] : this->svertices_end()); - in >> index; - if(index >= int(en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->svertices_last() = index >= 0 ? Edge_of[index] : this->svertices_end(); -@@ -1596,14 +1596,14 @@ read_vertex(Vertex_handle vh) { - in >> index; - if(index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->shalfedges_begin() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); - in >> index; - if(index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->shalfedges_last() = index >= 0 ? SEdge_of[index] : this->shalfedges_end(); -@@ -1611,14 +1611,14 @@ read_vertex(Vertex_handle vh) { - in >> index; - if(index >= int(sfn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->sfaces_begin() = index >= 0 ? SFace_of[index] : this->sfaces_end(); - in >> index; - if(index >= int(sfn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->sfaces_last() = index >= 0 ? SFace_of[index] : this->sfaces_end(); -@@ -1626,7 +1626,7 @@ read_vertex(Vertex_handle vh) { - in >> index; - if(index >= int(sln)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - vh->shalfloop() = index >= 0 ? SLoop_of[index] : this->shalfloops_end(); -@@ -1685,7 +1685,7 @@ read_edge(Halfedge_handle eh) { - in >> index; - if(index < 0 || index >= int(en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - eh->twin() = Edge_of[index]; -@@ -1693,7 +1693,7 @@ read_edge(Halfedge_handle eh) { - in >> index; - if(index < 0 || index >= int(vn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - eh->center_vertex() = Vertex_of[index]; -@@ -1703,7 +1703,7 @@ read_edge(Halfedge_handle eh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - eh->out_sedge() = SEdge_of[index]; -@@ -1711,7 +1711,7 @@ read_edge(Halfedge_handle eh) { - in >> index; - if(index < 0 || index >= int(sfn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - eh->incident_sface() = SFace_of[index]; -@@ -1770,7 +1770,7 @@ read_facet(Halffacet_handle fh) { - in >> index; - if(index < 0 || index >= int(fn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - fh->twin() = Halffacet_of[index]; -@@ -1782,7 +1782,7 @@ read_facet(Halffacet_handle fh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - fh->boundary_entry_objects().push_back(make_object(SEdge_of[index])); -@@ -1795,7 +1795,7 @@ read_facet(Halffacet_handle fh) { - in >> index; - if(index < 0 || index >= int(sln)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - fh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); -@@ -1805,7 +1805,7 @@ read_facet(Halffacet_handle fh) { - in >> index; - if(index < 0 || index >= int(vn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - fh->incident_volume() = Volume_of[index+addInfiBox]; -@@ -1852,7 +1852,7 @@ read_volume(Volume_handle ch) { - in >> index; - if(index < 0 || index >= int(sfn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - ch->shell_entry_objects().push_back(make_object(SFace_of[index])); -@@ -1907,7 +1907,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->twin() = SEdge_of[index]; -@@ -1915,7 +1915,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->sprev() = SEdge_of[index]; -@@ -1923,7 +1923,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->snext() = SEdge_of[index]; -@@ -1931,7 +1931,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->source() = Edge_of[index]; -@@ -1939,7 +1939,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sfn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->incident_sface() = SFace_of[index]; -@@ -1947,7 +1947,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->prev() = SEdge_of[index]; -@@ -1955,7 +1955,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(sen)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->next() = SEdge_of[index]; -@@ -1963,7 +1963,7 @@ read_sedge(SHalfedge_handle seh) { - in >> index; - if(index < 0 || index >= int(fn)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - seh->facet() = Halffacet_of[index]; -@@ -2018,7 +2018,7 @@ read_sloop(SHalfloop_handle slh) { - in >> index; - if(index < 0 || index >= sln) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - slh->twin() = SLoop_of[index]; -@@ -2026,7 +2026,7 @@ read_sloop(SHalfloop_handle slh) { - in >> index; - if(index < 0 || index >= sfn) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - slh->incident_sface() = SFace_of[index]; -@@ -2034,7 +2034,7 @@ read_sloop(SHalfloop_handle slh) { - in >> index; - if(index < 0 || index >= fn) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - slh->facet() = Halffacet_of[index]; -@@ -2085,7 +2085,7 @@ read_sface(SFace_handle sfh) { - in >> index; - if(index < 0 || index >= vn) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - sfh->center_vertex() = Vertex_of[index]; -@@ -2099,7 +2099,7 @@ read_sface(SFace_handle sfh) { - SM_decorator SD(&*sfh->center_vertex()); - if(index < 0 || index >= sen) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - SD.link_as_face_cycle(SEdge_of[index],sfh); -@@ -2112,7 +2112,7 @@ read_sface(SFace_handle sfh) { - in >> index; - if(index < 0 || index >= en) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - sfh->boundary_entry_objects().push_back(make_object(Edge_of[index])); -@@ -2126,7 +2126,7 @@ read_sface(SFace_handle sfh) { - in >> index; - if(index < 0 || index >= sln) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - sfh->boundary_entry_objects().push_back(make_object(SLoop_of[index])); -@@ -2137,7 +2137,7 @@ read_sface(SFace_handle sfh) { - in >> index; - if(index < 0 || index >= vn) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - sfh->volume() = Volume_of[index+addInfiBox]; -diff --git a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -index a9377719f93..d58126bac9c 100644 ---- a/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -+++ b/Nef_S2/include/CGAL/Nef_S2/SM_io_parser.h -@@ -205,7 +205,7 @@ bool SM_io_parser::read_vertex(SVertex_handle v) - - if(f<0 || (iso && f > fn) || (!iso && f > en)) - { -- in.clear(std::ios_base::badbit); -+ in.setstate(std::ios_base::badbit); - return false; - } - -@@ -246,7 +246,7 @@ bool SM_io_parser::read_edge(SHalfedge_handle e) - v >= 0 && v < vn && f >= 0 && f < fn )) - { - std::cerr<<"wrong index in read_edge"<::read_face(SFace_handle f) - if(!(ei >= 0 && ei < en)) - { - std::cerr<<"wrong index in face cycle list."<store_sm_boundary_object(Edge_of[ei],f); -@@ -326,7 +326,7 @@ bool SM_io_parser::read_face(SFace_handle f) - if(!(vi >= 0 && vi < vn)) - { - std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(SVertex_of[vi],f); -@@ -336,7 +336,7 @@ bool SM_io_parser::read_face(SFace_handle f) - if(!(li >= 0 && li < 2)) - { - std::cerr<<"wrong index in iso vertex list."<store_sm_boundary_object(Loop_of[li],f); - -From ffa019712b0ad3b20e3d02edad4d731fda04a2ef Mon Sep 17 00:00:00 2001 -From: Maxime Gimeno -Date: Mon, 25 Jan 2021 12:59:48 +0100 -Subject: [PATCH 5/8] First face may be -1, don't fail on it, just don't use it - ---- - Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -index 64a3e94916e..d08b08180d6 100644 ---- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -+++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -@@ -280,11 +280,7 @@ bool PM_io_parser::read_face(Face_handle f) - { - f->set_halfedge(Halfedge_of[ei]); - } -- else -- { -- in.setstate(std::ios_base::badbit); -- return false; -- } -+ - while (in >> ei) { - CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); - if (!(ei >= 0 && ei < en)) - -From d78842712cdfcbb3bdfc5f7cb252d3772fd6a16f Mon Sep 17 00:00:00 2001 -From: Maxime Gimeno -Date: Tue, 26 Jan 2021 09:55:20 +0100 -Subject: [PATCH 6/8] Fix conversion warnigns - ---- - Nef_2/include/CGAL/Nef_2/PM_io_parser.h | 8 ++++---- - Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 18 +++++++++--------- - 2 files changed, 13 insertions(+), 13 deletions(-) - -diff --git a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -index d08b08180d6..39b99b37d7c 100644 ---- a/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -+++ b/Nef_2/include/CGAL/Nef_2/PM_io_parser.h -@@ -200,7 +200,7 @@ bool PM_io_parser::read_vertex(Vertex_handle v) - !(in >> p) || - !check_sep("}") ) return false; - -- if(!(f >= 0 && ((iso && f < fn) || (!iso && f < en)))) -+ if(!(f >= 0 && ((iso && (std::size_t)f < fn) || (!iso && (std::size_t)f < en)))) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -276,14 +276,14 @@ bool PM_io_parser::read_face(Face_handle f) - int n, ei, vi; Mark m; - if ( !(in >> n) || !check_sep("{") ) return false; - if ( !(in >> ei) || !check_sep(",") ) return false; -- if (ei >= 0 && ei < en) -+ if (ei >= 0 && (std::size_t) ei < en) - { - f->set_halfedge(Halfedge_of[ei]); - } - - while (in >> ei) { - CGAL_assertion_msg(ei >= 0 && (std::size_t) ei < en, "wrong index in face cycle list."); -- if (!(ei >= 0 && ei < en)) -+ if (!(ei >= 0 && (std::size_t)ei < en)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -293,7 +293,7 @@ bool PM_io_parser::read_face(Face_handle f) - if (!check_sep(",")) { return false; } - while (in >> vi) { - CGAL_assertion_msg(vi >= 0 && (std::size_t) vi < vn, "wrong index in iso vertex list."); -- if (!(vi >= 0 && vi < vn)) -+ if (!(vi >= 0 && (std::size_t)vi < vn)) - { - in.setstate(std::ios_base::badbit); - return false; -diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -index e5530445153..1dde7f8d0b3 100644 ---- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -+++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -@@ -1579,7 +1579,7 @@ read_vertex(Vertex_handle vh) { - vh->sncp() = this->sncp(); - - in >> index; -- if(index >= int(en)) -+ if(index >= (int)en) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2016,7 +2016,7 @@ read_sloop(SHalfloop_handle slh) { - OK = OK && test_string("{"); - - in >> index; -- if(index < 0 || index >= sln) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2024,7 +2024,7 @@ read_sloop(SHalfloop_handle slh) { - slh->twin() = SLoop_of[index]; - OK = OK && test_string(","); - in >> index; -- if(index < 0 || index >= sfn) -+ if(index < 0 || index >= (int)(sfn)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2032,7 +2032,7 @@ read_sloop(SHalfloop_handle slh) { - slh->incident_sface() = SFace_of[index]; - OK = OK && test_string(","); - in >> index; -- if(index < 0 || index >= fn) -+ if(index < 0 || index >= (int)(fn)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2083,7 +2083,7 @@ read_sface(SFace_handle sfh) { - OK = OK && test_string("{"); - - in >> index; -- if(index < 0 || index >= vn) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2097,7 +2097,7 @@ read_sface(SFace_handle sfh) { - in >> index; - // sfh->boundary_entry_objects().push_back(SEdge_of[index]); - SM_decorator SD(&*sfh->center_vertex()); -- if(index < 0 || index >= sen) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2110,7 +2110,7 @@ read_sface(SFace_handle sfh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -- if(index < 0 || index >= en) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2124,7 +2124,7 @@ read_sface(SFace_handle sfh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -- if(index < 0 || index >= sln) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2135,7 +2135,7 @@ read_sface(SFace_handle sfh) { - } - - in >> index; -- if(index < 0 || index >= vn) -+ if(index < 0 || index >= (int)(sln)) - { - in.setstate(std::ios_base::badbit); - return false; - -From 23cc6b0f4a2ac6061b01d86411d58b6da7ff5a34 Mon Sep 17 00:00:00 2001 -From: Maxime Gimeno -Date: Wed, 27 Jan 2021 10:04:45 +0100 -Subject: [PATCH 7/8] Fix read_sface - ---- - .../Convex_decomposition_3/check_decomposition.cpp | 2 ++ - Nef_3/include/CGAL/Nef_3/SNC_io_parser.h | 10 +++++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -index 1dde7f8d0b3..a31a07c5d99 100644 ---- a/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -+++ b/Nef_3/include/CGAL/Nef_3/SNC_io_parser.h -@@ -1803,7 +1803,7 @@ read_facet(Halffacet_handle fh) { - } - - in >> index; -- if(index < 0 || index >= int(vn)) -+ if(index < 0 || index >= int(cn)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2083,7 +2083,7 @@ read_sface(SFace_handle sfh) { - OK = OK && test_string("{"); - - in >> index; -- if(index < 0 || index >= (int)(sln)) -+ if(index < 0 || index >= (int)(vn)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2097,7 +2097,7 @@ read_sface(SFace_handle sfh) { - in >> index; - // sfh->boundary_entry_objects().push_back(SEdge_of[index]); - SM_decorator SD(&*sfh->center_vertex()); -- if(index < 0 || index >= (int)(sln)) -+ if(index < 0 || index >= (int)(sen)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2110,7 +2110,7 @@ read_sface(SFace_handle sfh) { - while(isdigit(cc)) { - in.putback(cc); - in >> index; -- if(index < 0 || index >= (int)(sln)) -+ if(index < 0 || index >= (int)(en)) - { - in.setstate(std::ios_base::badbit); - return false; -@@ -2135,7 +2135,7 @@ read_sface(SFace_handle sfh) { - } - - in >> index; -- if(index < 0 || index >= (int)(sln)) -+ if(index < 0 || index >= (int)(cn)) - { - in.setstate(std::ios_base::badbit); - return false; - -- cgit 1.4.1 From dbcd90cba7d491454922ab0a705e44d91ea1cb72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:09:54 +0100 Subject: gnu: rpm: Update to 4.16.1.3. * gnu/packages/package-management.scm (rpm): Update to 4.16.1.3. --- 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 f45c2f65e3..888f54322d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -705,7 +705,7 @@ features of Stow with some extensions.") (define-public rpm (package (name "rpm") - (version "4.16.1.2") + (version "4.16.1.3") (source (origin (method url-fetch) (uri (string-append "http://ftp.rpm.org/releases/rpm-" @@ -713,7 +713,7 @@ features of Stow with some extensions.") version ".tar.bz2")) (sha256 (base32 - "1k6ank2aad7r503w12m6m494mxr6iccj52wqhwbc94pwxsf34mw3")))) + "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-external-db" ;use the system's bdb -- cgit 1.4.1 From 94963642a8ffaca36fca755d09c61946fb93a461 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:10:58 +0100 Subject: gnu: yggdrasil: Update to 0.3.16. * gnu/packages/networking.scm (yggdrasil): Update to 0.3.16. --- gnu/packages/networking.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 3f6023c966..ea3e3f67e7 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3943,7 +3943,7 @@ network.") (define-public yggdrasil (package (name "yggdrasil") - (version "0.3.15") + (version "0.3.16") (source (origin (method git-fetch) @@ -3954,8 +3954,7 @@ network.") (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 - "0gk7gy8yq5nrnblv4imxzzm2hac4ri0hlw19ajfbc1zll5kj32gf")) + (base32 "0vyd7a333hwn6j1lv1g9sicw74a4qk982bsi3cfdhjlv6hsjwmil")) (patches (search-patches "yggdrasil-extra-config.patch")))) (build-system go-build-system) (arguments -- cgit 1.4.1 From 6139c879a5743571ebe1b730a2744ad2e0fdb758 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 13:37:29 +0100 Subject: gnu: perl-moosex-getopt: Update to 0.75. * gnu/packages/perl.scm (perl-moosex-getopt): Update to 0.75. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 23c3d38f2f..7203481d74 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Raoul J.P. Bonnal ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2017 Adriano Peluso -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Allan Webber ;;; Copyright © 2018, 2019 Oleg Pykhalov @@ -6806,14 +6806,14 @@ private methods are not.") (define-public perl-moosex-getopt (package (name "perl-moosex-getopt") - (version "0.74") + (version "0.75") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "MooseX-Getopt-" version ".tar.gz")) (sha256 - (base32 "091crga5gjyhj2lz55w3ba37xq6pmjg5dx5xccsrzghy8cxxzq0x")))) + (base32 "1j7b2jnf0blxr4czp3vfcnv1h5zj601mrfdm92g1wf5wn9dvxwv3")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit 1.4.1 From 46cac065be7b457ea084633720eeb33c7d44222c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 14:12:29 +0100 Subject: gnu: efibootmgr: Update to 17. * gnu/packages/linux.scm (efibootmgr): Update to 17. [source]: Use GIT-FETCH and GIT-FILE-NAME. Add a patch to build against efivar@37. * gnu/packages/patches/efibootmgr-remove-extra-decl.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 20 ++++++++-------- .../patches/efibootmgr-remove-extra-decl.patch | 27 ++++++++++++++++++++++ 3 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/efibootmgr-remove-extra-decl.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5c5555069e..f8991ff78a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -955,6 +955,7 @@ dist_patch_DATA = \ %D%/packages/patches/ecl-16-format-directive-limit.patch \ %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ %D%/packages/patches/ecl-16-libffi.patch \ + %D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/eigen-remove-openmp-error-counting.patch \ %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ %D%/packages/patches/einstein-build.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0eaf014b5c..ac137f448d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6163,15 +6163,17 @@ interface to the variable facility of UEFI boot firmware.") (define-public efibootmgr (package (name "efibootmgr") - (version "16") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/rhinstaller/efibootmgr" - "/releases/download/" version "/efibootmgr" - "-" version ".tar.bz2")) - (sha256 - (base32 - "0pzn67vxxaf7jna4cd0i4kqm60h04kb21hckksv9z82q9gxra1wm")))) + (version "17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rhinstaller/efibootmgr") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1niicijxg59rsmiw3rsjwy4bvi1n42dynvm01lnp9haixdzdpq03")) + (patches (search-patches "efibootmgr-remove-extra-decl.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no tests diff --git a/gnu/packages/patches/efibootmgr-remove-extra-decl.patch b/gnu/packages/patches/efibootmgr-remove-extra-decl.patch new file mode 100644 index 0000000000..eb68108f88 --- /dev/null +++ b/gnu/packages/patches/efibootmgr-remove-extra-decl.patch @@ -0,0 +1,27 @@ +From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Wed, 13 Jun 2018 09:41:01 -0400 +Subject: [PATCH] remove extra decl + +Signed-off-by: Peter Jones +--- + src/efibootmgr.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/efibootmgr.c b/src/efibootmgr.c +index de38f01..4e1a680 100644 +--- a/src/efibootmgr.c ++++ b/src/efibootmgr.c +@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv) + "invalid numeric value %s\n", + optarg); + } +- /* XXX efivar-36 accidentally doesn't have a public +- * header for this */ +- extern int efi_set_verbose(int verbosity, FILE *errlog); + efi_set_verbose(opts.verbose - 2, stderr); + break; + case 'V': +-- +2.24.0 + -- cgit 1.4.1 From 5802858be335c945a80eb4d3528cc3cd55f2bbbe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 14:15:50 +0100 Subject: gnu: fcitx5-qt: Update to 5.0.5. * gnu/packages/fcitx5.scm (fcitx5-qt): Update to 5.0.5. --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index eea60dc1e0..cae8a74289 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -250,7 +250,7 @@ for GTK+2/GTK+3 application.") (define-public fcitx5-qt (package (name "fcitx5-qt") - (version "5.0.2") + (version "5.0.5") (source (origin (method url-fetch) @@ -258,7 +258,7 @@ for GTK+2/GTK+3 application.") "/fcitx5-qt/fcitx5-qt-" version ".tar.xz")) (sha256 - (base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj")))) + (base32 "0vsvrfv0b21pfrz5n0v6p458vfr8k7km50h9bhjp1bnssampjfsb")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From eee69da3a5c64cbb897e9e923769f12baf916d9e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 16:41:40 +0100 Subject: tests: Remove Cuirass tests. Those tests don't make sense anymore as the Cuirass 1.0 version has removed the possibility to execute a custom registration procedure. * gnu/tests/cuirass.scm: Remove it. * gnu/local.mk (GNU_SYSTEM_MODULES): Ditto. --- gnu/local.mk | 1 - gnu/tests/cuirass.scm | 299 -------------------------------------------------- 2 files changed, 300 deletions(-) delete mode 100644 gnu/tests/cuirass.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f8991ff78a..7891c58dfa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -687,7 +687,6 @@ GNU_SYSTEM_MODULES = \ %D%/tests.scm \ %D%/tests/audio.scm \ %D%/tests/base.scm \ - %D%/tests/cuirass.scm \ %D%/tests/cups.scm \ %D%/tests/databases.scm \ %D%/tests/desktop.scm \ diff --git a/gnu/tests/cuirass.scm b/gnu/tests/cuirass.scm deleted file mode 100644 index ea5db34515..0000000000 --- a/gnu/tests/cuirass.scm +++ /dev/null @@ -1,299 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2020, 2021 Mathieu Othacehe -;;; -;;; 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 cuirass) - #:use-module (gnu tests) - #:use-module (gnu system) - #:use-module (gnu system vm) - #:use-module (gnu system install) - #:use-module (gnu packages databases) - #:use-module (gnu packages guile) - #:use-module (gnu packages version-control) - #:use-module (gnu services) - #:use-module (gnu services avahi) - #:use-module (gnu services base) - #:use-module (gnu services cuirass) - #:use-module (gnu services databases) - #:use-module (gnu services networking) - #:use-module (gnu system nss) - #:use-module (guix channels) - #:use-module (guix gexp) - #:use-module (guix store) - #:export (%cuirass-test - %cuirass-remote-test)) - -(define %derivation-file - (scheme-file - "derivation.scm" - '(begin - (use-modules (guix) - (srfi srfi-1) - (ice-9 match)) - - (define (derivation->alist store drv) - `((#:derivation . ,(derivation-file-name drv)) - (#:log . ,(log-file store (derivation-file-name drv))) - (#:outputs . ,(filter-map (lambda (res) - (match res - ((name . path) - `(,name . ,path)))) - (derivation->output-paths drv))) - (#:nix-name . ,(derivation-name drv)) - (#:system . ,(derivation-system drv)) - (#:max-silent-time . 3600) - (#:timeout . 3600))) - - (define (cuirass-jobs store arguments) - (let* ((file (plain-file "test" "this is a test derivation")) - (job-name "test-job") - (drv (run-with-store store - (gexp->derivation - job-name - #~(begin - (mkdir #$output) - (symlink #$file - (string-append #$output "/file"))))))) - (list (lambda () - `((#:job-name . ,job-name) - ,@(derivation->alist store drv))))))))) - -(define git-service - ;; Create a Git repository to host Cuirass' specification. - (simple-service - 'create-git-directory activation-service-type - #~(begin - (let* ((git (string-append #$git "/bin/git")) - (main "/tmp/cuirass-main") - (file (string-append main "/build-aux/cuirass/gnu-system.scm"))) - (mkdir-p (dirname file)) - (with-directory-excursion main - (copy-file #$%derivation-file file) - (invoke git "config" "--global" "user.email" - "charlie@example.org") - (invoke git "config" "--global" "user.name" "A U Thor") - (invoke git "init") - (invoke git "add" ".") - (invoke git "commit" "-m" "That's a commit.")))))) - -(define cow-service - ;; The Guix-daemon & Cuirass will complain if the store is - ;; read-only. Create a store overlay to solve this issue. - (simple-service - 'mount-cow-store activation-service-type - #~(begin - (use-modules (guix build syscalls) - (guix build utils)) - (mkdir-p "/rw-store") - (mount "none" "/rw-store" "tmpfs") - - (mkdir-p "/rw-store/upper") - (mkdir-p "/rw-store/work") - (mount "none" "/gnu/store" "overlay" 0 - "lowerdir=/gnu/store,upperdir=/rw-store/upper,workdir=/rw-store/work")))) - -(define %cuirass-specs - #~(list - '((#:name . "test") - (#:load-path-inputs . ()) - (#:package-path-inputs . ()) - (#:proc-input . "main") - (#:proc-file . "build-aux/cuirass/gnu-system.scm") - (#:proc . cuirass-jobs) - (#:proc-args . ()) - (#:inputs . (((#:name . "main") - (#:url . "file:///tmp/cuirass-main/") - (#:load-path . ".") - (#:branch . "master") - (#:no-compile? . #t)))) - (#:build-outputs . ()) - (#:priority . 1)))) - -(define* (cuirass-services #:key remote-build?) - (list - (service cuirass-service-type - (cuirass-configuration - (specifications %cuirass-specs) - (remote-server (and remote-build? - (cuirass-remote-server-configuration))) - (host "0.0.0.0") - (use-substitutes? #t))))) - -(define (run-cuirass-test name os) - (define os* - (let ((modules '((gnu services herd) - (guix combinators) - (guix build syscalls) - (guix build utils)))) - (marionette-operating-system - os - #:imported-modules modules))) - - (define cuirass-web-port 8081) - (define forward-port 5000) - - (define vm - (virtual-machine - (operating-system os*) - (memory-size 1024) - (port-forwardings `((,forward-port . ,cuirass-web-port))))) - - (define test - (with-extensions (list guile-json-4) - (with-imported-modules '((gnu build marionette)) - #~(begin - (use-modules (srfi srfi-11) (srfi srfi-64) - (gnu build marionette) - (ice-9 match) - (ice-9 rdelim) - (json) - (rnrs bytevectors) - (web client) (web response)) - - (define marionette - (make-marionette (list #$vm))) - - (define (query path) - (http-get - (format #f "http://localhost:~a~a" - #$(number->string forward-port) - path))) - - (define* (retry f #:key times delay) - (let loop ((attempt 1)) - (let ((result (f))) - (cond - (result result) - (else - (if (>= attempt times) - #f - (begin - (sleep delay) - (loop (+ 1 attempt))))))))) - - (mkdir #$output) - (chdir #$output) - - (test-begin "cuirass") - - ;; XXX: Shepherd reads the config file *before* binding its - ;; control socket, so /var/run/shepherd/socket might not exist yet - ;; when the 'marionette' service is started. - (test-assert "shepherd socket ready" - (marionette-eval - `(begin - (use-modules (gnu services herd)) - (let loop ((i 10)) - (cond ((file-exists? (%shepherd-socket-file)) - #t) - ((> i 0) - (sleep 1) - (loop (- i 1))) - (else - 'failure)))) - marionette)) - - ;; Wait for cuirass to be up and running. - (test-assert "cuirass running" - (marionette-eval - '(begin - (use-modules (gnu services herd)) - (start-service 'cuirass) - #t) - marionette)) - - (test-assert "cuirass-web running" - (begin - (wait-for-tcp-port #$cuirass-web-port marionette) - (retry - (lambda () - (let-values (((response text) - (query "/"))) - (eq? (response-code response) 200))) - #:times 5 - #:delay 5))) - - (test-assert "cuirass-web evaluation" - (begin - (retry - (lambda () - (let-values (((response text) - (query "/api/evaluation?id=1"))) - (let ((result - (false-if-exception - (json-string->scm - (utf8->string text))))) - (eq? (and result - (assoc-ref result "id")) - 1)))) - #:times 5 - #:delay 5))) - - ;; Even though there's a store overlay, the Guix database is not - ;; initialized, meaning that we won't be able to perform the - ;; build. Check at least that it is queued. - (test-assert "cuirass-web build queued" - (begin - (retry - (lambda () - (let-values (((response text) - (query "/api/queue?nr=1"))) - (let ((result - (json-string->scm - (utf8->string text)))) - (match (vector->list result) - ((build) - (string=? (assoc-ref build "job") "test-job")) - (else #f))))) - #:times 5 - #:delay 10))) - - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0)))))) - - (gexp->derivation name test)) - -(define %cuirass-test - (let ((os (operating-system - (inherit %simple-os) - (services - (append (list cow-service - (service dhcp-client-service-type) - git-service) - (cuirass-services) - (operating-system-user-services %simple-os)))))) - (system-test - (name "cuirass") - (description "Connect to a Cuirass server.") - (value - (run-cuirass-test name os))))) - -(define %cuirass-remote-test - (let ((os (operating-system - (inherit %simple-os) - (name-service-switch %mdns-host-lookup-nss) - (services - (append (list (service avahi-service-type) - cow-service - (service dhcp-client-service-type) - git-service) - (cuirass-services #:remote-build? #t) - (operating-system-user-services %simple-os)))))) - (system-test - (name "cuirass-remote") - (description "Connect to a Cuirass server with remote build.") - (value (run-cuirass-test name os))))) -- cgit 1.4.1 From eda735fb6179aa4a80a2ef48bb418cfa2f7552ed Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 16:43:12 +0100 Subject: services: cuirass: Adapt to Cuirass 1.0. * gnu/services/cuirass.scm (cuirass-shepherd-service, cuirass-remote-worker-shepherd-service): Adapt to Cuirass 1.0. --- gnu/services/cuirass.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index 317d877459..d8d6e841a0 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -143,6 +143,7 @@ (requirement '(guix-daemon postgres postgres-roles networking)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") + "register" "--cache-directory" #$cache-directory "--specifications" #$(scheme-file "cuirass-specs.scm" specs) @@ -174,19 +175,15 @@ (requirement '(cuirass)) (start #~(make-forkexec-constructor (list (string-append #$cuirass "/bin/cuirass") - "--cache-directory" #$cache-directory + "web" "--database" #$database - "--web" - "--port" #$(number->string port) "--listen" #$host - "--interval" #$(number->string interval) + "--port" #$(number->string port) #$@(if parameters (list (string-append "--parameters=" parameters)) '()) - #$@(if use-substitutes? '("--use-substitutes") '()) - #$@(if fallback? '("--fallback") '()) #$@extra-options) #:user #$user @@ -203,7 +200,8 @@ (provision '(cuirass-remote-server)) (requirement '(avahi-daemon cuirass)) (start #~(make-forkexec-constructor - (list (string-append #$cuirass "/bin/remote-server") + (list (string-append #$cuirass "/bin/cuirass") + "remote-server" (string-append "--database=" #$database) (string-append "--cache=" #$cache) (string-append "--user=" #$user) @@ -347,7 +345,8 @@ CONFIG." (provision '(cuirass-remote-worker)) (requirement '(avahi-daemon guix-daemon networking)) (start #~(make-forkexec-constructor - (list (string-append #$cuirass "/bin/remote-worker") + (list (string-append #$cuirass "/bin/cuirass") + "remote-worker" (string-append "--workers=" #$(number->string workers)) #$@(if server -- cgit 1.4.1 From 2ee361c764b30e8d4a66f4fc459302ba8d918f0e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 23 Mar 2021 18:12:17 +0100 Subject: gnu: giac: Update to 1.7.0-1. * gnu/packages/algebra.scm (giac): Update to 1.7.0-1. --- 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 129d922751..64f7eda485 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -341,7 +341,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.6.0-47") + (version "1.7.0-1") (source (origin (method url-fetch) @@ -353,7 +353,7 @@ precision.") "~parisse/debian/dists/stable/main/source/" "giac_" version ".tar.gz")) (sha256 - (base32 "15sgsr8l6njp5spagbqclqkdy3x7ra23wi6wvpc8vzlbivy3v43k")))) + (base32 "0s926aza2larfz02hrhdlpxn77yjlrhjg844b3fhwz11yj942p9q")))) (build-system gnu-build-system) (arguments `(#:modules ((ice-9 ftw) -- cgit 1.4.1 From e5406632030a6b2f243e2986c0a7cb325468cfc3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Mar 2021 01:44:06 -0400 Subject: gnu: Borg: Adjust snippet for 1.1.16. This is a followup to commit 8cb7854d271cb379724b9c41949b4c972f50b6e1. * gnu/packages/backup.scm (borg)[source]: Update list of Cython-generated files to delete. --- gnu/packages/backup.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 35cd3cf7f3..c8382536b0 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -588,6 +588,8 @@ detection, and lossless compression.") ;; generate the wrong list. (for-each delete-file '("src/borg/algorithms/checksums.c" + "src/borg/algorithms/msgpack/_packer.cpp" + "src/borg/algorithms/msgpack/_unpacker.cpp" "src/borg/chunker.c" "src/borg/compress.c" "src/borg/crypto/low_level.c" -- cgit 1.4.1 From 8fae75a3584c19c9b2c705b49c600c23dccc8799 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 22 Mar 2021 01:29:40 -0300 Subject: gnu: Add libheif. * gnu/packages/image.scm (libheif): New variable. Signed-off-by: Leo Famulari --- gnu/packages/image.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 835060c041..d04a247976 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2164,6 +2164,42 @@ by AOM, including with alpha.") (license (list license:bsd-2 ; libavif itself license:expat)))) ; cJSON in the test suite +(define-public libheif + (package + (name "libheif") + (version "1.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/strukturag/libheif") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "036n63vlk4sk7y25q2kzyvvw4r5vv323ysbmbrcaprg9hdyjqgf5")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f)) ;no test target although there is a tests folder + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("dav1d" ,dav1d) + ("gdk-pixbuf" ,gdk-pixbuf) ;optional + ("libaom" ,libaom) + ("libde265" ,libde265) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("x265" ,x265))) + (home-page "https://github.com/strukturag/libheif") + (synopsis "HEIF and AVIF file format decoder and encoder") + (description + "@code{libheif} is an ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File +Format) file format decoder and encoder.") + (license license:lgpl3+))) + (define-public mtpaint (package (name "mtpaint") -- cgit 1.4.1 From feb68a26cc97e36a77f280830f775eb144c965ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 22 Mar 2021 06:48:34 -0400 Subject: gnu: icecat: Update to 78.9.0-guix0-preview1 [security fixes]. Includes fixes for CVE-2021-23981, CVE-2021-23982, CVE-2021-23984, and CVE-2021-23987. * gnu/packages/gnuzilla.scm (%icecat-version, %icecat-build-id): Update. (icecat-source): Update upstream source hash. --- gnu/packages/gnuzilla.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 425ed81f9a..826dbbd511 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -694,8 +694,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %icecat-version "78.8.0-guix0-preview1") -(define %icecat-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-version "78.9.0-guix0-preview1") +(define %icecat-build-id "20210323000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -717,7 +717,7 @@ from forcing GEXP-PROMISE." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "0451hhjrj9hb6limxim7sbhvw4gs6dd2gmnfxjjx07z3wbgdzwhw")))) + "0r28wrsk2k6pc922zfs5wljh8ziqm4a98lisn7409j2szhfsq0wf")))) (upstream-icecat-base-version "78.7.0") ; maybe older than base-version ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) -- cgit 1.4.1 From 3c9a353849c6efa6d738ef57d82eccdb063b0c6d Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 23 Mar 2021 20:30:24 +0100 Subject: services: cuirass: Set default port values. * gnu/services/cuirass.scm (, ): Set default port values. --- gnu/services/cuirass.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm index d8d6e841a0..9de36eb1c9 100644 --- a/gnu/services/cuirass.scm +++ b/gnu/services/cuirass.scm @@ -66,9 +66,11 @@ cuirass-remote-server-configuration make-cuirass-remote-server-configuration cuirass-remote-server-configuration? (backend-port cuirass-remote-server-configuration-backend-port ;int - (default #f)) + (default 5555)) + (log-port cuirass-remote-server-configuration-log-port ;int + (default 5556)) (publish-port cuirass-remote-server-configuration-publish-port ;int - (default #f)) + (default 5557)) (log-file cuirass-remote-server-log-file ;string (default "/var/log/cuirass-remote-server.log")) (cache cuirass-remote-server-configuration-cache ;string @@ -328,7 +330,7 @@ (log-file cuirass-remote-worker-log-file ;string (default "/var/log/cuirass-remote-worker.log")) (publish-port cuirass-remote-worker-configuration-publish-port ;int - (default #f)) + (default 5558)) (public-key cuirass-remote-worker-configuration-public-key ;string (default #f)) (private-key cuirass-remote-worker-configuration-private-key ;string -- cgit 1.4.1 From 1ef63d74d971b6e1cb3a83d2798821dd47f297ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:24:21 +0100 Subject: gnu: rust-beef: Update to 0.5.0. * gnu/packages/crates-io.scm (rust-beef-0.4): Rename to... (rust-beef-0.5): ...this. Update to 0.5.0. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 123a95a9f6..4dabc77c59 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3873,17 +3873,17 @@ c6e7d37. However, this package works only up to 128 bytes.") (description "This library provides for encoding and decoding any base.") (license license:expat))) -(define-public rust-beef-0.4 +(define-public rust-beef-0.5 (package (name "rust-beef") - (version "0.4.4") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "beef" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hva1rmbx2a54q4ncs8i5lbr26669wyvnya1sh3x22r0cxm64jj7")))) + (base32 "02blba0j192l0374kqwn8rjsc8aifj43xi26v142ijpjim1f4dk7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 7dbb5ca3613ca9f4ddd858fcbe4efef7ac34b3ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:25:09 +0100 Subject: gnu: rust-time@0.2: Update to 0.2.23. * gnu/packages/crates-io.scm (rust-time-0.2): Update to 0.2.23. --- gnu/packages/crates-io.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4dabc77c59..a983e54830 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42306,15 +42306,14 @@ fixed set of worker threads.") (define-public rust-time-0.2 (package (name "rust-time") - (version "0.2.19") + (version "0.2.23") (source (origin (method url-fetch) (uri (crate-uri "time" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18bhl0nmfyd8drksskw830ybw9pr47pisfn4245wabqijgys3hc0")))) + (base32 "12z95k0005rmyn9pf9v4hq80khsns7y5wfydnjr5jpci2yiyxnmw")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 56b0568450bc37483f241368ab307158bae70762 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:47:44 +0100 Subject: gnu: rust-tuikit@0.4: Update to 0.4.5. * gnu/packages/crates-io.scm (rust-tuikit-0.4): Update to 0.4.5. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a983e54830..23a9955548 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45829,14 +45829,14 @@ or dashboards.") (define-public rust-tuikit-0.4 (package (name "rust-tuikit") - (version "0.4.3") + (version "0.4.5") (source (origin (method url-fetch) (uri (crate-uri "tuikit" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hf6pgclb2lj08jzb45q0mpjq2a9zw27h7kwyi5cibjz5skd054b")))) + (base32 "07x5218f9da6cbvmwpfyfymqyl7nksvkxxycxcrll9ajazy8qqlc")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 7932034d071793f3ef79f36f0d7cf23a8d2600f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:48:37 +0100 Subject: gnu: rust-vte@0.9: New package version. * gnu/packages/crates-io.scm (rust-vte-0.9): New public variable. --- gnu/packages/crates-io.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 23a9955548..30b3c55cc9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47573,6 +47573,20 @@ updated when the crate version changes.") "This package provides a parser for implementing terminal emulators.") (license (list license:asl2.0 license:expat)))) +(define-public rust-vte-0.9 + (package + (inherit rust-vte-0.10) + (name "rust-vte") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "vte" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yjl1jzlrk617kwk445mg9zmc71nxvwghhgsxfqhmm9401hlaxvf")))))) + (define-public rust-vte-0.3 (package (inherit rust-vte-0.10) -- cgit 1.4.1 From ea27cbe113de626204634c85d099c6479cbd81f0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:50:01 +0100 Subject: gnu: skim: Update to 0.9.4. * gnu/packages/crates-io.scm (skim): Update to 0.9.4. [arguments]: Update #:cargo-inputs: add rust-atty-0.2 and update rust-beef-0.4 to rust-beef-0.5, rust-crossbeam-0.7 to rust-crossbeam-0.8, rust-env-logger-0.6 to rust-env-logger-0.8, rust-nix-0.14 to rust-nix-0.19, rust-time-0.1 to rust-time-0.2, and rust-vte-0.3 to rust-vte-0.9. --- gnu/packages/crates-io.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 30b3c55cc9..f3d6c92e11 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49986,7 +49986,7 @@ configuration file and/or environment variables.") (define-public skim (package (name "skim") - (version "0.9.3") + (version "0.9.4") (source (origin (method url-fetch) @@ -49995,30 +49995,31 @@ configuration file and/or environment variables.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0qir6m4cpd63bnp0lqq4si1ccgd6rbv4m1662v771fkyynrdrj0s")))) + "1d5v9vq8frkdjm7bnw3455h6xf3c277d51il2qasn7r20kwik7ab")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-beef" ,rust-beef-0.4) + (("rust-atty-0.2" ,rust-atty-0.2) + ("rust-beef" ,rust-beef-0.5) ("rust-bitflags" ,rust-bitflags-1) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-2) - ("rust-crossbeam" ,rust-crossbeam-0.7) + ("rust-crossbeam" ,rust-crossbeam-0.8) ("rust-defer-drop" ,rust-defer-drop-1) ("rust-derive-builder" ,rust-derive-builder-0.9) - ("rust-env-logger" ,rust-env-logger-0.6) + ("rust-env-logger" ,rust-env-logger-0.8) ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.14) + ("rust-nix" ,rust-nix-0.19) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-shlex" ,rust-shlex-0.1) - ("rust-time" ,rust-time-0.1) + ("rust-time" ,rust-time-0.2) ("rust-timer" ,rust-timer-0.2) ("rust-tuikit" ,rust-tuikit-0.4) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-vte" ,rust-vte-0.3)) + ("rust-vte" ,rust-vte-0.9)) #:phases (modify-phases %standard-phases (add-after 'install 'install-extras -- cgit 1.4.1 From 042b2eb1ae508f31f6f1b9ccf46deaff95eeb723 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Mar 2021 18:52:50 +0100 Subject: gnu: parallel: Update to 20210322. * gnu/packages/parallel.scm (parallel): Update to 20210322. --- 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 8816844368..05964cd038 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018 Rutger Helling -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019, 2020 Ludovic Courtès ;;; Copyright © 2020 Roel Janssen @@ -57,14 +57,14 @@ (define-public parallel (package (name "parallel") - (version "20210222") + (version "20210322") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "0az73cpl04k3j9hwyxgych5cr95ls8qrsmy6zni4xxv2xc5b0saf")))) + (base32 "152np0jg4n94sbl2p2fzxjfnssiyp5sg7r5wx6s8p893b921pxwq")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From aa13529baf498362b5d0c2310d1349692f71a260 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 17 Mar 2021 19:57:29 +0000 Subject: gnu: Add snapcast. * gnu/packages/audio.scm (snapcast): 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 73e8a79606..f1346208a2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1052,6 +1052,40 @@ performances. The plugins include a cellular automaton synthesizer, an envelope follower, distortion effects, tape effects and more.") (license license:gpl2+))) +(define-public snapcast + (package + (name "snapcast") + (version "0.24.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/badaix/snapcast") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13yz8alplnqwkcns3mcli01qbyy6l3h62xx0v71ygcrz371l4g9g")))) + (build-system cmake-build-system) + (arguments + '(#:tests? #f)) ; no included tests + (inputs + `(("boost" ,boost) + ("libvorbis" ,libvorbis) + ("soxr" ,soxr) + ("alsa-lib" ,alsa-lib) + ("avahi" ,avahi) + ("pulseaudio" ,pulseaudio) + ("flac" ,flac) + ("opus" ,opus))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (home-page "https://github.com/badaix/snapcast") + (synopsis "Synchronous multiroom audio player") + (description + "Snapcast is a multi-room client-server audio player. Clients are time +synchronized with the server to play synced audio.") + (license license:gpl3+))) + (define-public swh-plugins (package (name "swh-plugins") -- cgit 1.4.1 From d3c8aa3f8214434c8ba819984ed4513796a09e38 Mon Sep 17 00:00:00 2001 From: ZmnSCPxj Date: Wed, 17 Mar 2021 11:48:52 +0000 Subject: gnu: bitcoin-core: Add 0.21.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/finance.scm (bitcoin-core): Rename to … (bitcoin-core-0.21): … this, and update to 0.21. (bitcoin-core-0.20): New variable. Signed-off-by: Christopher Baines --- gnu/packages/finance.scm | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 6674452ab5..3ccc077b94 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2020 Vinicius Monego ;;; Copyright © 2020 Carlo Holl ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 ZmnSCPxj jxPCSnmZ ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system qt) + #:use-module (guix deprecation) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages aidc) @@ -108,10 +110,10 @@ #:use-module (gnu packages xml) #:use-module (gnu packages gnuzilla)) -(define-public bitcoin-core +(define-public bitcoin-core-0.21 (package (name "bitcoin-core") - (version "0.20.1") + (version "0.21.0") (source (origin (method url-fetch) (uri @@ -119,7 +121,7 @@ version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab")))) + "0dszcn4r43w0ffsmgwmyzkzr5lqws3bbhlkssmjgnjgfc8n2148s")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -186,6 +188,24 @@ of the bitcoin protocol. This package provides the Bitcoin Core command line client and a client based on Qt.") (license license:expat))) +(define-public bitcoin-core-0.20 + (package + (inherit bitcoin-core-0.21) + (version "0.20.1") + (source (origin + (method url-fetch) + (uri + (string-append "https://bitcoincore.org/bin/bitcoin-core-" + version "/bitcoin-" version ".tar.gz")) + (sha256 + (base32 + "0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab")))))) + +;; The support lifetimes for bitcoin-core versions can be found in +;; . + +(define-public bitcoin-core bitcoin-core-0.21) + (define-public hledger (package (name "hledger") -- cgit 1.4.1 From 4490dff98c6979a77f3982716239b526e0ef1337 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Tue, 23 Mar 2021 23:13:23 +0100 Subject: gnu: Add java-xmlpull-api-v1. * gnu/packages/xml.scm (java-xmlpull-api-v1): New variable. --- gnu/packages/xml.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 2a72fc6ad2..b0b159c5aa 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -28,6 +28,7 @@ ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Julien Lepiller ;;; ;;; This file is part of GNU Guix. ;;; @@ -2008,6 +2009,60 @@ efficiently all input elements (for example in SOAP processors). This package is in maintenance mode.") (license (license:non-copyleft "file:///LICENSE.txt")))) +(define-public java-xmlpull-api-v1 + (package + (name "java-xmlpull-api-v1") + (version "1.1.3.4b") + (source (origin + ;; The package is originally from Extreme! Lab, but the website + ;; is now gone. This repositories contains the sources of the + ;; latest version. + (method git-fetch) + (uri (git-reference + (url "https://github.com/aslom/xmlpull-api-v1") + ;; No releases, this is the latest commit + (commit "abeaa4aa87b2625af70c32f658f44e11355fe568"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "15bdqxfncnakskna4m9gsh4f9iczxy83qxn2anqiqd15z406a5ih")) + (modules '((guix build utils))) + (snippet + `(begin + (delete-file-recursively "lib") + (mkdir-p "lib") + ;; prevents a failure in "dist_lite" + (substitute* "build.xml" + (("README.html") "README.md")))))) + (build-system ant-build-system) + (arguments + `(#:test-target "junit" + #:build-target "dist" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version)) + (java (string-append out "/share/java")) + (project (string-append + "xmlpull_" + ,(string-join (string-split version #\.) "_")))) + (mkdir-p doc) + (copy-recursively (string-append "build/dist/" project "/doc/") + doc) + (mkdir-p java) + (copy-file (string-append "build/dist/" project "/" project ".jar") + (string-append java "/" project ".jar"))) + ))))) + (home-page "https://github.com/aslom/xmlpull-api-v1") + (synopsis "XML pull parsing API") + (description "XmlPull v1 API is a simple to use XML pull parsing API. XML +pull parsing allows incremental (sometimes called streaming) parsing of XML +where application is in control - the parsing can be interrupted at any given +moment and resumed when application is ready to consume more input.") + (license license:public-domain))) + (define-public java-dom4j (package (name "java-dom4j") -- cgit 1.4.1 From 08b9e0ca0be309a732f0784ceee7e436bfd70f15 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 23 Mar 2021 15:38:39 +0100 Subject: gnu: Add java-mxparser. * gnu/packages/xml.scm (java-mxparser): New variable. Co-Authored-By: Julien Lepiller Signed-off-by: Julien Lepiller --- gnu/packages/xml.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b0b159c5aa..808a847eaf 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2311,6 +2311,48 @@ outputting XML data from Java code.") and back again.") (license license:bsd-3))) +(define-public java-mxparser + (package + (name "java-mxparser") + (version "1.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x-stream/mxparser") + (commit (string-append "v-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i3jrjbz4hgf62fm1ix7nlcmhi4kcv4flqsfvh7a3l2v7nsp5ryb")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "mxparser.jar" + #:source-dir "src/main/java" + #:test-dir "src/test" + #:phases + (modify-phases %standard-phases + (add-before 'build 'copy-resources + (lambda _ + (copy-recursively "src/main/resources" "build/classes") + #t))))) + (propagated-inputs + `(("java-xmlpull-api-v1" ,java-xmlpull-api-v1))) + (native-inputs + `(("java-junit" ,java-junit))) + (home-page "https://github.com/x-stream/mxparser") + (synopsis "Streaming pull XML parser forked from @code{java-xpp3}") + (description "Xml Pull Parser (in short XPP) is a streaming pull XML +parser and should be used when there is a need to process quickly and +efficiently all input elements (for example in SOAP processors). This +package is a stable XmlPull parsing engine that is based on ideas from XPP +and in particular XPP2 but completely revised and rewritten to take the best +advantage of JIT JVMs. + +MXParser is a fork of xpp3_min 1.1.7 containing only the parser with merged +changes of the Plexus fork. It is an implementation of the XMLPULL V1 API +(parser only).") + (license (license:non-copyleft "file://LICENSE.txt")))) + (define-public xmlrpc-c (package (name "xmlrpc-c") -- cgit 1.4.1 From 8b2b5463963d5d4dee480b0cf73fa4a9eca414ba Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 23 Mar 2021 15:38:40 +0100 Subject: gnu: java-xstream: Update to 1.4.16 [security fixes]. Fixes CVE-2021-21341, CVE-2021-21342, CVE-2021-21343, CVE-2021-21344, CVE-2021-21345, CVE-2021-21346, CVE-2021-21347, CVE-2021-21348, CVE-2021-21349, CVE-2021-21350 and CVE-2021-21351. * gnu/packages/xml.scm (java-xstream): Update to 1.4.16. [inputs]: Add java-mxparser, a fork of java-xpp3 made by upstream. Java-xpp3 is still needed. Signed-off-by: Julien Lepiller --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 808a847eaf..d05d326f5b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2272,7 +2272,7 @@ outputting XML data from Java code.") (define-public java-xstream (package (name "java-xstream") - (version "1.4.15") + (version "1.4.16") (source (origin (method git-fetch) @@ -2284,7 +2284,7 @@ outputting XML data from Java code.") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "1178qryrjwjp44439pi5dxzd32896r5zs429z1qhlc09951r7mi9")))) + (base32 "16k2mc63h2fw7lxv74qmhg4p8q9hfrw114daa6nxwnpv08cnq755")))) (build-system ant-build-system) (arguments `(#:jar-name "xstream.jar" @@ -2299,6 +2299,7 @@ outputting XML data from Java code.") ("java-joda-time" ,java-joda-time) ("java-jettison" ,java-jettison) ("java-xom" ,java-xom) + ("java-mxparser" ,java-mxparser) ("java-xpp3" ,java-xpp3) ("java-dom4j" ,java-dom4j) ("java-stax2-api" ,java-stax2-api) -- cgit 1.4.1 From f21da3325566c1af06f8dc187995910e181f1752 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:01 +0100 Subject: gnu: python2-arrow: Remove package. * gnu/packages/time.scm (python2-arrow): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/time.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 20ce76d8d0..be37ea980e 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -448,9 +448,6 @@ converting dates, times, and timestamps. It implements and updates the datetime type.") (license asl2.0))) -(define-public python2-arrow - (package-with-python2 python-arrow)) - (define-public python-aniso8601 (package (name "python-aniso8601") -- cgit 1.4.1 From 6bafc5cf1ec64a1a88ccdedf4c07ddf9bb17a286 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:02 +0100 Subject: gnu: python2-cairocffi: Remove. * gnu/packages/python-xyz.scm (python2-cairocffi): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bbe52ff5eb..9571eff103 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6425,9 +6425,6 @@ graphics library with support for multiple backends including image buffers, PNG, PostScript, PDF, and SVG file output.") (license license:bsd-3))) -(define-public python2-cairocffi - (package-with-python2 python-cairocffi)) - (define-public python-decorator (package (name "python-decorator") -- cgit 1.4.1 From 6a098614b8ed997c374a4e0408c960b462026378 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:03 +0100 Subject: gnu: python2-dulwich: Remove package. * gnu/packages/python-xyz.scm (python2-dulwich): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9571eff103..8d2d1c1f10 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15310,9 +15310,6 @@ protocols written in pure Python.") ;; Can be used with either license. (license (list license:asl2.0 license:gpl2+)))) -(define-public python2-dulwich - (package-with-python2 python-dulwich)) - (define-public python-pbkdf2 (package (name "python-pbkdf2") -- cgit 1.4.1 From 9541682c799973c136bd93bc88eb7724a772eafe Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:04 +0100 Subject: gnu: python2-yubikey-manager: Remove package. * gnu/packages/security-token.scm (python2-yubikey-manager): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/security-token.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index f47619aa55..e53d8590e6 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -670,6 +670,3 @@ that after installing this package, you might still need to add appropriate udev rules to your system configuration to be able to configure the YubiKey as an unprivileged user.") (license license:bsd-2))) - -(define-public python2-yubikey-manager - (package-with-python2 python-yubikey-manager)) -- cgit 1.4.1 From b5bae212d64480641231dff35099f798a861888f Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:05 +0100 Subject: gnu: python2-fido2: Remove package. * gnu/packages/security-token.scm (python2-fido2): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/security-token.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index e53d8590e6..accab82419 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -631,9 +631,6 @@ implementing a Relying Party.") ;; files for internal use, so they are not really a bundled dependency. (license (list license:bsd-2 license:asl2.0)))) -(define-public python2-fido2 - (package-with-python2 python-fido2)) - (define-public python-yubikey-manager (package (name "python-yubikey-manager") -- cgit 1.4.1 From d20198347510094c809fb16f04181ae67b50a924 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:06 +0100 Subject: gnu: python2-flask-wtf: Remove package. * gnu/packages/python-web.scm (python2-flask-wtf): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0f67046f75..119d3aa0a9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2970,9 +2970,6 @@ presume or force a developer to use a particular tool or library.") upload, and reCAPTCHA.") (license license:bsd-3))) -(define-public python2-flask-wtf - (package-with-python2 python-flask-wtf)) - (define-public python-flask-multistatic (package (name "python-flask-multistatic") -- cgit 1.4.1 From ec1a9c61e70e52450b4b80bbf5e6f8cce324036a Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:07 +0100 Subject: gnu: python2-flask-babel: Remove package. * gnu/packages/python-web.scm (python2-flask-babel): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 119d3aa0a9..2c5847312b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1017,9 +1017,6 @@ support for Flask. This is based on the Python babel module as well as pytz - both of which are installed automatically if you install this library.") (license license:bsd-3))) -(define-public python2-flask-babel - (package-with-python2 python-flask-babel)) - (define-public python-flask-cors (package (name "python-flask-cors") -- cgit 1.4.1 From d1e421ca0db05333ac68cd47826b3ca704f26b29 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:08 +0100 Subject: gnu: python2-flask-htmlmin: Remove package. * gnu/packages/python-web.scm (python2-flask-htmlmin): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 2c5847312b..5e6673b2c6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3604,9 +3604,6 @@ It comes with safe defaults and easily configurable options.") "Minify @code{text/html} MIME type responses when using @code{Flask}.") (license license:bsd-3))) -(define-public python2-flask-htmlmin - (package-with-python2 python-flask-htmlmin)) - (define-public python-jsmin (package (name "python-jsmin") -- cgit 1.4.1 From f44917ea55891194798193e8e49dd7cce919bdd3 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:09 +0100 Subject: gnu: python2-flask-login: Remove package. * gnu/packages/python-web.scm (python2-flask-login): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 5e6673b2c6..ec4c755f8b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -3657,9 +3657,6 @@ handles the common tasks of logging in, logging out, and remembering your users' sessions over extended periods of time.") (license license:expat))) -(define-public python2-flask-login - (package-with-python2 python-flask-login)) - (define-public python-oauth2client (package (name "python-oauth2client") -- cgit 1.4.1 From dab3c57d587eee2a005c9a6534cfd4c706e679fa Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:35 +0100 Subject: gnu: python2-flask-multistatic: Remove package. * gnu/packages/python-web.scm (python2-flask-multistatic): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ec4c755f8b..64170d4f45 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2987,9 +2987,6 @@ upload, and reCAPTCHA.") for overriding static files.") (license license:gpl3+))) -(define-public python2-flask-multistatic - (package-with-python2 python-flask-multistatic)) - (define-public python-cookies (package (name "python-cookies") -- cgit 1.4.1 From 7502c13895b9f1548106dfa2323a4143d2dc91b3 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:36 +0100 Subject: gnu: python2-httpbin: Remove package. * gnu/packages/web.scm (python2-httpbin): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ef11cb6a1c..1e93308fb0 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6209,9 +6209,6 @@ response. This exists to cover all kinds of HTTP scenarios. All endpoint respo JSON-encoded.") (license license:isc))) -(define-public python2-httpbin - (package-with-python2 python-httpbin)) - (define-public python-pytest-httpbin (package (name "python-pytest-httpbin") -- cgit 1.4.1 From bce0165f7c818a2c2764ee1a12e1b3a4b642e0ad Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:37 +0100 Subject: gnu: python2-flask: Remove package. * gnu/packages/python-web.scm (python2-flask): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 64170d4f45..6b57af18a3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2932,9 +2932,6 @@ and Jinja2 template engine. It is called a micro framework because it does not presume or force a developer to use a particular tool or library.") (license license:bsd-3))) -(define-public python2-flask - (package-with-python2 python-flask)) - (define-public python-flask-wtf (package (name "python-flask-wtf") -- cgit 1.4.1 From ec2384b79d739c1edf99dc33d555e3f3fedac639 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:38 +0100 Subject: gnu: python2-furl: Remove package. * gnu/packages/python-web.scm (python2-furl): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6b57af18a3..21af15b0a9 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -623,9 +623,6 @@ over a different origin than that of the web application.") @code{urllib} and @code{urlparse} modules for manipulating URLs.") (license license:unlicense))) -(define-public python2-furl - (package-with-python2 python-furl)) - (define-public python-httplib2 (package (name "python-httplib2") -- cgit 1.4.1 From 5f3411e4012658f0894e253aed3b198412d77bfd Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:39 +0100 Subject: gnu: python2-graphql-core: Remove package. * gnu/packages/python-xyz.scm (python2-graphql-core): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8d2d1c1f10..1b6ad247e1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14665,9 +14665,6 @@ This library is a port of @url{https://github.com/graphql/graphql-js,graphql-js} to Python.") (license license:expat))) -(define-public python2-graphql-core - (package-with-python2 python-graphql-core)) - (define-public python-graphql-relay (package (name "python-graphql-relay") -- cgit 1.4.1 From 4c726e06981da1391bd819d905f5a79670a5ffbb Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:40 +0100 Subject: gnu: python2-ipywidgets: Remove package. * gnu/packages/python-xyz.scm (python2-ipywidgets): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1b6ad247e1..1b6453c827 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10444,9 +10444,6 @@ widgets are used. Users gain control of their data and can visualize changes in the data.") (license license:bsd-3))) -(define-public python2-ipywidgets - (package-with-python2 python-ipywidgets)) - (define-public python-jupyter-console (package (name "python-jupyter-console") -- cgit 1.4.1 From f72d345e44f856c97fe3da1f191091ba3edd0641 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:42 +0100 Subject: gnu: python2-mutagen: Remove package. * gnu/packages/music.scm (python2-mutagen): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/music.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 06632986ab..f02c7f2c21 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -3348,9 +3348,6 @@ APEv2 tags can be edited regardless of audio format. It can also manipulate Ogg streams on an individual packet/page level.") (license license:gpl2))) ; "later version" never mentioned -(define-public python2-mutagen - (package-with-python2 python-mutagen)) - (define-public python-mediafile (package (name "python-mediafile") -- cgit 1.4.1 From 84950c0d06155b5a7309f782932de37d2f5553e1 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:43 +0100 Subject: gnu: python2-nbxmpp: Remove package. * gnu/packages/messaging.scm (python2-nbxmpp): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/messaging.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 26000c48b8..a967ac31c2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1017,9 +1017,6 @@ of xmpppy.") (home-page "https://dev.gajim.org/gajim/python-nbxmpp") (license license:gpl3+))) -(define-public python2-nbxmpp - (package-with-python2 python-nbxmpp)) - (define-public gajim (package (name "gajim") -- cgit 1.4.1 From c74c4377b3a39d93b3d72c4c4fae86abaa2961d1 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:44 +0100 Subject: gnu: python2-rq: Remove package. * gnu/packages/databases.scm (python2-rq): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8be83f5cbe..83b6a13892 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3353,9 +3353,6 @@ processing them in the background with workers. It is backed by Redis and it is designed to have a low barrier to entry.") (license license:bsd-2))) -(define-public python2-rq - (package-with-python2 python-rq)) - (define-public python-rq-scheduler (package (name "python-rq-scheduler") -- cgit 1.4.1 From 7c03695a24f966685b6990272114472728798fd2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:55:41 +0100 Subject: gnu: python2-mpd2: Remove package. * gnu/packages/mpd.scm (python2-mpd2): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/mpd.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 2f32364ad8..7df0d82805 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -307,9 +307,6 @@ information about tracks being played to a scrobbler, such as Libre.FM.") interface for the Music Player Daemon.") (license license:lgpl3+))) -(define-public python2-mpd2 - (package-with-python2 python-mpd2)) - (define-public sonata (package (name "sonata") -- cgit 1.4.1 From f68dbdadba8627e72f625834abc30a8fb6d82d0b Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:56:11 +0100 Subject: gnu: python2-sh: Remove package. * gnu/packages/python-xyz.scm (python2-sh): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1b6453c827..4f9ff2c97b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -992,9 +992,6 @@ concepts.") @code{subprocess} feature.") (license license:expat))) -(define-public python2-sh - (package-with-python2 python-sh)) - (define-public python-cftime (package (name "python-cftime") -- cgit 1.4.1 From 97f4fd8a746c41bb305c43aee6ba015c066a5c8f Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:56:12 +0100 Subject: gnu: python2-stem: Remove package. * gnu/packages/python-xyz.scm (python2-stem): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 4f9ff2c97b..674f343691 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14232,9 +14232,6 @@ control protocol to script against the Tor process and read descriptor data relays publish about themselves.") (license license:lgpl3))) -(define-public python2-stem - (package-with-python2 python-stem)) - (define-public python-pyserial (package (name "python-pyserial") -- cgit 1.4.1 From 82c772a774fdc64f60e3814e8648f2bae9d15306 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:56:13 +0100 Subject: gnu: python2-tables: Remove package. * gnu/packages/python-xyz.scm (python2-tables): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 674f343691..a4584140a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9528,9 +9528,6 @@ tasks, sockets, files, locks, and queues.") designed to efficiently cope with extremely large amounts of data.") (license license:bsd-3))) -(define-public python2-tables - (package-with-python2 python-tables)) - (define-public python-sniffio (package (name "python-sniffio") -- cgit 1.4.1 From d8402031af537266300f4e556c267434b4b34c60 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:56:14 +0100 Subject: gnu: python2-utils: Remove package. * gnu/packages/python-xyz.scm (python2-utils): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a4584140a5..bb162cc162 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16264,9 +16264,6 @@ exception message with a traceback that points to the culprit.") make common patterns shorter and easier.") (license license:bsd-2))) -(define-public python2-utils - (package-with-python2 python-utils)) - (define-public python-diff-match-patch (package (name "python-diff-match-patch") -- cgit 1.4.1 From d0429747deb3efcce567c94ac74ac3a48b0f0bd6 Mon Sep 17 00:00:00 2001 From: zimoun Date: Mon, 15 Mar 2021 16:56:15 +0100 Subject: gnu: python2-widgetsnbextension: Remove package. * gnu/packages/python-xyz.scm (python2-widgetsnbextension): Delete. Signed-off-by: Maxim Cournoyer --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bb162cc162..9f57992fdd 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10408,9 +10408,6 @@ interactive computing.") notebooks.") (license license:bsd-3))) -(define-public python2-widgetsnbextension - (package-with-python2 python-widgetsnbextension)) - (define-public python-ipywidgets (package (name "python-ipywidgets") -- cgit 1.4.1 From c221d4951083ec2e92469e95e896f2d666f74cf5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 17:08:57 -0500 Subject: gnu: Add libdecaf. * gnu/packages/crypto.scm (libdecaf): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/crypto.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 0000e7fbf2..94f9cbeebf 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -47,9 +47,11 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crates-io) #:use-module (gnu packages cryptsetup) + #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) + #:use-module (gnu packages graphviz) #:use-module (gnu packages image) #:use-module (gnu packages kerberos) #:use-module (gnu packages libbsd) @@ -88,6 +90,57 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26)) +(define-public libdecaf + (package + (name "libdecaf") + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "git://git.code.sf.net/p/ed448goldilocks/code") + (commit + (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1ajgmyvc6a4m1h2hg1g4wz7ibx10x1xys9m6ancnmmf1f2srlfly")))) + (build-system cmake-build-system) + (outputs '("out" "python" "doc")) + (arguments + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-python-binding + (lambda _ + (substitute* "python/setup.py" + (("gmake") + "make") + (("'\\.\\.', 'build', 'lib', 'libdecaf\\.so'") + "'..', '..', 'build', 'src', 'libdecaf.so'")))) + (add-after 'install 'install-python-binding + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion "../source/python" + (invoke "python" "setup.py" "install" + (string-append "--prefix=" (assoc-ref outputs "python")) + "--root=/")))) + (add-after 'install-python-binding 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "doc") + (let* ((doc (assoc-ref outputs "doc")) + (dest (string-append doc "/share/doc"))) + (copy-recursively "doc" dest))))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen) + ("python" ,python-wrapper))) + (synopsis "Decaf Elliptic Curve Library") + (description "The libdecaf library is an implementation of elliptic curve +cryptography using the Montgomery and Edwards curves Curve25519, Ed25519, +Ed448-Goldilocks and Curve448, using the Decaf encoding.") + (home-page "http://ed448goldilocks.sourceforge.net/") + (license (list license:expat ;library + license:bsd-2)))) ;python bindings + (define-public libsodium (package (name "libsodium") -- cgit 1.4.1 From c2a9b05f02094b9fba9be9b491acbd97b0920754 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 12:04:37 -0500 Subject: gnu: bcunit: Update to 3.0.2-0.74021cc and enable more features. * gnu/packages/linphone.scm (bcunit)[source]: Switch to git repository. [version]: Update to 3.0.2-0.74021cc. [outputs]: Add a "doc" output. [arguments]: Remove the tests? argument, enabling tests. [configure-flags]: Enable curses, doc, examples, tests and memtrace. [phases]{patch-source, move-doc}: New phases. {check}: Override phase. [inputs]: Add ncurses. [description]: Fix typo. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 88 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index afa542412f..382b3a912b 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -35,6 +35,8 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages linux) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -57,28 +59,70 @@ #:use-module (guix build-system gnu)) (define-public bcunit - (package - (name "bcunit") - (version "3.0.2") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0ylchj8w98ic2fkqpxc6yk4s6s0h0ql2zsz5n49jd7126m4h8dqk")))) - (build-system cmake-build-system) - (arguments - '(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required - (synopsis "Belledonne Communications Unit Testing Framework") - (description "BCUnit is a fork of the defunct project CUnit, with several -fixes and patches applied. It is an unit testing framework for writing, -administering, and running unit tests in C.") - (home-page "https://gitlab.linphone.org/BC/public/bcunit") - (license license:lgpl2.0+))) + (let ((commit "74021cc7cb20a4e177748dd2948173e1f9c270ae") + (revision "0")) + (package + (name "bcunit") + (version (git-version "3.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/bcunit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0npdwvanjkfg9vrqs5yi8vh6wliv50ycdli8pzavir84nb31nq1b")))) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_CURSES=ON" + "-DENABLE_DOC=ON" + "-DENABLE_EXAMPLES=ON" + "-DENABLE_TEST=ON" + "-DENABLE_MEMTRACE=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Include BCunit headers for examples. + (substitute* "Examples/CMakeLists.txt" + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}") + (string-append "${CMAKE_CURRENT_SOURCE_DIR} " + "${PROJECT_SOURCE_DIR}/BCUnit/Headers " + "${CMAKE_BINARY_DIR}/BCUnit/Headers"))) + ;; Link bcunit and bcunit_tests libraries. + (substitute* "BCUnit/Sources/CMakeLists.txt" + (("target_include_directories\\(bcunit_test PUBLIC Test\\)") + (string-append + "target_include_directories(bcunit_test PUBLIC Test)\n" + "target_link_libraries(bcunit_test bcunit)"))))) + (replace 'check + (lambda _ + (with-directory-excursion "BCUnit/Sources/Test" + (invoke "./test_bcunit")))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (for-each mkdir-p + `(,(string-append doc "/share/doc") + ,(string-append doc "/share/BCUnit"))) + (rename-file + (string-append out "/share/doc/BCUnit") + (string-append doc "/share/doc/BCUnit")) + (rename-file + (string-append out "/share/BCUnit/Examples") + (string-append doc "/share/BCUnit/Examples")))))))) + (inputs + `(("ncurses" ,ncurses))) + (synopsis "Belledonne Communications Unit Testing Framework") + (description "BCUnit is a fork of the defunct project CUnit, with +several fixes and patches applied. It is a unit testing framework for +writing, administering, and running unit tests in C.") + (home-page "https://gitlab.linphone.org/BC/public/bcunit") + (license license:lgpl2.0+)))) (define-public bctoolbox (package -- cgit 1.4.1 From dc68018e015a18fb75bc9f95ed57b33c574a39dd Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 01:54:52 -0400 Subject: gnu: Add cbonsai. * gnu/packages/toys.scm (cbonsai): New variable. --- gnu/packages/toys.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/toys.scm b/gnu/packages/toys.scm index 6387e84a3d..f88ea68436 100644 --- a/gnu/packages/toys.scm +++ b/gnu/packages/toys.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019 Jesse Gibbons ;;; Copyright © 2019, 2020 Timotej Lazar ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2021 Leo Famulari ;;; ;;; This file is part of GNU Guix. ;;; @@ -236,3 +237,41 @@ and various scenery elements.") "This is an animated, color, ANSI-text telnet server that renders a loop of the Nyan Cat / Poptart Cat animation.") (license license:ncsa))) + +(define-public cbonsai + (package + (name "cbonsai") + (version "1.0.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jallbrit/cbonsai.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a5lqc0il0dq26j4wxg1z2siqanra2905x9akwi86zriq65ayb77")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No test suite + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ; No ./configure script + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" + ,(package-version this-package)))) + (install-file "README.md" doc))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("ncurses" ,ncurses))) + (home-page "https://gitlab.com/jallbrit/cbonsai") + (synopsis "Grow bonsai trees in a terminal") + (description "Cbonsai is a bonsai tree generator using ASCII art. It +creates, colors, and positions a bonsai tree, and is configurable.") + (license license:gpl3+))) -- cgit 1.4.1 From 8a1118a96c9ae128302c3d435ae77cb3dd693aea Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 10 Jan 2021 16:58:57 -0800 Subject: gnu: bootstrap: Add support for powerpc64le-linux. The bootstrap tarballs used by these bootstrap packages were created via the following steps: - Create a new x86_64 VM using QEMU. - Use https://ftp.gnu.org/gnu/guix/guix-system-install-1.2.0.x86_64-linux.iso.xz to install Guix System 1.2.0 in the VM. - Run: guix pull --no-substitutes --commit=662e7e28d576ada91fc9dec7d27c100666114f03 - Run: guix build --no-substitutes --target=powerpc64le-linux-gnu bootstrap-tarballs With the exception of gcc-static, all bootstrap binaries contained in these tarballs can be built reproducibly. Unfortunately, gcc-static is not always reproducible when everything is built from source on separate machines. Despite investigation efforts, the cause remains unclear, so we have decided to move forward with these binaries to unblock further bootstrapping work. For details, see . * gnu/packages/bootstrap.scm (%bootstrap-executables) (bootstrap-executable-file-name, bootstrap-guile-url-path) (bootstrap-guile-hash, %bootstrap-coreutils&co, %bootstrap-binutils) (%bootstrap-glibc, %bootstrap-gcc): Add entries for powerpc64le-linux. (%bootstrap-executable-base-urls): Add an entry for alpha.gnu.org. --- gnu/packages/bootstrap.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c39e60ec8b..c598cedc0a 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -5,6 +5,8 @@ ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter +;;; Copyright © 2020 Jakub Kądziołka +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -122,16 +124,27 @@ ("tar" ,(base32 "06gmqdjq3rl8lr47b9fyx4ifnm5x56ymc8lyryp1ax1j2s4y5jb4")) ("xz" - ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))))) + ,(base32 "09j1d69qr0hhhx4k4ih8wp00dfc9y4rp01hfg3vc15yxd0jxabh5"))) + ("powerpc64le-linux" + ("bash" + ,(base32 "1kiw7n6mkdy2x9in97646nb7aiayxr090ws1hbrlazah3fjqi6nj")) + ("mkdir" + ,(base32 "04dpvi231zcl40ig048vqqnyvmnkw1byrm1q1qqvs1f0g16yhrrk")) + ("tar" + ,(base32 "150c8948cz8r208g6qgn2dn4f4zs5kpgbpbg6bwag6yw42rapw2l")) + ("xz" + ,(base32 "0v5738idy9pqzcbrjdpxi5c6qs5m78zrpsydmrpx5cfcfzbkxzjh"))))) (define %bootstrap-executable-base-urls ;; This is where the bootstrap executables come from. '("https://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/bootstrap/" + "https://alpha.gnu.org/gnu/guix/bootstrap/" "http://lilypond.org/janneke/guix/")) (define (bootstrap-executable-file-name system program) "Return the FILE-NAME part of url where PROGRAM can be found for SYSTEM." (match system + ("powerpc64le-linux" (string-append system "/20210106/" program)) ("i586-gnu" (string-append system "/20200326/" program)) (_ (string-append system "/" program "?id=44f07d1dc6806e97c4e9ee3e6be883cc59dc666e")))) @@ -332,6 +345,8 @@ or false to signal an error." "/20150101/guile-2.0.11.tar.xz") ("i586-gnu" "/20200326/guile-static-stripped-2.0.14-i586-pc-gnu.tar.xz") + ("powerpc64le-linux" + "/20210106/guile-static-stripped-2.0.14-powerpc64le-linux-gnu.tar.xz") (_ "/20131110/guile-2.0.9.tar.xz")))) @@ -346,6 +361,8 @@ or false to signal an error." (base32 "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")) ("armhf-linux" (base32 "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")) + ("powerpc64le-linux" + (base32 "1rnyfz5q38jyvxddj617443bnnzql4vw0mxzqpj8wz48wx4bhbq0")) ("aarch64-linux" (base32 "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")) ("i586-gnu" @@ -479,6 +496,8 @@ $out/bin/guile --version~%" "/20150101/static-binaries.tar.xz") ("aarch64-linux" "/20170217/static-binaries.tar.xz") + ("powerpc64le-linux" + "/20210106/static-binaries-0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/static-binaries-0-i586-pc-gnu.tar.xz") (_ @@ -498,6 +517,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "18dfiq6c6xhsdpbidigw6480wh0vdgsxqq3xindq4lpdgqlccpfh")) + ("powerpc64le-linux" + (base32 + "0afs2j9z2d1hjq42myz4iwjh0aqgzf59inifw87x6b6p1z9wv92v")) ("i586-gnu" (base32 "17kllqnf3fg79gzy9ansgi801c46yh9c23h4d923plvb0nfm1cfn")) @@ -547,6 +569,8 @@ $out/bin/guile --version~%" "/20150101/binutils-2.25.tar.xz") ("aarch64-linux" "/20170217/binutils-2.27.tar.xz") + ("powerpc64le-linux" + "/20210106/binutils-static-stripped-2.34-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/binutils-static-stripped-2.34-i586-pc-gnu.tar.xz") (_ @@ -566,6 +590,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "111s7ilfiby033rczc71797xrmaa3qlv179wdvsaq132pd51xv3n")) + ("powerpc64le-linux" + (base32 + "1klxy945c61134mzhqzz2gbk8w0n8jq7arwkrvz78d22ff2q0cwz")) ("i586-gnu" (base32 "11kykv1kmqc5wln57rs4klaqa13hm952smkc57qcsyss21kfjprs")) @@ -622,6 +649,8 @@ $out/bin/guile --version~%" "/20150101/glibc-2.20.tar.xz") ("aarch64-linux" "/20170217/glibc-2.25.tar.xz") + ("powerpc64le-linux" + "/20210106/glibc-stripped-2.31-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/glibc-stripped-2.31-i586-pc-gnu.tar.xz") (_ @@ -641,6 +670,9 @@ $out/bin/guile --version~%" ("aarch64-linux" (base32 "07nx3x8598i2924rjnlrncg6rm61c9bmcczbbcpbx0fb742nvv5c")) + ("powerpc64le-linux" + (base32 + "1a1df6z8gkaq09md3jy94lixnh20599p58p0s856p10xwjaqr1iz")) ("i586-gnu" (base32 "14ddm10lpbas8bankmn5bcrlqvz1v5dnn1qjzxb19r57vd2w5952")) @@ -713,6 +745,8 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "/20150101/gcc-4.8.4.tar.xz") ("aarch64-linux" "/20170217/gcc-5.4.0.tar.xz") + ("powerpc64le-linux" + "/20210106/gcc-stripped-5.5.0-powerpc64le-linux-gnu.tar.xz") ("i586-gnu" "/20200326/gcc-stripped-5.5.0-i586-pc-gnu.tar.xz") (_ @@ -732,6 +766,9 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ ("aarch64-linux" (base32 "1ar3vdzyqbfm0z36kmvazvfswxhcihlacl2dzdjgiq25cqnq9ih1")) + ("powerpc64le-linux" + (base32 + "151kjsai25vz2s667bgzpisx8f281fpl3n9pxz2yrp9jlnadz3m1")) ("i586-gnu" (base32 "1j2zc58wzil71a34h7c70sd68dmqvcscrw3rmn2whq79vd70zvv5")) -- cgit 1.4.1 From cac88b28b836e714b7b7e4c41b5e36a12df58925 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sat, 6 Feb 2021 16:29:40 -0800 Subject: gnu: gcc-4.7: On powerpc64le, fix /lib64 references. Fixes: . * gnu/packages/gcc.scm (gcc-4.7)[#:phases][pre-configure]: When the gcc/config/rs6000 directory exists, replace "/lib64" with "/lib" in all files within it. Note that this fix will be picked up by any package that re-uses the pre-configure phase from gcc-4.7 (e.g., all the usual gcc packages). (make-libstdc++)[#:phases][fix-rs6000-libdir]: New phase, which does the same as above. It was necessary to duplicate the fix here because make-libstdc++ does not re-use the pre-configure phase from gcc-4.7. --- gnu/packages/gcc.scm | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4d5aaa7070..3ea8695cf1 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -3,13 +3,14 @@ ;;; Copyright © 2014, 2015, 2018 Mark H Weaver ;;; Copyright © 2014, 2015, 2016, 2017, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2020 Joseph LaFreniere ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Simon Tournier +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -273,6 +274,14 @@ where the OS part is overloaded to denote a specific ABI---into GCC ~a" libc line)))) + ;; TODO: Make this unconditional in core-updates. + ,@(if (target-powerpc?) + `((when (file-exists? "gcc/config/rs6000") + ;; Force powerpc libdir to be /lib and not /lib64 + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib")))) + `()) + ;; Don't retain a dependency on the build-time sed. (substitute* "fixincludes/fixincl.x" (("static char const sed_cmd_z\\[\\] =.*;") @@ -598,12 +607,27 @@ using compilers other than GCC." (name "libstdc++") (arguments `(#:out-of-source? #t - #:phases (alist-cons-before - 'configure 'chdir - (lambda _ - (chdir "libstdc++-v3") - #t) - %standard-phases) + #:phases + ;; TODO: Use the target-powerpc arm for everyone. + ,(if (target-powerpc?) + `(modify-phases %standard-phases + ;; Force rs6000 (i.e., powerpc) libdir to be /lib and not /lib64. + (add-before 'chdir 'fix-rs6000-libdir + (lambda _ + (when (file-exists? "gcc/config/rs6000") + (substitute* (find-files "gcc/config/rs6000") + (("/lib64") "/lib"))) + #t)) + (add-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3") + #t))) + `(alist-cons-before 'configure 'chdir + (lambda _ + (chdir "libstdc++-v3") + #t) + %standard-phases)) + #:configure-flags `("--disable-libstdcxx-pch" ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") -- cgit 1.4.1 From 6e98e9ca9237eb6a9830e9c65006a3ca534c94d0 Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Sat, 6 Feb 2021 20:02:31 +0100 Subject: gnu: glibc: Fix ldd path on powerpc*. This should avoid some problems, such as "not a dynamic executable" errors. * gnu/packages/patches/glibc-ldd-powerpc.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/base.scm: (glibc)[native-inputs]: Add it. [arguments]: When building for powerpc* apply it. * gnu/packages/commencement.scm (glibc-final-with-bootstrap-bash, glibc-final)[native-inputs]: Add patch conditionally. This patch has been adjusted to apply to master. Signed-off-by: Chris Marusich Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + gnu/packages/base.scm | 16 +++++++++++++++- gnu/packages/commencement.scm | 10 +++++++++- gnu/packages/patches/glibc-ldd-powerpc.patch | 10 ++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/glibc-ldd-powerpc.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7891c58dfa..14d228cfa4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1121,6 +1121,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-hurd-mach-print.patch \ %D%/packages/patches/glibc-hurd-magic-pid.patch \ %D%/packages/patches/glibc-hurd-signal-sa-siginfo.patch \ + %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ %D%/packages/patches/glibc-locales-2.28.patch \ diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 9aa69cfe77..7c5ac61f01 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis -;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2016, 2018 Alex Vong ;;; Copyright © 2017 Rene Saavedra @@ -15,6 +15,8 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2020 Vitaliy Shatrov +;;; Copyright © 2020 Chris Marusich +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -890,6 +892,14 @@ the store.") files))) #t))) + ,@(if (target-powerpc?) + '((add-after 'unpack 'apply-patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((patch (assoc-ref inputs + "powerpc64le-patch"))) + (invoke "patch" "--force" "-p1" + "-i" patch))))) + '()) ,@(if (hurd-target?) '((add-after 'install 'augment-libc.so (lambda* (#:key outputs #:allow-other-keys) @@ -911,6 +921,10 @@ the store.") ("gettext" ,gettext-minimal) ("python" ,python-minimal) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ,@(if (hurd-target?) `(("mig" ,mig) ("perl" ,perl)) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 432910d7a3..93b0c50882 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3313,7 +3313,11 @@ memoized as a function of '%current-system'." `(("bison" ,bison-boot0) ("texinfo" ,texinfo-boot0) ("perl" ,perl-boot0) - ("python" ,python-boot0))) + ("python" ,python-boot0) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()))) (inputs `( ;; The boot inputs. That includes the bootstrap libc. We don't want ;; it in $CPATH, hence the 'pre-configure' phase above. @@ -3464,6 +3468,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ;; This time we need 'msgfmt' to install all the libc.mo files. (native-inputs `(,@(package-native-inputs glibc-final-with-bootstrap-bash) + ,@(if (target-powerpc?) + `(("powerpc64le-patch" ,@(search-patches + "glibc-ldd-powerpc.patch"))) + '()) ("gettext" ,gettext-boot0))) (propagated-inputs diff --git a/gnu/packages/patches/glibc-ldd-powerpc.patch b/gnu/packages/patches/glibc-ldd-powerpc.patch new file mode 100644 index 0000000000..8e899ee99b --- /dev/null +++ b/gnu/packages/patches/glibc-ldd-powerpc.patch @@ -0,0 +1,10 @@ +diff -r -U3 a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed +--- a/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 1970-01-01 01:00:00.000000000 +0100 ++++ b/sysdeps/unix/sysv/linux/powerpc/ldd-rewrite.sed 2020-02-29 00:15:41.080000000 +0100 +@@ -11,5 +11,5 @@ + # this works for /lib64/ld64.so.x and /lib/ld.so.x as input + s_lib64_lib_ + s_64\.so_\.so_ +-s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \164\264\3"_ ++s_^RTLDLIST=\(.*lib\)\(/[^/]*\)\(\.so\.[0-9.]*\)[[:blank:]]*$_RTLDLIST="\1\2\3 \1\264\3"_ + -- cgit 1.4.1 From b2135b5d576573115c1db9bc6b54d52452d44bee Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 31 Jan 2021 18:45:24 -0800 Subject: gnu: gcc-boot0: Enable 128-bit long double for POWER9. * gnu/packages/commencement.scm (gcc-boot0) [#:configure-flags]: Add --with-long-double-128 when the boot triplet is "powerpc64le-guix-linux-gnu", instead of "powerpc64le-linux-gnu", which is incorrect. The actual triplet used during bootstrapping is "powerpc64le-guix-linux-gnu". --- gnu/packages/commencement.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 93b0c50882..86bc7a602d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka +;;; Copyright © 2021 Chris Marusich ;;; ;;; This file is part of GNU Guix. ;;; @@ -2818,7 +2819,8 @@ exec " gcc "/bin/" program "--disable-shared" "--enable-languages=c,c++" - ,@(if (equal? "powerpc64le-linux-gnu" (boot-triplet)) + ;; boot-triplet inserts "guix" in the triplet. + ,@(if (equal? "powerpc64le-guix-linux-gnu" (boot-triplet)) ;; On POWER9 (little endian) glibc needs the ;; 128-bit long double type. '("--with-long-double-128") -- cgit 1.4.1 From 060478c32c9c548254fe3649426453b50c86a84f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Apr 2020 18:55:57 +0300 Subject: gnu: binutils-final: Provide bash for binary on powerpc-linux. * gnu/packages/commencement.scm (binutils-final)[arguments]: On powerpc-linux allow a reference to static-bash-for-glibc. [inputs]: On powerpc-linux add static-bash-for-glibc. --- gnu/packages/commencement.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 86bc7a602d..c0732bbf62 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3514,9 +3514,19 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (arguments `(#:guile ,%bootstrap-guile #:implicit-inputs? #f - #:allowed-references ("out" ,glibc-final) + #:allowed-references + ,@(match (%current-system) + ("powerpc-linux" + `(("out" ,glibc-final ,static-bash-for-glibc))) + (_ + `(("out" ,glibc-final)))) ,@(package-arguments binutils))) - (inputs (%boot2-inputs)))) + (inputs + (match (%current-system) + ("powerpc-linux" + `(("bash" ,static-bash-for-glibc) + ,@(%boot2-inputs))) + (_ (%boot2-inputs)))))) (define libstdc++ ;; Intermediate libstdc++ that will allow us to build the final GCC -- cgit 1.4.1 From be4b1cf53bdcdc5d60d21075d668d944c11e0598 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 2 Feb 2021 00:13:48 -0800 Subject: gnu: binutils-final: Support more Power architectures. * gnu/packages/commencement.scm (binutils-final)[arguments]: When checking if the system is a Power architecture, instead of hard-coding "powerpc-linux", use the target-powerpc? procedure so it works on more Power architectures. [inputs]: Likewise. --- gnu/packages/commencement.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index c0732bbf62..d4511ed914 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3516,14 +3516,14 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" #:implicit-inputs? #f #:allowed-references ,@(match (%current-system) - ("powerpc-linux" + ((? target-powerpc?) `(("out" ,glibc-final ,static-bash-for-glibc))) (_ `(("out" ,glibc-final)))) ,@(package-arguments binutils))) (inputs (match (%current-system) - ("powerpc-linux" + ((? target-powerpc?) `(("bash" ,static-bash-for-glibc) ,@(%boot2-inputs))) (_ (%boot2-inputs)))))) -- cgit 1.4.1 From 4cc2d2aa59910fcfd057bdee162bb96989b5a523 Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Sun, 7 Feb 2021 17:47:32 +0100 Subject: gnu: bdb-4.8: Fix configure on powerpc64le-linux. * gnu/packages/dbm.scm (bdb-4.8)[arguments]: Modify 'configure phase to append "--build=powerpc64le-unknown-linux-gnu" to configure's flags when compiling for powerpc64le-linux. Signed-off-by: Chris Marusich --- gnu/packages/dbm.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm index 82647c0c28..2dd51efb8c 100644 --- a/gnu/packages/dbm.scm +++ b/gnu/packages/dbm.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Mark H Weaver +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -74,6 +75,11 @@ '("--build=aarch64-unknown-linux-gnu") '()) + ;; Bdb doesn't recognize powerpc64le as an architecture. + ,@(if (string=? "powerpc64le-linux" (%current-system)) + '("--build=powerpc64le-unknown-linux-gnu") + '()) + ,@(if (%current-target-system) ; cross building '((string-append "--host=" target)) '()) -- cgit 1.4.1 From 69b3907adf6864e5d133797f1dad51d5a974c796 Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Mon, 8 Feb 2021 01:30:43 +0100 Subject: gnu: guile-avahi: Fix compilation on powerpc64le-linux. * gnu/packages/guile-xyz.scm (guile-avahi)[arguments]: Parallel builds fail on powerpc64le-linux. Set "#:parallel-build?" to "#f". Signed-off-by: Chris Marusich --- gnu/packages/guile-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 28e7c798a7..461b9e04bf 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -4262,6 +4263,9 @@ errors.") ,@%gnu-build-system-modules) #:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + ;; Parallel builds fail on powerpc64le-linux. + ;; See https://lists.nongnu.org/archive/html/guile-avahi-bugs/2021-01/msg00000.html + #:parallel-build? #f #:phases (modify-phases %standard-phases (add-before 'check 'fix-guile-avahi-file-name -- cgit 1.4.1 From e9938dc8f0e081e4407a96502a04ea63f07e5a8c Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Mon, 8 Feb 2021 03:13:53 +0100 Subject: gnu: texlive-bin: Fix compilation on powerpc64le*. * gnu/packages/tex.scm (texlive-bin)[arguments]: Append "--disable-luajittex" and "--disable-mfluajit" to keyword argument "#:configure-flags" on powerpc64le* because LuaJIT is not ported to powerpc64le* yet. Also set "#:tests?" to "#f" on powerpc64le*. Signed-off-by: Chris Marusich --- gnu/packages/tex.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c0f4ff0fcd..508537acda 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Paul Garlick ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -342,14 +343,23 @@ files from LOCATIONS with expected checksum HASH. CODE is not currently in use. "--with-system-teckit" "--with-system-xpdf" "--with-system-zlib" - "--with-system-zziplib") - - ;; Disable tests on mips64/aarch64 to cope with a failure of luajiterr.test. - ;; XXX FIXME fix luajit properly on mips64 and aarch64. + "--with-system-zziplib" + ;; LuaJIT is not ported to powerpc64le* yet. + ,@(if (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + '("--disable-luajittex" + "--disable-mfluajit") + '())) + + ;; Disable tests on some architectures to cope with a failure of + ;; luajiterr.test. + ;; XXX FIXME fix luajit properly on these architectures. #:tests? ,(let ((s (or (%current-target-system) (%current-system)))) (not (or (string-prefix? "aarch64" s) - (string-prefix? "mips64" s)))) + (string-prefix? "mips64" s) + (string-prefix? "powerpc64le" s)))) + #:phases (modify-phases %standard-phases (add-after 'unpack 'configure-ghostscript-executable -- cgit 1.4.1 From 1a0f4013d33535ed9b8518cfb3ac502f48132fd8 Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Mon, 8 Feb 2021 04:47:03 +0100 Subject: gnu: texlive-latex-base: Fix compilation on powerpc64le*. * gnu/packages/tex.scm (texlive-latex-base)[arguments]: LuaJIT is not ported to powerpc64le* yet. Update replacement 'build phase to add "luajittex" within the "disabled-formats" list on powerpc64le*. Signed-off-by: Chris Marusich --- gnu/packages/tex.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 508537acda..86cb1ee455 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014 Eric Bavier ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Roel Janssen -;;; Copyright © 2016, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Federico Beffa ;;; Copyright © 2016 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus @@ -2520,6 +2520,10 @@ formats.") "eptex eptex" "ptex ptex" "pdfxmltex pdftex" "platex eptex" "csplain pdftex" "mf mf-nowin" "mex pdftex" "pdfmex pdftex" "luacsplain luatex" + ,@(if (string-prefix? "powerpc64le" + (or (%current-target-system) + (%current-system))) + '("luajittex") '()) "cont-en xetex" "cont-en pdftex" "pdfcsplain xetex" "pdfcsplain pdftex" "pdfcsplain luatex" "cslatex pdftex" "mptopdf pdftex" "uplatex euptex" "jadetex pdftex" -- cgit 1.4.1 From b50f42680352213beb64c248c1af2f9dcc1612fc Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Tue, 9 Feb 2021 06:10:02 +0100 Subject: gnu: libelf: Fix compilation for powerpc64le-linux. * gnu/packages/elf.scm (libelf)[arguments]: Modify replacement 'configure phase to invoke "./configure" with "--host=powerpc64le-unknown-linux-gnu" on powerpc64le-linux. Signed-off-by: Chris Marusich --- gnu/packages/elf.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 2e21cab48d..aab912648b 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2020 Mark Wielaard ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -211,6 +212,10 @@ static analysis of the ELF binaries at hand.") (setenv "CONFIG_SHELL" (which "bash")) (invoke "./configure" (string-append "--prefix=" out) + ,@(if (string=? "powerpc64le-linux" + (%current-system)) + '("--host=powerpc64le-unknown-linux-gnu") + '()) ,@(if (string=? "aarch64-linux" (%current-system)) '("--host=aarch64-unknown-linux-gnu") -- cgit 1.4.1 From 8d9aece8c499e536d36c97f11fa8a55325ad4db6 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Sun, 21 Feb 2021 19:46:50 -0800 Subject: ci: %cross-targets: Add powerpc64le-linux-gnu. * gnu/ci.scm (%cross-targets): Add an entry for powerpc64le-linux-gnu. --- gnu/ci.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 2dcd49ac80..32b7a611fb 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -156,6 +156,7 @@ SYSTEM." "arm-linux-gnueabihf" "aarch64-linux-gnu" "powerpc-linux-gnu" + "powerpc64le-linux-gnu" "riscv64-linux-gnu" "i586-pc-gnu" ;aka. GNU/Hurd "i686-w64-mingw32" -- cgit 1.4.1 From 65c46e79e0495fe4d32f6f2725d7233fff10fd70 Mon Sep 17 00:00:00 2001 From: Chris Marusich Date: Tue, 9 Jun 2020 23:35:56 -0700 Subject: gnu: sed: Make it build on SELinux-enabled kernels. Fixes: . * gnu/packages/base.scm (sed)[arguments]: New field. This adds a snippet, equivalent to the patch submitted upstream, which fixes an issue that prevents sed from building on SELinux-enabled kernels. Adjusted by Efraim Flashner to apply to master. --- gnu/packages/base.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 7c5ac61f01..f0f9353398 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -148,6 +148,22 @@ including, for example, recursive directory searching.") (base32 "0alqagh0nliymz23kfjg6g9w3cr086k0sfni56gi8fhzqwa3xksk")))) (build-system gnu-build-system) + (arguments + ;; TODO: When merging this into core-updates, keep the version of + ;; this code (with comment!) applied as a snippet. + `(,@(if (string-prefix? "powerpc64le" (or (%current-target-system) + (%current-system))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'allow-building-on-selinux-systems + (lambda _ + (substitute* "Makefile.in" + (("^ abs_srcdir='\\$\\(abs_srcdir\\)'.*" previous-line) + (string-append + previous-line + " CONFIG_HEADER='$(CONFIG_HEADER)'\t\t\\\n"))) + #t)))) + '()))) (synopsis "Stream editor") (native-inputs `(("perl" ,perl))) ;for tests -- cgit 1.4.1 From 083809229bf199399c33b072056be77dbfd75555 Mon Sep 17 00:00:00 2001 From: João Pedro Simas Date: Fri, 12 Mar 2021 19:42:02 -0300 Subject: gnu: gnuradio: Update to 3.9.0.0. * gnu/packages/radio.scm (gnuradio): Update to 3.9.0.0. [source]: Remove snippet deleting the included copy of volk, as it is not included anymore. [native-inputs]: Replace swig with pybind11. [inputs]: Add sdl (for dtv). [arguments]: Remove 'configure-flags". Disable broken tests. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/radio.scm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 3378b36adb..233af9c287 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Danny Milosavljevic ;;; Copyright © 2020 Charlie Ritter ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 João Pedro Simas ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +68,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) + #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) @@ -286,32 +288,26 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (define-public gnuradio (package (name "gnuradio") - (version "3.8.0.0") + (version "3.9.0.0") (source (origin (method url-fetch) (uri (string-append "https://www.gnuradio.org/releases/gnuradio/" "gnuradio-" version ".tar.xz")) (sha256 - (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete bundled volk to use the shared one. - (delete-file-recursively "volk") - #t)))) + (base32 "1jvm9xd0l2pz1fww4zii6hl7ccnvy256nrf70ljb594n7j9j49ha")))) (build-system cmake-build-system) (native-inputs `(("doxygen" ,doxygen) ("ghostscript" ,ghostscript) ("orc" ,orc) ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) ("python-cheetah" ,python-cheetah) ("python-mako" ,python-mako) ("python-pyzmq" ,python-pyzmq) ("python-scipy" ,python-scipy) ("python-sphinx" ,python-sphinx) - ("swig" ,swig) ("texlive" ,(texlive-union (list texlive-amsfonts texlive-latex-amsmath ;; TODO: Add newunicodechar. @@ -343,6 +339,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("python-pyyaml" ,python-pyyaml) ("qtbase" ,qtbase) ("qwt" ,qwt) + ("sdl" ,sdl) ("volk" ,volk) ("zeromq" ,zeromq))) (arguments @@ -354,8 +351,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system) (guix build python-build-system)) - #:configure-flags - '("-DENABLE_INTERNAL_VOLK=OFF") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths @@ -371,8 +366,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (substitute* "cmake/Modules/GrPython.cmake" (("dist-packages") "site-packages")) - (substitute* '("gr-vocoder/swig/vocoder_swig.i" - "gr-vocoder/include/gnuradio/vocoder/codec2.h" + (substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h" "gr-vocoder/include/gnuradio/vocoder/freedv_api.h") (("string (parallel-job-count)) + "1") + "--output-on-failure" + ;;disable broken tests + "-E" (string-join + '(;; https://github.com/gnuradio/gnuradio/issues/3871 + "qa_header_payload_demux" + ;; https://github.com/gnuradio/gnuradio/issues/4348 + "qa_packet_headerparser_b") + "|")))) (add-after 'install 'wrap-python (assoc-ref python:%standard-phases 'wrap)) (add-after 'wrap-python 'wrap-glib-or-gtk -- cgit 1.4.1 From d3e7f1eeacf3c852b8997c30f4d8e87df87162ae Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 11:51:21 +0100 Subject: gnu: gnuradio: Add missing inputs. * gnu/packages/radio.scm (gnuradio)[native-inputs]: Add js-mathjax. [inputs]: Add libsndfile. [arguments]: Add 'configure-flags' to find mathjax. --- gnu/packages/radio.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 233af9c287..e2e96afbe2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages logging) @@ -300,6 +301,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (native-inputs `(("doxygen" ,doxygen) ("ghostscript" ,ghostscript) + ("js-mathjax" ,js-mathjax) ("orc" ,orc) ("pkg-config" ,pkg-config) ("pybind11" ,pybind11) @@ -325,6 +327,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") ("gsm" ,gsm) ("gtk+" ,gtk+) ("jack" ,jack-1) + ("libsndfile" ,libsndfile) ("log4cpp" ,log4cpp) ("pango" ,pango) ("portaudio" ,portaudio) @@ -351,6 +354,10 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") #:imported-modules (,@%cmake-build-system-modules (guix build glib-or-gtk-build-system) (guix build python-build-system)) + #:configure-flags + (list (string-append "-DMATHJAX2_ROOT=" + (assoc-ref %build-inputs "js-mathjax") + "/share/javascript/mathjax")) #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-paths -- cgit 1.4.1 From 50e33007a5f00860aa06e4f4715c293266ce1612 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 10:18:22 +0100 Subject: gnu: gnuradio-iqbalance: Update to 0.38.2-0.fbee239. * gnu/packages/radio.scm (gnuradio-iqbalance): Update to 0.38.2-0.fbee239. [native-inputs]: Replace swig by pybind11. --- gnu/packages/radio.scm | 67 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e2e96afbe2..eb46803719 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -518,36 +518,39 @@ primitives for SDR (Software Defined Radio).") (license license:gpl2+))) (define-public gnuradio-iqbalance - (package - (name "gnuradio-iqbalance") - (version "0.38.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.osmocom.org/gr-iqbal") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ksagwz05p3b0702q7ljq7013xmp0ijp30my9z6s3p7ja8dj42s3")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-numpy" ,python-numpy) - ("python-six" ,python-six) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("gmp" ,gmp) - ("gnuradio" ,gnuradio) - ("libosmo-dsp" ,libosmo-dsp) - ("log4cpp" ,log4cpp) - ("volk" ,volk))) - (synopsis "GNU Radio block to correct IQ imbalance") - (description + ;; No tag for version supporting Gnuradio 3.9; use commit. + (let ((commit "fbee239a6fb36dd2fb564f6e6a0d393c4bc844db") + (revision "0")) + (package + (name "gnuradio-iqbalance") + (version (git-version "0.38.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-iqbal") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12p193ngcs65nd3lynry119nhv40mikamqkw37wdln7lawx3nw7p")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) + ("python" ,python) + ("python-numpy" ,python-numpy) + ("python-six" ,python-six))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("libosmo-dsp" ,libosmo-dsp) + ("log4cpp" ,log4cpp) + ("volk" ,volk))) + (synopsis "GNU Radio block to correct IQ imbalance") + (description "This is a GNU Radio block to correct IQ imbalance in quadrature receivers. It's composed of two main block: @itemize @@ -555,8 +558,8 @@ receivers. It's composed of two main block: @item Optimize: Attempts to auto-detect the phase and amplitude error to feed to the fix block above. @end itemize") - (home-page "https://git.osmocom.org/gr-iqbal/") - (license license:gpl3+))) + (home-page "https://git.osmocom.org/gr-iqbal/") + (license license:gpl3+)))) (define-public gqrx (package -- cgit 1.4.1 From f1df119224f467eb05bb8c2abde96a0fea453aa7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 10:27:24 +0100 Subject: gnu: gnuradio-osmosdr: Update to 0.2.3-0.a100eb0. * gnu/packages/radio.scm (gnuradio-osmosdr): Update to 0.2.3-0.a100eb0. [native-inputs]: Replace swig by pybind11. [inputs]: Add libsndfile. --- gnu/packages/radio.scm | 70 ++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index eb46803719..14ac598ebb 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -438,40 +438,44 @@ environment.") (license license:gpl3+))) (define-public gnuradio-osmosdr - (package - (name "gnuradio-osmosdr") - (version "0.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.osmocom.org/gr-osmosdr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1aqj5cylipmmjh1x1kb2j8262hxq6mi86dgb2zphj94wvsab2ghx")))) - (build-system cmake-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("pkg-config" ,pkg-config) - ("python" ,python) - ("python-mako" ,python-mako) - ("python-six" ,python-six) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("fftwf" ,fftwf) - ("gmp" ,gmp) - ("gnuradio" ,gnuradio) - ("hackrf" ,hackrf) - ("log4cpp" ,log4cpp) - ("rtl-sdr" ,rtl-sdr) - ("volk" ,volk))) - (synopsis "GNU Radio block for interfacing with various radio hardware") - (description "This is a block for GNU Radio allowing to use a common API + ;; No tag for version supporting Gnuradio 3.9; use commit. + (let ((commit "a100eb024c0210b95e4738b6efd836d48225bd03") + (revision "0")) + (package + (name "gnuradio-osmosdr") + (version (git-version "0.2.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osmocom.org/gr-osmosdr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pk5gnyznfyy510lbqzg9ijcb1fnhmn547n24aiqyrxd6i6vv1ki")))) + (build-system cmake-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("pkg-config" ,pkg-config) + ("pybind11" ,pybind11) + ("python" ,python) + ("python-mako" ,python-mako) + ("python-six" ,python-six))) + (inputs + `(("boost" ,boost) + ("fftwf" ,fftwf) + ("gmp" ,gmp) + ("gnuradio" ,gnuradio) + ("hackrf" ,hackrf) + ("libsndfile" ,libsndfile) + ("log4cpp" ,log4cpp) + ("rtl-sdr" ,rtl-sdr) + ("volk" ,volk))) + (synopsis "GNU Radio block for interfacing with various radio hardware") + (description "This is a block for GNU Radio allowing to use a common API to access different radio hardware.") - (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR") - (license license:gpl3+))) + (home-page "https://osmocom.org/projects/gr-osmosdr/wiki/GrOsmoSDR") + (license license:gpl3+)))) (define-public libosmo-dsp (package -- cgit 1.4.1 From da80d4e6a7bd9fc42f94006152c4762dbbc1f509 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 24 Mar 2021 12:00:46 +0100 Subject: gnu: gqrx: Add missing input. * gnu/packages/radio.scm (gqrx)[inputs]: Add libsndfile. --- gnu/packages/radio.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 14ac598ebb..c10c91fd99 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -590,6 +590,7 @@ to the fix block above. ("gnuradio-iqbalance" ,gnuradio-iqbalance) ("gnuradio-osmosdr" ,gnuradio-osmosdr) ("jack" ,jack-1) + ("libsndfile" ,libsndfile) ("log4cpp" ,log4cpp) ("portaudio" ,portaudio) ("pulseaudio" ,pulseaudio) -- cgit 1.4.1 From 3f944e62044e7afd35b03f06525f04157f05f05d Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 22 Mar 2021 19:52:23 +0000 Subject: gnu: ccache: Update to 4.2. * gnu/packages/ccache.scm (ccache): Update to 4.2. [build-system]: Switch to cmake-build-system. [inputs]: Add zstd:lib. [arguments]: Move substitution before change of directory and add phase to set HOME variable. Signed-off-by: Efraim Flashner --- gnu/packages/ccache.scm | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ccache.scm b/gnu/packages/ccache.scm index c5b9790f27..112f613c88 100644 --- a/gnu/packages/ccache.scm +++ b/gnu/packages/ccache.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2014, 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,7 +23,7 @@ #:use-module (guix packages) #:use-module ((guix licenses) #:select (gpl3+)) #:use-module (guix download) - #:use-module (guix build-system gnu) + #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages perl) #:use-module (gnu packages compression)) @@ -30,25 +31,32 @@ (define-public ccache (package (name "ccache") - (version "3.7.12") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/ccache/ccache/releases/download/v" version "/ccache-" version ".tar.xz")) (sha256 - (base32 "005liq8csgxdn7m9hj2ah07hishww855p8sc96y1hrnwc21lwbx0")))) - (build-system gnu-build-system) + (base32 "0kx9ggbbm899zwyyxvm4dgzn1b95zi1niz0l734pi5y3i0cb251g")))) + (build-system cmake-build-system) (native-inputs `(("perl" ,perl) ; for test/run ("which" ,(@ (gnu packages base) which)))) - (inputs `(("zlib" ,zlib))) + (inputs `(("zlib" ,zlib) + ("zstd" ,zstd "lib"))) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'check 'setup-tests - (lambda _ - (substitute* '("unittest/test_hashutil.c" "test/suites/base.bash") - (("#!/bin/sh") (string-append "#!" (which "sh")))) - #t))))) + '(#:phases + (modify-phases %standard-phases + (add-before 'configure 'setup-tests + (lambda _ + (substitute* '("unittest/test_hashutil.cpp" "test/suites/base.bash") + (("#!/bin/sh") (string-append "#!" (which "sh")))) + #t)) + ;; tests require a writable HOME + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")) + #t))))) (home-page "https://ccache.dev/") (synopsis "Compiler cache") (description -- cgit 1.4.1 From 55685e45be072b8b688f5a2bda4fc68147febd3f Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 24 Mar 2021 14:14:10 +0100 Subject: gnu: Add python-pylibacl. * gnu/packages/acl.scm (python-pylibacl): New variable. --- gnu/packages/acl.scm | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index be4b079b04..abeafeef88 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Marius Bakke ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,13 +27,15 @@ #:use-module (guix licenses) #:use-module (gnu packages attr) #:use-module (gnu packages base) + #:use-module (gnu packages check) #:use-module (gnu packages hurd) #:use-module (gnu packages gettext) #:use-module (gnu packages perl) #:use-module (guix packages) #:use-module (guix download) #:use-module (gnu packages) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) (define-public acl (package @@ -93,3 +96,41 @@ (description "Library and tools for manipulating access control lists.") (license (list gpl2+ lgpl2.1+)))) + +(define-public python-pylibacl + (package + (name "python-pylibacl") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pylibacl" version)) + (sha256 + (base32 + "1zyrk2m20p5b6bdwxhrwib273i6i71zyr5hzssbxfqis5qra9848")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-tests + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; These tests operate on real files, but our tempfs does not support + ;; ACLs + (substitute* "tests/test_acls.py" + (("( *)def test_applyto(_extended(_mixed)?)?" match indent) + (string-append indent "@pytest.mark.skip(reason=\"guix\")\n" match))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest" "tests")) + #t))))) + (inputs `(("acl" ,acl))) + (native-inputs `(("python-pytest" ,python-pytest))) + (home-page "https://pylibacl.k1024.org/") + (synopsis "POSIX.1e ACLs for python") + (description "Python 3.4+ extension module that allows you to manipulate +the POSIX.1e Access Control Lists present in some OS/file-systems +combinations.") + (license lgpl2.1+))) -- cgit 1.4.1 From d999fc689e27569698d72d5e77eba986a9b016d7 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 24 Mar 2021 19:22:43 +0100 Subject: gnu: guile-mastodon: Update to 0.0.1-1.74b75bc. * gnu/packages/guile-xyz.scm (guile-mastodon): Update to 0.0.1-1.74b75bc. [source]: Remove Guile-3.0 snippet since this new release brings Guile-3.0 support. --- gnu/packages/guile-xyz.scm | 65 +++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 461b9e04bf..c798bed817 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1313,44 +1313,37 @@ Scheme by using Guile’s foreign function interface.") (deprecated-package "guile3.0-newt" guile-newt)) (define-public guile-mastodon - (package - (name "guile-mastodon") - (version "0.0.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://framagit.org/prouby/guile-mastodon.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1vblf3d1bbwna3l09p2ap5y8ycvl549bz6whgk78imyfmn28ygry")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Allow builds with Guile 3.0. - (substitute* "configure.ac" - (("^PKG_CHECK.*") "") - (("^GUILE_PKG.*") - "GUILE_PKG([3.0 2.2])\n")) - #t)))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs - `(("guile" ,guile-3.0) - ("gnutls" ,gnutls) - ("guile-json" ,guile-json-4))) - (home-page "https://framagit.org/prouby/guile-mastodon") - (synopsis "Guile Mastodon REST API module") - (description "This package provides Guile modules to access the + (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392") + (revision "1")) + (package + (name "guile-mastodon") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/prouby/guile-mastodon.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1wx5h6wa9c0na8mrnr2nv1nzjvq68zyrly8yyp11dsskhaw4y33h")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("emacs" ,emacs-minimal) + ("pkg-config" ,pkg-config) + ("texinfo" ,texinfo))) + (inputs + `(("guile" ,guile-3.0) + ("gnutls" ,gnutls) + ("guile-json" ,guile-json-4))) + (home-page "https://framagit.org/prouby/guile-mastodon") + (synopsis "Guile Mastodon REST API module") + (description "This package provides Guile modules to access the @uref{https://docs.joinmastodon.org/api/, REST API of Mastodon}, a federated microblogging service.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public guile-parted (package -- cgit 1.4.1 From 03bf951f7032c6592b576001c8800e7cbe056580 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 24 Mar 2021 19:26:00 +0100 Subject: gnu: guile-mastodon-dev: Remove it. * gnu/packages/ci.scm (guile-mastodon-dev): Remove it. (cuirass): Update it. --- gnu/packages/ci.scm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index e0c7238f2b..bafe997c82 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -47,24 +47,6 @@ #:use-module (gnu packages xml) #:use-module (guix build-system gnu)) -(define-public guile-mastodon-dev - (let ((commit "88115d85221876b1baea4accb7c76995da32f479") - (revision "1")) - (package - (inherit guile-mastodon) - (name "guile-mastodon") - (version (git-version "0.0.1" revision commit)) - (home-page "https://framagit.org/mothacehe/guile-mastodon.git") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit commit))) - (sha256 - (base32 - "04dgxliz9bmhn0f7h1n0dj0r5h0fzhg80nxl1rpbxh4zs1yw9qvj")) - (file-name (string-append name "-" version "-checkout"))))))) - (define-public cuirass (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") (revision "2")) @@ -158,7 +140,7 @@ ("guile-squee" ,guile-squee) ("guile-git" ,guile-git) ("guile-zlib" ,guile-zlib) - ("guile-mastodon" ,guile-mastodon-dev) + ("guile-mastodon" ,guile-mastodon) ("gnutls" ,gnutls) ("mailutils" ,mailutils) ;; FIXME: this is propagated by "guile-git", but it needs to be among -- cgit 1.4.1 From 650bb580df3c9b1654a0e7ad97fe750350546198 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 24 Mar 2021 21:06:44 +0200 Subject: gnu: ddrescue: Support cross compiling. * gnu/packages/disk.scm (ddrescue)[arguments]: Add configure-flag to fix cross compiling. --- gnu/packages/disk.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ed112f2ec2..b89da87967 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2016, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2017 Marius Bakke @@ -363,6 +363,8 @@ scheme.") (sha256 (base32 "0qqh38izl5ppap9a5izf3hijh94k65s3zbfkczd4b7x04syqwlyf")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags (list (string-append "CXX=" ,(cxx-for-target))))) (home-page "https://www.gnu.org/software/ddrescue/ddrescue.html") (synopsis "Data recovery utility") (native-inputs `(("lzip" ,lzip))) -- cgit 1.4.1 From 534bcb6b286af0c2fef6638378194ded876c2d10 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 24 Mar 2021 21:09:19 +0100 Subject: gnu: r-textshape: Use HTTPS home page URI. * gnu/packages/cran.scm (r-textshape)[home-page]: Use HTTPS URI. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b9842ca954..96a2aee766 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27600,7 +27600,7 @@ in same length matches).") `(("r-data-table" ,r-data-table) ("r-slam" ,r-slam) ("r-stringi" ,r-stringi))) - (home-page "http://github.com/trinker/textshape") + (home-page "https://github.com/trinker/textshape") (synopsis "Tools for Reshaping Text") (description "Tools that can be used to reshape and restructure text data.") -- cgit 1.4.1 From 92d231847a3bdd632e40c3cc963069e71d50737c Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Wed, 24 Mar 2021 21:51:51 +0100 Subject: gnu: Add emacs-vterm-toggle. * gnu/packages/emacs-xyz.scm (emacs-vterm-toggle): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a147e81289..84fe776f3b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21470,6 +21470,31 @@ stored playlists.") display a terminal in an Emacs buffer.") (license license:gpl3+)))) +(define-public emacs-vterm-toggle + ;; There have been no releases. + (let ((commit "d10239b7bb89b78dddb82f66ac2286bc0b02747b") + (revision "1")) + (package + (name "emacs-vterm-toggle") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jixiuf/vterm-toggle") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r9n23wg9cfy10h5f9zqr8jpkvw34f9rylri3nxq870awjab7rqi")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-vterm" ,emacs-vterm))) + (home-page "https://github.com/jixiuf/vterm-toggle") + (synopsis "Toggle between a vterm buffer and other buffers") + (description + "This package provides a DWIM way to switch from an Emacs buffer to +a vterm buffer and back again.") + (license license:gpl3+)))) + (define-public emacs-simple-mpc ;; There have been no releases. (let ((commit "bee8520e81292b4c7353e45b193f9a13b482f5b2") -- cgit 1.4.1 From c420cec69bf5b24540e86cef8d521d51e0ee6631 Mon Sep 17 00:00:00 2001 From: Stefan Reichör Date: Wed, 24 Mar 2021 19:34:44 +0100 Subject: gnu: emacs-git-gutter: Update to 0.91. * gnu/packages/emacs-xyz.scm (emacs-git-gutter): Update to 0.91. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 84fe776f3b..f45507c647 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3535,7 +3535,7 @@ representation.") (define-public emacs-git-gutter (package (name "emacs-git-gutter") - (version "0.90") + (version "0.91") (source (origin (method git-fetch) @@ -3544,7 +3544,7 @@ representation.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1abagq0psip7cgsqbfjv72qy60ywsny0ibsfcn74ldj6a9v17mz5")))) + (base32 "0zc9f73app1d7j4yb10sy4xidh5252ncyxlvr5kh0kiqk88ck6j9")))) (build-system emacs-build-system) (home-page "https://github.com/syohex/emacs-git-gutter") (synopsis "See and manage hunks of text in a version control system") -- cgit 1.4.1 From ab170124a327b4b359fc440796b18fadb0516f3c Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Mar 2021 23:30:49 -0300 Subject: gnu: Add drawing. * gnu/packages/gnome.scm (drawing): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6661942eb5..09e62d7897 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4256,6 +4256,57 @@ engineering.") ;; Dual licensed under GPLv2 or GPLv3 (both without "or later") (list license:gpl2 license:gpl3)))) +(define-public drawing + (package + (name "drawing") + (version "0.6.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/maoschanz/drawing") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kfgmalakifcvzhzss9zhmqjbdk24zr22c5xwkkahlvfcafp13wn")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/drawing")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (wrap-program prog + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) + #t)))))) + (native-inputs + `(("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("gtk+:bin" ,gtk+ "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf+svg) + ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gtk+" ,gtk+) + ("pango" ,pango) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject))) + (home-page "https://maoschanz.github.io/drawing/") + (synopsis "Basic image editor for GNOME") + (description + "Drawing is a basic image editor aiming at the GNOME desktop.") + (license license:gpl3+))) + (define-public gnome-themes-standard (package (name "gnome-themes-standard") -- cgit 1.4.1 From 86dd54f2307b1f984f599c218843f49b57ac6173 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 21 Mar 2021 22:45:53 -0300 Subject: gnu: Add gsequencer. * gnu/packages/music.scm (gsequencer): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f02c7f2c21..98cd3583cc 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Leo Prikler +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -152,6 +153,7 @@ #:use-module (gnu packages video) #:use-module (gnu packages vim) ;for 'xxd' #:use-module (gnu packages web) + #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -4784,6 +4786,67 @@ list view, and a score editor. MusE aims to be a complete multitrack virtual studio.") (license license:gpl2+))) +(define-public gsequencer + (package + (name "gsequencer") + (version "3.7.48") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/gsequencer.git/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0pqaj09x3lzcj0zbbkqpyaky9i1w462bhhvg1akh73nzwvyy46zd")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'prepare-x-for-test + (lambda _ + (system "Xvfb &") + (setenv "DISPLAY" ":0") + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("cunit" ,cunit) + ("gettext" ,gettext-minimal) + ("gobject-introspection" ,gobject-introspection) + ("gtk-doc" ,gtk-doc) + ("libtool" ,libtool) + ("libxslt" ,libxslt) + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("dssi" ,dssi) + ("fftw" ,fftw) + ("gst-plugins-base" ,gst-plugins-base) + ("gstreamer" ,gstreamer) + ("gtk+" ,gtk+) + ("jack" ,jack-1) + ("ladspa" ,ladspa) + ("libinstpatch" ,libinstpatch) + ("libsamplerate" ,libsamplerate) + ("libsndfile" ,libsndfile) + ("libsoup" ,libsoup) + ("libuuid" ,util-linux "lib") + ("libxml2" ,libxml2) + ("lv2" ,lv2) + ("pulseaudio" ,pulseaudio) + ("webkitgtk" ,webkitgtk))) + (home-page "https://nongnu.org/gsequencer/") + (synopsis "Advanced Gtk+ Sequencer") + (description + "GSequencer allows you to play, capture and create music. There is a piano +roll, automation and wave form editor. It has machines for playing drum samples, +Soundfont2 sound containers and synthesizers. They usually can be connected to a +MIDI input source (instrument). It has support for various audio backends like +ALSA, Pulseaudio, JACK, OSSv4 and CoreAudio.") + (license license:gpl3+))) + (define-public dssi (package (name "dssi") -- cgit 1.4.1 From b0eb525ddba77420ff8c0930b9173b10f9ae342d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Wed, 24 Mar 2021 23:41:05 +0100 Subject: gnu: guix: Update to 86dd54f. * gnu/packages/package-management.scm (guix): Update to 86dd54f. --- 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 888f54322d..c82ba3e213 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "86dd54f2307b1f984f599c218843f49b57ac6173") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 4dc13760c2bf60654a0922a696314876c49be809 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:50:29 -0400 Subject: gnu: linux-libre: Update to 5.11.9. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.9. (linux-libre-5.11-pristine-source): 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 ac137f448d..3840f14c05 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.8") +(define-public linux-libre-5.11-version "5.11.9") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "17y8q0gy4b00rms6pgglzmzz4msvmn2frqvln9vac39m78k3kyci"))) + (hash (base32 "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 1daef9052f9d4ab75461b6932aad6a48283785f6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:02 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.108. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.108. (linux-libre-5.4-pristine-source): 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 3840f14c05..84ff653b51 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.107") +(define-public linux-libre-5.4-version "5.4.108") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0q3m4d96d0hhhzn71aarh314i4cx9h3qvhhi5hrmcsrnbxafyg0w"))) + (hash (base32 "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From e5918b8c5e8895b7958da14c3ae38aae053ed027 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:20 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.183. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.183. (linux-libre-4.19-pristine-source): 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 84ff653b51..427f3d4a55 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.182") +(define-public linux-libre-4.19-version "4.19.183") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0r93mgvjypmj0glg0912vfq9zbagi59w4d88ynz5gm8sl05pbnq5"))) + (hash (base32 "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 153bc03830e585bb8fc8a3d40be524b9f4fb0aca Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:51:40 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.227. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.227. (linux-libre-4.14-pristine-source): 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 427f3d4a55..f01f1b8b9b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.226") +(define-public linux-libre-4.14-version "4.14.227") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "09llp8jl5xgxxzj0f2sfx32annwyz82k1zmgd26zy90lz0d09p3s"))) + (hash (base32 "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From a802989ce8984d923116dc5a7da2a143bbd21837 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:52:14 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.263. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.263. (linux-libre-4.9-pristine-source): 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 f01f1b8b9b..3d14932387 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.262") +(define-public linux-libre-4.9-version "4.9.263") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1zq77x9zf1wbk8n17rnblm5lfwlkin1xnxb3sxirwb9njm07cbmj"))) + (hash (base32 "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From da00a3a477775ce3996b15861059b3227a6bf5a3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 24 Mar 2021 14:52:31 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.263. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.263. (linux-libre-4.4-pristine-source): 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 3d14932387..cf193bc0b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.262") +(define-public linux-libre-4.4-version "4.4.263") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0yz9qi4i46ndshxmb99kvv7lk6cbb09y7bzagq7sgvqaj4lwaw6j"))) + (hash (base32 "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 27d967dfa44aaffd610bed29d88a7161ef144119 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 02:31:42 +0100 Subject: Revert "gnu: guix: Update to 86dd54f." A test failure (tests/print) was uncovered so revert until we fix it. This reverts commit b0eb525ddba77420ff8c0930b9173b10f9ae342d. --- 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 c82ba3e213..888f54322d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "86dd54f2307b1f984f599c218843f49b57ac6173") - (revision 18)) + (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") + (revision 17)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1vp3k4l7qs4s6irr4ylf9yk3yyq07bppvlz4z4c84s6qq5972m6i")) + "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From f445407df67b7c1ead0cae1456a619c24db1a874 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 25 Mar 2021 10:35:55 +0100 Subject: gnu: Add html-template. * gnu/packages/lisp-xyz.scm (cl-html-template, ecl-html-template, sbcl-html-template): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5682daee3f..c40995491f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15342,3 +15342,40 @@ numbers in Common Lisp.") (define-public cl-computable-reals (sbcl-package->cl-source-package sbcl-computable-reals)) + +(define-public sbcl-html-template + (package + (name "sbcl-html-template") + (version "0.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/html-template") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wz3czvjsn4x971dsiia9f9nvvcmbkablcl75zsvxndkimc93wxb")))) + (build-system asdf-build-system/sbcl) + (home-page "https://edicl.github.io/html-template/") + (synopsis "HTML templates from Common Lisp") + (description + "HTML-TEMPLATE is a Common Lisp library which can be used to fill +templates with arbitrary (string) values at runtime. The result does not have +to be HTML. + +It is loosely modeled after the Perl module @code{HTML::Template} and +partially compatible with a its syntax, though both libraries contain some +extensions that the other does not support. + +HTML-TEMPLATE translates templates into efficient closures which can be +re-used as often as needed. It uses a cache mechanism so you can update +templates while your program is running and have the changes take effect +immediately.") + (license license:bsd-2))) + +(define-public ecl-html-template + (sbcl-package->ecl-package sbcl-html-template)) + +(define-public cl-html-template + (sbcl-package->cl-source-package sbcl-html-template)) -- cgit 1.4.1 From 8ee6bb91c126799c2a0ac23df1ecb4ab5a0ceb1d Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 25 Mar 2021 10:36:05 +0100 Subject: gnu: Add quickproject. * gnu/packages/lisp-xyz.scm (cl-quickproject, ecl-quickproject, sbcl-quickproject): New variables. --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c40995491f..d4bf75b231 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15379,3 +15379,36 @@ immediately.") (define-public cl-html-template (sbcl-package->cl-source-package sbcl-html-template)) + +(define-public sbcl-quickproject + (package + (name "sbcl-quickproject") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xach/quickproject") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1szs8p2wr1yr9mjmj3h3557l6wxzzga0iszimb68z0hb1jj3lva6")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-fad" ,sbcl-cl-fad) + ("html-template" ,sbcl-html-template))) + (arguments + '(#:asd-files '("quickproject.asd"))) + (home-page "https://xach.com/lisp/quickproject/") + (synopsis "Create Common Lisp project skeletons") + (description + "Quickproject provides a quick way to make a Common Lisp project. After +creating a project, it extends the ASDF registry so the project may be +immediately loaded.") + (license license:expat))) + +(define-public ecl-quickproject + (sbcl-package->ecl-package sbcl-quickproject)) + +(define-public cl-quickproject + (sbcl-package->cl-source-package sbcl-quickproject)) -- cgit 1.4.1 From 6b3b72fb600a949e492a9c487e15f6b59da7d6b0 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:51:20 +0100 Subject: gnu: xfce4-battery-plugin: Update to 1.1.4. * gnu/packages/xfce.scm (xfce4-battery-plugin): Update to 1.1.4. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index dc65567835..eb934de4cf 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -463,7 +463,7 @@ applications menu, workspace switcher and more.") (define-public xfce4-battery-plugin (package (name "xfce4-battery-plugin") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -471,7 +471,7 @@ applications menu, workspace switcher and more.") name "-" version ".tar.bz2")) (sha256 (base32 - "18s0s004nidii8cc3ldp5n3jajc18vwn9vhkhmhy3lbbs520mghj")))) + "08n2cig9r2lccwvmk6v9vjiz0xqcp6x30m5b3q702v0m6ylg4z8h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("intltool" ,intltool))) -- cgit 1.4.1 From 71ee5a640db4c1aa16a79591ae319e6db83350f4 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:51:49 +0100 Subject: gnu: xfce4-systemload-plugin: Update to 1.3.1. * gnu/packages/xfce.scm (xfce4-systemload-plugin): Update to 1.3.1. [inputs]: Add libgtop. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index eb934de4cf..3dd42d7e1b 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1916,7 +1916,7 @@ freedesktop.org specification.") (define-public xfce4-systemload-plugin (package (name "xfce4-systemload-plugin") - (version "1.2.4") + (version "1.3.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1925,13 +1925,14 @@ freedesktop.org specification.") "/xfce4-systemload-plugin-" version ".tar.bz2")) (sha256 (base32 - "0dcqg13phlcri4i4g9752m4zfkcmidiqpjv4s3l3pfiwjbgvhc85")))) + "0lknh5l30qs5c69wwjcblbyhczvdbxs59fqkb8mpqbfm05w01lan")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config))) (inputs - `(("libxfce4ui" ,libxfce4ui) + `(("libgtop" ,libgtop) + ("libxfce4ui" ,libxfce4ui) ("xfce4-panel" ,xfce4-panel))) (home-page "https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin") -- cgit 1.4.1 From be27d36640ca12b88f96c0dce27b194b918a1243 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:18 +0100 Subject: gnu: thunar: Update to 4.16.6. * gnu/packages/xfce.scm (thunar): Update to 4.16.6. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 3dd42d7e1b..5560772fa7 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -765,7 +765,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.16.3") + (version "4.16.6") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -773,7 +773,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0wpzs7r79aayg4zbxy514fbkabac1hhvw522cjjr453gva4xq92m")))) + "1dq238m2bh938gpb058cr2xmhy6f3qkyyya9l0ya95kiwqzislyb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From d8235685d883b1a71b90fc20df347745725a4523 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:33 +0100 Subject: gnu: exo: Update to 4.16.1. * gnu/packages/xfce.scm (exo): Update to 4.16.1. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 5560772fa7..c8f0a0b7dd 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -313,7 +313,7 @@ upstream occasionally.") (define-public exo (package (name "exo") - (version "4.16.0") + (version "4.16.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -321,7 +321,7 @@ upstream occasionally.") "exo-" version ".tar.bz2")) (sha256 (base32 - "1k5sfm9cmg8k5zzzv0wb2cciqwwklnpfzcpak7wa32lsxl7b0x8r")))) + "0fxm2aczzbi0z4y6x24934964y9jg4cl4frvlnjc5zqmccjsr3aj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From 3f1b2bd322b6cdba99a43d08e5e8464f7424cbc5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 25 Mar 2021 01:52:49 +0100 Subject: gnu: xfce4-netload-plugin: Update to 1.4.0. * gnu/packages/xfce.scm (xfce4-netload-plugin): Update to 1.4.0. Signed-off-by: Efraim Flashner --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c8f0a0b7dd..e0ace027fb 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1761,7 +1761,7 @@ mounted or when unmounting fails.") (define-public xfce4-netload-plugin (package (name "xfce4-netload-plugin") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/panel-plugins/" @@ -1770,7 +1770,7 @@ mounted or when unmounting fails.") "/xfce4-netload-plugin-" version ".tar.bz2")) (sha256 (base32 - "0p91875n6s8n88l7wb4w9prqly3wvkyilnr7zq0ppq71rwjh9r12")))) + "036pvhfv1iynvj75va0xl8hpvnfckabyqm9jv56pb40p2072cxkc")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) -- cgit 1.4.1 From 10cbf042e13c328559de3bfd8e42ceb8f8f51d10 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 17:51:47 +0100 Subject: gnu: openssl: Update to 1.1.1k [security fixes]. Fixes CVE-2021-3450 and CVE-2021-3449. * gnu/packages/tls.scm (openssl/fixed): Update to 1.1.1k. --- 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 c10975ed52..2a8c69a68c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -434,7 +434,7 @@ required structures.") (define-public openssl/fixed (package (inherit openssl) - (version "1.1.1j") + (version "1.1.1k") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -447,7 +447,7 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1gw17520vh13izy1xf5q0a2fqgcayymjjj5bk0dlkxndfnszrwma")))))) + "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9")))))) (define-public openssl-1.0 (package -- cgit 1.4.1 From a172def55ad762b2a9e796531b88da33a74ccce7 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 12 Mar 2021 06:33:26 +0100 Subject: gnu: gcc: Fix comment about gfortran. Added by: cb4805e34c9997edca14743516b9a0fde6303d1c Fixes: 0681f05486d901c92637c098bb7afddef35068b0 * gnu/packages/gcc.scm (gcc): Fix comment about gfortran. Signed-off-by: Christopher Baines --- gnu/packages/gcc.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 3ea8695cf1..5f84d28551 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -595,8 +595,7 @@ It also includes runtime support libraries for these languages."))) "gcc-5.0-libvtv-runpath.patch")))))) ;; Note: When changing the default gcc version, update -;; the gcc-toolchain-* definitions and the gfortran definition -;; accordingly. +;; the gcc-toolchain-* definitions. (define-public gcc gcc-7) (define-public (make-libstdc++ gcc) -- cgit 1.4.1 From 0098fcecf0c196fd645c1dc44d2897ef1d58c730 Mon Sep 17 00:00:00 2001 From: Rafa Gálvez Date: Fri, 12 Mar 2021 16:16:13 +0100 Subject: gnu: synapse: Update to 1.29.0. * gnu/packages/matrix.scm (synapse): Update to 1.29.0. --- gnu/packages/matrix.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index 8a3a1283fa..a8d9d66ee7 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -61,13 +61,13 @@ an LDAP server.") (define-public synapse (package (name "synapse") - (version "1.25.0") + (version "1.29.0") (source (origin (method url-fetch) (uri (pypi-uri "matrix-synapse" version)) (sha256 (base32 - "0382qcsmgvg24p0xvb37kn3y1kd3bn363kblgwg58iy92df0pga4")))) + "0if2yhpz8psg0661401mvxznldbfhk2j9rhbs25jdaqm9jsv6907")))) (build-system python-build-system) ;; TODO Run tests with ‘PYTHONPATH=. trial3 tests’. (propagated-inputs -- cgit 1.4.1 From af3bf6b481b1cd134c02fecc9dc221bd045e65f8 Mon Sep 17 00:00:00 2001 From: Benoit Joly Date: Tue, 9 Mar 2021 00:27:55 -0500 Subject: gnu: Add go-gitlab.com-shackra-goimapnotify. * gnu/packages/mail.scm (go-gitlab.com-shackra-goimapnotify): New variable. Signed-off-by: Christopher Baines --- gnu/packages/mail.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b2a66f8513..a1168872ba 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020 divoplade ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Benoit Joly ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,6 +89,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages groff) @@ -155,6 +157,7 @@ #:use-module (guix utils) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system go) #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix build-system perl) @@ -317,6 +320,37 @@ software.") ;; Libraries are under LGPLv3+, and programs under GPLv3+. (list license:gpl3+ license:lgpl3+)))) +(define-public go-gitlab.com-shackra-goimapnotify + (let ((commit "832bc7112db9b28e28d69e90b91ea6c005244c9b") + (revision "0")) + (package + (name "go-gitlab.com-shackra-goimapnotify") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/shackra/goimapnotify") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h27kshx4vwl5k6vc2szsq3d701fzs4gczjypz907f8hj0lrnjmy")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.com/shackra/goimapnotify")) + (propagated-inputs + `(("go-github-com-emersion-go-imap" ,go-github-com-emersion-go-imap) + ("go-github-com-emersion-go-imap-idle" ,go-github-com-emersion-go-imap-idle) + ("go-github-com-emersion-go-sasl" ,go-github-com-emersion-go-sasl) + ("go-github-com-sirupsen-logrus" ,go-github-com-sirupsen-logrus) + ("go-golang-org-x-text" ,go-golang-org-x-text))) + (synopsis "Execute scripts on IMAP mailbox changes.") + (description + "Script to execute scripts on IMAP mailbox changes (new/deleted/updated +messages) using IDLE. Implemented in Go.") + (home-page "https://gitlab.com/shackra/goimapnotify") + (license license:gpl3+)))) + (define-public guile2.2-mailutils (package (inherit mailutils) -- cgit 1.4.1 From ac29d37e2ffd7a85adfcac9be4d5bce018289bec Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 25 Mar 2021 18:34:01 +0100 Subject: gnu: cuirass: Update to 1.0.0-3.f5a2eea. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-3.f5a2eea. --- 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 bafe997c82..c1305a781f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "6f4a203a0bb2d441d091d561c1735fbe2d170cf7") - (revision "2")) + (let ((commit "f5a2eeae18ec02043107199047ddffd83e76d620") + (revision "3")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "120cnnjy4j2dinfmas1ddmqzzc7ikj9c76sl4li6g6dn8g7s8f69")))) + "1jnm67zhfsbd7b0ns8llmlp7idahw1gcsg09ffrpx77yyr5xhyzg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From f5ef08c4373995aa7ba271f0d3110421f922d436 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:03:39 +0100 Subject: gnu: emacs: Update to 27.2. * gnu/packages/emacs.scm (emacs): Update to 27.2. --- 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 98061c93ae..7447cfe33a 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017 Jan Nieuwenhuizen ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2018 Mathieu Othacehe -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler @@ -76,14 +76,14 @@ (define-public emacs (package (name "emacs") - (version "27.1") + (version "27.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "0h9f2wpmp6rb5rfwvqwv1ia1nw86h74p7hnz3vb3gjazj67i4k2a")) + "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl")) (patches (search-patches "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" "emacs-ignore-empty-xim-styles.patch" -- cgit 1.4.1 From 846a6aadd6b7ec80115dfc0d23990ce3108e4d3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:03:55 +0100 Subject: gnu: libinstpatch: Update to 1.1.6. * gnu/packages/audio.scm (libinstpatch): Update to 1.1.6. --- 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 f1346208a2..29ef0266ce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4922,7 +4922,7 @@ minimum.") (define-public libinstpatch (package (name "libinstpatch") - (version "1.1.5") + (version "1.1.6") (source (origin (method git-fetch) @@ -4931,7 +4931,7 @@ minimum.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0psx4hc5yksfd3k2xqsc7c8lbz2d4yybikyddyd9hlkhq979cmjb")))) + (base32 "1w3nk0vvd1cxic70n45zjip0bdsrja969myvyvkhq3ngbarbykir")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;there are no tests -- cgit 1.4.1 From 23f964a62c6040b4d0ff34d9e69c9ad67a6033a0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:07 +0100 Subject: gnu: doctest: Update to 2.4.6. * gnu/packages/check.scm (doctest): Update to 2.4.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 21514d1bc4..c27f347819 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -561,7 +561,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.4.5") + (version "2.4.6") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -569,7 +569,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "1pc34dvpgdzx3paqdf0khgs87kvjncx27yn434f5ic33r1lwr9r4")))) + "14m3q6d96zg6d99x1152jkly50gdjrn5ylrbhax53pfgfzzc5yqx")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit 1.4.1 From 6bce6469b9f386bfe938d992ec122f842efbdbf2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:22 +0100 Subject: gnu: wla-dx: Update to 9.12. * gnu/packages/assembly.scm (wla-dx): Update to 9.12. --- gnu/packages/assembly.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm index 9db1834d27..dbed33bb3d 100644 --- a/gnu/packages/assembly.scm +++ b/gnu/packages/assembly.scm @@ -342,7 +342,7 @@ package for the Game Boy and Game Boy Color. It consists of: (define-public wla-dx (package (name "wla-dx") - (version "9.11") + (version "9.12") (source (origin (method git-fetch) (uri (git-reference @@ -351,7 +351,7 @@ package for the Game Boy and Game Boy Color. It consists of: (file-name (git-file-name name version)) (sha256 (base32 - "0i8pxvyaih79pqnyvqyqd9rwdid91pna76cap0k1n5zhg8xswf2f")))) + "1wlbqv2rgk9q6m9an1mi0i29250zl8lw7zipki2bbi9mczpyczli")))) (build-system cmake-build-system) (native-inputs `(("sphinx" ,python-sphinx))) ; to generate man pages -- cgit 1.4.1 From a4739f3742eb8a919f530bb4707a89a1b1cf5ec0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:04:40 +0100 Subject: gnu: youtube-dl: Update to 2021.03.25. * gnu/packages/video.scm (youtube-dl): Update to 2021.03.25. --- 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 b5a2aca980..bd8fddf9b4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.14") + (version "2021.03.25") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1bh74f9q6dv17ah5x8zcxw03dq6jbh959xd39kw374cf9ifrgnd3")) + "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From 43f82eecf52c300698f19dee3927573dc8abbcb9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:05:01 +0100 Subject: gnu: spdlog: Update to 1.8.3. * gnu/packages/logging.scm (spdlog): Update to 1.8.3. --- gnu/packages/logging.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index eafc23b2e6..09e9d59ed5 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Stefan Reichör ;;; Copyright © 2017 Eric Bavier -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Gábor Boskovits ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2020 Marius Bakke @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -199,8 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "03vmwbi9v7r3v8kzd0lj10fchp54kxbxwzfx7dp6qzkxjrvmx2dx")))) + (base32 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit 1.4.1 From cc33f50d0e2a7835e99913226cb4c4b0e9e961ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 25 Mar 2021 21:07:39 +0100 Subject: gnu: vips: Update to 8.10.6. * gnu/packages/image-processing.scm (vips): Update to 8.10.6. --- gnu/packages/image-processing.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 26f6faea8c..7205336d53 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Björn Höfling ;;; Copyright © 2018 Lprndn ;;; Copyright © 2019, 2021 Efraim Flashner @@ -556,7 +556,7 @@ vision algorithms. It can be used to do things like: (define-public vips (package (name "vips") - (version "8.10.5") + (version "8.10.6") (source (origin (method url-fetch) @@ -564,7 +564,7 @@ vision algorithms. It can be used to do things like: "https://github.com/libvips/libvips/releases/download/v" version "/vips-" version ".tar.gz")) (sha256 - (base32 "1n6gw7cw66rfn1wdb92ydpkv7gfmjiinsg6d6gqxpdja6gsz5vm4")))) + (base32 "0vjsh3i0861f6h9as3bch956cidz824zz499pvhjs3lfjn6hhs14")))) (build-system gnu-build-system) (native-inputs `(("gobject-introspection" ,gobject-introspection) -- cgit 1.4.1 From 52e1bab6cf6929882d9a6d7e69d75df44608a617 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 15:48:35 -0400 Subject: gnu: linux-libre: Update to 5.11.10. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.10. (linux-libre-5.11-pristine-source): 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 cf193bc0b6..469b62dbc4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.9") +(define-public linux-libre-5.11-version "5.11.10") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "0dcqn6s85sd4zl7rv8ay88p5z12xvy2rma0dx6g6b480rg68sxal"))) + (hash (base32 "07fw48sy8p17jmm24x3rl99cwxiwhwjrxnmy3g542w9kzawaqwnk"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 6205f9521732f3d69820b2eb1ce2a735762c20b2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 15:51:37 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.26. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.26. (linux-libre-5.10-pristine-source): 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 469b62dbc4..5e7542d50b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.25") +(define-public linux-libre-5.10-version "5.10.26") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1p8s8vp5b6vjmvhj3plm0pr0d9qp5lrwm6l40a4bjr1vk9myf2lk"))) + (hash (base32 "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From bc8554ecb1c132629640f1e61dd2a7e7c9a92027 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 25 Mar 2021 18:54:49 -0400 Subject: gnu: ircii: Update to 20210314 [security fixes]. See this message for more information about the security issues fixed in ircii 20210314: https://seclists.org/oss-sec/2021/q1/262 * gnu/packages/irc.scm (ircii): Update to 20210314. --- gnu/packages/irc.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index a595b40594..5fba72b576 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -282,14 +282,14 @@ for the IRCv3 protocol.") (define-public ircii (package (name "ircii") - (version "20151120") + (version "20210314") (source (origin (method url-fetch) (uri (string-append "https://ircii.warped.com/" name "-" version ".tar.gz")) (sha256 (base32 - "178dc279f5j894qvp96dzz7c0jpryqlcqw5g0dc9yaxg9kgw1lqm")))) + "04jczayv1vdn21fcf5zkfaa98sy7d6ydrv2sns2i67gvya2z28j3")))) (build-system gnu-build-system) ;; TODO: We should package a small socks4/5 library/server to configure ;; ircii with socks client. `ghc-socks' pulls in lots of haskell, which -- cgit 1.4.1 From a801c7379a534a2896a03a1a6f8b47eb92691b00 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Mar 2021 15:52:39 -0500 Subject: gnu: Remove QT 4. For more information, see: https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html https://bugs.gnu.org/45704 * gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables. * gnu/packages/engineering.scm (qucs, qucs-s): Remove variables. * gnu/packages/messaging.scm (pybitmessage): Remove variable. * gnu/packages/password-utils.scm (keepassx): Remove variable. * gnu/packages/pdf.scm (poppler-qt4): Remove variable. --- gnu/packages/engineering.scm | 250 --------------------------------------- gnu/packages/messaging.scm | 93 --------------- gnu/packages/password-utils.scm | 31 ----- gnu/packages/pdf.scm | 7 -- gnu/packages/qt.scm | 251 ---------------------------------------- 5 files changed, 632 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index f3c6e6f3cd..8d7ba9c1da 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2016,256 +2016,6 @@ parallel computing platforms. It also supports serial execution.") (license (list license:gpl2+ license:lgpl2.0+)))) ; freehdl's libraries -(define-public qucs - ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from git. - ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced this - ;; comment and update the package. - (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8") - (revision "0")) - (package - (name "qucs") - (version (git-version "0.0.19" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Qucs/qucs") - (commit commit))) - (sha256 - (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4r3gb")) - (file-name (string-append name "-" version "-checkout")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap - (lambda _ - (for-each patch-shebang - '("bootstrap" - "qucs/bootstrap" - "qucs-doc/bootstrap" - "qucs-core/bootstrap")) - #t)) - (add-before 'configure 'patch-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/configure" - (("\\$QTDIR") (assoc-ref inputs "qt4"))) - #t)) - (add-after 'patch-configure 'patch-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (substitute* '("qucs/qucs/qucsdigi" - "qucs/qucs/qucsdigilib" - "qucs/qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref outputs "out") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilog")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-before 'check 'pre-check - (lambda _ - ;; The test suite requires a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; 'qucs' directly invokes gcc, hence this wrapping. - (wrap-program (string-append out "/bin/qucs") - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("ADMSXMLBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "adms") "/bin"))) - `("ASCOBINDIR" ":" prefix - (,(string-append (assoc-ref inputs "asco") "/bin"))) - `("QUCS_OCTAVE" ":" prefix - (,(string-append (assoc-ref inputs "octave") "/bin/octave"))))) - #t))) - #:parallel-build? #f ; race condition - #:configure-flags '("--disable-doc"))) ; we need octave-epstk - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("libtool-native" ,libtool) - ("pkg-config" ,pkg-config) - ("python" ,python-2) ; for tests - ("matplotlib" ,python2-matplotlib) ; for tests - ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server-for-tests))) ; for tests - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("sed" ,sed))) - (home-page "http://qucs.sourceforge.net/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs is a circuit simulator with graphical user interface. The software -aims to support all kinds of circuit simulation types---e.g. DC, AC, -S-parameter, transient, noise and harmonic balance analysis. Pure digital -simulations are also supported.") - (license license:gpl2+)))) - -(define-public qucs-s - (package - (name "qucs-s") - (version "0.0.21") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/ra3xdh/qucs_s/archive/" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "12m1jwhb9qwvb141qzyskbxnw3wn1x22d02z4b4862p7xvccl5h7")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-before 'configure 'patch-scripts - (lambda* (#:key inputs #:allow-other-keys) - (substitute* '("qucs/qucsdigi" - "qucs/qucsdigilib" - "qucs/qucsveri") - (("\\$BINDIR") - (string-append (assoc-ref inputs "qucs") "/bin")) - (("freehdl-config") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config")) - (("freehdl-v2cc") - (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc")) - (("cp ") - (string-append (assoc-ref inputs "coreutils") "/bin/cp ")) - (("glibtool") - (string-append (assoc-ref inputs "libtool") "/bin/libtool")) - (("sed") - (string-append (assoc-ref inputs "sed") "/bin/sed")) - (("iverilog") - (string-append (assoc-ref inputs "iverilog") "/bin/iverilog")) - (("vvp") - (string-append (assoc-ref inputs "iverilog") "/bin/vvp"))) - #t)) - (add-after 'patch-scripts 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qucs/main.cpp" - (((string-append "QucsSettings\\.Qucsator = QucsSettings\\.BinDir " - "\\+ \"qucsator\" \\+ executableSuffix")) - (string-append "}{ QucsSettings.Qucsator = \"" - (assoc-ref inputs "qucs") "/bin/qucsator\"")) - (((string-append "QucsSettings\\.XyceExecutable = " - "\"/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce")) - (string-append "}{ QucsSettings.XyceExecutable = \"" - (assoc-ref inputs "xyce-serial") "/bin/Xyce")) - (((string-append "else QucsSettings\\.XyceParExecutable = " - "\"mpirun -np %p /usr/local" - "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce")) - (string-append "QucsSettings.XyceParExecutable = \"" - (assoc-ref inputs "mpi") "/bin/mpirun -np %p " - (assoc-ref inputs "xyce-parallel") "/bin/Xyce")) - (("else QucsSettings\\.NgspiceExecutable = \"ngspice\"") - (string-append "QucsSettings.NgspiceExecutable = " "\"" - (assoc-ref inputs "ngspice") "/bin/ngspice\""))) - (substitute* "qucs/extsimkernels/ngspice.cpp" - (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib")) - (substitute* "qucs/qucs_actions.cpp" - (("qucstrans") - (string-append (assoc-ref inputs "qucs") "/bin/qucstrans")) - (("qucsattenuator") - (string-append (assoc-ref inputs "qucs") "/bin/qucsattenuator")) - (("qucsrescodes") - (string-append (assoc-ref inputs "qucs") "/bin/qucsrescodes"))) - #t)) - (add-after 'install 'install-scripts - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each - (lambda (script) - (let ((file (string-append "../qucs_s-" ,version - "/qucs/" script)) - (out (assoc-ref outputs "out"))) - (install-file file (string-append out "/bin")) - (chmod (string-append out "/bin/" script) #o555))) - '("qucsdigi" "qucsdigilib" "qucsveri")) - #t)) - (add-after 'install-scripts 'make-wrapper - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/bin/qucs-s")) - (qucs (assoc-ref inputs "qucs")) - (qucsator (string-append qucs "/bin/qucsator"))) - (wrap-program file - `("CPLUS_INCLUDE_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/include"))) - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/bin"))) - `("LIBRARY_PATH" ":" prefix - (,(string-append (assoc-ref inputs "gcc-toolchain") - "/lib"))) - `("QUCSATOR" ":" prefix (,qucsator)) - `("QUCSCONV" ":" prefix (,(string-append qucsator "/bin/qucsconv"))) - `("ADMSXMLBINDIR" ":" prefix (,(string-append (assoc-ref inputs "adms") - "/bin"))) - `("ASCOBINDIR" ":" prefix (,(string-append (assoc-ref inputs "asco") - "/bin"))) - `("QUCS_OCTAVE" ":" prefix (,(string-append (assoc-ref inputs "octave") - "/bin/octave")))) - (symlink qucsator (string-append out "/bin/qucsator")) - #t)))))) - (native-inputs - `(("libtool-native" ,libtool))) - (inputs - `(("adms" ,adms) - ("asco" ,asco) - ("coreutils" ,coreutils) - ("freehdl" ,freehdl) - ("gcc-toolchain" ,gcc-toolchain) - ("iverilog" ,iverilog) - ("libtool" ,libtool) - ("mpi" ,openmpi) - ("ngspice" ,ngspice) - ("octave" ,octave-cli) - ("qt4" ,qt-4) - ("qucs" ,qucs) - ("sed" ,sed) - ("xyce-serial" ,xyce-serial) - ("xyce-parallel" ,xyce-parallel))) - (home-page "https://ra3xdh.github.io/") - (synopsis "Circuit simulator with graphical user interface") - (description - "Qucs-S is a spin-off of the Qucs cross-platform circuit simulator. -The S letter indicates SPICE. The purpose of the Qucs-S subproject is to use -free SPICE circuit simulation kernels with the Qucs GUI. It provides the -simulator backends @code{Qucsator}, @code{ngspice} and @code{Xyce}.") - (license license:gpl2+))) - (define-public librepcb (package (name "librepcb") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index a967ac31c2..5c55e08fb2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1616,99 +1616,6 @@ guidelines. It provides an easy to use application that allows you to connect with friends and family without anyone else listening in.") (license license:gpl3+))) -(define-public pybitmessage - (package - (name "pybitmessage") - (version "0.6.3.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Bitmessage/PyBitmessage") - (commit version))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35")))) - (propagated-inputs - ;; TODO: - ;; Package "pyopencl", required in addition to numpy for OpenCL support. - ;; Package "gst123", required in addition to alsa-utils and - ;; mpg123 for sound support. - `(("python2-msgpack" ,python2-msgpack) - ("python2-pythondialog" ,python2-pythondialog) - ("python2-pyqt-4" ,python2-pyqt-4) - ("python2-sip" ,python2-sip) - ("python2-pysqlite" ,python2-pysqlite) - ("python2-pyopenssl" ,python2-pyopenssl))) - (native-inputs - `(("openssl" ,openssl))) - (build-system python-build-system) - (arguments - `(#:modules ((guix build python-build-system) - (guix build utils)) - #:tests? #f ;no test target - #:python ,python-2 - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-unmatched-python-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/bitmessagemain.py" - (("#!/usr/bin/env python2.7") - (string-append "#!" (which "python")))) - (substitute* "src/bitmessagecli.py" - (("#!/usr/bin/env python2.7.x") - (string-append "#!" (which "python")))) - #t)) - (add-after 'unpack 'fix-depends - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/depends.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so"))) - #t)) - (add-after 'unpack 'fix-local-files-in-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "src/proofofwork.py" - (("bitmsghash.so") - (string-append (assoc-ref outputs "out") - "/lib/bitmsghash.so"))) - #t)) - (add-after 'unpack 'fix-pyelliptic - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/pyelliptic/openssl.py" - (("libcrypto.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libcrypto.so")) - (("libssl.so") - (string-append (assoc-ref inputs "openssl") - "/lib/libssl.so"))) - #t)) - (add-after 'unpack 'noninteractive-build - ;; This applies upstream commit 4c597d3f7cf9f83a763472aa165a1a4292019f20 - (lambda _ - (substitute* "setup.py" - (("except NameError") - "except EOFError, NameError")) - #t)) - ;; XXX: python setup.py does not build and install bitmsghash, - ;; without it PyBitmessage tries to compile it at first run - ;; in the store, which due to obvious reasons fails. Do it - ;; and place it in /lib. - (add-after 'unpack 'build-and-install-bitmsghash - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion "src/bitmsghash" - (system* "make") - (install-file "bitmsghash.so" - (string-append (assoc-ref outputs "out") "/lib"))) - #t))))) - (license license:expat) - (description - "Distributed and trustless peer-to-peer communications protocol -for sending encrypted messages to one person or many subscribers.") - (synopsis "Distributed peer-to-peer communication") - (home-page "https://bitmessage.org/"))) - (define-public ytalk (package (name "ytalk") diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0d86a3d69e..d7942a0f8b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -179,37 +179,6 @@ algorithms AES or Twofish.") ;; the combined work falls under the GPLv3. (license license:gpl3))) -(define-public keepassx - (package - (name "keepassx") - (version "2.0.3") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.keepassx.org/releases/" version - "/keepassx-" version ".tar.gz")) - (sha256 - (base32 - "1ia7cqx9ias38mnffsl7da7g1f66bcbjsi23k49sln0c6spb9zr3")))) - (build-system cmake-build-system) - (inputs - `(("libgcrypt" ,libgcrypt) - ("libxi" ,libxi) - ("libxtst" ,libxtst) - ("qt" ,qt-4))) - (native-inputs - `(("zlib" ,zlib))) - (home-page "https://www.keepassx.org") - (synopsis "Password manager") - (description "KeePassX is a password manager or safe which helps you to -manage your passwords in a secure way. You can put all your passwords in one -database, which is locked with one master key or a key-file which can be stored -on an external storage device. The databases are encrypted using the -algorithms AES or Twofish.") - ;; Non functional parts use various licences. - (license license:gpl3) - (properties `((superseded . ,keepassxc))))) - (define-public pwsafe (package (name "pwsafe") diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 437000b7c0..00468fa814 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -299,13 +299,6 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (license (list license:bsd-3 license:gpl2)))) -(define-public poppler-qt4 - (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 (name "poppler-qt5") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d718b520bd..21ccf15dc3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -277,210 +277,6 @@ other text such as code. The syntax uses the syntax of the Django template system, and the core design of Django is reused in Grantlee.") (license license:lgpl2.1+))) -(define-public qt-4 - (package - (name "qt") - (version "4.8.7") - (source (origin - (method url-fetch) - (uri (string-append "http://download.qt-project.org/archive/qt/" - (string-copy version 0 (string-rindex version #\.)) - "/" version - "/qt-everywhere-opensource-src-" - version ".tar.gz")) - (sha256 - (base32 - "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (search-patches "qt4-ldflags.patch")) - (modules '((guix build utils))) - (snippet - ;; Remove webkit module, which is not built. - '(begin (delete-file-recursively "src/3rdparty/webkit") - #t)))) - (build-system gnu-build-system) - (propagated-inputs - `(("mesa" ,mesa))) - (inputs - `(("alsa-lib" ,alsa-lib) - ("bluez" ,bluez) - ("cups" ,cups) - ("dbus" ,dbus) - ("double-conversion" ,double-conversion) - ("expat" ,expat) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("glib" ,glib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("icu4c" ,icu4c) - ("jasper" ,jasper) - ("libinput" ,libinput-minimal) - ("libmng" ,libmng) - ("libpci" ,pciutils) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxcursor" ,libxcursor) - ("libxext" ,libxext) - ("libxfixes" ,libxfixes) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxkbcommon" ,libxkbcommon) - ("libxml2" ,libxml2) - ("libxrandr" ,libxrandr) - ("libxrender" ,libxrender) - ("libxslt" ,libxslt) - ("libxtst" ,libxtst) - ("mtdev" ,mtdev) - ("mariadb-dev" ,mariadb "dev") - ("nss" ,nss) - ("postgresql" ,postgresql) - ("pulseaudio" ,pulseaudio) - ("pcre2" ,pcre2) - ("sqlite" ,sqlite) - ("udev" ,eudev) - ("unixodbc" ,unixodbc) - ("wayland" ,wayland) - ("xcb-util" ,xcb-util) - ("xcb-util-image" ,xcb-util-image) - ("xcb-util-keysyms" ,xcb-util-keysyms) - ("xcb-util-renderutil" ,xcb-util-renderutil) - ("xcb-util-wm" ,xcb-util-wm) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo) - ("libsm" ,libsm) - ("openssl" ,openssl-1.0))) - (native-inputs - `(;; XXX: The JavaScriptCore engine does not build with the C++11 standard. - ;; We could build it with -std=gnu++98, but then we'll get in trouble with - ;; ICU later. Just keep using GCC 5 for now. - ("gcc@5" ,gcc-5) - ("bison" ,bison) - ("flex" ,flex) - ("gperf" ,gperf) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("python" ,python-2) - ("ruby" ,ruby) - ("which" ,(@ (gnu packages base) which)))) - ;; 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" - ;; would refer to each other. - (outputs '("out" ;112MiB core + 37MiB examples - "doc")) ;280MiB of HTML + code - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'set-paths 'hide-default-gcc - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Remove the default GCC from CPLUS_INCLUDE_PATH to prevent - ;; conflicts with the GCC 5 input. - (setenv "CPLUS_INCLUDE_PATH" - (string-join - (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") #\:)) - ":")) - #t))) - (replace - 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - (substitute* "src/corelib/global/global.pri" - (("/bin/ls") (which "ls"))) - - (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) - ;; Because of qt4-documentation-path.patch, documentation ends up - ;; being installed in OUT. Move it to the right place. - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (olddoc (string-append out "/doc")) - (docdir (string-append doc "/share/doc/qt-" ,version))) - (mkdir-p (dirname docdir)) - - ;; Note: We can't use 'rename-file' here because OUT and DOC are - ;; different "devices" due to bind-mounts. - (copy-recursively olddoc docdir) - (delete-file-recursively olddoc) - #t)))))) - (native-search-paths - (list (search-path-specification - (variable "QMAKEPATH") - (files '("lib/qt5"))) - (search-path-specification - (variable "QML2_IMPORT_PATH") - (files '("lib/qt5/qml"))) - (search-path-specification - (variable "QT_PLUGIN_PATH") - (files '("lib/qt5/plugins"))) - (search-path-specification - (variable "XDG_DATA_DIRS") - (files '("share"))) - (search-path-specification - (variable "XDG_CONFIG_DIRS") - (files '("etc/xdg"))))) - (home-page "https://www.qt.io/") - (synopsis "Cross-platform GUI library") - (description "Qt is a cross-platform application and UI framework for -developers using C++ or QML, a CSS & JavaScript like language.") - (license (list license:lgpl2.1 license:lgpl3)) - - ;; Qt 4: 'QBasicAtomicPointer' leads to build failures on MIPS; - ;; see . - ;; Qt 5: assembler error; see . - (supported-systems (delete "mips64el-linux" %supported-systems)))) - (define (qt5-urls component version) "Return a list of URLs for VERSION of the Qt5 COMPONENT." ;; We can't use a mirror:// scheme because these URLs are not exact copies: @@ -2286,53 +2082,6 @@ itself.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))))) -(define-public python2-pyqt-4 - (package (inherit python-pyqt) - (name "python2-pyqt") - (version "4.12.3") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/pyqt/PyQt4/" - "PyQt-" version "/PyQt4_gpl_x11-" - version ".tar.gz")) - (sha256 - (base32 - "0wnlasg62rm5d39nq1yw4namcx2ivxgzl93r5f2vb9s0yaz5l3x0")))) - (native-inputs - `(("qt" ,qt-4))) - (inputs `(("python" ,python-2))) - (propagated-inputs - `(("python-sip" ,python2-sip))) - (arguments - `(#:tests? #f ; no check target - #:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (sip (string-append out "/share/sip")) - (python (assoc-ref inputs "python")) - (python-version - (last (string-split python #\-))) - (python-major+minor - (string-join - (take (string-split python-version #\.) 2) - ".")) - (lib (string-append out "/lib/python" - python-major+minor - "/site-packages"))) - (invoke "python" "configure.py" - "--confirm-license" - "--bindir" bin - "--destdir" lib - "--sipdir" sip))))))) - (license (list license:gpl2 license:gpl3)))) ; choice of either license - (define-public python-qtpy (package (name "python-qtpy") -- cgit 1.4.1 From 52c8d07a4f7033534a71ac7efeec21a65d35c125 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 25 Mar 2021 11:55:10 +0100 Subject: gnu: mariadb: Fix CVE-2021-27928. * gnu/packages/patches/mariadb-CVE-2021-27928.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/databases.scm (mariadb/fixed): New variable. Apply patch. (mariadb)[replacement]: Graft. --- gnu/local.mk | 1 + gnu/packages/databases.scm | 8 + gnu/packages/patches/mariadb-CVE-2021-27928.patch | 642 ++++++++++++++++++++++ 3 files changed, 651 insertions(+) create mode 100644 gnu/packages/patches/mariadb-CVE-2021-27928.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 14d228cfa4..40956598db 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1380,6 +1380,7 @@ dist_patch_DATA = \ %D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/mailutils-fix-uninitialized-variable.patch \ %D%/packages/patches/make-impure-dirs.patch \ + %D%/packages/patches/mariadb-CVE-2021-27928.patch \ %D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/maxima-defsystem-mkdir.patch \ diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 83b6a13892..20069f9383 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -734,6 +734,7 @@ Language.") (append (find-files "extra/wolfssl") (find-files "zlib"))) #t)))) + (replacement mariadb/fixed) (build-system cmake-build-system) (outputs '("out" "lib" "dev")) (arguments @@ -969,6 +970,13 @@ Language.") as a drop-in replacement of MySQL.") (license license:gpl2))) +(define mariadb/fixed + (package + (inherit mariadb) + (source (origin + (inherit (package-source mariadb)) + (patches (search-patches "mariadb-CVE-2021-27928.patch")))))) + (define-public mariadb-connector-c (package (name "mariadb-connector-c") diff --git a/gnu/packages/patches/mariadb-CVE-2021-27928.patch b/gnu/packages/patches/mariadb-CVE-2021-27928.patch new file mode 100644 index 0000000000..39a023c159 --- /dev/null +++ b/gnu/packages/patches/mariadb-CVE-2021-27928.patch @@ -0,0 +1,642 @@ +From 7580701e6279900fec40822952a3b874732289cf Mon Sep 17 00:00:00 2001 +From: Sergei Golubchik +Date: Thu, 18 Feb 2021 14:20:48 +0100 +Subject: [PATCH] make @@wsrep_provider and @@wsrep_notify_cmd read-only + +this should simplify run-time cluster management +--- + mysql-test/suite/galera/disabled.def | 2 + + .../galera/include/galera_load_provider.inc | 19 -------- + .../galera/include/galera_unload_provider.inc | 3 +- + .../suite/galera/r/galera_ist_rsync.result | 2 +- + .../galera/r/galera_sst_mysqldump.result | 2 +- + .../suite/galera/r/mysql-wsrep#33.result | 2 +- + .../suite/sys_vars/r/sysvars_wsrep.result | 4 +- + .../sys_vars/r/wsrep_notify_cmd_basic.result | 47 ------------------- + .../sys_vars/r/wsrep_provider_basic.result | 40 ---------------- + .../r/wsrep_provider_options_basic.result | 46 ------------------ + .../sys_vars/t/wsrep_notify_cmd_basic.test | 43 ----------------- + .../sys_vars/t/wsrep_provider_basic.test | 39 --------------- + .../t/wsrep_provider_options_basic.test | 41 ---------------- + mysql-test/suite/wsrep/disabled.def | 2 + + mysql-test/suite/wsrep/r/variables.result | 12 ++--- + mysql-test/suite/wsrep/t/variables.test | 32 +++---------- + sql/sys_vars.cc | 8 ++-- + 17 files changed, 25 insertions(+), 319 deletions(-) + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_provider_basic.result + delete mode 100644 mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_provider_basic.test + delete mode 100644 mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test + +diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def +index d940c702d54..83f26e81636 100644 +--- a/mysql-test/suite/galera/disabled.def ++++ b/mysql-test/suite/galera/disabled.def +@@ -49,3 +49,5 @@ partition : MDEV-19958 Galera test failure on galera.partition + query_cache: MDEV-15805 Test failure on galera.query_cache + sql_log_bin : MDEV-21491 galera.sql_log_bin + versioning_trx_id : MDEV-18590 galera.versioning_trx_id ++galera_wsrep_provider_unset_set: wsrep_provider is read-only for security reasons ++pxc-421: wsrep_provider is read-only for security reasons +diff --git a/mysql-test/suite/galera/include/galera_load_provider.inc b/mysql-test/suite/galera/include/galera_load_provider.inc +index 0f843597d9c..28010cc5b71 100644 +--- a/mysql-test/suite/galera/include/galera_load_provider.inc ++++ b/mysql-test/suite/galera/include/galera_load_provider.inc +@@ -1,25 +1,6 @@ + --echo Loading wsrep provider ... + + --disable_query_log +---eval SET GLOBAL wsrep_provider = '$wsrep_provider_orig'; +- +-# +-# count occurences of successful node starts in error log +-# +-perl; +- use strict; +- my $test_log=$ENV{'LOG_FILE'} or die "LOG_FILE not set"; +- my $test_log_copy=$test_log . '.copy'; +- if (-e $test_log_copy) { +- unlink $test_log_copy; +- } +- +-EOF +---copy_file $LOG_FILE $LOG_FILE.copy +- +-# +-# now join to the cluster +-# + --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig'; + + --enable_query_log +diff --git a/mysql-test/suite/galera/include/galera_unload_provider.inc b/mysql-test/suite/galera/include/galera_unload_provider.inc +index cd841f51fbc..ed7e9bc41f0 100644 +--- a/mysql-test/suite/galera/include/galera_unload_provider.inc ++++ b/mysql-test/suite/galera/include/galera_unload_provider.inc +@@ -1,7 +1,6 @@ + --echo Unloading wsrep provider ... + + --let $wsrep_cluster_address_orig = `SELECT @@wsrep_cluster_address` +---let $wsrep_provider_orig = `SELECT @@wsrep_provider` + --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` + --let $wsrep_error_log_orig = `SELECT @@log_error` + if(!$wsrep_log_error_orig) +@@ -12,4 +11,4 @@ if(!$wsrep_log_error_orig) + } + --let LOG_FILE= $wsrep_log_error_orig + +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; +diff --git a/mysql-test/suite/galera/r/galera_ist_rsync.result b/mysql-test/suite/galera/r/galera_ist_rsync.result +index 13f7d898a59..70a87c73df7 100644 +--- a/mysql-test/suite/galera/r/galera_ist_rsync.result ++++ b/mysql-test/suite/galera/r/galera_ist_rsync.result +@@ -23,7 +23,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/galera/r/galera_sst_mysqldump.result b/mysql-test/suite/galera/r/galera_sst_mysqldump.result +index 4ed679ba477..145b3a94775 100644 +--- a/mysql-test/suite/galera/r/galera_sst_mysqldump.result ++++ b/mysql-test/suite/galera/r/galera_sst_mysqldump.result +@@ -30,7 +30,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33.result b/mysql-test/suite/galera/r/mysql-wsrep#33.result +index fb0b593cc96..45c6a3f660a 100644 +--- a/mysql-test/suite/galera/r/mysql-wsrep#33.result ++++ b/mysql-test/suite/galera/r/mysql-wsrep#33.result +@@ -32,7 +32,7 @@ INSERT INTO t1 VALUES ('node2_committed_before'); + INSERT INTO t1 VALUES ('node2_committed_before'); + COMMIT; + Unloading wsrep provider ... +-SET GLOBAL wsrep_provider = 'none'; ++SET GLOBAL wsrep_cluster_address = ''; + connection node_1; + SET AUTOCOMMIT=OFF; + START TRANSACTION; +diff --git a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +index 4b6abf85434..f73bfbd13e7 100644 +--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result ++++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result +@@ -403,7 +403,7 @@ NUMERIC_MIN_VALUE NULL + NUMERIC_MAX_VALUE NULL + NUMERIC_BLOCK_SIZE NULL + ENUM_VALUE_LIST NULL +-READ_ONLY NO ++READ_ONLY YES + COMMAND_LINE_ARGUMENT REQUIRED + GLOBAL_VALUE_PATH NULL + VARIABLE_NAME WSREP_ON +@@ -463,7 +463,7 @@ NUMERIC_MIN_VALUE NULL + NUMERIC_MAX_VALUE NULL + NUMERIC_BLOCK_SIZE NULL + ENUM_VALUE_LIST NULL +-READ_ONLY NO ++READ_ONLY YES + COMMAND_LINE_ARGUMENT REQUIRED + GLOBAL_VALUE_PATH NULL + VARIABLE_NAME WSREP_PROVIDER_OPTIONS +diff --git a/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result b/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result +deleted file mode 100644 +index 056ff8c817b..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_notify_cmd_basic.result ++++ /dev/null +@@ -1,47 +0,0 @@ +-# +-# wsrep_notify_cmd +-# +-call mtr.add_suppression("WSREP: Failed to get provider options"); +-# save the initial value +-SET @wsrep_notify_cmd_global_saved = @@global.wsrep_notify_cmd; +-# default +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +- +- +-# scope +-SELECT @@session.wsrep_notify_cmd; +-ERROR HY000: Variable 'wsrep_notify_cmd' is a GLOBAL variable +-SET @@global.wsrep_notify_cmd='notify_cmd'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-notify_cmd +- +-# valid values +-SET @@global.wsrep_notify_cmd='command'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-command +-SET @@global.wsrep_notify_cmd='hyphenated-command'; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-hyphenated-command +-SET @@global.wsrep_notify_cmd=default; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +- +-SET @@global.wsrep_notify_cmd=NULL; +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-NULL +- +-# invalid values +-SET @@global.wsrep_notify_cmd=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_notify_cmd' +-SELECT @@global.wsrep_notify_cmd; +-@@global.wsrep_notify_cmd +-NULL +- +-# restore the initial value +-SET @@global.wsrep_notify_cmd = @wsrep_notify_cmd_global_saved; +-# End of test +diff --git a/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result b/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result +deleted file mode 100644 +index 3e4ac8ca883..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_provider_basic.result ++++ /dev/null +@@ -1,40 +0,0 @@ +-# +-# wsrep_provider +-# +-# save the initial value +-SET @wsrep_provider_global_saved = @@global.wsrep_provider; +-# default +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# scope +-SELECT @@session.wsrep_provider; +-ERROR HY000: Variable 'wsrep_provider' is a GLOBAL variable +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# valid values +-SET @@global.wsrep_provider=default; +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# invalid values +-SET @@global.wsrep_provider='/invalid/libgalera_smm.so'; +-ERROR 42000: Variable 'wsrep_provider' can't be set to the value of '/invalid/libgalera_smm.so' +-SET @@global.wsrep_provider=NULL; +-ERROR 42000: Variable 'wsrep_provider' can't be set to the value of 'NULL' +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +-SET @@global.wsrep_provider=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_provider' +-SELECT @@global.wsrep_provider; +-@@global.wsrep_provider +-none +- +-# restore the initial value +-SET @@global.wsrep_provider = @wsrep_provider_global_saved; +-# End of test +diff --git a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result b/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result +deleted file mode 100644 +index 15949a14e39..00000000000 +--- a/mysql-test/suite/sys_vars/r/wsrep_provider_options_basic.result ++++ /dev/null +@@ -1,46 +0,0 @@ +-# +-# wsrep_provider_options +-# +-call mtr.add_suppression("WSREP: Failed to get provider options"); +-# default +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# scope +-SELECT @@session.wsrep_provider_options; +-ERROR HY000: Variable 'wsrep_provider_options' is a GLOBAL variable +-SET @@global.wsrep_provider_options='option1'; +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# valid values +-SET @@global.wsrep_provider_options='name1=value1;name2=value2'; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options='hyphenated-name:value'; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options=default; +-ERROR HY000: WSREP (galera) not started +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +- +-# invalid values +-SET @@global.wsrep_provider_options=1; +-ERROR 42000: Incorrect argument type to variable 'wsrep_provider_options' +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-SET @@global.wsrep_provider_options=NULL; +-Got one of the listed errors +-SELECT @@global.wsrep_provider_options; +-@@global.wsrep_provider_options +- +-# End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test b/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test +deleted file mode 100644 +index 6d1535ba148..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_notify_cmd_basic.test ++++ /dev/null +@@ -1,43 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_notify_cmd +---echo # +- +-call mtr.add_suppression("WSREP: Failed to get provider options"); +- +---echo # save the initial value +-SET @wsrep_notify_cmd_global_saved = @@global.wsrep_notify_cmd; +- +---echo # default +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd='notify_cmd'; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # valid values +-SET @@global.wsrep_notify_cmd='command'; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd='hyphenated-command'; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd=default; +-SELECT @@global.wsrep_notify_cmd; +-SET @@global.wsrep_notify_cmd=NULL; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # invalid values +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_notify_cmd=1; +-SELECT @@global.wsrep_notify_cmd; +- +---echo +---echo # restore the initial value +-SET @@global.wsrep_notify_cmd = @wsrep_notify_cmd_global_saved; +- +---echo # End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test +deleted file mode 100644 +index 1190ab41bb0..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_provider_basic.test ++++ /dev/null +@@ -1,39 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_provider +---echo # +- +---echo # save the initial value +-SET @wsrep_provider_global_saved = @@global.wsrep_provider; +- +---echo # default +-SELECT @@global.wsrep_provider; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_provider; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # valid values +-SET @@global.wsrep_provider=default; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # invalid values +---error ER_WRONG_VALUE_FOR_VAR +-SET @@global.wsrep_provider='/invalid/libgalera_smm.so'; +---error ER_WRONG_VALUE_FOR_VAR +-SET @@global.wsrep_provider=NULL; +-SELECT @@global.wsrep_provider; +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_provider=1; +-SELECT @@global.wsrep_provider; +- +---echo +---echo # restore the initial value +-SET @@global.wsrep_provider = @wsrep_provider_global_saved; +- +---echo # End of test +diff --git a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test b/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test +deleted file mode 100644 +index 6eb3a94b6a4..00000000000 +--- a/mysql-test/suite/sys_vars/t/wsrep_provider_options_basic.test ++++ /dev/null +@@ -1,41 +0,0 @@ +---source include/have_wsrep.inc +- +---echo # +---echo # wsrep_provider_options +---echo # +- +-call mtr.add_suppression("WSREP: Failed to get provider options"); +- +---echo # default +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # scope +---error ER_INCORRECT_GLOBAL_LOCAL_VAR +-SELECT @@session.wsrep_provider_options; +---error 0,ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='option1'; +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # valid values +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='name1=value1;name2=value2'; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options='hyphenated-name:value'; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options=default; +-SELECT @@global.wsrep_provider_options; +- +---echo +---echo # invalid values +---error ER_WRONG_TYPE_FOR_VAR +-SET @@global.wsrep_provider_options=1; +-SELECT @@global.wsrep_provider_options; +---error ER_WRONG_ARGUMENTS,ER_WRONG_ARGUMENTS +-SET @@global.wsrep_provider_options=NULL; +-SELECT @@global.wsrep_provider_options; +- +---echo # End of test +diff --git a/mysql-test/suite/wsrep/disabled.def b/mysql-test/suite/wsrep/disabled.def +index 11577bfe8b0..3d204db6945 100644 +--- a/mysql-test/suite/wsrep/disabled.def ++++ b/mysql-test/suite/wsrep/disabled.def +@@ -10,3 +10,5 @@ + # + ############################################################################## + ++ ++mdev_6832: wsrep_provider is read-only for security reasons +diff --git a/mysql-test/suite/wsrep/r/variables.result b/mysql-test/suite/wsrep/r/variables.result +index a9988fd1628..e57440125ee 100644 +--- a/mysql-test/suite/wsrep/r/variables.result ++++ b/mysql-test/suite/wsrep/r/variables.result +@@ -14,7 +14,6 @@ SET SESSION wsrep_replicate_myisam= ON; + ERROR HY000: Variable 'wsrep_replicate_myisam' is a GLOBAL variable and should be set with SET GLOBAL + SET GLOBAL wsrep_replicate_myisam= ON; + SET GLOBAL wsrep_replicate_myisam= OFF; +-SET GLOBAL wsrep_provider=none; + # + # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of + # variables when using "_" +@@ -151,7 +150,6 @@ wsrep_local_state_comment # + # Should show nothing. + SHOW STATUS LIKE 'x'; + Variable_name Value +-SET GLOBAL wsrep_provider=none; + + SHOW STATUS LIKE 'wsrep_local_state_uuid'; + Variable_name Value +@@ -160,7 +158,6 @@ wsrep_local_state_uuid # + SHOW STATUS LIKE 'wsrep_last_committed'; + Variable_name Value + wsrep_last_committed # +-SET GLOBAL wsrep_provider=none; + + # + # MDEV#6206: wsrep_slave_threads subtracts from max_connections +@@ -174,7 +171,7 @@ SELECT @@global.wsrep_slave_threads; + 1 + SELECT @@global.wsrep_cluster_address; + @@global.wsrep_cluster_address +- ++gcomm:// + SELECT @@global.wsrep_on; + @@global.wsrep_on + 1 +@@ -183,14 +180,14 @@ Variable_name Value + Threads_connected 1 + SHOW STATUS LIKE 'wsrep_thread_count'; + Variable_name Value +-wsrep_thread_count 0 ++wsrep_thread_count 2 + + SELECT @@global.wsrep_provider; + @@global.wsrep_provider + libgalera_smm.so + SELECT @@global.wsrep_cluster_address; + @@global.wsrep_cluster_address +- ++gcomm:// + SELECT @@global.wsrep_on; + @@global.wsrep_on + 1 +@@ -199,11 +196,10 @@ Variable_name Value + Threads_connected 1 + SHOW STATUS LIKE 'wsrep_thread_count'; + Variable_name Value +-wsrep_thread_count 0 ++wsrep_thread_count 2 + + # Setting wsrep_cluster_address triggers the creation of + # applier/rollbacker threads. +-SET GLOBAL wsrep_cluster_address= 'gcomm://'; + # Wait for applier thread to get created 1. + # Wait for applier thread to get created 2. + SELECT VARIABLE_VALUE AS EXPECT_1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test +index f2c3a0a3b78..fd352b61a3a 100644 +--- a/mysql-test/suite/wsrep/t/variables.test ++++ b/mysql-test/suite/wsrep/t/variables.test +@@ -23,7 +23,7 @@ SET GLOBAL wsrep_replicate_myisam= ON; + + # Reset it back. + SET GLOBAL wsrep_replicate_myisam= OFF; +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + + --echo # + --echo # MDEV#5790: SHOW GLOBAL STATUS LIKE does not show the correct list of +@@ -32,9 +32,6 @@ SET GLOBAL wsrep_provider=none; + + CALL mtr.add_suppression("WSREP: Could not open saved state file for reading.*"); + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log + + --replace_column 2 # + SHOW GLOBAL STATUS LIKE 'wsrep%'; +@@ -50,11 +47,9 @@ SHOW GLOBAL STATUS LIKE 'wsrep_local_state_comment'; + SHOW STATUS LIKE 'x'; + + # Reset it back. +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + # The following 2 variables are used by mariabackup + # SST. +@@ -66,7 +61,7 @@ SHOW STATUS LIKE 'wsrep_local_state_uuid'; + SHOW STATUS LIKE 'wsrep_last_committed'; + + # Reset it back. +-SET GLOBAL wsrep_provider=none; ++#SET GLOBAL wsrep_provider=none; + + --echo + --echo # +@@ -74,9 +69,7 @@ SET GLOBAL wsrep_provider=none; + --echo # + call mtr.add_suppression("WSREP: Failed to get provider options"); + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ + SELECT @@global.wsrep_provider; +@@ -87,9 +80,7 @@ SHOW STATUS LIKE 'threads_connected'; + SHOW STATUS LIKE 'wsrep_thread_count'; + --echo + +---disable_query_log +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +---enable_query_log ++#evalp SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; + + --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ + SELECT @@global.wsrep_provider; +@@ -101,7 +92,7 @@ SHOW STATUS LIKE 'wsrep_thread_count'; + + --echo # Setting wsrep_cluster_address triggers the creation of + --echo # applier/rollbacker threads. +-SET GLOBAL wsrep_cluster_address= 'gcomm://'; ++#SET GLOBAL wsrep_cluster_address= 'gcomm://'; + + --echo # Wait for applier thread to get created 1. + --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +@@ -162,15 +153,6 @@ SET @@global.wsrep_sst_auth= NULL; + SELECT @@global.wsrep_sst_auth; + SET @@global.wsrep_sst_auth= @wsrep_sst_auth_saved; + +-# Reset (for mtr internal checks) +- +---disable_query_log +-SET GLOBAL wsrep_slave_threads= @wsrep_slave_threads_saved; +-eval SET GLOBAL wsrep_provider= '$WSREP_PROVIDER'; +-SET GLOBAL wsrep_cluster_address= @wsrep_cluster_address_saved; +-SET GLOBAL wsrep_provider_options= @wsrep_provider_options_saved; +---enable_query_log +- + --source include/galera_wait_ready.inc + + --echo # End of test. +diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc +index 64040243df0..8c67a4d432a 100644 +--- a/sql/sys_vars.cc ++++ b/sql/sys_vars.cc +@@ -5669,8 +5669,8 @@ static Sys_var_tz Sys_time_zone( + + static Sys_var_charptr_fscs Sys_wsrep_provider( + "wsrep_provider", "Path to replication provider library", +- PREALLOCATED GLOBAL_VAR(wsrep_provider), CMD_LINE(REQUIRED_ARG), +- DEFAULT(WSREP_NONE), ++ PREALLOCATED READ_ONLY GLOBAL_VAR(wsrep_provider), CMD_LINE(REQUIRED_ARG), ++ DEFAULT(WSREP_NONE), + NO_MUTEX_GUARD, NOT_IN_BINLOG, + ON_CHECK(wsrep_provider_check), ON_UPDATE(wsrep_provider_update)); + +@@ -5886,8 +5886,8 @@ static Sys_var_ulong Sys_wsrep_max_ws_rows ( + + static Sys_var_charptr Sys_wsrep_notify_cmd( + "wsrep_notify_cmd", "", +- GLOBAL_VAR(wsrep_notify_cmd),CMD_LINE(REQUIRED_ARG), +- DEFAULT("")); ++ READ_ONLY GLOBAL_VAR(wsrep_notify_cmd), CMD_LINE(REQUIRED_ARG), ++ DEFAULT("")); + + static Sys_var_mybool Sys_wsrep_certify_nonPK( + "wsrep_certify_nonPK", "Certify tables with no primary key", +-- +2.31.0 + -- cgit 1.4.1 From 6e7ba45357078b31a369b23f8a9f38302dfcbb10 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 18 Mar 2021 07:09:10 +0100 Subject: gnu: sqlite: Update to 3.32.3 [security fixes]. Fixes CVE-2020-11655, CVE-2020-11656, CVE-2020-13434, CVE-2020-13435, CVE-2020-13630, CVE-2020-13631, CVE-2020-13632, CVE-2020-15358 and CVE-2020-9327. * gnu/packages/sqlite.scm (sqlite/fixed): New variable. (sqlite)[replacement]: Graft. --- gnu/packages/sqlite.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index eeb77749d8..a48d724488 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -65,6 +65,7 @@ (sha256 (base32 "1bj936svd8i5g25xd1bj52hj4zca01fgl3sqkj86z9q5pkz4wa32")))) + (replacement sqlite/fixed) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (native-inputs (if (hurd-target?) @@ -122,6 +123,27 @@ widely deployed SQL database engine in the world. The source code for SQLite is in the public domain.") (license license:public-domain))) +(define-public sqlite/fixed + (package + (inherit sqlite) + (version "3.32.3") + (source (origin + (method url-fetch) + (uri (let ((numeric-version + (match (string-split version #\.) + ((first-digit other-digits ...) + (string-append first-digit + (string-pad-right + (string-concatenate + (map (cut string-pad <> 2 #\0) + other-digits)) + 6 #\0)))))) + (string-append "https://sqlite.org/2020/sqlite-autoconf-" + numeric-version ".tar.gz"))) + (sha256 + (base32 + "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3")))))) + ;; Column metadata support was added to the regular 'sqlite' package with ;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. (define-public sqlite-with-column-metadata -- cgit 1.4.1 From f21075f039be2afb86f0735f151b94050a3d41bd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 26 Mar 2021 05:42:48 +0100 Subject: gnu: guix: Update to 6e7ba45. * gnu/packages/package-management.scm (guix): Update to 6e7ba45. --- 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 888f54322d..5d761df47d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "ec7fb669945bfb47c5e1fdf7de3a5d07f7002ccf") - (revision 17)) + (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") + (revision 18)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "1v9pwsqx8n4l6f7aj9vxv6m7vb4lyw8j5qg6mxf5zksia0qlcv2z")) + "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 4c56620555a7f1235ef4e6f5b9ad2cfe87403c55 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:25:11 -0400 Subject: gnu: libaom: Update to 3.0.0. * gnu/packages/video.scm (libaom): Update to 3.0.0. --- 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 bd8fddf9b4..6e4303c6f0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -772,7 +772,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "2.0.2") + (version "3.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -781,7 +781,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "0f3i983s9yvh9zc6mpy1ck5sjcg9l09lpw9v4md3mv8gbih9f0z0")))) + "178rq1d7i9q4lg40bipkyhdrk18j9wi5k5avpa5bls0zm7g5ifsx")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) -- cgit 1.4.1 From f0357df8c54e3a4232476211b0fb8f71cf1df7a8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:30:47 -0400 Subject: gnu: SVT-AV1: Update URLs. * gnu/packages/video.scm (svt-av1)[source, home-page]: Update URLs. --- 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 6e4303c6f0..4bb8e2a63d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4757,7 +4757,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/AOMediaCodec/SVT-AV1") + (url "https://gitlab.com/AOMediaCodec/SVT-AV1.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -4783,7 +4783,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (description "SVT-AV1 is an AV1 codec implementation. The encoder is a work-in-progress, aiming to support video-on-demand and live streaming applications. It only supports Intel-compatible CPUs (x86).") - (home-page "https://github.com/AOMediaCodec/SVT-AV1") + (home-page "https://gitlab.com/AOMediaCodec/SVT-AV1") (license license:bsd-2))) (define-public svt-vp9 -- cgit 1.4.1 From 6665f0fa589b6f3639414602900147aa6a57c178 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 26 Mar 2021 02:28:22 -0400 Subject: gnu: SVT-HEVC: Update to 1.5.0. * gnu/packages/video.scm (svt-hevc): Update to 1.5.0. [license]: Specify the license. --- 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 4bb8e2a63d..02096dc7a4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -286,7 +286,7 @@ video and audio streams from a DVD.") (define-public svt-hevc (package (name "svt-hevc") - (version "1.4.3") + (version "1.5.0") (source (origin (method git-fetch) @@ -296,7 +296,7 @@ video and audio streams from a DVD.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1sqh3dciqm2p1b66kngcpxqy5fx3ramxlxy8gfcbdwn2i3rsqhs7")))) + (base32 "038r3x3axil895vh2dq6223623ybrc45vn58vfmfb7cikz68sy23")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; Test script is stand-alone -- cgit 1.4.1 From ac7250f8baf501af3f051bf558992d3e84e4303c Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 26 Mar 2021 09:50:24 +0100 Subject: gnu: r-suppdists: Update hash. * gnu/packages/cran.scm (r-suppdists)[source]: Update hash. --- gnu/packages/cran.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 96a2aee766..44ae65c359 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3792,7 +3792,7 @@ statistics/methods are implemented.") (uri (cran-uri "SuppDists" version)) (sha256 (base32 - "01j6p94m1g363nph2158fq2rmd6z3h5dvcv6aidh2d6syw131xak")))) + "1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8")))) (properties `((upstream-name . "SuppDists"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/SuppDists") -- cgit 1.4.1 From 80cd6a1b6376a12e0f0bc09b3ab8f24bd1f2f39f Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Sun, 14 Feb 2021 21:44:36 -0800 Subject: gnu: Add r-gsa. * gnu/packages/cran.scm (r-gsa): 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 44ae65c359..3038ca9ab4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2020 Magali Lemes ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 Aniket Patil +;;; Copyright © 2021 Tim Howes ;;; ;;; This file is part of GNU Guix. ;;; @@ -28280,3 +28281,24 @@ functionalities for displaying text co-occurrence networks, text correlation networks, dependency relationships as well as text clustering. Feel free to join the effort of providing interesting text visualisations.") (license license:gpl2))) + +(define-public r-gsa + (package + (name "r-gsa") + (version "1.03.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "GSA" version)) + (sha256 + (base32 + "05x9wspah1cdznjpncqam1iawsxdiigyl8v2anyhss2k7wwd94p1")))) + (properties `((upstream-name . "GSA"))) + (build-system r-build-system) + (home-page "https://statweb.stanford.edu/~tibs/GSA/") + (synopsis "Gene set analysis") + (description "This package lets you determine the significance of +pre-defined sets of genes with respect to an outcome variable, such as a group +indicator, a quantitative variable or a survival time.") + ;; Any version of the LGPL + (license license:lgpl3+))) -- cgit 1.4.1 From e9741ad623db22afa46f809b862685c26e67318a Mon Sep 17 00:00:00 2001 From: Tim Howes Date: Fri, 26 Mar 2021 10:12:03 +0100 Subject: gnu: Add r-samr. * gnu/packages/cran.scm (r-samr): 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 3038ca9ab4..e90e2b3363 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28302,3 +28302,32 @@ pre-defined sets of genes with respect to an outcome variable, such as a group indicator, a quantitative variable or a survival time.") ;; Any version of the LGPL (license license:lgpl3+))) + +(define-public r-samr + (package + (name "r-samr") + (version "3.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "samr" version)) + (sha256 + (base32 + "01km0f7qgm73x19vbvsxl083hs1dq4dj8qm5h64cxbf20b08my15")))) + (properties `((upstream-name . "samr"))) + (build-system r-build-system) + (propagated-inputs + `(("r-gsa" ,r-gsa) + ("r-impute" ,r-impute) + ("r-matrixstats" ,r-matrixstats) + ("r-openxlsx" ,r-openxlsx) + ("r-shiny" ,r-shiny) + ("r-shinyfiles" ,r-shinyfiles))) + (native-inputs `(("gfortran" ,gfortran))) + (home-page "https://statweb.stanford.edu/~tibs/SAM/") + (synopsis "Significance analysis of Microarrays") + (description + "This is a package for significance analysis of Microarrays for +differential expression analysis, RNAseq data and related problems.") + ;; Any version of the LGPL + (license license:lgpl3+))) -- cgit 1.4.1 From 635622e54185c9bc5a0695f4e8de40c605e59aef Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 26 Mar 2021 10:12:24 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-26.410f58c. * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-26.410f58c. [inputs]: Use newer PostgreSQL and guile-json packages, and switch to non-deprecated variants of other packages. --- gnu/packages/web.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1e93308fb0..ae41588037 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4709,8 +4709,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "b7ba8d0c2ca3aca9ba5b5f9f27b9778ee949d20e") - (revision "25")) + (let ((commit "410f58cb43f083623885a430700c6818a187cadc") + (revision "26")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4722,7 +4722,7 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0brv64bsqysl7dncz067blwvmqrlx99c2kwrgpz6k0nqv8nzsa28")))) + "1jvxn3w6gwlvm52raf6zkjwg7bvfvbznsb9ch8ha0fcc6ccx7r60")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) @@ -4781,15 +4781,15 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs - `(("guix" ,guile3.0-guix) - ("guile-fibers" ,guile3.0-fibers) - ("guile-json" ,guile3.0-json) - ("guile-email" ,guile3.0-email) + `(("guix" ,guix) + ("guile-fibers" ,guile-fibers) + ("guile-json" ,guile-json-4) + ("guile-email" ,guile-email) ("guile-prometheus" ,guile-prometheus) - ("guile-squee" ,guile3.0-squee) + ("guile-squee" ,guile-squee) ("ephemeralpg" ,ephemeralpg) ("util-linux" ,util-linux) - ("postgresql" ,postgresql-11) + ("postgresql" ,postgresql-13) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) -- cgit 1.4.1 From 87547517bceaddb9d67146a1e286d1d0c5017d0c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 26 Mar 2021 10:15:23 +0000 Subject: gnu: guix-build-coordinator: Update to 0-21.6e7e63f. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-21.6e7e63f. --- 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 5d761df47d..de549fd094 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1049,8 +1049,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "1f79fc38a17ceda30f378efd4e7f80f252c99b4d") - (revision "20")) + (let ((commit "6e7e63f356cb88e3e5fe1a55a0390a1366205c9c") + (revision "21")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1061,7 +1061,7 @@ environments.") (commit commit))) (sha256 (base32 - "0d5zr5mv07pi195vva2fhclfgyzrgbk9vlnwrmy7z1jcw2p1d2zp")) + "01l4f0h9r864dbq4fg38fr2pdm5c7q2dysxcv8bx1clxilm58kd5")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 0dc9ad898180bd37aadfa23d23806b595e600c83 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 12 Mar 2021 18:55:41 +0100 Subject: gnu: eolie: Add missing inputs. This fixes errors observed directly at launch of Eolie inside pure environments. (See for more information.) It is still not possible to launch Eolie inside a container, however. (See also .) * gnu/packages/gnome.scm (eolie)[inputs]: Add libhandy and gnome-settings-daemon. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09e62d7897..7702510eb4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6712,9 +6712,11 @@ almost all of them.") ("python-pygobject" ,python-pygobject) ("python-pycairo" ,python-pycairo) ("python-pycrypto" ,python-pycrypto) + ("libhandy" ,libhandy) ("libsecret" ,libsecret) ("gtkspell3" ,gtkspell3) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("gnome-settings-daemon" ,gnome-settings-daemon) ; desktop-schemas are not enough ("webkitgtk" ,webkitgtk))) (home-page "https://wiki.gnome.org/Apps/Eolie") (synopsis "Web browser for GNOME") -- cgit 1.4.1 From a0dbf1bafc016a9fa96e4b4220d20a537f3a8fa0 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 26 Mar 2021 14:23:39 +0100 Subject: gnu: cuirass: Update to 1.0.0-4.ff3f25d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-4.ff3f25d. --- 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 c1305a781f..5afa4e28b2 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "f5a2eeae18ec02043107199047ddffd83e76d620") - (revision "3")) + (let ((commit "ff3f25d28782a85841b5e604335fc1118ef93f01") + (revision "4")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jnm67zhfsbd7b0ns8llmlp7idahw1gcsg09ffrpx77yyr5xhyzg")))) + "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) -- cgit 1.4.1 From 2e9cdb6a65aa0260f01110d26e83080e898ea0a5 Mon Sep 17 00:00:00 2001 From: qblade Date: Fri, 26 Mar 2021 01:33:42 +0000 Subject: gnu: Add hikari. * gnu/packages/wm.scm (hikari): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/wm.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3d85392394..a637bce602 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2400,3 +2400,55 @@ for wayland conceptually based on the X11 window manager (description "libucl implements a configuration language that is easy to read and write, and compatible with JSON.") (license license:bsd-2))) + +(define-public hikari + (package + (name "hikari") + (version "2.2.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hikari.acmelabs.space/releases/hikari-" + version ".tar.gz")) + (sha256 + (base32 + "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (build-system gnu-build-system) + (native-inputs + `(("bmake" ,bmake) + ("pkg-config" ,pkg-config) + ("wayland-protocols" ,wayland-protocols))) + (inputs + `(("wayland" ,wayland) + ("wlroots" ,wlroots) + ("libinput" ,libinput) + ("cairo" ,cairo) + ("pango" ,pango) + ("libxkbcommon" ,libxkbcommon) + ("libucl" ,libucl) + ("pam" ,linux-pam))) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list + (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "CC=" ,(cc-for-target)) + "WITH_XWAYLAND=YES" + "WITH_SCREENCOPY=YES" + "WITH_LAYERSHELL=YES" + "WITH_VIRTUAL_INPUT=YES") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" make-flags))) + (replace 'install + (lambda* (#:key inputs outputs make-flags #:allow-other-keys) + (apply invoke "bmake" "install" make-flags)))))) + (home-page "https://hikari.acmelabs.space/") + (synopsis "Stacking Wayland compositor with additional tiling capabilities") + (description "Stacking Wayland compositor with additional tiling +capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (license license:bsd-2))) -- cgit 1.4.1 From 636caba168bf06a17c10ca583e374793e7c7b1cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Mar 2021 14:47:55 +0100 Subject: gnu: hikari: Improve package. * gnu/packages/wm.scm (hikari)[inputs]: Sort alphabetically. [synopsis]: Shorten a bit. [description]: Use full sentences. --- gnu/packages/wm.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a637bce602..6105a98f14 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2408,28 +2408,26 @@ read and write, and compatible with JSON.") (source (origin (method url-fetch) - (uri (string-append - "https://hikari.acmelabs.space/releases/hikari-" - version ".tar.gz")) + (uri (string-append "https://hikari.acmelabs.space/releases/" + "hikari-" version ".tar.gz")) (sha256 - (base32 - "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (inputs - `(("wayland" ,wayland) - ("wlroots" ,wlroots) + `(("cairo" ,cairo) ("libinput" ,libinput) - ("cairo" ,cairo) - ("pango" ,pango) - ("libxkbcommon" ,libxkbcommon) ("libucl" ,libucl) - ("pam" ,linux-pam))) + ("libxkbcommon" ,libxkbcommon) + ("pam" ,linux-pam) + ("pango" ,pango) + ("wayland" ,wayland) + ("wlroots" ,wlroots))) (arguments - `(#:tests? #f ; no tests + `(#:tests? #f ; no tests #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) @@ -2448,7 +2446,8 @@ read and write, and compatible with JSON.") (lambda* (#:key inputs outputs make-flags #:allow-other-keys) (apply invoke "bmake" "install" make-flags)))))) (home-page "https://hikari.acmelabs.space/") - (synopsis "Stacking Wayland compositor with additional tiling capabilities") - (description "Stacking Wayland compositor with additional tiling -capabilities, it is heavily inspired by the Calm Window manager(cwm)") + (synopsis "Stacking Wayland compositor with tiling capabilities") + (description + "Hikari is a stacking Wayland compositor with additional tiling +capabilities. It is heavily inspired by the Calm Window manager(cwm).") (license license:bsd-2))) -- cgit 1.4.1 From 8dea0a52e0b1b5f2d14cd5c455df9753e251d726 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 26 Mar 2021 02:35:49 -0300 Subject: gnu: emacs-all-the-icons-dired: Update to 1.0-2-fc2dfa1. * gnu/packages/emacs-xyz.scm (emacs-all-the-icons-dired): Update to 1.0-2-fc2dfa1. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f45507c647..a226a8324c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22833,9 +22833,9 @@ based on diff output.") (license license:gpl3+)))) (define-public emacs-all-the-icons-dired - (let ((commit "980b7747d6c4a7992a1ec56afad908956db0a519") + (let ((commit "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5") (version "1.0") - (revision "1")) + (revision "2")) (package (name "emacs-all-the-icons-dired") (version (git-version version revision commit)) @@ -22848,7 +22848,7 @@ based on diff output.") (file-name (git-file-name name version)) (sha256 (base32 - "1pvbgyxfj4j205nj1r02045f1y4wgavdsk7f45hxkkhms1rj8jyy")))) + "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-all-the-icons" ,emacs-all-the-icons))) -- cgit 1.4.1 From 11488907f793309aec4b7f52f4c155fb2bdd289f Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Thu, 25 Mar 2021 14:39:41 +0100 Subject: gnu: Add emacs-nice-citation. * gnu/packages/emacs-xyz.scm (emacs-nice-citation): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a226a8324c..7ff8232476 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21335,6 +21335,33 @@ DBI, and provides DB-accessing API and the simple management UI.") to open SQLite databases.") (license license:gpl3+)))) +(define-public emacs-nice-citation + (let ((commit "1013b56d9d1495a335f40a5f76203034dc5fa0ea") + (revision "0")) + (package + (name "emacs-nice-citation") + (version (git-version "0.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/damiencollard/nice-citation") + (commit commit))) + (sha256 + (base32 "00xqr7haca5vd0bzd043lc6x4fjb903z96frz9b8cbd7spp63z7q")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/damiencollard/nice-citation") + (synopsis "Depth-colored citations for Gnus") + (description + "This package replaces the traditional chevron citation marks @samp{>} +with a Unicode vertical bar with the same color as the text it is quoting. + +It is purely presentation: the underlying text is unchanged. In particular, +if you send a message containing a citation, it will contain the traditional +chevron marks.") + (license license:gpl3+)))) + (define-public emacs-nix-mode (package (name "emacs-nix-mode") -- cgit 1.4.1 From e0495951d5e8544c0f6d2e5a8a83b3c3e419bb3a Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Tue, 23 Mar 2021 13:54:03 +0300 Subject: gnu: emacs-imenu-list: Update to 0.9-0.b502223. * gnu/packages/emacs-xyz.scm (emacs-imenu-list): Update to 0.9-0.b502223. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7ff8232476..a51a36616c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2675,9 +2675,9 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (license license:gpl2+))) (define-public emacs-imenu-list - (let ((commit "46008738f8fef578a763c308cf6695e5b4d4aa77") + (let ((commit "b50222378412fbe321622a84cb2b036e084c697a") (revision "0") - (version "0.8")) + (version "0.9")) (package (name "emacs-imenu-list") (version (git-version version revision commit)) @@ -2690,7 +2690,7 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14l3yw9y1nk103s7z5i1fmd6kvlb2p6ayi6sf9l1x1ydg9glrpl8")))) + (base32 "1936dd41fa05ndzf2bwhllvjz97iz0rflkazjipr7dvz5q072wj2")))) (build-system emacs-build-system) (home-page "https://github.com/bmag/imenu-list") (synopsis -- cgit 1.4.1 From 45556111cb6a4e82df6003c4e172b619afe89e6d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 26 Mar 2021 15:34:24 +0100 Subject: gnu: emacs-imenu-list: Bump revision. * gnu/packages/emacs-xyz.scm (emacs-imenu-list): Bump revision. This is a followup to e0495951d5e8544c0f6d2e5a8a83b3c3e419bb3a. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a51a36616c..ea2bd347c3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2676,7 +2676,7 @@ using the DOT syntax, and use Graphviz to convert these files to diagrams.") (define-public emacs-imenu-list (let ((commit "b50222378412fbe321622a84cb2b036e084c697a") - (revision "0") + (revision "1") (version "0.9")) (package (name "emacs-imenu-list") -- cgit 1.4.1 From 078dbd22f5e2331f69d24cb1bcaee75cb76b920b Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 7 Feb 2021 13:11:47 +0100 Subject: gnu: tzdata: Update to 2021a. * gnu/packages/base.scm (tzdata): Update to 2021a. [inputs]: Update tzcode. Signed-off-by: Leo Famulari --- gnu/packages/base.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f0f9353398..ea2e102c15 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1274,7 +1274,9 @@ command.") (define-public tzdata (package (name "tzdata") - (version "2020f") + ;; This package should be kept in sync with python-pytz in (gnu packages + ;; time). + (version "2021a") (source (origin (method url-fetch) (uri (string-append @@ -1282,7 +1284,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "10b8cr55x6ji14n3kqkn3avj1s9b79b8gszh81fxrrisij8k248j")))) + "022fn6gkmp7pamlgab04x0dm5hnyn2m2fcnyr3pvm36612xd5rrr")))) (build-system gnu-build-system) (arguments `(#:tests? #f @@ -1342,7 +1344,7 @@ command.") version ".tar.gz")) (sha256 (base32 - "1i998crd9fxdfhv4jd241j1arx0ng7j7cvczpmj4y5j5fwmfmvng")))))) + "1l02b0jiwp3fl0xd6227i69d26rmx3yrnq0ssq9vvdmm4jhvyipb")))))) (home-page "https://www.iana.org/time-zones") (synopsis "Database of current and historical time zones") (description "The Time Zone Database (often called tz or zoneinfo) -- cgit 1.4.1 From b05edb8c14900822ae9c1bb3fde78743cc32e279 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Mar 2021 00:44:50 -0400 Subject: gnu: python-pytzdata: Update to 2020.1. * gnu/packages/time.scm (python-pytzdata): Update to 2020.1. --- 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 be37ea980e..20a7ad114f 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -97,14 +97,14 @@ expressions.") (define-public python-pytzdata (package (name "python-pytzdata") - (version "2019.3") + (version "2020.1") (source (origin (method url-fetch) (uri (pypi-uri "pytzdata" version)) (sha256 (base32 - "0ppfc6kz4p41mxyqxq1g1zp6gvns99g6b344qj6ih0x9vxy6zh7s")))) + "0h0md0ldhb8ghlwjslkzh3wcj4fxg3n43bj5sghqs2m06nri7yiy")))) (build-system python-build-system) ;; XXX: The PyPI distribution contains no tests, and the upstream ;; repository lacks a setup.py! How to build from git? -- cgit 1.4.1 From e8337f1e45b57035c6e5d45133aa9412d4e5e882 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 23 Mar 2021 00:45:08 -0400 Subject: gnu: python-pytz: Update to 2021.1. * gnu/packages/time.scm (python-pytz): Update to 2021.1. --- gnu/packages/time.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 20a7ad114f..d6ebb59a1e 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -123,14 +123,15 @@ expressions.") (define-public python-pytz (package (name "python-pytz") - (version "2020.4") + ;; This package should be kept in sync with tzdata in (gnu packages base). + (version "2021.1") (source (origin (method url-fetch) (uri (pypi-uri "pytz" version)) (sha256 (base32 - "0s72lz9q7rm2xgl2in0nvhn5cp0cyrxa257fpj2919g0s797ssry")))) + "1nn459q7zg20n75akxl3ljkykgw1ydc8nb05rx1y4f5zjh4ak943")))) (build-system python-build-system) (home-page "http://pythonhosted.org/pytz") (synopsis "Python timezone library") -- cgit 1.4.1 From 9d72295827f1e9c82add42b1cbf2e740fb9109e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 26 Mar 2021 21:13:06 +0100 Subject: gnu: cuirass: Fix version generation. * gnu/packages/ci.scm (cuirass)[arguments]: Add a 'fix-version-gen phase. --- gnu/packages/ci.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5afa4e28b2..f7f4bf4dc1 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -65,7 +65,7 @@ "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) (build-system gnu-build-system) (arguments - '(#:modules ((guix build utils) + `(#:modules ((guix build utils) (guix build gnu-build-system) (ice-9 rdelim) (ice-9 popen)) @@ -73,6 +73,13 @@ #:parallel-tests? #f #:phases (modify-phases %standard-phases + (add-before 'bootstrap 'fix-version-gen + (lambda _ + (patch-shebang "build-aux/git-version-gen") + + (call-with-output-file ".tarball-version" + (lambda (port) + (display ,version port))))) (add-before 'check 'set-PATH-for-tests (lambda* (#:key inputs #:allow-other-keys) (let ((pg (assoc-ref inputs "ephemeralpg")) -- cgit 1.4.1 From f9e2f6ec1d93eb97b59af60066059d5afdeb3e6a Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 26 Mar 2021 21:38:12 +0100 Subject: gnu: rust: Add Rust 1.51 * gnu/packages/rust.scm (rust-1.51): 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 c7840e1a20..3952a17908 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -1460,5 +1460,9 @@ move around." (rust-bootstrapped-package rust-1.49 "1.50.0" "0pjs7j62maiyvkmhp9zrxl528g2n0fphp4rq6ap7aqdv0a6qz5wm")) +(define-public rust-1.51 + (rust-bootstrapped-package rust-1.50 "1.51.0" + "0ixqkqglv3isxbvl4ldr4byrkx692wghsz3fasy1pn5kr2prnsvs")) + ;; TODO(staging): Bump this variable to the latest packaged rust. (define-public rust rust-1.45) -- cgit 1.4.1 From 1d8e6eb06ef661a515d233ffce98a8c5aa161526 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Fri, 26 Mar 2021 22:11:28 +0100 Subject: gnu: Add emacs-relative-buffers. * gnu/packages/emacs-xyz.scm (emacs-relative-buffers): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ea2bd347c3..645ccb8c36 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1525,6 +1525,46 @@ reformat the current buffer using a command-line program, together with an optional minor mode which can apply this command automatically on save.") (license license:gpl3+))) +(define-public emacs-relative-buffers + (let ((release "0.0.1") + (revision "0") + (commit "9762fe268e9ff150dcec2e2e45d862d82d5c4008")) + (package + (name "emacs-relative-buffers") + (version (git-version release revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsattic/relative-buffers") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fzhwbpyndwrmxip9zlcwkrr675l5pzwcygi45hv7w1hn39w0hxp")) + (snippet + '(begin + ;; Delete the Cask test runners. + (for-each delete-file '("Cask" "test/test-helper.el")) + #t)))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (native-inputs + `(("ert-runner" ,emacs-ert-runner))) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/emacsattic/relative-buffers") + (synopsis "Minor mode to rename buffers by project structure") + (description + "This package provides a minor mode for renaming buffers according to +project structure. For Python buffers, that will be the whole module name. +For temporary files and directories, that will be the relative path from the +project root.") + (license license:gpl3+)))) + (define-public emacs-relint (package (name "emacs-relint") -- cgit 1.4.1 From 147b86ad30bb574e0d3b4e30486b70ae31fd16c3 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Fri, 26 Mar 2021 22:16:41 +0100 Subject: gnu: Add emacs-cascading-dir-locals. * gnu/packages/emacs-xyz.scm (emacs-cascading-dir-locals): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 645ccb8c36..ead2144b42 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23391,6 +23391,39 @@ Dash docsets.") through Dash docsets.") (license license:expat)))) +(define-public emacs-cascading-dir-locals + (let ((release "0.1") + (revision "0") + (commit "efdf5e6d62b955ee0ca3c170eae1d388799f9fa0")) + (package + (name "emacs-cascading-dir-locals") + (version (git-version release revision commit)) + (home-page "https://github.com/fritzgrabo/cascading-dir-locals") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jwd99kk5l588n7wwi1x3b4bgimm66x1icna3n20pwaj49kf0zy8")))) + (build-system emacs-build-system) + (synopsis "Apply all @file{.dir-locals.el} from root to current directory") + (description + "This package provides a global minor mode that changes how Emacs +handles the lookup of applicable dir-locals files (@file{.dir-locals.el}): +instead of starting at the directory of the visited file and moving up the +directory tree only until a first dir-locals file is found, collect and apply +all (!) dir-locals files found from the current directory up to the root one. + +Values specified in files nearer to the current directory take precedence over +values in files farther away from it. + +You might want to use this to globally set dir-local variables that apply to +all of your projects, then override or add variables on a per-project basis.") + (license license:gpl3+)))) + (define-public emacs-calibredb (package (name "emacs-calibredb") -- cgit 1.4.1 From 53dd99bc0b2e23c5463b4cb95546fd438a72d229 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 26 Mar 2021 22:51:14 +0100 Subject: gnu: upx: Fix CVE-2021-20285. * gnu/packages/patches/upx-CVE-2021-20285.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (upx): Apply patch. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 3 +- gnu/packages/patches/upx-CVE-2021-20285.patch | 76 +++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/upx-CVE-2021-20285.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 40956598db..f8c4e73402 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1765,6 +1765,7 @@ dist_patch_DATA = \ %D%/packages/patches/unzip-zipbomb-part2.patch \ %D%/packages/patches/unzip-zipbomb-part3.patch \ %D%/packages/patches/unzip-32bit-zipbomb-fix.patch \ + %D%/packages/patches/upx-CVE-2021-20285.patch \ %D%/packages/patches/ustr-fix-build-with-gcc-5.patch \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/upower-builddir.patch \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 2d065046ee..ef73e6038b 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2100,7 +2100,8 @@ decompression is a little bit slower.") version "/upx-" version "-src.tar.xz")) (sha256 (base32 - "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7")))) + "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7")) + (patches (search-patches "upx-CVE-2021-20285.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) diff --git a/gnu/packages/patches/upx-CVE-2021-20285.patch b/gnu/packages/patches/upx-CVE-2021-20285.patch new file mode 100644 index 0000000000..1d47b2a8bb --- /dev/null +++ b/gnu/packages/patches/upx-CVE-2021-20285.patch @@ -0,0 +1,76 @@ +From 3781df9da23840e596d5e9e8493f22666802fe6c Mon Sep 17 00:00:00 2001 +From: John Reiser +Date: Fri, 11 Dec 2020 13:38:18 -0800 +Subject: [PATCH] Check DT_REL/DT_RELA, DT_RELSZ/DT_RELASZ + +https://github.com/upx/upx/issues/421 + modified: p_lx_elf.cpp +--- + src/p_lx_elf.cpp | 34 +++++++++++++++++++++++++++++----- + 1 file changed, 29 insertions(+), 5 deletions(-) + +diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp +index 182db192..3a4101cf 100644 +--- a/src/p_lx_elf.cpp ++++ b/src/p_lx_elf.cpp +@@ -2222,8 +2222,20 @@ bool PackLinuxElf32::canPack() + int z_rsz = dt_table[Elf32_Dyn::DT_RELSZ]; + if (z_rel && z_rsz) { + unsigned rel_off = get_te32(&dynseg[-1+ z_rel].d_val); ++ if ((unsigned)file_size <= rel_off) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf32_Dynamic[DT_REL] %#x\n", ++ rel_off); ++ throwCantPack(msg); ++ } + Elf32_Rel *rp = (Elf32_Rel *)&file_image[rel_off]; + unsigned relsz = get_te32(&dynseg[-1+ z_rsz].d_val); ++ if ((unsigned)file_size <= relsz) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf32_Dynamic[DT_RELSZ] %#x\n", ++ relsz); ++ throwCantPack(msg); ++ } + Elf32_Rel *last = (Elf32_Rel *)(relsz + (char *)rp); + for (; rp < last; ++rp) { + unsigned r_va = get_te32(&rp->r_offset); +@@ -2562,14 +2574,26 @@ PackLinuxElf64::canPack() + int z_rel = dt_table[Elf64_Dyn::DT_RELA]; + int z_rsz = dt_table[Elf64_Dyn::DT_RELASZ]; + if (z_rel && z_rsz) { +- unsigned rel_off = get_te64(&dynseg[-1+ z_rel].d_val); ++ upx_uint64_t rel_off = get_te64(&dynseg[-1+ z_rel].d_val); ++ if ((u64_t)file_size <= rel_off) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf64_Dynamic[DT_RELA] %#llx\n", ++ rel_off); ++ throwCantPack(msg); ++ } + Elf64_Rela *rp = (Elf64_Rela *)&file_image[rel_off]; +- unsigned relsz = get_te64(&dynseg[-1+ z_rsz].d_val); ++ upx_uint64_t relsz = get_te64(&dynseg[-1+ z_rsz].d_val); ++ if ((u64_t)file_size <= relsz) { ++ char msg[70]; snprintf(msg, sizeof(msg), ++ "bad Elf64_Dynamic[DT_RELASZ] %#llx\n", ++ relsz); ++ throwCantPack(msg); ++ } + Elf64_Rela *last = (Elf64_Rela *)(relsz + (char *)rp); + for (; rp < last; ++rp) { +- unsigned r_va = get_te64(&rp->r_offset); ++ upx_uint64_t r_va = get_te64(&rp->r_offset); + if (r_va == user_init_ava) { // found the Elf64_Rela +- unsigned r_info = get_te64(&rp->r_info); ++ upx_uint64_t r_info = get_te64(&rp->r_info); + unsigned r_type = ELF64_R_TYPE(r_info); + if (Elf64_Ehdr::EM_AARCH64 == e_machine + && R_AARCH64_RELATIVE == r_type) { +@@ -2581,7 +2605,7 @@ PackLinuxElf64::canPack() + } + else { + char msg[50]; snprintf(msg, sizeof(msg), +- "bad relocation %#x DT_INIT_ARRAY[0]", ++ "bad relocation %#llx DT_INIT_ARRAY[0]", + r_info); + throwCantPack(msg); + } -- cgit 1.4.1 From 05e0bd07d4fcfd082a8095150a86ceacb4635b7c Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:11:02 -0400 Subject: gnu: bcg729: Enable tests and update home page, license. * gnu/packages/linphone.scm (bcg729)[source]: Remove '.git' suffix from URL. [tests?]: Remove argument. [configure-flags]: Enable tests. [phases]{copy-inputs}: New phase. {check}: Override. [native-inputs]: Add perl, test-patterns and unzip. [home-page]: Update. [license]: Upgrade to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 56 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 382b3a912b..19b50170d2 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -243,24 +243,68 @@ tracks in one file. ") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/bcg729.git") + (url "git://git.linphone.org/bcg729") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1hal6b3w6f8y5r1wa0xzj8sj2jjndypaxyw62q50p63garp2h739")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES") + #:phases + (modify-phases %standard-phases + (add-before 'check 'copy-inputs + (lambda* (#:key inputs #:allow-other-keys) + (let ((test-patterns (assoc-ref inputs "test-patterns")) + (dest (string-append "test/bcg729-patterns.zip"))) + (copy-recursively test-patterns dest)))) + (replace 'check + (lambda _ + (with-directory-excursion "test" + (invoke "unzip" "bcg729-patterns.zip") + (for-each + (lambda (test-name) + (invoke "./testCampaign" "-s" test-name)) + (list "fixedCodebookSearch" + "postProcessing" + "adaptativeCodebookSearch" + "computeLP" + "computeAdaptativeCodebookGain" + "postFilter" + "decoder" + "LPSynthesisFilter" + "decodeLSP" + ;; "encoder" + ;; "LSPQuantization" + "preProcessing" + "decodeFixedCodeVector" + "CNGdecoder" + ;; "LP2LSPConversion" + "gainQuantization" + "findOpenLoopPitchDelay" + "decodeGains" + "computeWeightedSpeech" + "interpolateqLSPAndConvert2LP" + "decodeAdaptativeCodeVector")))))))) + (native-inputs + `(("perl" ,perl) + ("test-patterns" + ,(origin + (method url-fetch) + (uri (string-append "http://www.belledonne-communications.com/" + "bc-downloads/bcg729-patterns.zip")) + (sha256 + (base32 "1kivarhh3izrl9sg0szs6x6pbq2ap0y6xsraw0gbgspi4gnfihrh")))) + ("unzip" ,unzip))) (synopsis "Belledonne Communications G729 Codec") (description "BcG729 is an implementation of both encoder and decoder of the ITU G729 speech codec. The library written in C 99 is fully portable and can be executed on many platforms including both ARM and x86 processors. It supports concurrent channels encoding and decoding for multi call application such as conferencing.") - (home-page "https://gitlab.linphone.org/BC/public/belcard") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/bcg729") + (license license:gpl3+))) (define-public ortp (package -- cgit 1.4.1 From 279908ef510342b967f9ce25e5ff969f9c0ca55d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 20:30:21 -0400 Subject: gnu: bcmatroska2: Fetch the sources from git. * gnu/packages/linphone.scm (bcmatroska2)[source]: Fetch sources from git. [description]: Expound description. [license]: Add the gpl2+ license to the list. Remove broken URLs. --- gnu/packages/linphone.scm | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 19b50170d2..078185046f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -209,31 +209,26 @@ format.") (version "0.23") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bcmatroska2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a0vlk4fhh189pfzrwbc3xbc5vyx6cnxy642d1h40045jz9y4h15")))) + (base32 "1avl9w18kh4dxm3g8j0bkw39bksd7bz3nfxvyibqqnz63ds8vfi2")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required + `(#:tests? #f ; No test target + #:configure-flags (list "-DENABLE_STATIC=NO"))) ; Not required (synopsis "Belledonne Communications Media Container") (description "BcMatroska is a free and open standard multi-media container format. It can hold an unlimited number of video, audio, picture, or subtitle -tracks in one file. ") +tracks in one file. This project provides a convenient distribution of the +Matroska multimedia container format.") (home-page "https://gitlab.linphone.org/BC/public/bcmatroska2") - (license - (list - ;; For Core C and LibEBML2. - ;; https://www.matroska.org/node/47 - license:bsd-4 - ;; For LibMatroska2. - ;; https://www.matroska.org/node/47 - license:lgpl2.1+)))) + (license (list license:gpl2+ ;for this package (build system files) + license:bsd-4 ;for Core C and LibEBML2 + license:lgpl2.1+)))) ;for LibMatroska2 (define-public bcg729 (package -- cgit 1.4.1 From ec3b73336861eaa27f506d17fdbea573363beb84 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 27 Mar 2021 10:45:47 +0100 Subject: gnu: cuirass: Update to 1.0.0-5.eb94e7d. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-5.eb94e7d. --- 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 f7f4bf4dc1..15d1cb5317 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "ff3f25d28782a85841b5e604335fc1118ef93f01") - (revision "4")) + (let ((commit "eb94e7da6a5985a4b92d92aa22955e4013490e9c") + (revision "5")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0sykgmh12llkk5qb63542wb7ywjiirscqmlvrsskfkqlgs7scsgg")))) + "1fyj33bhfl0zl7ik98dxqvb58n24zv3aw037gvri0p0xzyp2fhbx")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit 1.4.1 From c7d04418af3d9a107330063192eee32d1457a2a5 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sat, 27 Mar 2021 14:13:43 +0100 Subject: gnu: icedove: Update to 78.9.0. * gnu/packages/gnuzilla.scm (icedove): Update to 78.9.0. --- gnu/packages/gnuzilla.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 826dbbd511..f2de477548 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1305,11 +1305,11 @@ standards of the IceCat project.") (cpe-version . ,(first (string-split version #\-))))))) ;; Update this together with icecat! -(define %icedove-build-id "20210223000000") ;must be of the form YYYYMMDDhhmmss +(define %icedove-build-id "20210323000000") ;must be of the form YYYYMMDDhhmmss (define-public icedove (package (name "icedove") - (version "78.8.0") + (version "78.9.0") (source icecat-source) (properties `((cpe-name . "thunderbird_esr"))) @@ -1589,7 +1589,7 @@ standards of the IceCat project.") ;; in the Thunderbird release tarball. We don't use the release ;; tarball because it duplicates the Icecat sources and only adds the ;; "comm" directory, which is provided by this repository. - ,(let ((changeset "d801a94f25867ca5f2f3488c4700532351987999")) + ,(let ((changeset "1a5cd2aa11de609116f258b413afcf113ed72f3a")) (origin (method hg-fetch) (uri (hg-reference @@ -1598,7 +1598,7 @@ standards of the IceCat project.") (file-name (string-append "thunderbird-" version "-checkout")) (sha256 (base32 - "19h1s9qcxzcvbd1m07xajk5lhpikj53k5fp3nwvl38xj7a3s0gxw"))))) + "0qgz9qj8gbn2ccmhvk3259ahs9p435ipvkzsysn3xj8a6klbz02w"))))) ("autoconf" ,autoconf-2.13) ("cargo" ,rust-1.41 "cargo") ("clang" ,clang) -- cgit 1.4.1 From 61746650b22698583bbc016b4ae1763422f7023c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 15:20:50 +0100 Subject: gnu: cryptsetup: Update to 2.3.5. * gnu/packages/cryptsetup.scm (cryptsetup): Update to 2.3.5. --- gnu/packages/cryptsetup.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm index a12ac93b25..1b3da5389c 100644 --- a/gnu/packages/cryptsetup.scm +++ b/gnu/packages/cryptsetup.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2016 Ludovic Courtès -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,7 +35,7 @@ (define-public cryptsetup (package (name "cryptsetup") - (version "2.3.4") + (version "2.3.5") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/utils/cryptsetup/v" @@ -43,7 +43,7 @@ "/cryptsetup-" version ".tar.xz")) (sha256 (base32 - "0wrpz2fzbsszmsgxxbssxjgylpyiindh24z8g13m2fxmjsxyw5lx")))) + "1hbhzlv4vbib1da20vnrqaikhxi7ljnchbzrv8v2a4sd8ipr9nff")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From da431695b5b7a8dce96404d8d8b054d3fa7ef6a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:33:49 +0100 Subject: gnu: nnn: Update to 3.6. * gnu/packages/admin.scm (nnn): Update to 3.6. --- 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 6949edd00c..df467c6965 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3501,14 +3501,14 @@ information tool.") (define-public nnn (package (name "nnn") - (version "3.5") + (version "3.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/jarun/nnn/releases/download/v" version "/nnn-v" version ".tar.gz")) (sha256 - (base32 "1ww18vvfjkvi36rcamw8kpix4bhk71w5bw9kmnh158crah1x8dp6")))) + (base32 "1dbq16cdipij5ws59ab3alfmxli7n4wx28ip7gsyq8ncxg598l47")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) -- cgit 1.4.1 From 8a423f8911b5d476b6322ceaebed87f85c3c3806 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:47:05 +0100 Subject: gnu: ccls: Update to 0.20201219. * gnu/packages/cpp.scm (ccls): Update to 0.20201219. --- gnu/packages/cpp.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 2233d2e993..a0fc373bfd 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Ethan R. Jones -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2019, 2020 Mathieu Othacehe @@ -482,7 +482,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (define-public ccls (package (name "ccls") - (version "0.20201025") + (version "0.20201219") (source (origin (method git-fetch) @@ -490,8 +490,7 @@ tools (containers, algorithms) used by other QuantStack packages.") (url "https://github.com/MaskRay/ccls") (commit version))) (sha256 - (base32 - "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p")) + (base32 "0nkg92rgb1x6scpiwdamfrd1ag87j7ajxyn5qi861r916m5mh9m8")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From acbcc0c4b1810422963e41c7ecbf23cada171b66 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 16:47:21 +0100 Subject: gnu: facter: Update to 4.0.52. * gnu/packages/admin.scm (facter): Update to 4.0.52. --- 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 df467c6965..1b0cc6a4ec 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -462,7 +462,7 @@ graphs and can export its output to different formats.") (define-public facter (package (name "facter") - (version "4.0.51") + (version "4.0.52") (source (origin (method git-fetch) (uri (git-reference @@ -471,7 +471,7 @@ graphs and can export its output to different formats.") (file-name (git-file-name name version)) (sha256 (base32 - "1s98rq2wjmh8bqdfdibvfp9j2ynd97k0c4hairryrzl9nna3j542")))) + "05j4q87sak1f1isj7ngzr59h3j3xskfwjjwfv0xd7lhwcaxg3a3c")))) (build-system ruby-build-system) (arguments `(#:phases -- cgit 1.4.1 From b51f086f9297a4c9b54952b6d5e33db66f0f7bcd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 19:04:51 +0100 Subject: gnu: git: Update to 2.31.1. * gnu/packages/version-control.scm (git): Update to 2.31.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 137c7c8336..95703e5e00 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -172,14 +172,14 @@ as well as the classic centralized workflow.") (define-public git (package (name "git") - (version "2.31.0") + (version "2.31.1") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0h4sg3xqa9pd2agrd7m18sqg319ls978d39qswyf30rjvg5n5wg8")))) + "10367n5sv4nsgaxy486pbp7nscx34vjk8vrb06jm9ffm8ix42qcz")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -196,7 +196,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "1v40wwj130k76xf2w6vwhvfpkk765q1gcy5bqcrqssxf66ydqp8q")))) + "00n7vbfmd3ywgjksgwrszwj0l2niba64qkaq07ra4p8mawy483ax")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From dfd20df252f803a3215a7e9a5d799ac5ab8d4f87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 19:06:38 +0100 Subject: gnu: gptfdisk: Update to 1.0.7. * gnu/packages/disk.scm (gptfdisk): Update to 1.0.7. --- 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 b89da87967..81197c9cc2 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -305,14 +305,14 @@ tables, and it understands a variety of different formats.") (define-public gptfdisk (package (name "gptfdisk") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gptfdisk/gptfdisk/" version "/gptfdisk-" version ".tar.gz")) (sha256 - (base32 "1a4c2ss6n2s6x8v11h79jykh96y46apd6i838ka0ngx58gb53ifx")))) + (base32 "1h1871gwlq05gdc2wym98ghfmq6pn5lh8g5cqy3r49svz2vh8h3m")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From a4a8693c8e9916dc649b527d5e9728e728f0cc5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 20:04:55 +0100 Subject: gnu: diffoscope: Update to 171. * gnu/packages/diffoscope.scm (diffoscope): Update to 171. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 20ba92709a..0b2779d288 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "170") + (version "171") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0s1z4yc5d10ns4x28d2lm8py30r7sq4764q6b8yxcwxwfrjibmb0")))) + "1niz481s8i86ql56kfmnyzh0nwinhpzhprfkljwdprqi6hc63v0c")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 50a325166780d860d82efb218822792b5dc2d7e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 20:47:55 +0100 Subject: gnu: ntl: Update to 11.4.4. * gnu/packages/algebra.scm (ntl): Update to 11.4.4. --- gnu/packages/algebra.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 64f7eda485..d92e963af4 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017, 2020 Efraim Flashner -;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2019 Mathieu Othacehe @@ -563,14 +563,14 @@ these types and other mathematical functions.") (define-public ntl (package (name "ntl") - (version "11.4.3") + (version "11.4.4") (source (origin (method url-fetch) (uri (string-append "https://shoup.net/ntl/ntl-" version ".tar.gz")) (sha256 (base32 - "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp")) + "1nr1h27j2gdz6badzz9lk2pknxhdijqdxqhd3haryh0sw616wzwx")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 8521e875b49a3171c921d41ba865dffcd6ba6328 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:05:26 +0100 Subject: gnu: Add gpart. * gnu/packages/disk.scm (gpart): New public variable. --- gnu/packages/disk.scm | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 81197c9cc2..6b9a9e4812 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -302,6 +302,58 @@ fdisk. fdisk is used for the creation and manipulation of disk partition tables, and it understands a variety of different formats.") (license license:gpl3+))) +(define-public gpart + ;; The latest (0.3) release is from 2015 and is missing a crash fix. + (let ((commit "ec03350a01ad69708b5a3e2d47b8e002b0eba6c9") + (revision "0")) + (package + (name "gpart") + (version (git-version "0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/baruch/gpart") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dassswliaiwhhmx7yz540yyxgk53fvg672dbvgc5q0v6cqrh5jx")))) + (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 'unpack 'skip-premature-configuration + (lambda _ + (substitute* "autogen.sh" + (("\\./configure") ""))))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + (home-page "https://github.com/baruch/gpart") + (synopsis "Guess and recover PC-style partition tables") + (description + "Gpart tries to guess the partitions on a PC-style, MBR-partitioned disk +after they have been inadvertently deleted or the primary partition table at +sector 0 damaged. In both cases, the contents of these partitions still exist +on the disk but the operating system cannot access them. + +Gpart ignores the partition table and scans each sector of the device or image +file for several known file system and partition types. Only partitions which +have been formatted in some way can be recognized. Several file system guessing +modules are built in; more can be written and loaded at run time. + +The guessed table can be restored manually, for example with @command{fdisk}, +written to a file, or---if you firmly believe it's entirely correct---directly +to disk. + +It should be stressed that gpart does a very heuristic job. It can easily be +right in its guesswork but it can also be terribly wrong. Never believe its +output without any plausability checks.") + (license license:gpl2+)))) + (define-public gptfdisk (package (name "gptfdisk") -- cgit 1.4.1 From f7aa0734518f18680a1fe4d54af221a45002475b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:17:55 +0100 Subject: gnu: pam-mount: Update to 2.18. * gnu/packages/admin.scm (pam-mount): Update to 2.18. [inputs]: Replace pcre with pcre2. --- gnu/packages/admin.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 1b0cc6a4ec..df7973395d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4104,14 +4104,14 @@ tcpdump and snoop.") (define-public pam-mount (package (name "pam-mount") - (version "2.17") + (version "2.18") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pam-mount/pam_mount/" "pam_mount-" version ".tar.xz")) (sha256 - (base32 "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy")))) + (base32 "0832nh2qf9pisgwnbgx6hkylx5d7i416l19y3ly4ifv7k1p7mxqa")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl) @@ -4123,7 +4123,7 @@ tcpdump and snoop.") ("linux-pam" ,linux-pam) ("lvm2" ,lvm2) ("openssl" ,openssl) - ("pcre" ,pcre) + ("pcre2" ,pcre2) ("libmount" ,util-linux "lib") ("util-linux" ,util-linux))) (arguments -- cgit 1.4.1 From 02a2c7e53cc0070233c31f52600bec5e6a0d7c72 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:47:02 +0100 Subject: gnu: gnu-efi: Update to 3.0.13. * gnu/packages/efi.scm (gnu-efi): Update to 3.0.13. --- gnu/packages/efi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/efi.scm b/gnu/packages/efi.scm index 11cfe586ac..8bbd873435 100644 --- a/gnu/packages/efi.scm +++ b/gnu/packages/efi.scm @@ -38,14 +38,14 @@ (define-public gnu-efi (package (name "gnu-efi") - (version "3.0.12") + (version "3.0.13") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnu-efi/" "gnu-efi-" version ".tar.bz2")) (sha256 - (base32 "0sbn6am3k5lqafycggh1g964fcwjwnh0i9hhwrk4ncrwzphz55h1")))) + (base32 "0z9v5pl5pmlw8pjpd66iyh9pml2hh6pqd4c5qilywilw4wazgk1g")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; none exist -- cgit 1.4.1 From 3f4a71a44efb2b1a2a5c994598021b441aada7a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 27 Mar 2021 22:47:13 +0100 Subject: gnu: knot: Update to 3.0.5. * gnu/packages/dns.scm (knot): Update to 3.0.5. --- 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 953933d880..b6f86711a3 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -812,7 +812,7 @@ Extensions} (DNSSEC).") (define-public knot (package (name "knot") - (version "3.0.4") + (version "3.0.5") (source (origin (method git-fetch) @@ -821,7 +821,7 @@ Extensions} (DNSSEC).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mbjl18zi8yxs7pa3395lqjwdw0agjbfpl32x42i6d9zb8fsblzs")) + (base32 "16rgcmgj21w2niyz45d3zjlci9i22gxcvfzqw7g5zwsjdy9610nx")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 9f511106c6759e6b555060220eebae0ca98b71e8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 27 Mar 2021 22:42:15 +0100 Subject: gnu: Add mandoc. * gnu/packages/man.scm (mandoc): New variable. Co-authored-by: Stefan Karrmann --- gnu/packages/man.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 8a548e6e56..8911463a61 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, 2018 Ludovic Courtès +;;; Copyright © 2012, 2014, 2015, 2017, 2018, 2021 Ludovic Courtès ;;; Copyright © 2014 David Thompson ;;; Copyright © 2015, 2016 Ricardo Wurmus ;;; Copyright © 2015 Alex Kost @@ -32,6 +32,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system ruby) #:use-module (guix utils) + #:use-module (gnu packages compression) #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) @@ -221,6 +222,50 @@ accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases.") (license license:gpl2+))) +(define-public mandoc + (package + (name "mandoc") + (version "1.14.5") + (source (origin + (method url-fetch) + (uri (string-append "https://mandoc.bsd.lv/snapshots/mandoc-" + version ".tar.gz")) + (sha256 + (base32 + "1xyqllxpjj1kimlipx11pzyywf5c25i4wmv0lqm7ph3gnlnb86c2")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases (modify-phases %standard-phases + (add-before 'configure 'set-prefix + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "configure" + (("^CC=.*") + (string-append "CC=" ,(cc-for-target) "\n")) + (("^DEFCFLAGS=\\\\\"") + "DEFCFLAGS=\"-O2 ") + (("^UTF8_LOCALE=.*") ;used for tests + "UTF8_LOCALE=en_US.UTF-8\n") + (("^MANPATH_(BASE|DEFAULT)=.*" _ which) + (string-append "MANPATH_" which "=" + "/run/current-system/profile/share/man\n")) + (("^PREFIX=.*") + (string-append "PREFIX=" (assoc-ref outputs "out") + "\n")))))))) + (native-inputs `(("perl" ,perl))) ;used to run tests + (inputs `(("zlib" ,zlib))) + (synopsis "Tools for BSD mdoc and man pages") + (description + "mandoc is a suite of tools compiling mdoc, the roff macro language of +choice for BSD manual pages, and man, the predominant historical language for +UNIX manuals. It is small and quite fast. The main component of the toolset +is the @command{mandoc} utility program, based on the libmandoc validating +compiler, to format output for UTF-8 and ASCII UNIX terminals, HTML 5, +PostScript, and PDF. Additional tools include the @command{man} viewer, and +@command{apropos} and @command{whatis}.") + (home-page "https://mandoc.bsd.lv/") + (license license:isc))) + (define-public man-pages (package (name "man-pages") -- cgit 1.4.1 From 52d2c0b27aba1f29b99bdb8649c992f5dfaee95d Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 23 Jan 2021 14:57:25 -0600 Subject: gnu: Add interception-tools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (interception-tools): New variable. Co-authored-by: Ludovic Courtès --- gnu/packages/linux.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5e7542d50b..929b930dd9 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3532,6 +3532,53 @@ subsystem. @code{uinput} allows userspace programs to create and handle input devices that can inject events directly into the input subsystem.") (license license:bsd-3))) +(define-public interception-tools + (package + (name "interception-tools") + (version "0.6.4") + (home-page "https://gitlab.com/interception/linux/tools") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "121jy40ynkbzlqnx7g0dqwvkb7dm2ahcy6vwrz6ylsyd0jmi6s5a")))) + (build-system cmake-build-system) + (inputs + `(("boost" ,boost) + ("libevdev" ,libevdev) + ("libudev" ,eudev) + ("yaml-cpp" ,yaml-cpp))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-libevdev-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((libevdev (assoc-ref inputs "libevdev"))) + (substitute* "CMakeLists.txt" + (("/usr/include/libevdev-1.0") + (string-append libevdev "/include/libevdev-1.0"))) + #t)))) + ;; No tests are included. + #:tests? #f)) + (synopsis "Utilities for operating on input events of evdev devices") + (description + "Interception Tools provides a composable infrastructure on top of +@code{libudev} and @code{libevdev}. The following utilities are provided: + +@itemize +@item @command{udevmon} --- monitor input devices for launching tasks +@item @command{intercept} --- redirect device input events to stdout +@item @command{uinput} --- redirect device input events from stding to virtual device +@item @command{mux} --- mux streams of input events +@end itemize") + ;; Dual-licensed under GPLv3+ or "something else" on request, per + ;; 'README.md'. + (license license:gpl3+))) + (define-public lvm2 (package (name "lvm2") -- cgit 1.4.1 From 3b0ead1c6a6665c175bb390155eba1f54ba510b5 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Sat, 23 Jan 2021 16:13:27 -0600 Subject: gnu: Add interception-dual-function-keys. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/linux.scm (interception-dual-function-keys): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/linux.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 929b930dd9..388b8aae8d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3579,6 +3579,46 @@ devices that can inject events directly into the input subsystem.") ;; 'README.md'. (license license:gpl3+))) +(define-public interception-dual-function-keys + (package + (name "interception-dual-function-keys") + (version "1.3.0") + (home-page "https://gitlab.com/interception/linux/plugins/dual-function-keys") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gvhkmwzl5fyyc7k8rc4rf2b9mzh05wa8wcybf9hz2x1mqkc7lmz")))) + (build-system gnu-build-system) + (inputs + `(("libevdev" ,libevdev) + ("yaml-cpp" ,yaml-cpp))) + (arguments + `(#:make-flags (list "CC=gcc" "CXX=g++" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-libevdev-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((libevdev (assoc-ref inputs "libevdev"))) + (substitute* "config.mk" + (("/usr/include/libevdev-1.0") + (string-append libevdev "/include/libevdev-1.0"))) + #t))) + ;; No configure script + (delete 'configure) + ;; No target 'check' + (delete 'check)))) + (synopsis "Tap for one key, hold for another") + (description + "Dual Function Keys is a plugin for @code{interception-tools} that allows +one to send arbitrary keycodes when a given key is tapped or held.") + (license license:expat))) + (define-public lvm2 (package (name "lvm2") -- cgit 1.4.1 From 7c2b840d6c586f80fe22a862ce4e362c997559a5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:07:59 -0400 Subject: gnu: imagemagick: Remove graft. Note that this commit does *not* integrate the fixes that were previously applied via the graft. This commit simply discards those fixes. We will address those security flaws, without grafting, in subsequent commits. * gnu/packages/imagemagick.scm (imagemagick)[replacement]: Remove field. (imagemagick/fixed): Remove variable. --- gnu/packages/imagemagick.scm | 40 ---------------------------------------- 1 file changed, 40 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a3562f2e13..cc5f1de4bf 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -51,7 +51,6 @@ ;; 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.11-48") - (replacement imagemagick/fixed) (source (origin (method url-fetch) (uri (string-append "mirror://imagemagick/ImageMagick-" @@ -128,45 +127,6 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) -(define-public imagemagick/fixed - (package - (inherit imagemagick) - (name "imagemagick") - ;; 'g' for 'guix', appended character to retain version length so grafting - ;; works properly. - (version "6.9.12-2g") - (source (origin - (method url-fetch) - (uri (string-append "mirror://imagemagick/ImageMagick-" - ;; Hardcode the version here since we had to - ;; change it above. - "6.9.12-2.tar.xz")) - (sha256 - (base32 - "17da5zihz58qm41y61sbvw626m5xfwr2nzszlikrvxyq1j1q7asa")))) - (arguments - (substitute-keyword-arguments (package-arguments imagemagick) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'fix-compat-cheat-rename-so - (lambda* (#:key outputs #:allow-other-keys) - (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/lib") - (symlink "libMagick++-6.Q16.so.9.0.0" - "libMagick++-6.Q16.so.8.0.0") - (symlink "libMagick++-6.Q16.so.9" - "libMagick++-6.Q16.so.8") - (symlink "libMagickCore-6.Q16.so.7.0.0" - "libMagickCore-6.Q16.so.6.0.0") - (symlink "libMagickCore-6.Q16.so.7" - "libMagickCore-6.Q16.so.6") - (symlink "libMagickWand-6.Q16.so.7.0.0" - "libMagickWand-6.Q16.so.6.0.0") - (symlink "libMagickWand-6.Q16.so.7" - "libMagickWand-6.Q16.so.6")) - #t)))))))) - (define-public perl-image-magick (package (name "perl-image-magick") -- cgit 1.4.1 From be3aef49ed1d8a0f13d64cd5cf6f280500876efd Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:16:50 -0400 Subject: gnu: imagemagick: Add 'imagemagick/stable' variant. * gnu/packages/imagemagick.scm (imagemagick/stable): New variable. (imagemagick): This is now an alias to 'imagemagick/stable'. --- gnu/packages/imagemagick.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index cc5f1de4bf..528fb9eb25 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -44,7 +44,19 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) -(define-public imagemagick +;; This is a variant of the 'imagemagick' package that is not updated often. +;; It is intended to be used as a native-input at build-time only, e.g. by +;; 'gtk-doc' (via 'dblatex') for generating package documentation. This +;; allows the main 'imagemagick' package to be freely updated on the 'master' +;; branch without triggering an excessive number of rebuilds. +;; +;; Normally the grafts mechanism would be used, but there are often +;; difficulties grafting imagemagick, e.g. because upstream changes the ABI +;; between micro version updates. Also, the overwhelming majority of +;; dependencies on imagemagick are via 'gtk-doc' in 'native-inputs', where +;; grafting is ineffective. See: +;; . +(define-public imagemagick/stable (package (name "imagemagick") ;; The 7 release series has an incompatible API, while the 6 series is still @@ -127,6 +139,9 @@ transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) +(define-public imagemagick + imagemagick/stable) + (define-public perl-image-magick (package (name "perl-image-magick") -- cgit 1.4.1 From 69437a59e67634f85477a5eadab092598aa57ee1 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:27:52 -0400 Subject: gnu: dblatex: Add 'dblatex/stable' variant. * gnu/packages/docbook.scm (dblatex/stable): New variable. --- gnu/packages/docbook.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index 012e86f6a5..e348fb1a5b 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Maxim Cournoyer +;;; Copyright © 2021 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -33,6 +34,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix build-system trivial) #:use-module (guix build-system python)) @@ -460,3 +462,14 @@ process. MathML 2.0 markups are supported too. It started as a clone of DB2LaTeX.") ;; lib/contrib/which is under an X11 license (license gpl2+))) + +;; This is a variant of the 'dblatex' package that is not updated often. It +;; is intended to be used as a native-input at build-time only, e.g. by +;; 'gtk-doc' for generating package documentation. This allows the main +;; 'dblatex' and 'imagemagick' packages to be freely updated on the 'master' +;; branch without triggering an excessive number of rebuilds. +(define-public dblatex/stable + (hidden-package + (package/inherit dblatex + (inputs (alist-replace "imagemagick" `(,imagemagick/stable) + (package-inputs dblatex)))))) -- cgit 1.4.1 From 11d73170c5eee450b9b2f2dd444457850389e6a2 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:29:25 -0400 Subject: gnu: gtk-doc: Add 'gtk-doc/stable' variant. * gnu/packages/gtk.scm (gtk-doc/stable): New variable. --- gnu/packages/gtk.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cf9116214c..52710b4687 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -48,6 +48,7 @@ #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) @@ -1829,6 +1830,17 @@ typically used to document the public API of GTK+ and GNOME libraries, but it can also be used to document application code.") (license license:gpl2+))) +;; This is a variant of the 'gtk-doc' package that is not updated often. It +;; is intended to be used as a native-input at build-time only. This allows +;; the main 'gtk-doc', 'dblatex' and 'imagemagick' packages to be freely +;; updated on the 'master' branch without triggering an excessive number of +;; rebuilds. +(define-public gtk-doc/stable + (hidden-package + (package/inherit gtk-doc + (inputs (alist-replace "dblatex" `(,dblatex/stable) + (package-inputs gtk-doc)))))) + (define-public gtk-engines (package (name "gtk-engines") -- cgit 1.4.1 From 9dea1618755891526f708aa335b4136c1302d16e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:35:02 -0400 Subject: gnu: Use 'gtk-doc/stable' in native-inputs of selected packages. * gnu/packages/calendar.scm (libical), gnu/packages/check.scm (umockdev), gnu/packages/fontutils.scm (libraqm), gnu/packages/freedesktop.scm (appstream, farstream, libglib-testing) (udisks, libfprint, libportal), gnu/packages/geo.scm (memphis, osm-gps-map), gnu/packages/glib.scm (template-glib), gnu/packages/gnome.scm (gupnp-igd, libcloudproviders, libgrss, seed) (gtx, dee, zeitgeist, phodav, gssdp, gupnp, gupnp-dlna, gupnp-av, rygel) (libnma, gdl, libnotify, vte-ng, dconf, libxklavier, libsoup, colord) (geoclue, geocode-glib, amtk, grilo, gvfs, gusb, network-manager) (network-manager-applet, gfbgraph, libunique, cheese, libhandy) (gnome-latex, libgda), gnu/packages/gstreamer.scm (orc), gnu/packages/gtk.scm (at-spi2-core, goocanvas), gnu/packages/language.scm (nimf), gnu/packages/networking.scm (libnice), gnu/packages/video.scm (schroedinger), gnu/packages/virtualization.scm (libosinfo), gnu/packages/webkit.scm (wpewebkit, webkitgtk), gnu/packages/xml.scm (libxmlb)[native-inputs]: Replace 'gtk-doc' with 'gtk-doc/stable'. --- gnu/packages/calendar.scm | 2 +- gnu/packages/check.scm | 2 +- gnu/packages/fontutils.scm | 2 +- gnu/packages/freedesktop.scm | 12 +++---- gnu/packages/geo.scm | 4 +-- gnu/packages/glib.scm | 2 +- gnu/packages/gnome.scm | 70 ++++++++++++++++++++--------------------- gnu/packages/gstreamer.scm | 2 +- gnu/packages/gtk.scm | 4 +-- gnu/packages/language.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/virtualization.scm | 2 +- gnu/packages/webkit.scm | 4 +-- gnu/packages/xml.scm | 2 +- 15 files changed, 57 insertions(+), 57 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 4e1e4f05b6..d473900ac5 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -156,7 +156,7 @@ the library for handling time zones and leap seconds.") (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("vala" ,vala))) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c27f347819..7c95ea6950 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -2732,7 +2732,7 @@ provides a simple way to achieve this.") (native-inputs `(("vala" ,vala) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ;; For tests. diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index a4c92f5bea..1d9c81b8a6 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -965,7 +965,7 @@ Unicode Charts. It was developed for use with DejaVu Fonts project.") (arguments `(#:configure-flags (list "--disable-static"))) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 4105dd7ca0..a9e96c9928 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -173,7 +173,7 @@ ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gperf" ,gperf) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) ("xsltproc" ,libxslt))) @@ -261,7 +261,7 @@ application-centers for distributions.") ("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("perl" ,perl) ("pkg-config" ,pkg-config) @@ -313,7 +313,7 @@ for videoconferencing.") `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (inputs `(("dbus" ,dbus) ("glib" ,glib))) @@ -1202,7 +1202,7 @@ Analysis and Reporting Technology) functionality.") ("glib:bin" ,glib "bin") ; for glib-mkenums ("gnome-common" ,gnome-common) ; TODO: Why is this needed? ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) @@ -1598,7 +1598,7 @@ wish to perform colour calibration.") `(("eudev" ,eudev) ("glib:bin" ,glib "bin") ; for {glib-,}mkenums ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) ; for 88 KiB of API documentation + ("gtk-doc" ,gtk-doc/stable) ; for 88 KiB of API documentation ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -2197,7 +2197,7 @@ fallback to generic Systray support if none of those are available.") #t)))))) (native-inputs `(("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("docbook-xsl" ,docbook-xsl) ("docbook-xml" ,docbook-xml) ("libxml2" ,libxml2) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c988d6b114..97fa83b86b 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -151,7 +151,7 @@ ("automake" ,automake) ("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -1138,7 +1138,7 @@ OpenStreetMap data files.") (build-system gnu-build-system) (native-inputs `(("gnome-common" ,gnome-common) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("cairo" ,cairo) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9c3cd75624..c04bd334e9 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1165,7 +1165,7 @@ other API remains the same.") `(("bison" ,bison) ("flex" ,flex) ("glib:bin" ,glib "bin") ;; For glib-mkenums - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (home-page "https://gitlab.gnome.org/GNOME/template-glib") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7702510eb4..1e8af1c41f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -263,7 +263,7 @@ ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -366,7 +366,7 @@ features to enable users to create their discs easily and quickly.") (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -415,7 +415,7 @@ services.") (native-inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib) @@ -512,7 +512,7 @@ bindings.") ("docbook-xml" ,docbook-xml-4.1.2) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) @@ -622,7 +622,7 @@ It is written in C using GObject and libsoup.") "/share/gtk-doc/html")))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs `(("glib" ,glib))) @@ -692,7 +692,7 @@ of writing test cases for asynchronous interactions.") ("dbus-test-runner" ,dbus-test-runner) ("docbook-xml" ,docbook-xml-4.3) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ;; Would only be required by configure flag "--enable-extended-tests". ;("gtx" ,gtx) ("pkg-config" ,pkg-config) @@ -768,7 +768,7 @@ of known objects without needing a central registrar.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libtool" ,libtool) ("pkg-config" ,pkg-config) ("vala" ,vala) @@ -1177,7 +1177,7 @@ Library reference documentation.") `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("avahi" ,avahi) @@ -1295,7 +1295,7 @@ It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1326,7 +1326,7 @@ a debugging tool, @command{gssdp-device-sniffer}.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1357,7 +1357,7 @@ for creating UPnP devices and control points, written in C using `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -1391,7 +1391,7 @@ given profile, etc. DLNA is a subset of UPnP A/V.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("libxml" ,libxml2) ("pkg-config" ,pkg-config))) (inputs @@ -1607,7 +1607,7 @@ preview files on the GNOME desktop.") (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (inputs @@ -1669,7 +1669,7 @@ client devices can handle.") `(("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala))) @@ -2417,7 +2417,7 @@ GNOME Desktop.") ("automake" ,automake) ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("gnome-common" ,gnome-common) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("libtool" ,libtool) @@ -3057,7 +3057,7 @@ configuring CUPS.") ("gobject-introspection" ,gobject-introspection) ;; For the documentation. - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("xsltproc" ,libxslt) ("docbook-xsl" ,docbook-xsl))) (home-page "https://developer-next.gnome.org/libnotify/") @@ -4503,7 +4503,7 @@ editors, IDEs, etc.") "0rnm5c6m3abbm81jsfdas0y80z299ny54gr4syn4bfrms3s4g19l")))) (build-system meson-build-system) (native-inputs - `(("gtk-doc" ,gtk-doc) + `(("gtk-doc" ,gtk-doc/stable) ,@(package-native-inputs vte))) (arguments `(#:configure-flags '("-Ddocs=true"))) @@ -4620,7 +4620,7 @@ and RDP protocols.") ("docbook-xml" ,docbook-xml-4.2) ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (arguments @@ -4697,7 +4697,7 @@ and objects.") `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("which" ,which) ("autoconf" ,autoconf) @@ -4920,7 +4920,7 @@ libxml to ease remote use of the RESTful API.") `(("docbook-xml" ,docbook-xml-4.1.2) ("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -5287,7 +5287,7 @@ keyboard shortcuts.") `(("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("vala" ,vala))) (propagated-inputs @@ -5332,7 +5332,7 @@ output devices.") ("gobject-introspection" ,gobject-introspection) ("modem-manager" ,modem-manager) ("libnotify" ,libnotify) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool))) (inputs `(("avahi" ,avahi) @@ -5377,7 +5377,7 @@ permission from user.") ("glibc-locales" ,glibc-locales) ; for tests ("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("json-glib" ,json-glib))) (propagated-inputs @@ -5683,7 +5683,7 @@ which are easy to play with the aid of a mouse.") (native-inputs `(("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") ; for glib-mkenums - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib) @@ -6100,7 +6100,7 @@ as possible!") ("intltool" ,intltool) ("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("vala" ,vala))) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -6534,7 +6534,7 @@ part of udev-extras, then udev, then systemd. It's now a project on its own.") (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. ("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs @@ -6599,7 +6599,7 @@ DAV, and others.") `(("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) ("vala" ,vala) - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Both of these are required by gusb.pc. `(("glib" ,glib) @@ -7804,7 +7804,7 @@ users.") `(("glib" ,glib))) (native-inputs `(("glib:bin" ,glib "bin") ; for gdbus-codegen - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("gobject-introspection" ,gobject-introspection) ("docbook-xml" ,docbook-xml) ("docbook-xsl" ,docbook-xsl) @@ -8061,7 +8061,7 @@ Cisco's AnyConnect SSL VPN.") `(("intltool" ,intltool) ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc. ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (propagated-inputs ;; libnm-gtk.pc refers to all these. @@ -9809,7 +9809,7 @@ compiled.") "--enable-introspection"))) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ;; The 0.2.4 ‘release’ tarball isn't bootstrapped. @@ -9881,7 +9881,7 @@ environment, which can notably display keyboard layouts.") `(("pkg-config" ,pkg-config) ("gobject-introspection" ,gobject-introspection) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc))) + ("gtk-doc" ,gtk-doc/stable))) (propagated-inputs ;; Referred to in .h files and .pc. `(("gtk+" ,gtk+))) @@ -10466,7 +10466,7 @@ photo-booth-like software, such as Cheese.") ("docbook-xml" ,docbook-xml-4.3) ("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("itstool" ,itstool) ("libxml2" ,libxml2) ("libxslt" ,libxslt) @@ -11005,7 +11005,7 @@ tabs, and it supports drag and drop re-ordering of terminals.") `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ; for g-ir-scanner ("vala" ,vala) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) @@ -11540,7 +11540,7 @@ card sheets that you’ll find at most office supply stores.") `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("itstool" ,itstool) ("pkg-config" ,pkg-config) @@ -12132,7 +12132,7 @@ developed with the aim of being used with the Librem 5 phone.") ("glib:bin" ,glib "bin") ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 1c7ba98a86..6a4e14167d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -384,7 +384,7 @@ http://www.tux.org/~ricdude/overview.html") "if (error) return 77;")) #t))))) (native-inputs - `(("gtk-doc" ,gtk-doc))) + `(("gtk-doc" ,gtk-doc/stable))) (home-page "https://gstreamer.freedesktop.org/modules/orc.html") (synopsis "Oil runtime compiler") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 52710b4687..fa4241eb31 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -723,7 +723,7 @@ in the GNOME project.") (native-inputs `(("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("glib" ,glib "bin") ("pkg-config" ,pkg-config))) (synopsis "Assistive Technology Service Provider Interface, core components") @@ -2247,7 +2247,7 @@ popovers.") `(("gettext" ,gettext-minimal) ("glib-bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config) ("python" ,python))) (inputs diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index d4b9b8d4cb..5325445a24 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -170,7 +170,7 @@ ("gobject-introspection" ,gobject-introspection) ("gtk+-2:bin" ,gtk+-2 "bin") ("gtk+:bin" ,gtk+ "bin") - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("intltool" ,intltool) ("libtool" ,libtool) ("perl" ,perl) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ea3e3f67e7..ecc6f57f4e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -302,7 +302,7 @@ Android, and ChromeOS.") (native-inputs `(("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("gstreamer" ,gstreamer) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 02096dc7a4..05502a1d1a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -381,7 +381,7 @@ video decode, encode and filtering on Intel's Gen graphics hardware platforms.") #t)))))) (native-inputs `(("dash" ,dash) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("glew" ,glew) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index fabac5b984..96347adf7c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -984,7 +984,7 @@ Debian or a derivative using @command{debootstrap}.") (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("vala" ,vala) ("intltool" ,intltool) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 89eee74def..d8378354bd 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -174,7 +174,7 @@ engine that uses Wayland for graphics output.") ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -301,7 +301,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("gtk-doc" ,gtk-doc) ; For documentation generation + ("gtk-doc" ,gtk-doc/stable) ; For documentation generation ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) (propagated-inputs diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d05d326f5b..defc0323e6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -99,7 +99,7 @@ `(#:glib-or-gtk? #t)) (native-inputs `(("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("pkg-config" ,pkg-config))) (inputs `(("appstream-glib" ,appstream-glib) -- cgit 1.4.1 From ea2b379ac58fc81e20ee274fa66054efff285b5d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:49:04 -0400 Subject: gnu: imagemagick: Update to 6.9.12-4. * gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.12-4. --- gnu/packages/imagemagick.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index 528fb9eb25..a26e08eb42 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Eric Bavier ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari -;;; Copyright © 2016 Mark H Weaver +;;; Copyright © 2016, 2021 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong @@ -140,7 +140,19 @@ text, lines, polygons, ellipses and Bézier curves.") (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) (define-public imagemagick - imagemagick/stable) + (package + (inherit imagemagick/stable) + ;; 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.12-4") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")))))) (define-public perl-image-magick (package -- cgit 1.4.1 From cb3ae2f246646e9d27f844a33a28146093051bbc Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 19:37:36 -0400 Subject: gnu: imagemagick: Hide 'imagemagick/stable' variant. * gnu/packages/imagemagick.scm (imagemagick/stable): Hide it. (imagemagick): Remove inherited 'hidden?' property. --- gnu/packages/imagemagick.scm | 151 ++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a26e08eb42..bbf038534f 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -42,7 +42,8 @@ #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) #:use-module (gnu packages xml) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) ;; This is a variant of the 'imagemagick' package that is not updated often. ;; It is intended to be used as a native-input at build-time only, e.g. by @@ -57,91 +58,93 @@ ;; grafting is ineffective. See: ;; . (define-public imagemagick/stable - (package - (name "imagemagick") - ;; 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.11-48") - (source (origin - (method url-fetch) - (uri (string-append "mirror://imagemagick/ImageMagick-" - version ".tar.xz")) - (sha256 - (base32 - "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" + (hidden-package + (package + (name "imagemagick") + ;; 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.11-48") + (source (origin + (method url-fetch) + (uri (string-append "mirror://imagemagick/ImageMagick-" + version ".tar.xz")) + (sha256 + (base32 + "0m8nkmywkqwyrr01q7aiakj6mi4rb2psjgzv8n0x82x3s1rpfyql")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-frozenpaths" "--without-gcc-arch" - ;; Do not embed the build date in binaries. - "--enable-reproducible-build") + ;; Do not embed the build date in binaries. + "--enable-reproducible-build") - ;; FIXME: The test suite succeeded before version 6.9.6-2. - ;; Try enabling it again with newer releases. - #:tests? #f - #:phases (modify-phases %standard-phases - (add-before - 'build 'pre-build - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - ;; Clear the `LIBRARY_PATH' setting, which otherwise - ;; interferes with our own use. - (("^LIBRARY_PATH[[:blank:]]*=.*$") - "") + ;; FIXME: The test suite succeeded before version 6.9.6-2. + ;; Try enabling it again with newer releases. + #:tests? #f + #:phases (modify-phases %standard-phases + (add-before + 'build 'pre-build + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + ;; Clear the `LIBRARY_PATH' setting, which otherwise + ;; interferes with our own use. + (("^LIBRARY_PATH[[:blank:]]*=.*$") + "") - ;; Since the Makefile overrides $docdir, modify it to - ;; refer to what we want. - (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") - (let ((doc (assoc-ref outputs "doc"))) - (string-append "DOCUMENTATION_PATH = " - doc "/share/doc/" - ,name "-" - ,(package-version this-package) "\n")))) - #t)) - (add-before - 'configure 'strip-configure-xml - (lambda _ - (substitute* "config/configure.xml.in" - ;; Do not record 'configure' arguments in the - ;; configure.xml file that gets installed: That would - ;; include --docdir, and thus retain a reference to the - ;; 'doc' output. - (("@CONFIGURE_ARGS@") - "not recorded")) - #t))))) - ;; TODO: Add Jasper etc. - (inputs `(("fftw" ,fftw) - ("graphviz" ,graphviz) - ("ghostscript" ,ghostscript) - ("lcms" ,lcms) - ("libx11" ,libx11) - ("zlib" ,zlib) - ("libxml2" ,libxml2) - ("libtiff" ,libtiff) - ("libpng" ,libpng) - ("libjpeg" ,libjpeg-turbo) - ("pango" ,pango) - ("freetype" ,freetype) - ("bzip2" ,bzip2) - ("xz" ,xz))) - (native-inputs `(("pkg-config" ,pkg-config))) - (outputs '("out" - "doc")) ; 26 MiB of HTML documentation - (home-page "https://www.imagemagick.org/") - (synopsis "Create, edit, compose, or convert bitmap images") - (description - "ImageMagick is a software suite to create, edit, compose, or convert + ;; Since the Makefile overrides $docdir, modify it to + ;; refer to what we want. + (("^DOCUMENTATION_PATH[[:blank:]]*=.*$") + (let ((doc (assoc-ref outputs "doc"))) + (string-append "DOCUMENTATION_PATH = " + doc "/share/doc/" + ,name "-" + ,(package-version this-package) "\n")))) + #t)) + (add-before + 'configure 'strip-configure-xml + (lambda _ + (substitute* "config/configure.xml.in" + ;; Do not record 'configure' arguments in the + ;; configure.xml file that gets installed: That would + ;; include --docdir, and thus retain a reference to the + ;; 'doc' output. + (("@CONFIGURE_ARGS@") + "not recorded")) + #t))))) + ;; TODO: Add Jasper etc. + (inputs `(("fftw" ,fftw) + ("graphviz" ,graphviz) + ("ghostscript" ,ghostscript) + ("lcms" ,lcms) + ("libx11" ,libx11) + ("zlib" ,zlib) + ("libxml2" ,libxml2) + ("libtiff" ,libtiff) + ("libpng" ,libpng) + ("libjpeg" ,libjpeg-turbo) + ("pango" ,pango) + ("freetype" ,freetype) + ("bzip2" ,bzip2) + ("xz" ,xz))) + (native-inputs `(("pkg-config" ,pkg-config))) + (outputs '("out" + "doc")) ; 26 MiB of HTML documentation + (home-page "https://www.imagemagick.org/") + (synopsis "Create, edit, compose, or convert bitmap images") + (description + "ImageMagick is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.") - (license (license:fsf-free "http://www.imagemagick.org/script/license.php")))) + (license (license:fsf-free "http://www.imagemagick.org/script/license.php"))))) (define-public imagemagick (package (inherit imagemagick/stable) + (properties (alist-delete 'hidden? (package-properties imagemagick/stable))) ;; 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. -- cgit 1.4.1 From bfc69d5e7c45eac865e231643b58396580afb231 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 08:08:37 -0400 Subject: gnu: imagemagick: Fix CVE-2020-27829. * gnu/packages/patches/imagemagick-CVE-2020-27829.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/imagemagick.scm (source): Add patch. --- gnu/local.mk | 1 + gnu/packages/imagemagick.scm | 4 +++- .../patches/imagemagick-CVE-2020-27829.patch | 27 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/imagemagick-CVE-2020-27829.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f8c4e73402..435aade2b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1220,6 +1220,7 @@ dist_patch_DATA = \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ + %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index bbf038534f..c48ba534c2 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -155,7 +155,9 @@ text, lines, polygons, ellipses and Bézier curves.") version ".tar.xz")) (sha256 (base32 - "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")))))) + "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")) + (patches + (search-patches "imagemagick-CVE-2020-27829.patch")))))) (define-public perl-image-magick (package diff --git a/gnu/packages/patches/imagemagick-CVE-2020-27829.patch b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch new file mode 100644 index 0000000000..b15c1d0879 --- /dev/null +++ b/gnu/packages/patches/imagemagick-CVE-2020-27829.patch @@ -0,0 +1,27 @@ +We omit the ChangeLog changes below, since they do not apply cleanly. + + +From 6ee5059cd3ac8d82714a1ab1321399b88539abf0 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Mon, 30 Nov 2020 16:26:59 +0000 +Subject: [PATCH] possible TIFF related-heap buffer overflow (alert & POC by + Hardik Shah) + +--- + ChangeLog | 6 ++++++ + coders/tiff.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/coders/tiff.c b/coders/tiff.c +index e98f927ab..1eecf17ae 100644 +--- a/coders/tiff.c ++++ b/coders/tiff.c +@@ -1975,7 +1975,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, + extent+=image->columns*sizeof(uint32); + #endif + strip_pixels=(unsigned char *) AcquireQuantumMemory(extent, +- sizeof(*strip_pixels)); ++ 2*sizeof(*strip_pixels)); + if (strip_pixels == (unsigned char *) NULL) + ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed"); + (void) memset(strip_pixels,0,extent*sizeof(*strip_pixels)); -- cgit 1.4.1 From 2d3d7faf0a087c7836d71c92c8a67283c3d4dec5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Mar 2021 07:01:37 -0400 Subject: gnu: imagemagick: Add more upstream fixes. * gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch, gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch, gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/imagemagick.scm (source): Add patches. --- gnu/local.mk | 3 ++ gnu/packages/imagemagick.scm | 5 +++- .../patches/imagemagick-ReadDCMImage-fix.patch | 26 ++++++++++++++++ .../patches/imagemagick-ReadDCMPixels-fix.patch | 35 ++++++++++++++++++++++ .../imagemagick-WriteTHUMBNAILImage-fix.patch | 25 ++++++++++++++++ 5 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch create mode 100644 gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch create mode 100644 gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 435aade2b8..52a021c2a3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1221,6 +1221,9 @@ dist_patch_DATA = \ %D%/packages/patches/idris-disable-test.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ %D%/packages/patches/imagemagick-CVE-2020-27829.patch \ + %D%/packages/patches/imagemagick-ReadDCMImage-fix.patch \ + %D%/packages/patches/imagemagick-ReadDCMPixels-fix.patch \ + %D%/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch \ %D%/packages/patches/inetutils-hurd.patch \ %D%/packages/patches/inkscape-poppler-0.76.patch \ %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index c48ba534c2..4f0ffcbcc6 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -157,7 +157,10 @@ text, lines, polygons, ellipses and Bézier curves.") (base32 "1pkwij76yz7vd5grl6520pgpa912qb6kh34qamx4zfndwcx6cf6b")) (patches - (search-patches "imagemagick-CVE-2020-27829.patch")))))) + (search-patches "imagemagick-ReadDCMImage-fix.patch" + "imagemagick-ReadDCMPixels-fix.patch" + "imagemagick-WriteTHUMBNAILImage-fix.patch" + "imagemagick-CVE-2020-27829.patch")))))) (define-public perl-image-magick (package diff --git a/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch new file mode 100644 index 0000000000..42ece43682 --- /dev/null +++ b/gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch @@ -0,0 +1,26 @@ +From 512668dfd92b20d0d08b91d62b422d8262573281 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Wed, 24 Mar 2021 20:37:15 +0100 +Subject: [PATCH] Throw exception when no exception was raised but status was + false (#3432). + +--- + coders/dcm.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coders/dcm.c b/coders/dcm.c +index 7a68ed6e8..ed17c9567 100644 +--- a/coders/dcm.c ++++ b/coders/dcm.c +@@ -3989,6 +3989,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) + if (redmap != (int *) NULL) + redmap=(int *) RelinquishMagickMemory(redmap); + image=DestroyImageList(image); ++ if ((status == MagickFalse) && (exception->severity < ErrorException)) ++ ThrowReaderException(CorruptImageError,"CorruptImage"); + return(GetFirstImageInList(images)); + } + if (info.depth != (1UL*MAGICKCORE_QUANTUM_DEPTH)) +-- +2.31.0 + diff --git a/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch new file mode 100644 index 0000000000..a91999186b --- /dev/null +++ b/gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch @@ -0,0 +1,35 @@ +From c8f25953ad1dd38a8b2d92738f0f742ad7e0bce7 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Sun, 21 Mar 2021 21:21:15 -0400 +Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32322 + +--- + coders/dcm.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/coders/dcm.c b/coders/dcm.c +index 29eed9618..7a68ed6e8 100644 +--- a/coders/dcm.c ++++ b/coders/dcm.c +@@ -2984,12 +2984,12 @@ static MagickBooleanType ReadDCMPixels(Image *image,DCMInfo *info, + } + else + { +- SetPixelRed(q,(Quantum) (((ssize_t) pixel.red) | +- (((ssize_t) GetPixelRed(q)) << 8))); +- SetPixelGreen(q,(Quantum) (((ssize_t) pixel.green) | +- (((ssize_t) GetPixelGreen(q)) << 8))); +- SetPixelBlue(q,(Quantum) (((ssize_t) pixel.blue) | +- (((ssize_t) GetPixelBlue(q)) << 8))); ++ SetPixelRed(q,(Quantum) (((size_t) pixel.red) | ++ (((size_t) GetPixelRed(q)) << 8))); ++ SetPixelGreen(q,(Quantum) (((size_t) pixel.green) | ++ (((size_t) GetPixelGreen(q)) << 8))); ++ SetPixelBlue(q,(Quantum) (((size_t) pixel.blue) | ++ (((size_t) GetPixelBlue(q)) << 8))); + } + q++; + } +-- +2.31.0 + diff --git a/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch new file mode 100644 index 0000000000..f38a45b800 --- /dev/null +++ b/gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch @@ -0,0 +1,25 @@ +From 6a5d3575487487f2703383338bd17c8c25068f19 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Thu, 25 Mar 2021 08:58:18 -0400 +Subject: [PATCH] eliminate compiler warning + +--- + coders/thumbnail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/coders/thumbnail.c b/coders/thumbnail.c +index 3833341b0..1e2bfe8c2 100644 +--- a/coders/thumbnail.c ++++ b/coders/thumbnail.c +@@ -199,7 +199,7 @@ static MagickBooleanType WriteTHUMBNAILImage(const ImageInfo *image_info, + q++; + } + if ((q > (GetStringInfoDatum(profile)+GetStringInfoLength(profile))) || +- (length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) ++ ((ssize_t) length > (GetStringInfoDatum(profile)+GetStringInfoLength(profile)-q))) + ThrowWriterException(CoderError,"ImageDoesNotHaveAThumbnail"); + thumbnail_image=BlobToImage(image_info,q,length,&image->exception); + if (thumbnail_image == (Image *) NULL) +-- +2.31.0 + -- cgit 1.4.1 From ac6e19b08259f2085ae4757bf4efb095fbdd23e9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 21:57:10 -0400 Subject: gnu: soci: Propagate inputs. * gnu/packages/databases.scm (soci)[inputs]: Move to... [propagated-inputs]: ... here. Signed-off-by: Maxim Cournoyer --- gnu/packages/databases.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 20069f9383..130e94d535 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3782,7 +3782,8 @@ The drivers officially supported by @code{libdbi} are: (base32 "14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp")))) (build-system cmake-build-system) - (inputs + (propagated-inputs + ;; Headers of soci has include-references to headers of these inputs. `(("firebird" ,firebird) ("postgresql" ,postgresql) ("sqlite" ,sqlite) -- cgit 1.4.1 From 65719505b8c96498f79890f3c52fd6ebc0ada4a7 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 5 May 2020 22:01:57 -0400 Subject: gnu: Add build. * gnu/packages/build-tools.scm (build): New variable. Co-authored-by: Raghav Gururajan --- gnu/packages/build-tools.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 3e453cca82..b5cebf0f9b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -547,3 +547,43 @@ besides executing the make build command, updates the JSON compilation database file corresponding to that build, resulting in a command-line interface similar to Bear.") (license license:gpl3))) + +(define-public build + (package + (name "build") + (version "0.3.10") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "build/" (version-major+minor version) + "/build-" version ".tar.bz2")) + (sha256 + (base32 "1lx5rpnmsbip43zpp0a57sl5rm7pjb0y6i2si6rfglfp4p9d3z76")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags (list (string-append "install_prefix=" %output)) + #:tests? #f + #:phases (modify-phases %standard-phases + (delete 'build) + (delete 'configure)))) + (home-page "https://www.codesynthesis.com/projects/build/") + (synopsis "Massively-parallel build system implemented on top of GNU make") + (description "Build is a massively-parallel software build system +implemented on top of GNU Make, designed with the following tasks in mind: +@itemize +@item configuration +@item building +@item testing +@item installation +@end itemize +Build has features such as: +@itemize +@item Position-independent makefiles. +@item Non-recursive multi-makefile include-based structure. +@item Leaf makefiles are full-fledged GNU makefiles, not just variable definitions. +@item Complete dependency graph. +@item Inter-project dependency tracking. +@item Extensible language/compiler framework. +@end itemize") + (license license:gpl2+))) -- cgit 1.4.1 From ae479f183418679a916a39ef499e80052d6a0abd Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 5 May 2020 22:01:05 -0400 Subject: gnu: Add libcutl. * gnu/packages/cpp.scm (libcutl): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index a0fc373bfd..908ab17c5f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -17,6 +17,8 @@ ;;; Copyright © 2020, 2021 Greg Hogan ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Milkey Mouse +;;; Copyright © 2021 Raghav Gururajan + ;;; ;;; This file is part of GNU Guix. ;;; @@ -37,6 +39,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -64,7 +67,8 @@ #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (gnu packages xml)) (define-public range-v3 (package @@ -1014,3 +1018,42 @@ Linear Congruential Generator (LCG) with a permutation function to increase output randomness while retaining speed, simplicity, and conciseness.") (home-page "https://www.pcg-random.org") (license (list license:expat license:asl2.0))))) ; dual licensed + +(define-public libcutl + (package + (name "libcutl") + (version "1.10.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://www.codesynthesis.com/download/libcutl/" + (version-major+minor version) + "/libcutl-" version ".tar.bz2")) + (sha256 + (base32 + "070j2x02m4gm1fn7gnymrkbdxflgzxwl7m96aryv8wp3f3366l8j")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove bundled sources. + (with-directory-excursion "cutl/details" + (for-each delete-file-recursively + ;; FIXME: Boost_RegEx isn't being detected. + (list + ;;"boost" + "expat"))))))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags (list "--disable-static" + ;;"--with-external-boost" + "--with-external-expat"))) + (inputs + `(;;("boost ,boost) + ("expat" ,expat))) + (home-page "https://www.codesynthesis.com/projects/libcutl/") + (synopsis "C++ utility library with generic and independent components") + (description "libcutl is a C++ utility library. It contains a collection +of generic and independent components such as meta-programming tests, smart +pointers, containers, compiler building blocks, etc.") + (license (list license:expat ;everything except... + license:boost1.0)))) ;...the files under cutl/details/boost -- cgit 1.4.1 From 111004cc581e93197f63001237b64323e72b1db6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 01:53:48 -0400 Subject: gnu: Add libxsd-frontend. * gnu/packages/cpp.scm (libxsd-frontend): New variable. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 908ab17c5f..6e6328a045 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -48,6 +48,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages boost) + #:use-module (gnu packages build-tools) #:use-module (gnu packages c) #:use-module (gnu packages check) #:use-module (gnu packages code) @@ -1057,3 +1058,50 @@ of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks, etc.") (license (list license:expat ;everything except... license:boost1.0)))) ;...the files under cutl/details/boost + +(define-public libxsd-frontend + (package + (name "libxsd-frontend") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "libxsd-frontend/" (version-major+minor version) + "/libxsd-frontend-" version ".tar.bz2")) + (sha256 + (base32 "1nmzchsvwvn66jpmcx18anzyl1a3l309x1ld4zllrg37ijc31fim")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:imported-modules ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules (((guix build copy-build-system) #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include/")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("xsd-frontend" "include/xsd-frontend" + #:include-regexp ("\\.?xx$")) + ("xsd-frontend" "lib" + #:include-regexp ("\\.so$"))) + args)))))) + (native-inputs + `(("build" ,build))) + (inputs + `(("libcutl" ,libcutl) + ("libxerces-c" ,xerces-c))) + (synopsis "XSD Front-end") + (description "@code{libxsd-frontend} is a compiler frontend for the W3C +XML Schema definition language. It includes a parser, semantic graph types +and a traversal mechanism.") + (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") + (license license:gpl2+))) -- cgit 1.4.1 From f649a0a557bdc4afc39e033597f5b67cdabd3743 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 21:21:45 -0400 Subject: gnu: Add cli. * gnu/packages/cpp.scm (cli): New variable. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 6e6328a045..22d1341b8d 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1105,3 +1105,51 @@ XML Schema definition language. It includes a parser, semantic graph types and a traversal mechanism.") (home-page "https://www.codesynthesis.com/projects/libxsd-frontend/") (license license:gpl2+))) + +(define-public cli + (package + (name "cli") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "cli/" (version-major+minor version) + "/cli-" version ".tar.bz2")) + (sha256 + (base32 "0bg0nsai2q4h3mldpnj0jz4iy4svs0bcfvmq0v0c9cdyknny606g")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include") + (string-append "install_prefix=" + (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* (find-files "." "\\.make$") + (("build-0\\.3") + (string-append (assoc-ref %build-inputs "build") + "/include/build-0.3"))) + ;; Add the namespace prefix, to avoid errors such as "error: + ;; ‘iterate_and_dispatch’ was not declared in this scope". + (substitute* (find-files "." "\\.?xx$") + (("add \\(typeid \\(type\\), \\*this\\);" all) + (string-append "traverser_map::" all)) + (("iterate_and_dispatch \\(s\\.names_begin.*;" all) + (string-append "edge_dispatcher::" all))))) + (delete 'configure)))) + (native-inputs + `(("build" ,build))) + (inputs + `(("libcutl" ,libcutl))) + (synopsis "C++ Command Line Interface (CLI) definition language") + (description "@code{cli} is a domain-specific language (DSL) for defining +command line interfaces of C++ programs. It allows you to describe the +options that your program supports, their types, default values, and +documentation.") + (home-page "https://codesynthesis.com/projects/cli/") + (license license:expat))) -- cgit 1.4.1 From 510e24f973a918391d8122fd6ad515c0567bf23e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 27 Mar 2021 22:46:39 -0400 Subject: gnu: Add xsd. * gnu/packages/cpp.scm (xsd): New variable. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/cpp.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 22d1341b8d..2a00d3838a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages llvm) #:use-module (gnu packages logging) #:use-module (gnu packages maths) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -1153,3 +1154,60 @@ options that your program supports, their types, default values, and documentation.") (home-page "https://codesynthesis.com/projects/cli/") (license license:expat))) + +(define-public xsd + (package + (name "xsd") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.codesynthesis.com/download/" + "xsd/" (version-major+minor version) + "/xsd-" version ".tar.bz2")) + (sha256 + (base32 "1hi9ppxd34np8ydv1h0vgc2qpdmgcd1cdzgk30aidv670xjg91fx")))) + (build-system gnu-build-system) + (outputs '("out" "doc")) ;3.8 MiB of doc and examples + (arguments + `(#:test-target "test" + #:make-flags (list (string-append "--include-dir=" + (assoc-ref %build-inputs "build") + "/include/") + (string-append "install_prefix=" + (assoc-ref %outputs "out"))) + #:phases (modify-phases %standard-phases + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc")) + (rename-file (string-append out "/share/doc/xsd") + (string-append doc "/share/doc/xsd-" + ,version))))) + (delete 'configure)))) + (native-inputs + `(("build" ,build) + ("cli" ,cli))) + (inputs + `(("libcutl" ,libcutl) + ("libnsl" ,libnsl) + ("libxsd-frontend" ,libxsd-frontend))) + (propagated-inputs + ;; The code XSD generates requires the following library at run time; + ;; propagate it for convenience. + `(("xerces-c" ,xerces-c))) + (synopsis "XML Data Binding for C++") + (description "CodeSynthesis XSD (also known as libxsd or xsdcxx) is an XML +Schema to C++ data binding compiler. Provided with an XML instance +specification (XML Schema), it generates C++ classes that represent the given +vocabulary as well as XML parsing and serialization code. The data stored in +XML can then be accessed using types and functions that semantically +correspond to an application domain rather than dealing with the intricacies +of reading and writing XML.") + (home-page "https://codesynthesis.com/projects/xsd/") + ;; Exceptions are made to allow using the generated source files as well + ;; as the libxsd library in free software projects whose license is + ;; incompatible with the GPL v2. Refer to the file named FLOSSE for the + ;; details. + (license license:gpl2+))) -- cgit 1.4.1 From 43469e193ba5c2d06c5f3e10d5550ce7ec201729 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 12:51:08 +0200 Subject: gnu: autofs: Update to 5.1.7. * gnu/packages/file-systems.scm (autofs): Update to 5.1.7. [arguments]: Add a new 'fix-rpath phase. --- gnu/packages/file-systems.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 198653c639..ae10796fab 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -80,7 +80,7 @@ (define-public autofs (package (name "autofs") - (version "5.1.6") + (version "5.1.7") (source (origin (method url-fetch) @@ -88,7 +88,7 @@ "v" (version-major version) "/" "autofs-" version ".tar.xz")) (sha256 - (base32 "1vya21mb4izj3khcr3flibv7xc15vvx2v0rjfk5yd31qnzcy7pnx")))) + (base32 "1myfz6a3wj2c4j9h5g44zj796fdi82jhp1s92w2hg6xp2632csx3")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -112,6 +112,12 @@ (("^searchpath=\".*\"") "searchpath=\"$PATH\"")) #t)) + (add-before 'configure 'fix-rpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile.rules" + (("^AUTOFS_LIB_LINK.*=" match) + (string-append match " -Wl,-rpath=" out "/lib")))))) (add-before 'install 'omit-obsolete-lookup_nis.so-link ;; Building lookup_yp.so depends on $(YPCLNT) but this doesn't, ;; leading to a make error. Since it's broken, comment it out. -- cgit 1.4.1 From 1f6e870ea56d2d43a135973e6a8b4513ad9fb469 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 13:16:16 +0200 Subject: gnu: gramps: Update to 5.1.3. * gnu/packages/genealogy.scm (gramps): Update to 5.1.3. --- gnu/packages/genealogy.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/genealogy.scm b/gnu/packages/genealogy.scm index dde0fddc25..2c3781d361 100644 --- a/gnu/packages/genealogy.scm +++ b/gnu/packages/genealogy.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Guillaume Le Vaillant -;;; Copyright © 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +39,7 @@ (define-public gramps (package (name "gramps") - (version "5.1.2") + (version "5.1.3") (source (origin (method git-fetch) @@ -48,7 +48,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "175iwvdp6c1a8rskl2wpk4yvzl437j7hm23v481974a85qy43iv8")))) + (base32 "109dwkswz2h2328xkqk2zj736d117s9pp7rz5cc1qg2vxn1lpm93")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From b30407b82f6ab6dab1e08cfd4a8e9eb0a8831eef Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 14:28:41 +0200 Subject: gnu: gnutls: Fix typos in description. * gnu/packages/tls.scm (gnutls)[description]: Fix typos. Reported by genr8 on #guix. --- gnu/packages/tls.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 2a8c69a68c..423612f4b6 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -251,7 +251,7 @@ living in the same process.") (description "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols. It is provided in the form of a C library to support the -protocols, as well as to parse and write X.5009, PKCS 12, OpenPGP and other +protocols, as well as to parse and write X.509, PKCS #12, OpenPGP and other required structures.") (license license:lgpl2.1+) (properties '((ftp-server . "ftp.gnutls.org") -- cgit 1.4.1 From da29d63a10409e7886bb825a6e03ea2af787009a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:28:46 +0200 Subject: gnu: spdlog: Update to 1.8.5. * gnu/packages/logging.scm (spdlog): Update to 1.8.5. --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 09e9d59ed5..b879fecebc 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.3") + (version "1.8.5") (source (origin (method git-fetch) @@ -199,7 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qcabdc3yrm30vapn7g7lf3bwjissl15y66mpmx2w0gjjc6aqdd1")))) + (base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit 1.4.1 From 81e85d6299fa71eb4366b799b1858b3e0ec3483b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:45:53 +0200 Subject: gnu: babl: Update to 0.1.86. * gnu/packages/gimp.scm (babl): Update to 0.1.86. [arguments]: Build with meson@0.55. --- gnu/packages/gimp.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5d005e0378..b864c88e2f 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages algebra) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) @@ -166,7 +167,7 @@ of a larger interface.") (define-public babl (package (name "babl") - (version "0.1.78") + (version "0.1.86") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/babl/" @@ -180,10 +181,11 @@ of a larger interface.") "/babl-" version ".tar.xz"))) (sha256 (base32 - "0fjjfb0pbgimlqi7rk8cqz8pq595b7gw8nrpkxfmixdz6cv4km8p")))) + "1w68h81kqkqnziixrx21qs0gfv2z79651h19sxn226xdb58mjgqb")))) (build-system meson-build-system) (arguments - `(#:configure-flags + `(#:meson ,meson-0.55 + #:configure-flags (list "-Denable-gir=false"))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From b5116db5c05f662f775096ef4c105fa7aea5c8b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 18:46:16 +0200 Subject: gnu: gegl: Update to 0.4.28. * gnu/packages/gimp.scm (gegl): Update to 0.4.28. [arguments]: Build with meson@0.55. --- gnu/packages/gimp.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b864c88e2f..4bdc4ee42e 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -207,7 +207,7 @@ provided, as well as a framework to add new color models and data types.") (define-public gegl (package (name "gegl") - (version "0.4.26") + (version "0.4.28") (source (origin (method url-fetch) (uri (list (string-append "https://download.gimp.org/pub/gegl/" @@ -221,10 +221,11 @@ provided, as well as a framework to add new color models and data types.") "/gegl-" version ".tar.xz"))) (sha256 (base32 - "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg")))) + "003ri7yv7lm2fi86ama3vlkwnz656yyib4r36hxwlk6mfy2hs48x")))) (build-system meson-build-system) (arguments - `(#:configure-flags + `(#:meson ,meson-0.55 + #:configure-flags (list "-Dintrospection=false") #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 58452d08ff3e0044e9a32e6d5b3663cf185d8b33 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Sun, 28 Mar 2021 10:51:16 -0700 Subject: gnu: cross-base: Relax check for powerpc64le. * gnu/packages/cross-base.scm (cross-gcc-arguments): When conditionally adding "--with-long-double-128", check for "powerpc64le-" prefix instead of matching full target. Signed-off-by: Chris Marusich --- gnu/packages/cross-base.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index bea2d69876..180594509b 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -153,7 +153,7 @@ base compiler and using LIBC (which may be either a libc package or #f.)" "--disable-decimal-float" ;would need libc "--disable-libcilkrts" - ,@(if (equal? "powerpc64le-linux-gnu" target) + ,@(if (string-prefix? "powerpc64le-" target) ;; On POWER9 (little endian) glibc needs ;; the 128-bit long double type. '("--with-long-double-128") -- cgit 1.4.1 From 8bd2c50bee40f68b582a4d26bc918baf60e9c36c Mon Sep 17 00:00:00 2001 From: Zheng Junjie <873216071@qq.com> Date: Sun, 21 Mar 2021 10:33:52 +0800 Subject: gnu: hnsd: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/dns.scm (hnsd): Update to 1.0.0. Signed-off-by: Ludovic Courtès --- gnu/packages/dns.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index b6f86711a3..37f8c3a6be 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020 Leo Famulari ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Simon South +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1111,20 +1112,17 @@ attempts the update when it has changed.") (license license:gpl2+))) (define-public hnsd - ;; There have been no releases yet, hence this commit. - (let ((revision "0") - (commit "895d89c25d316d18df9d374fe78aae3902bc89fb")) (package (name "hnsd") - (version (git-version "0.0" revision commit)) + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/handshake-org/hnsd") - (commit commit))) + (commit (string-append "v" version)))) (sha256 (base32 - "0704y73sddn24jga9csw4gxyfb3pnrfnk0vdcph84n1h38490l16")) + "1kdgff8rf8gmvwz2p758ilbjxpvz4xm6z41pa5353asg6xb853bb")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -1161,7 +1159,7 @@ attempts the update when it has changed.") (description "@command{hnsd} is a @dfn{host name resolver} for the Handshake Naming System (HNS) peer-to-peer network.") - (license license:expat)))) + (license license:expat))) (define-public libmicrodns (package -- cgit 1.4.1 From 5d8c2c00d60196c46a32b68c618ccbe2b3aa48f4 Mon Sep 17 00:00:00 2001 From: Simon South Date: Mon, 1 Mar 2021 10:13:29 -0500 Subject: tests: Add Transmission Daemon system test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/tests/file-sharing.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/tests/file-sharing.scm | 271 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 272 insertions(+) create mode 100644 gnu/tests/file-sharing.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 52a021c2a3..d131dc0388 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -692,6 +692,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/desktop.scm \ %D%/tests/dict.scm \ %D%/tests/docker.scm \ + %D%/tests/file-sharing.scm \ %D%/tests/ganeti.scm \ %D%/tests/guix.scm \ %D%/tests/monitoring.scm \ diff --git a/gnu/tests/file-sharing.scm b/gnu/tests/file-sharing.scm new file mode 100644 index 0000000000..9a8ee6a593 --- /dev/null +++ b/gnu/tests/file-sharing.scm @@ -0,0 +1,271 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Simon South +;;; +;;; 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 . + +;;; +;;; The Transmission Daemon service. +;;; + +(define-module (gnu tests file-sharing) + #:use-module (gnu packages bittorrent) + #:use-module (gnu services) + #:use-module (gnu services file-sharing) + #:use-module (gnu services networking) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix gexp) + #:export (%test-transmission-daemon)) + +(define %transmission-daemon-user "transmission") +(define %transmission-daemon-group "transmission") + +(define %transmission-daemon-config-dir "/var/lib/transmission-daemon") +(define %transmission-daemon-watch-dir + (string-append %transmission-daemon-config-dir "/watch")) +(define %transmission-daemon-incomplete-dir + (string-append %transmission-daemon-config-dir "/incomplete")) + +(define %transmission-daemon-settings-file + (string-append %transmission-daemon-config-dir "/settings.json")) + +(define %transmission-daemon-peer-port 51000) ; default is 51413 + +(define %transmission-daemon-rpc-port 9999) ; default is 9091 +(define %transmission-daemon-rpc-username "test-username") +(define %transmission-daemon-rpc-password "test-password") + +(define %transmission-daemon-test-configuration + (transmission-daemon-configuration + (incomplete-dir-enabled? #t) + (incomplete-dir %transmission-daemon-incomplete-dir) + + (watch-dir-enabled? #t) + (watch-dir %transmission-daemon-watch-dir) + + (peer-port-random-on-start? #f) + (peer-port %transmission-daemon-peer-port) + + (rpc-enabled? #t) + (rpc-port %transmission-daemon-rpc-port) + (rpc-whitelist-enabled? #f) + (rpc-authentication-required? #t) + (rpc-username %transmission-daemon-rpc-username) + (rpc-password (transmission-password-hash %transmission-daemon-rpc-password + "yEK0q3.X")))) + +(define (run-transmission-daemon-test) + (define os + (marionette-operating-system + (simple-operating-system + (service dhcp-client-service-type) + (service transmission-daemon-service-type + %transmission-daemon-test-configuration)) + #:imported-modules '((gnu services herd) + (json parser)) + #:requirements '(transmission-daemon))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-64)) + + (define marionette + (make-marionette + (list #$(virtual-machine + (operating-system os) + (port-forwardings + `((9091 . ,%transmission-daemon-rpc-port))))))) + + (mkdir #$output) + (chdir #$output) + + (test-begin "transmission-daemon") + + ;; Make sure the "transmission" user and group have been created. + (test-assert "\"transmission\" user exists" + (marionette-eval + '(begin + (getpwnam #$%transmission-daemon-user) + #t) + marionette)) + (test-assert "\"transmission\" group exists" + (marionette-eval + '(begin + (getgrnam #$%transmission-daemon-group) + #t) + marionette)) + + ;; Make sure Transmission Daemon's configuration directory has been + ;; created with the correct ownership and permissions. + (test-assert "configuration directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-config-dir)) + 'directory) + marionette)) + (test-assert "configuration directory has correct ownership" + (marionette-eval + '(let ((config-dir (stat #$%transmission-daemon-config-dir)) + (transmission-user (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid config-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid config-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert "configuration directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-config-dir)) + #o750) + marionette)) + + ;; Make sure the incomplete-downloads and watch directories have been + ;; created with the correct ownership and permissions. + (test-assert "incomplete-downloads directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-incomplete-dir)) + 'directory) + marionette)) + (test-assert "incomplete-downloads directory has correct ownership" + (marionette-eval + '(let ((incomplete-dir + (stat #$%transmission-daemon-incomplete-dir)) + (transmission-user + (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid incomplete-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid incomplete-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert + "incomplete-downloads directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-incomplete-dir)) + #o750) + marionette)) + + (test-assert "watch directory exists" + (marionette-eval + '(eq? (stat:type (stat #$%transmission-daemon-watch-dir)) + 'directory) + marionette)) + (test-assert "watch directory has correct ownership" + (marionette-eval + '(let ((watch-dir (stat #$%transmission-daemon-watch-dir)) + (transmission-user (getpwnam #$%transmission-daemon-user))) + (and (eqv? (stat:uid watch-dir) + (passwd:uid transmission-user)) + (eqv? (stat:gid watch-dir) + (passwd:gid transmission-user)))) + marionette)) + (test-assert "watch directory has expected permissions" + (marionette-eval + '(eqv? (stat:perms (stat #$%transmission-daemon-watch-dir)) + #o770) + marionette)) + + ;; Make sure the settings file has been created and appears valid. + (test-assert "settings file exists" + (marionette-eval + '(file-exists? #$%transmission-daemon-settings-file) + marionette)) + (test-assert "settings file is valid JSON" + (marionette-eval + '(begin + (use-modules (json parser)) + (with-input-from-file #$%transmission-daemon-settings-file + (lambda () + (json->scm))) + #t) + marionette)) + (test-assert "settings file contains a non-empty JSON object" + (marionette-eval + '(begin + (use-modules (json parser) + (srfi srfi-1)) + (let ((settings (with-input-from-file + #$%transmission-daemon-settings-file + (lambda () + (json->scm))))) + (and (list? settings) + (not (null? settings)) + (every pair? settings)))) + marionette)) + + ;; Make sure Transmission Daemon is running. + (test-assert "transmission-daemon is running" + (marionette-eval + '(begin + (use-modules (gnu services herd)) + (live-service-running + (find (lambda (live-service) + (memq 'transmission-daemon + (live-service-provision live-service))) + (current-services)))) + marionette)) + + ;; Make sure the daemon is listening for peer connections. + (test-assert "transmission-daemon is listening for peers" + (wait-for-tcp-port #$%transmission-daemon-peer-port marionette)) + + ;; Make sure the daemon is listening for RPC-client connections. + (test-assert "transmission-daemon is listening for RPC clients" + (wait-for-tcp-port #$%transmission-daemon-rpc-port marionette)) + + ;; Make sure the RPC-authentication settings are honored. + (test-assert "transmission-daemon requires RPC authentication" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote"))) + (with-error-to-port (%make-void-port "w") + (lambda () + (not (zero? (system* transmission-remote + "--session-info"))))))) + (test-assert "transmission-daemon rejects incorrect RPC credentials" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote")) + (wrong-auth-string + (string-append #$%transmission-daemon-rpc-username + ":" + "wrong-" + #$%transmission-daemon-rpc-password))) + (with-error-to-port (%make-void-port "w") + (lambda () + (not (zero? (system* transmission-remote + "--auth" wrong-auth-string + "--session-info"))))))) + (test-assert "transmission-daemon accepts correct RPC credentials" + (let ((transmission-remote + (string-append #+transmission "/bin/transmission-remote")) + (auth-string + (string-append #$%transmission-daemon-rpc-username + ":" + #$%transmission-daemon-rpc-password))) + (with-output-to-port (%make-void-port "w") + (lambda () + (zero? (system* transmission-remote + "--auth" auth-string + "--session-info")))))) + + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + + (gexp->derivation "transmission-daemon-test" test)) + +(define %test-transmission-daemon + (system-test + (name "transmission-daemon") + (description "Test a running Transmission Daemon service.") + (value (run-transmission-daemon-test)))) -- cgit 1.4.1 From f2d9174b7c8ddbdb2b94bf4e76fb7f34849db3c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:19:18 +0200 Subject: gnu: mpop: Update to 1.4.13. * gnu/packages/mail.scm (mpop): Update to 1.4.13. --- 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 a1168872ba..2eb03f60f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -2718,14 +2718,14 @@ easily (one at a time).") (define-public mpop (package (name "mpop") - (version "1.4.12") + (version "1.4.13") (source (origin (method url-fetch) (uri (string-append "https://marlam.de/mpop/releases/" "mpop-" version ".tar.xz")) (sha256 - (base32 "02j8qfd44dfyq1sq7r9znj9y6wam39ncch1sc8chcdlw5nsmaqsz")))) + (base32 "1hbx69d6ivbvjajrcp54fdb3g1ms4ydj0ybf3bfhlravqrk88jdk")))) (build-system gnu-build-system) (inputs `(("gnutls" ,gnutls))) -- cgit 1.4.1 From fd5139199321302b93a4c9ce9592829ce4c8eb6b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:19:27 +0200 Subject: gnu: neomutt: Update to 20210205. * gnu/packages/mail.scm (neomutt): Update to 20210205. --- 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 2eb03f60f2..54ff2fe6fc 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -528,7 +528,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20201127") + (version "20210205") (source (origin (method git-fetch) @@ -537,7 +537,7 @@ operating systems.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1yhpz591jhcjpwllgppwf7vl7z2rnaqfphsvqd1sihd9k4lwch06")))) + (base32 "15kr9nvb4j8lx5rl2yapv231rbp4sbn709vv82pfhx5717x3yf00")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) -- cgit 1.4.1 From 86a119e3e36d907cf65d5e2ee4f0fa62c6f2ee11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:35:44 +0200 Subject: gnu: links: Update to 2.22. * gnu/packages/web-browsers.scm (links): Update to 2.22. --- 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 e5e726ad19..24bca093a6 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -173,14 +173,14 @@ older or slower computers and embedded systems.") (define-public links (package (name "links") - (version "2.21") + (version "2.22") (source (origin (method url-fetch) (uri (string-append "http://links.twibright.com/download/" "links-" version ".tar.bz2")) (sha256 (base32 - "0qqdcghsdqm7l6kyi0k752ws3ak5crw85pqkcb11wy67j62yspi8")))) + "0k88qbmq0mf6zmk2v158c0rxvqbi7ysn58xyf4qqw7kz79mrhr03")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From ceff850369738888a0b7ce96d71614a57c769e71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:35:57 +0200 Subject: gnu: skopeo: Update to 1.2.2. * gnu/packages/virtualization.scm (skopeo): Update to 1.2.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 96347adf7c..c6929b9f1a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1670,7 +1670,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "1.2.1") + (version "1.2.2") (source (origin (method git-fetch) (uri (git-reference @@ -1679,7 +1679,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "1y9pmijazbgxzriymrm7zrifmkd1x1wad9b3zjcj7zwr6c999dhg")))) + "03sznybn3rqjyplc6w4b7mfa6gas8db15p5vnmfm1xqw72ldylgc")))) (build-system go-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From ed4899968a514ed43732fbd72a15acdbb90f68a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:37:26 +0200 Subject: gnu: bcachefs-tools: Update to 0.1-4.bb6eccc. * gnu/packages/file-systems.scm (bcachefs-tools): Update to 0.1-4.bb6eccc. --- 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 ae10796fab..9877e5c433 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -340,8 +340,8 @@ from a mounted file system.") (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "612f6b9ab73c7f46e0254355b707d494a8ad9270") - (revision "3")) + (let ((commit "bb6eccc2ecd4728871bfc70462d3a4a20daa9d68") + (revision "4")) (package (name "bcachefs-tools") (version (git-version "0.1" revision commit)) @@ -353,7 +353,7 @@ from a mounted file system.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1a62wkv1i6pg5k1cjw7fzn933cbz8cp8y40cdpfd8rxjx0wg2szb")))) + (base32 "0ziqmcxbrak6bjck6s46hqrqx44zc97yaj0kbk3amsxf18rsfs0n")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From d9429a1a804cf064b7e855f38eb6039cb090b6b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 22:37:43 +0200 Subject: gnu: wireguard-tools: Update to 1.0.20210315. * gnu/packages/vpn.scm (wireguard-tools): Update to 1.0.20210315. --- 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 2ea04acaa2..4eccd2c64f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -683,7 +683,7 @@ WireGuard was added to Linux 5.6.") (define-public wireguard-tools (package (name "wireguard-tools") - (version "1.0.20210223") + (version "1.0.20210315") (source (origin (method git-fetch) @@ -692,7 +692,7 @@ WireGuard was added to Linux 5.6.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pz7rir7bzj7rv1lqy45pqnr6jxsb4war31f9492757fql7kcrf4")))) + (base32 "1an5gm2dv111n3fylbrnyynxmi2d3iwf2b46zq08hc54kzazxcml")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 55a754ce3a6384e8183b34fe93da2ef343297247 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:17:40 +0300 Subject: gnu: vim-asyncrun: Update to 2.8.5. * gnu/packages/vim.scm (vim-asyncrun): Update to 2.8.5. --- gnu/packages/vim.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 9a3547bbc9..0a73d9e402 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2017 Marius Bakke @@ -842,7 +842,7 @@ through its msgpack-rpc API.") (define-public vim-asyncrun (package (name "vim-asyncrun") - (version "2.7.5") + (version "2.8.5") (source (origin (method git-fetch) (uri (git-reference @@ -851,7 +851,7 @@ through its msgpack-rpc API.") (file-name (git-file-name name version)) (sha256 (base32 - "02fiqf4rcrxbcgvj02mpd78wkxsrnbi54aciwh9fv5mnz5ka249m")))) + "0mxsmjv497h6w8dxw0zvqginlx0yvrvrx4z3jhq2x3y2dfvpcm41")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit 1.4.1 From 6ebc3c41f4411110e998d0e4ba810f5e7b669fd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:23:53 +0300 Subject: gnu: urlscan: Update to 0.9.6. * gnu/packages/mail.scm (urlscan): Update to 0.9.6. --- 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 54ff2fe6fc..3e0ce99457 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Paul van der Walt ;;; Copyright © 2015, 2016, 2018 Eric Bavier ;;; Copyright © 2015 Andreas Enge -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016 Al McElrath ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari @@ -3825,13 +3825,13 @@ servers. The 4rev1 and 4 versions of IMAP are supported.") (define-public urlscan (package (name "urlscan") - (version "0.9.5") + (version "0.9.6") (source (origin (method url-fetch) (uri (pypi-uri "urlscan" version)) (sha256 - (base32 "07vcwirap0p4dkqrqblfn1q017slgd8m6qyijvbi3gxnr09pbyx2")))) + (base32 "09lxi7dhn49fpb3ij4cgrhj3qqqqs9rcxbjb7p9smw5wblrqpzga")))) (build-system python-build-system) (propagated-inputs `(("python-urwid" ,python-urwid))) -- cgit 1.4.1 From bdc72870af04a93b084f7c4d18a7e5c3937f14d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:27:32 +0300 Subject: gnu: qrencode: Update to 4.1.1. * gnu/packages/aidc.scm (qrencode): Update to 4.1.1. --- gnu/packages/aidc.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 6628a8ead3..8bbdacaf6f 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darringon -;;; Copyright © 2016, 2020 Efraim Flashner +;;; Copyright © 2016, 2020, 2021 Efraim Flashner ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guillaume Le Vaillant @@ -108,15 +108,14 @@ formats.") (define-public qrencode (package (name "qrencode") - (version "4.0.2") + (version "4.1.1") (source (origin (method url-fetch) - (uri (string-append - "https://fukuchi.org/works/qrencode/qrencode-" version - ".tar.bz2")) + (uri (string-append "https://fukuchi.org/works/qrencode/" + "qrencode-" version ".tar.bz2")) (sha256 (base32 - "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9")))) + "08v9d8jn26bva2a8x4hghq3mgl8zcid393iqkidwyhc05xrxjmg4")))) (build-system gnu-build-system) (inputs `(("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From 414fc58cef4eb9c2cc18a381629d17c5adf76210 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 00:42:19 +0300 Subject: gnu: qrencode: Enable tests. * gnu/packages/aidc.scm (qrencode)[arguments]: Add configure-flag to build tests. Use custom 'check phase to run tests. --- gnu/packages/aidc.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 8bbdacaf6f..d1b63de736 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -117,6 +117,16 @@ formats.") (base32 "08v9d8jn26bva2a8x4hghq3mgl8zcid393iqkidwyhc05xrxjmg4")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--with-tests") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "./test_basic.sh"))) + #t))))) (inputs `(("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config))) (synopsis "Encode data into a QR Code symbol") -- cgit 1.4.1 From bdd0d5bfbd494ad14393e5b558abf959dada56e3 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 13 Mar 2021 14:00:48 -0500 Subject: gnu: bctoolbox: Update to 4.4.34 and enable libdecaf, tests. * gnu/packages/linphone.scm (bctoolbox)[version]: Update to 4.4.34. [source]: Switch to git repository. [outputs]: Add a debug output. [arguments]: Remove tests? argument, enabling tests. [phases]{patch-cmake, skip-problematic-tests} {fix-installed-resource-directory-detection}: New phases. {check}: Override phase. [inputs]: Add libdecaf. [license]: Update to GPLv3+. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 61 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 49 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 078185046f..cfe05eaa7a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; -;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Raghav Gururajan +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -127,28 +128,64 @@ writing, administering, and running unit tests in C.") (define-public bctoolbox (package (name "bctoolbox") - (version "0.6.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bctoolbox.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1a1i70pb4hhnykkwyhhc7fv67q556l8kprny8xzgfqpj1nby2ms6")))) + (base32 "0bfswwvvdshaahg4jd2j10f0sci8809s4khajd0m6b059zwc7y25")))) (build-system cmake-build-system) + (outputs '("out" "debug")) (arguments - '(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix decaf dependency (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/3). + (let* ((decaf (assoc-ref inputs "decaf"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(Decaf CONFIG\\)") + "set(DECAF_FOUND 1)") + (("\\$\\{DECAF_INCLUDE_DIRS\\}") + (string-append decaf "/include/decaf")) + (("\\$\\{DECAF_TARGETNAME\\}") + "decaf"))))) + (add-after 'unpack 'skip-problematic-tests + (lambda _ + ;; The following test relies on networking; disable it. + (substitute* "tester/port.c" + (("[ \t]*TEST_NO_TAG.*bctbx_addrinfo_sort_test\\)") + "")))) + (add-after 'unpack 'fix-installed-resource-directory-detection + (lambda _ + ;; There's some broken logic in tester.c that checks if CWD, or + ;; if its parent exist, and if so, sets the prefix where the test + ;; resources are looked up to; disable it (see: + ;; https://gitlab.linphone.org/BC/public/bctoolbox/-/issues/4). + (substitute* "src/tester.c" + (("if \\(file_exists\\(\".\"\\)\\)") + "if (NULL)") + (("if \\(file_exists\\(\"..\"\\)\\)") + "if (NULL)")))) + (replace 'check + (lambda _ + (with-directory-excursion "tester" + (invoke "./bctoolbox_tester"))))))) (inputs `(("bcunit" ,bcunit) + ("decaf" ,libdecaf) ("mbedtls" ,mbedtls-apache))) (synopsis "Belledonne Communications Tool Box") (description "BcToolBox is an utilities library used by Belledonne Communications software like belle-sip, mediastreamer2 and linphone.") (home-page "https://gitlab.linphone.org/BC/public/bctoolbox") - (license license:gpl2+))) + (license license:gpl3+))) (define-public belr (package -- cgit 1.4.1 From c52d0f9c42596404180f1d3f06c646b25b3ac541 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 14 Mar 2021 23:40:02 -0400 Subject: gnu: belr: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (belr)[source]: Switch to git repository. [version]: Update to 4.4.34. [arguments]: Remove the tests? argument to enable tests. [phases]{move-tester, check}: New phases. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 43 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index cfe05eaa7a..3e46d23838 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -190,20 +190,45 @@ Communications software like belle-sip, mediastreamer2 and linphone.") (define-public belr (package (name "belr") - (version "0.1.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/belr.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1fwv2cg3qy9vdc7dimcda7nqcqc1h2cdd7ikhk7ng7q4ys8m96c1")))) + (base32 "0w2canwwm0qb99whnangvaybvjzq8xg6vksqxykgr8fbx7clw03h")))) (build-system cmake-build-system) + (outputs '("out" "debug" "tester")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (delete 'check) ;moved after the install phase + (add-after 'install 'check + (lambda* (#:key outputs #:allow-other-keys) + (let* ((tester (assoc-ref outputs "tester")) + (belr_tester (string-append tester "/bin/belr_tester")) + (tester-share (string-append tester "/share/belr_tester"))) + (invoke belr_tester)))) + (add-after 'install 'move-tester + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file + (string-append out "/bin/belr_tester") + (string-append tester "/bin/belr_tester")) + (rename-file + (string-append out "/share/belr-tester") + ;; The detect_res_prefix procedure in bctoolbox's tester.c + ;; resolves the resource path based on the executable path and + ;; name, so have it match. + (string-append tester "/share/belr_tester")))))))) (inputs `(("bctoolbox" ,bctoolbox))) (synopsis "Belledonne Communications Language Recognition Library") -- cgit 1.4.1 From 7a8e17343d3b8fbf394e8ef091852ea54d9fc741 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 16:24:20 -0400 Subject: gnu: belcard: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (belcard)[source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]: Add the tester and debug outputs. [arguments]: Enable tests. [phases]{patch-vcard-grammar-location, install-tester, check}: New phases. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 49 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 3e46d23838..d1648418e5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -242,20 +242,51 @@ IETF.") (define-public belcard (package (name "belcard") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/belcard.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0iiyrll1shnbb0561pkvdqcmx9b2cdr76xpsbaqdirc3s4xzcl0k")))) + (base32 "16x2xp8d0a115132zhy1kpxkyj86ia7vrsnpjdg78fnbvmvysc8m")))) (build-system cmake-build-system) + (outputs '("out" "debug" "tester")) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=OFF"))) ; Not required + `(#:tests? #t + #:configure-flags '("-DENABLE_STATIC=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-vcard-grammar-location + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (vcard-grammar + (string-append out "/share/belr/grammars/vcard_grammar"))) + (substitute* "include/belcard/vcard_grammar.hpp" + (("define VCARD_GRAMMAR \"vcard_grammar\"") + (format #f "define VCARD_GRAMMAR ~s" vcard-grammar)))))) + (add-after 'install 'install-tester + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester")) + (test-name (string-append ,name "_tester"))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin/" test-name) + (string-append tester "/bin/" test-name)) + (rename-file (string-append out "/share/" test-name) + (string-append tester "/share/" test-name))))) + (delete 'check) + (add-after 'install-tester 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (let* ((tester (assoc-ref outputs "tester")) + (belcard_tester (string-append tester + "/bin/belcard_tester"))) + (invoke belcard_tester)))))))) (inputs `(("bctoolbox" ,bctoolbox) ("belr" ,belr))) -- cgit 1.4.1 From ebc75b6ae8205c9a23826453db2e6ac4ce37ff0d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:22:31 -0400 Subject: gnu: bzrtp: Update to 4.4.34 and enable tests. * gnu/packages/linphone.scm (bzrtp)[source]: Switch to git repository. [version]: Update to 4.4.34. [configure-flags]: Enable tests. [license]: Upgrade to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index d1648418e5..60221ffad8 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -425,20 +425,22 @@ implements the RFC 3550 standard.") (define-public bzrtp (package (name "bzrtp") - (version "1.0.6") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/bzrtp") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "12y0kkh90pixaaxfyx26ca2brhy6nw57fsypp6vh8jk1illv0j5z")))) + (base32 "1yjmsbqmymzl4r7sba6w4a2yld8m6hzafr6jf7sj0syhwpnc3zv6")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:configure-flags + (list + "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES"))) (inputs `(("bctoolbox" ,bctoolbox) ("sqlite3" ,sqlite) @@ -448,7 +450,7 @@ implements the RFC 3550 standard.") written in C. It is fully portable and can be executed on many platforms including both ARM and x86.") (home-page "https://gitlab.linphone.org/BC/public/bzrtp") - (license license:gpl2+))) + (license license:gpl3+))) (define-public belle-sip (package -- cgit 1.4.1 From 2dda883dee6efffc213181f9f8462500bd1fb45a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 15 Mar 2021 22:09:07 -0400 Subject: gnu: ortp: Update to 4.4.34. * gnu/packages/linphone.scm (ortp)[source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]{doc, tester}: New outputs. [configure-flag]: Enable tests. [phases]{fix-version-strings, separate-outputs}: New phases. [home-page]: Update. [license]: Upgrade to GPLv3+. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 60221ffad8..370748220a 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -397,20 +397,44 @@ such as conferencing.") (define-public ortp (package (name "ortp") - (version "1.0.2") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/ortp.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "016qg0lmdgmqh2kv19w9qhi4kkiyi5h1xp35g2s65b1j8ccm25d5")))) + (base32 "1r1kvjzyfvkf66in4p51wi87balzg3sw3aq6r4xr609mz86spi5m")))) (build-system cmake-build-system) + (outputs '("out""tester" + "doc")) ;1.5 MiB of HTML doc (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required + `(#:tests? #f ;requires networking + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_TESTS=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-strings + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION 4.4.0") + (string-append "VERSION " ,version)) + (("\\$\\{ORTP_DOC_VERSION\\}") + ,version)))) + (add-after 'install 'separate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (doc-src (string-append out "/share/doc/ortp-" ,version)) + (doc-dest (string-append doc "/share/doc/ortp-" ,version)) + (tester (assoc-ref outputs "tester"))) + (for-each mkdir-p (list (string-append doc "/share/doc") + (string-append tester "/bin"))) + (rename-file doc-src doc-dest) + (rename-file (string-append out "/bin") + (string-append tester "/bin")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen))) @@ -419,8 +443,8 @@ such as conferencing.") (synopsis "Belledonne Communications RTP Library") (description "oRTP is a C library implementing the RTP protocol. It implements the RFC 3550 standard.") - (home-page "https://gitlab.linphone.org/BC/public/ortp") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/ortp") + (license license:gpl3+))) (define-public bzrtp (package -- cgit 1.4.1 From 146a9403b3f9bda114e4e3a63ad1ad1aaac82d12 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 15:51:11 -0400 Subject: gnu: mediastreamer2: Update to 4.4.34. * gnu/packages/linphone.scm (mediastreamer2)[source]: Switch to git repository. [version]: Update to 4.4.34. [patches]: Remove field. [configure-flags]: Remove the ENABLE_STRICT, ENABLE_BV16, CMAKE_C_FLAGS and CMAKE_CXX_FLAGS flags. [phases]{fix-version}: New phase. {separate-outputs}: Modify. [native-inputs]: Replace python with python-wrapper. [home-page]: Update. [license]: Upgrade to GPLv3+. * gnu/packages/patches/mediastreamer2-srtp2.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 1 - gnu/packages/linphone.scm | 61 +++++----- gnu/packages/patches/mediastreamer2-srtp2.patch | 155 ------------------------ 3 files changed, 29 insertions(+), 188 deletions(-) delete mode 100644 gnu/packages/patches/mediastreamer2-srtp2.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d131dc0388..2194e46f5d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1397,7 +1397,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ - %D%/packages/patches/mediastreamer2-srtp2.patch \ %D%/packages/patches/mesa-skip-tests.patch \ %D%/packages/patches/mescc-tools-boot.patch \ %D%/packages/patches/meson-for-build-rpath.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 370748220a..129b6764e5 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -417,9 +417,10 @@ such as conferencing.") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version-strings + ;; See: https://gitlab.linphone.org/BC/public/ortp/-/issues/5. (lambda _ (substitute* "CMakeLists.txt" - (("VERSION 4.4.0") + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version)) (("\\$\\{ORTP_DOC_VERSION\\}") ,version)))) @@ -518,56 +519,52 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (define-public mediastreamer2 (package (name "mediastreamer2") - (version "2.16.1") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" - "mediastreamer/mediastreamer-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mediastreamer2.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0whpqr69wz0pnzvragkpfblxhd0rds8k06c3mw5a0ag216a1yd9k")) - (patches (search-patches "mediastreamer2-srtp2.patch")))) + (base32 "0989h3d0h7qrx4kjx8gg09j8c5hvvi3h8qi1iq1dqbppwbaxbz8c")))) (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" ; Would otherwise treat warnings as err - "-DENABLE_BV16=NO" ; Not available - "-DCMAKE_C_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"" - "-DCMAKE_CXX_FLAGS=-DMS2_GIT_VERSION=\\\"unknown\\\"") + #:configure-flags (list "-DENABLE_STATIC=NO") #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-version + (lambda _ + (substitute* "CMakeLists.txt" + (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") + (string-append "VERSION " ,version))))) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) (tester (assoc-ref outputs "tester")) - (tester-name (string-append ,name "_tester"))) + (tester-name (string-append ,name "_tester")) + (doc (assoc-ref outputs "doc")) + (doc-name (string-append ,name "-" ,version))) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share") + (string-append doc "/share/doc"))) ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) ;; Copy the tester data files. - (copy-recursively (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)) - (delete-file-recursively (string-append out "/share/" - tester-name)) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name)) ;; Copy the HTML documentation. - (copy-recursively (string-append out "/share/doc/" - ,name "-" ,version "/html") - (string-append doc "/share/doc/" - ,name "-" ,version "/html")) - (delete-file-recursively (string-append out "/share/doc/" - ,name "-" ,version - "/html")) - #t)))))) + (rename-file (string-append out "/share/doc/" doc-name) + (string-append doc "/share/doc/" doc-name)))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python))) + ("python" ,python-wrapper))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) @@ -600,8 +597,8 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") for telephony applications. This media processing and streaming toolkit is responsible for receiving and sending all multimedia streams in Linphone, including media capture, encoding and decoding, and rendering.") - (home-page "https://gitlab.linphone.org/BC/public/mediastreamer2") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/mediastreamer2") + (license license:gpl3+))) (define-public liblinphone (package diff --git a/gnu/packages/patches/mediastreamer2-srtp2.patch b/gnu/packages/patches/mediastreamer2-srtp2.patch deleted file mode 100644 index f6d494facb..0000000000 --- a/gnu/packages/patches/mediastreamer2-srtp2.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 97903498364ae2596e790cb2c2ce9ac76c04d64a Mon Sep 17 00:00:00 2001 -From: Danmei Chen -Date: Fri, 19 Jan 2018 10:04:07 +0100 -Subject: [PATCH] add compability with srtp2 - ---- - cmake/FindSRTP.cmake | 24 ++++++++++++++++++++---- - src/CMakeLists.txt | 1 + - src/crypto/ms_srtp.c | 10 ++-------- - src/utils/srtp_prefix.h | 41 +++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 64 insertions(+), 12 deletions(-) - create mode 100644 src/utils/srtp_prefix.h - -diff --git a/cmake/FindSRTP.cmake b/cmake/FindSRTP.cmake -index 988b846a..f720ce7e 100644 ---- a/cmake/FindSRTP.cmake -+++ b/cmake/FindSRTP.cmake -@@ -31,20 +31,36 @@ set(_SRTP_ROOT_PATHS - ) - - find_path(SRTP_INCLUDE_DIRS -- NAMES srtp/srtp.h -+ NAMES srtp2/srtp.h - HINTS _SRTP_ROOT_PATHS - PATH_SUFFIXES include - ) - - if(SRTP_INCLUDE_DIRS) - set(HAVE_SRTP_SRTP_H 1) --endif() -- --find_library(SRTP_LIBRARIES -+ set(SRTP_VERSION 2) -+ find_library(SRTP_LIBRARIES -+ NAMES srtp2 -+ HINTS ${_SRTP_ROOT_PATHS} -+ PATH_SUFFIXES bin lib -+ ) -+else() -+ find_path(SRTP_INCLUDE_DIRS -+ NAMES srtp/srtp.h -+ HINTS _SRTP_ROOT_PATHS -+ PATH_SUFFIXES include -+ ) -+ if(SRTP_INCLUDE_DIRS) -+ set(HAVE_SRTP_SRTP_H 1) -+ set(SRTP_VERSION 1) -+ endif() -+ find_library(SRTP_LIBRARIES - NAMES srtp - HINTS ${_SRTP_ROOT_PATHS} - PATH_SUFFIXES bin lib - ) -+endif() -+ - - include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SRTP -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index da429764..c46faa62 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -183,6 +183,7 @@ set(VOIP_SOURCE_FILES_C - utils/pcap_sender.c - utils/pcap_sender.h - utils/stream_regulator.c -+ utils/srtp_prefix.h - voip/audioconference.c - voip/audiostream.c - voip/bandwidthcontroller.c -diff --git a/src/crypto/ms_srtp.c b/src/crypto/ms_srtp.c -index 5a510c99..67810316 100644 ---- a/src/crypto/ms_srtp.c -+++ b/src/crypto/ms_srtp.c -@@ -25,6 +25,7 @@ - #include "mediastreamer2/ms_srtp.h" - #include "mediastreamer2/mediastream.h" - -+ - #ifdef HAVE_SRTP - - /*srtp defines all this stuff*/ -@@ -34,13 +35,7 @@ - #undef PACKAGE_TARNAME - #undef PACKAGE_VERSION - --#if defined(MS2_WINDOWS_PHONE) --// Windows phone doesn't use make install --#include --#else --#include --#endif -- -+#include "srtp_prefix.h" - - #include "ortp/b64.h" - -@@ -352,7 +347,6 @@ int ms_srtp_init(void) - srtp_init_done++; - }else{ - ms_fatal("Couldn't initialize SRTP library: %d.", st); -- err_reporting_init("mediastreamer2"); - } - }else srtp_init_done++; - return (int)st; -diff --git a/src/utils/srtp_prefix.h b/src/utils/srtp_prefix.h -new file mode 100644 -index 00000000..68bde496 ---- /dev/null -+++ b/src/utils/srtp_prefix.h -@@ -0,0 +1,41 @@ -+/* -+ mediastreamer2 library - modular sound and video processing and streaming -+ Copyright (C) 2006-2014 Belledonne Communications, Grenoble -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2.1 of the License, or (at your option) any later version. -+ -+ This library 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+*/ -+#ifndef __SRTP2_H__ -+#define __SRTP2_H__ -+ -+#if defined(MS2_WINDOWS_PHONE) -+// Windows phone doesn't use make install -+#include -+#elif SRTP_VERSION==1 -+#include -+#else -+#include -+#define err_status_t srtp_err_status_t -+#define err_status_ok srtp_err_status_ok -+#define crypto_policy_t srtp_crypto_policy_t -+#define crypto_policy_set_aes_cm_256_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32 -+#define crypto_policy_set_aes_cm_128_null_auth srtp_crypto_policy_set_aes_cm_128_null_auth -+#define crypto_policy_set_null_cipher_hmac_sha1_80 srtp_crypto_policy_set_null_cipher_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80 -+#define crypto_policy_set_aes_cm_256_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_256_hmac_sha1_32 -+#define ssrc_t srtp_ssrc_t -+#endif -+ -+#endif --- -2.21.0 - -- cgit 1.4.1 From 0c6f7d8396349dc5afb5c24b72f940f097737e78 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 16:56:25 -0400 Subject: gnu: mediastreamer2: Enable tests. * gnu/packages/linphone.scm (mediastreamer2) [arguments]: Remove tests? argument, enabling tests. [phases]{pre-check}: New phase. {check}: Replace with custom phase. [native-inputs]: Add xorg-server-for-tests. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 129b6764e5..f06b2be452 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -532,8 +532,7 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags (list "-DENABLE_STATIC=NO") + `(#:configure-flags (list "-DENABLE_STATIC=NO") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version @@ -541,6 +540,14 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (substitute* "CMakeLists.txt" (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version))))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 +extension GLX &") + (setenv "DISPLAY" ":1") + ;; Tests write to $HOME. + (setenv "HOME" (getenv "TEMP")))) + (delete 'check) ;move after install (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -552,19 +559,37 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (list (string-append tester "/bin") (string-append tester "/share") (string-append doc "/share/doc"))) - ;; Copy the tester executable. + ;; Move the tester executable. (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. + ;; Move the tester data files. (rename-file (string-append out "/share/" tester-name) (string-append tester "/share/" tester-name)) - ;; Copy the HTML documentation. + ;; Move the HTML documentation. (rename-file (string-append out "/share/doc/" doc-name) - (string-append doc "/share/doc/" doc-name)))))))) + (string-append doc "/share/doc/" doc-name))))) + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/mediastreamer2_tester"))) + (for-each (lambda (suite-name) + (invoke tester "--suite" suite-name)) + ;; Some tests fail, due to requiring access to the + ;; sound card or the network. + (list "Basic Audio" + ;; "Sound Card" + ;; "AdaptiveAlgorithm" + ;; "AudioStream" + ;; "VideoStream" + "H26x Tools" + "Framework" + ;; "Player" + "TextStream")))))))) (native-inputs `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("alsa" ,alsa-lib) ("bcg729" ,bcg729) -- cgit 1.4.1 From abc1418786df47816a00c68e90c770d9692a2bb7 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 18:43:55 -0400 Subject: gnu: mediastreamer2: Enable PCAP, port-audio and G729B support. * gnu/packages/linphone.scm (mediastreamer2) [configure-flags]: Add the ENABLE_PCAP, ENABLE_PORTAUDIO and ENABLE_G729B_CNG flags. [phases]{patch-source}: New phase. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index f06b2be452..0da9e02b4c 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -532,7 +532,12 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (outputs '("out" "doc" "tester")) (build-system cmake-build-system) (arguments - `(#:configure-flags (list "-DENABLE_STATIC=NO") + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_PCAP=YES" + ;; Do not fail on compile warnings. + "-DENABLE_STRICT=NO" + "-DENABLE_PORTAUDIO=YES" + "-DENABLE_G729B_CNG=YES") #:phases (modify-phases %standard-phases (add-after 'unpack 'fix-version @@ -540,6 +545,10 @@ API. It also comprises a simple HTTP/HTTPS client implementation.") (substitute* "CMakeLists.txt" (("VERSION [0-9]+\\.[0-9]+\\.[0-9]+") (string-append "VERSION " ,version))))) + (add-after 'unpack 'patch-source + (lambda _ + (substitute* "src/otherfilters/mspcapfileplayer.c" + (("O_BINARY") "L_INCR")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running X server. -- cgit 1.4.1 From 23a96055fb1c952d9b182b4f2dbd53e7ac25deba Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 12:40:05 -0400 Subject: gnu: belle-sip: Update to 4.4.34. * gnu/packages/linphone.scm (belle-sip)[source]: Switch to git repository. [version]: Update to 4.4.34. [home-page]: Update. [license]: Update to GPLv3+. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0da9e02b4c..6f7634ecdb 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -480,15 +480,16 @@ including both ARM and x86.") (define-public belle-sip (package (name "belle-sip") - (version "1.6.3") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.linphone.org/belle-sip") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0s55kggmgxap54dkw5856bgk4xg7yvbzialpxnjm0zhpic3hff1z")))) + (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; Requires network access @@ -513,8 +514,8 @@ including both ARM and x86.") (description "Belle-sip is a modern library implementing SIP transport, transaction and dialog layers. It is written in C, with an object-oriented API. It also comprises a simple HTTP/HTTPS client implementation.") - (home-page "https://gitlab.linphone.org/BC/public/belle-sip") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/belle-sip") + (license license:gpl3+))) (define-public mediastreamer2 (package -- cgit 1.4.1 From c2a86746142fd51f53f3006dce5420d23ea36fef Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 13:25:14 -0400 Subject: gnu: belle-sip: Enable tests. * gnu/packages/linphone.scm (belle-sip)[outputs]: New "tester" output. [tests?]: Remove argument, enabling tests. [phases]{check}: Override phase. {separate-outputs}: New phase. [inputs]: Remove antlr3, anttlr3c and java. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 48 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 6f7634ecdb..ec35ad4545 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -485,15 +485,15 @@ including both ARM and x86.") (origin (method git-fetch) (uri (git-reference - (url "git://git.linphone.org/belle-sip") + (url "https://gitlab.linphone.org/BC/public/belle-sip.git") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 "1kknnlczq7dpqaj1dwxvy092dzrqjy11ndkv90rqwmdryigkjk6z")))) (build-system cmake-build-system) + (outputs '("out" "tester")) (arguments - `(#:tests? #f ; Requires network access - #:configure-flags + `(#:configure-flags (list "-DENABLE_STATIC=NO") ; Not required #:phases (modify-phases %standard-phases @@ -502,13 +502,43 @@ including both ARM and x86.") (substitute* "src/CMakeLists.txt" ;; ANTLR would use multithreaded DFA generation otherwise, ;; which would not be reproducible. - (("-Xmultithreaded ") "")) - #t))))) + (("-Xmultithreaded ") "")))) + (delete 'check) ;move after install + (add-after 'install 'separate-outputs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (tester (assoc-ref outputs "tester")) + (tester-name "belle_sip_tester")) + (for-each mkdir-p (list (string-append tester "/bin") + (string-append tester "/share"))) + (rename-file (string-append out "/bin") + (string-append tester "/bin")) + (rename-file (string-append out "/share/" tester-name) + (string-append tester "/share/" tester-name))))) + (add-after 'separate-outputs 'check + (lambda* (#:key outputs #:allow-other-keys) + (let ((tester (string-append (assoc-ref outputs "tester") + "/bin/belle_sip_tester"))) + (for-each (lambda (suite-name) + (invoke tester "--suite" suite-name)) + (list "Object inheritance" + "SIP URI" + "FAST SIP URI" + "FAST SIP URI 2" + "Generic uri" + "Headers" + "Core" + "SDP" + ;;"Resolver" + "Message" + "Authentication helper" + ;;"Register" + ;;"Dialog" + "Refresher" + ;;"HTTP stack" + "Object")))))))) (inputs - `(("antlr3" ,antlr3-3.3) - ("antlr3c" ,libantlr3c) - ("bctoolbox" ,bctoolbox) - ("java" ,icedtea) + `(("bctoolbox" ,bctoolbox) ("zlib" ,zlib))) (synopsis "Belledonne Communications SIP Library") (description "Belle-sip is a modern library implementing SIP transport, -- cgit 1.4.1 From 3c7ff0be83973ea37a186e1e9d277e8d02e4f785 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 14:28:56 -0400 Subject: gnu: belle-sip: Enable mDNS support. * gnu/packages/linphone.scm (belle-sip)[configure-flags]: Enable mDNS support. [phases]{patch}: Force the detection of avahi. [inputs]: Add avahi. --- gnu/packages/linphone.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index ec35ad4545..2ca05ac8b9 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -23,6 +23,7 @@ #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages audio) + #:use-module (gnu packages avahi) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -493,12 +494,21 @@ including both ARM and x86.") (build-system cmake-build-system) (outputs '("out" "tester")) (arguments - `(#:configure-flags - (list "-DENABLE_STATIC=NO") ; Not required + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_MDNS=ON") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix mDNS dependency. + (let* ((avahi (assoc-ref inputs "avahi"))) + (substitute* (find-files "." "CMakeLists.txt") + (("find_package\\(DNSSD REQUIRED\\)") + "set(DNSSD_FOUND 1)") + (("\\$\\{DNSSD_INCLUDE_DIRS\\}") + (string-append avahi "/include/avahi-compat-libdns_sd")) + (("\\$\\{DNSSD_LIBRARIES\\}") + "dns_sd"))) (substitute* "src/CMakeLists.txt" ;; ANTLR would use multithreaded DFA generation otherwise, ;; which would not be reproducible. @@ -538,7 +548,8 @@ including both ARM and x86.") ;;"HTTP stack" "Object")))))))) (inputs - `(("bctoolbox" ,bctoolbox) + `(("avahi" ,avahi) + ("bctoolbox" ,bctoolbox) ("zlib" ,zlib))) (synopsis "Belledonne Communications SIP Library") (description "Belle-sip is a modern library implementing SIP transport, -- cgit 1.4.1 From 093c5da74702b90c209c3659913b0736ed002b29 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Tue, 16 Mar 2021 23:08:41 -0400 Subject: gnu: Add lime. * gnu/packages/linphone.scm (lime): New variable. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 2ca05ac8b9..1c94d49f59 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) @@ -676,6 +677,58 @@ including media capture, encoding and decoding, and rendering.") (home-page "https://linphone.org/technical-corner/mediastreamer2") (license license:gpl3+))) +(define-public lime + (package + (name "lime") + (version "4.4.34") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/lime.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14jg1zisjbzflw3scfqdbwy48wq3cp93l867vigb8l40lkc6n26z")))) + (build-system cmake-build-system) + (outputs '("out" "doc")) + (arguments + `(#:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_C_INTERFACE=YES") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Disable tests that require networking. + (substitute* "tester/CMakeLists.txt" + (("add_test\\(?.*\"Hello World\"\\)") "") + (("add_test\\(?.*\"lime\"\\)") "") + (("add_test\\(?.*\"FFI\"\\)") "")))) + (add-after 'build 'build-doc + (lambda _ + (invoke "make" "doc"))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((doc (assoc-ref outputs "doc")) + (dir (string-append doc "/share/doc")) + (dest (string-append dir "/" ,name "-" ,version))) + (mkdir-p dest) + (copy-recursively "doc" dest))))))) + (native-inputs + `(("dot" ,graphviz) + ("doxygen" ,doxygen))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("belle-sip" ,belle-sip) + ("soci" ,soci))) + (synopsis "Belledonne Communications Encryption Library") + (description "LIME is an encryption library for one-to-one and group +instant messaging, allowing users to exchange messages privately and +asynchronously. It supports multiple devices per user and multiple users per +device.") + (home-page "https://linphone.org/technical-corner/lime") + (license license:gpl3+))) + (define-public liblinphone (package (name "liblinphone") -- cgit 1.4.1 From acf4c0cd7c41e2c4643ebb6820cbcd86f0bf3b48 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 17 Mar 2021 23:36:02 -0400 Subject: gnu: liblinphone: Update to 4.4.34. * gnu/packages/linphone.scm (liblinphone) [source]: Switch to git repository. [version]: Update to 4.4.34. [outputs]: Remove the "doc" output. [imported-modules, modules]: Remove arguments. [configure-flags]: Remove flag. : Likewise. [phases] : Remove phases. : Modify. [native-inputs]: Add perl. Replace python with python-wrapper. [inputs]: Add belr, lime, soci and xsd. Remove glib and gtk+-2. [home-page]: Update. [license]: Upgrade to GPLv3+. Modified-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 95 ++++++++++++++++------------------------------- 1 file changed, 31 insertions(+), 64 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 1c94d49f59..cc1308b8f7 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages cpp) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) @@ -732,95 +733,61 @@ device.") (define-public liblinphone (package (name "liblinphone") - (version "3.12.0") + (version "4.4.34") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/linphone" - "/linphone-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/liblinphone.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0phhkx55xdyg28d4wn8l8q4yvsmdgzmjiw584d4s190sq1azm91x")))) - (outputs '("out" "doc" "tester")) + (base32 "1lwabr93jw24y04pdqnw9dgg8jb3lzfplyx19f83jgp9dj8kmfq9")))) + (outputs '("out" "tester")) (build-system cmake-build-system) (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list (string-append "-DGTK2_GDKCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "gtk2") - "/lib/gtk-2.0/include")) - (string-append "-DGTK2_GLIBCONFIG_INCLUDE_DIR=" - (string-append (assoc-ref %build-inputs "glib") - "/lib/glib-2.0/include")) - "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_STRICT=NO" - "-DENABLE_GTK_UI=YES") ; for legacy UI - #:imported-modules (,@%cmake-build-system-modules - (guix build glib-or-gtk-build-system)) - #:modules ((guix build cmake-build-system) - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) - (guix build utils)) + `(#:tests? #f ; Tests require networking + #:configure-flags (list "-DENABLE_STATIC=NO" + "-DENABLE_DOC=NO" ;requires unpackaged javasphinx + "-DENABLE_LDAP=YES") #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "gtk/main.c" - (("#include \"liblinphone_gitversion.h\"") - "")) - #t)) (add-after 'install 'separate-outputs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) (tester (assoc-ref outputs "tester")) (tester-name (string-append ,name "_tester"))) - ;; Copy the tester executable. - (mkdir-p (string-append tester "/bin")) + (for-each mkdir-p + (list (string-append tester "/bin") + (string-append tester "/share"))) (rename-file (string-append out "/bin/" tester-name) (string-append tester "/bin/" tester-name)) - ;; Copy the tester data files. - (mkdir-p (string-append tester "/share/")) + (rename-file (string-append out "/bin/groupchat_benchmark") + (string-append tester "/bin/groupchat_benchmark")) (rename-file (string-append out "/share/" tester-name) - (string-append tester "/share/" tester-name)) - ;; Copy the HTML and XML documentation. - (copy-recursively - (string-append out "/share/doc/linphone-" ,version) - (string-append doc "/share/doc/" ,name "-" ,version)) - (delete-file-recursively - (string-append out "/share/doc/linphone-" ,version)) - #t))) - (add-after 'install 'install-man-pages - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1"))) - (for-each (lambda (file) - (install-file file man)) - (find-files ".." ".*.1$")) - #t))) - (add-after 'separate-outputs 'glib-or-gtk-compile-schemas - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) - (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap - (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) + (string-append tester "/share/" tester-name)))))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("udev" ,eudev) ;for libudev.h - ;; For generating the C++ wrappers. - ("dot" ,graphviz) + `(("dot" ,graphviz) ("doxygen" ,doxygen) - ("python" ,python) + ("gettext" ,gettext-minimal) + ("perl" ,perl) + ("python" ,python-wrapper) ("pystache" ,python-pystache) - ("six" ,python-six))) + ("six" ,python-six) + ("udev" ,eudev))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) ("bellesip" ,belle-sip) + ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) - ("glib" ,glib) - ("gtk2" ,gtk+-2) + ("libxsd" ,xsd) + ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) ("notify" ,libnotify) ("ortp" ,ortp) + ("soci" ,soci) ("sqlite" ,sqlite) ("xml2" ,libxml2) ("zlib" ,zlib))) @@ -830,8 +797,8 @@ all calling and instant messaging features into an unified easy-to-use API. It is the cross-platform VoIP library on which the Linphone application is based on, and that anyone can use to add audio and video calls or instant messaging capabilities to an application.") - (home-page "https://gitlab.linphone.org/BC/public/liblinphone") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/liblinphone") + (license license:gpl3+))) (define-public linphoneqt (package -- cgit 1.4.1 From 342e223c8e1913fdab9e099a68bce7d93b16cc42 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 04:08:06 -0400 Subject: gnu: liblinphone: Enable LDAP support. * gnu/packages/linphone.scm (liblinphone) [configure-flags] : New flag. [inputs]: Add openldap. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index cc1308b8f7..053e9e9e6f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) + #:use-module (gnu packages openldap) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -782,6 +783,7 @@ device.") ("belr" ,belr) ("bzrtp" ,bzrtp) ("iconv" ,libiconv) + ("ldap" ,openldap) ("libxsd" ,xsd) ("lime" ,lime) ("mediastreamer2" ,mediastreamer2) -- cgit 1.4.1 From 48b2202789c85b6ab2d10916e2b6b118efc18ea9 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 20:58:20 -0400 Subject: gnu: linphoneqt: Update to 4.2.5 and rename to linphone-desktop. Also enable the daemon and console interfaces. * gnu/packages/linphone.scm (linphoneqt) [name]: Rename to linphone-desktop. [source]: Switch to git repository. [patches]: Remove linphoneqt-tabbutton.patch and add linphone-desktop-without-sdk.patch. [outputs]: New output. [configure-flags]: Disable update checking and enable the daemon and console interfaces. [phases]: New phase. : Remove phases. : Rename to... : ... this; adjust. [native-inputs]: Add pkg-config. [inputs]: Add belr and ortp. Remove belle-sip. [home-page]: Update home page. [license]: Update to GPLv3+. * gnu/packages/patches/linphoneqt-tabbutton.patch: Remove file. linphone-desktop-without-sdk.patch: New file. * gnu/local.mk (dist_patch_DATA): Update. Co-authored-by: Maxim Cournoyer Signed-off-by: Maxim Cournoyer --- gnu/local.mk | 2 +- gnu/packages/linphone.scm | 74 ++++--- .../patches/linphone-desktop-without-sdk.patch | 235 +++++++++++++++++++++ gnu/packages/patches/linphoneqt-tabbutton.patch | 96 --------- 4 files changed, 277 insertions(+), 130 deletions(-) create mode 100644 gnu/packages/patches/linphone-desktop-without-sdk.patch delete mode 100644 gnu/packages/patches/linphoneqt-tabbutton.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 2194e46f5d..40732ca696 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1362,7 +1362,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linkchecker-tests-require-network.patch \ - %D%/packages/patches/linphoneqt-tabbutton.patch \ + %D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linux-libre-support-for-Pinebook-Pro.patch \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 053e9e9e6f..7337e0ef1e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages openldap) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -802,55 +803,59 @@ and video calls or instant messaging capabilities to an application.") (home-page "https://linphone.org/technical-corner/liblinphone") (license license:gpl3+))) -(define-public linphoneqt +(define-public linphone-desktop (package - (name "linphoneqt") - (version "4.1.1") + (name "linphone-desktop") + (version "4.2.5") (source (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/" name - "/" name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/linphone-desktop") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1g2zrr9li0g1hgs6vys06vr98h5dx36z22hx7a6ry231536c002a")) - (patches (search-patches "linphoneqt-tabbutton.patch")))) + (base32 "1gq4l9p21rbrcksa7fbkzn9fzbbynqmn6ni6lhnvzk359sb1xvbz")) + (patches (search-patches "linphone-desktop-without-sdk.patch")))) (build-system qt-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ; No test target + #:configure-flags (list "-DENABLE_UPDATE_CHECK=NO" + "-DENABLE_DAEMON=YES" + "-DENABLE_CONSOLE_UI=YES") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-cmake-error - (lambda _ - ;; This is fixed in commit efed2fd8 of the master branch. - (substitute* "CMakeLists.txt" - (("js)\\$\"") - "js$\"")) - #t)) - (add-after 'unpack 'set-version-string + (add-after 'unpack 'pre-configure (lambda _ - (substitute* "src/app/AppController.cpp" - (("LINPHONE_QT_GIT_VERSION") - (format #f "~s" ,version))) - #t)) - (add-after 'install 'extend-shared-resources - ;; Not using the FHS exposes an issue where the client refers to - ;; its own "share" directory, which lacks sound files installed by - ;; liblinphone. + (make-file-writable "linphone-app/linphoneqt_version.cmake") + (substitute* "linphone-app/linphoneqt_version.cmake" + (("\\$\\{GUIX-SET-VERSION\\}") ,version)))) + (add-after 'install 'post-install (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((liblinphone (assoc-ref inputs "linphone")) - (out (assoc-ref outputs "out"))) + (let* ((out (assoc-ref outputs "out")) + (liblinphone (assoc-ref inputs "liblinphone")) + (grammar-dest (string-append out "/share/belr/grammars"))) + ;; Remove unnecessary Qt configuration file. + (delete-file (string-append out "/bin/qt.conf")) + ;; Not using the FHS exposes an issue where the client + ;; refers to its own "share" directory, which lacks files + ;; installed by the dependencies. (symlink (string-append liblinphone "/share/sounds") (string-append out "/share/sounds")) - #t)))))) + (mkdir-p (dirname grammar-dest)) + (symlink (string-append liblinphone "/share/belr/grammars") + grammar-dest))))))) (native-inputs - `(("qttools" ,qttools))) + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools))) (inputs `(("bctoolbox" ,bctoolbox) ("belcard" ,belcard) - ("bellesip" ,belle-sip) - ("linphone" ,liblinphone) + ("belr" ,belr) + ("liblinphone" ,liblinphone) ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) @@ -875,8 +880,11 @@ and video calls or instant messaging capabilities to an application.") @item Audio codecs: opus, speex, g711, g729, gsm, iLBC, g722, SILK, etc. @item Video codecs: VP8, H.264 and H.265 with resolutions up to 1080P, MPEG4 @end itemize") - (home-page "https://gitlab.linphone.org/BC/public/linphone-desktop") - (license license:gpl2+))) + (home-page "https://linphone.org/technical-corner/linphone") + (license license:gpl3+))) + +(define-public linphoneqt + (deprecated-package "linphoneqt" linphone-desktop)) (define-public msopenh264 (package diff --git a/gnu/packages/patches/linphone-desktop-without-sdk.patch b/gnu/packages/patches/linphone-desktop-without-sdk.patch new file mode 100644 index 0000000000..63e9808bf4 --- /dev/null +++ b/gnu/packages/patches/linphone-desktop-without-sdk.patch @@ -0,0 +1,235 @@ +From cfdf6d1c2051d6a20d0cbb94d81fe398f70dea4d Mon Sep 17 00:00:00 2001 +From: Raghav Gururajan +Date: Sun, 21 Mar 2021 21:13:53 -0400 +Subject: [PATCH] [PATCH]: Fix building from git. + +--- + CMakeLists.txt | 73 +------------------ + linphone-app/CMakeLists.txt | 12 +-- + .../cmake_builder/additional_steps.cmake | 2 +- + .../linphone_package/CMakeLists.txt | 38 ---------- + linphone-app/linphoneqt_version.cmake | 1 + + linphone-app/src/config.h.cmake | 1 + + 6 files changed, 6 insertions(+), 121 deletions(-) + create mode 100644 linphone-app/linphoneqt_version.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f7eb05f2..3e853bdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -48,16 +48,6 @@ project(linphoneqt) + include(GNUInstallDirs) + include(CheckCXXCompilerFlag) + +-# Prepare gobal CMAKE configuration specific to the current project +-set(SDK_BUILD_DIR "${CMAKE_BINARY_DIR}/WORK") # SDK build in WORK. Keep all in it. +-set(LINPHONE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/linphone-sdk/desktop") +- +-set(APPLICATION_OUTPUT_DIR "${CMAKE_BINARY_DIR}/OUTPUT") +- +-set(CMAKE_PREFIX_PATH "${LINPHONE_OUTPUT_DIR};${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +-string(REPLACE ";" "|" PREFIX_PATH "${CMAKE_PREFIX_PATH}") +-#set(PREFIX_PATH "${LINPHONE_OUTPUT_DIR}|${APPLICATION_OUTPUT_DIR}${PREFIX_PATH}") +- + # Avoid cmake warning if CMP0071 is not set. + if (POLICY CMP0071) + cmake_policy(SET CMP0071 NEW) +@@ -116,9 +106,6 @@ if(ENABLE_V4L) + endif() + list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") + +-list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") +- +-include(ExternalProject) + set(PROJECT_BUILD_COMMAND "") + if(CMAKE_BUILD_PARALLEL_LEVEL) + list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") +@@ -133,32 +120,10 @@ if(CMAKE_VERBOSE_MAKEFILE) + endif() + endif() + if(UNIX AND NOT APPLE) +- set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") + list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") + endif() +-ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" +- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" +- STAMP_DIR "${SDK_BUILD_DIR}/stamp" +- BINARY_DIR "${SDK_BUILD_DIR}" +- STEP_TARGETS build +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- #BUILD_ALWAYS NO #${DO_BUILD} +-) +-ExternalProject_Add_Step(sdk force_build +- COMMENT "Forcing build for 'desktop'" +- DEPENDEES configure +- DEPENDERS build +- ALWAYS 1 +-) + include(FindPkgConfig) + +-set(APP_DEPENDS sdk) +- +- + find_package(Qt5 5.12 COMPONENTS Core REQUIRED) + + if ( NOT Qt5_FOUND ) +@@ -173,39 +138,5 @@ find_package(Mediastreamer2 CONFIG QUIET) + find_package(ortp CONFIG QUIET) + + +-if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) +- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") +- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- DEPENDS ${APP_DEPENDS} +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- # ${APP_OPTIONS} +- BUILD_ALWAYS ON +- ) +- install(CODE "message(STATUS Running install)") +- set(AUTO_REGENERATION auto_regeneration) +- add_custom_target(${AUTO_REGENERATION} ALL +- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} +- DEPENDS linphone-qt) +-else() +- message("Adding Linphone Desktop in an IDE-friendly state") +- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") +- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +- add_dependencies(app-library ${APP_DEPENDS}) +-endif() +-ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" +- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" +- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" +- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" +- BUILD_COMMAND ${CMAKE_COMMAND} --build --config $ ${PROJECT_BUILD_COMMAND} +-# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." +- LIST_SEPARATOR | # Use the alternate list separator +- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_PREFIX_PATH=${PREFIX_PATH} +- EXCLUDE_FROM_ALL ON +- BUILD_ALWAYS ON +-) ++message("Adding Linphone Desktop in an IDE-friendly state") ++add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) +diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt +index 3bc9420a..5267cd4a 100644 +--- a/linphone-app/CMakeLists.txt ++++ b/linphone-app/CMakeLists.txt +@@ -21,17 +21,8 @@ + ################################################################################ + cmake_minimum_required(VERSION 3.1) + ++include(linphoneqt_version.cmake) + find_package(bctoolbox CONFIG) +-set(FULL_VERSION ) +-bc_compute_full_version(FULL_VERSION) +-set(version_major ) +-set(version_minor ) +-set(version_patch ) +-set(identifiers ) +-set(metadata ) +-bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) +- +-project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") + + if(ENABLE_BUILD_VERBOSE) + #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") +@@ -49,7 +40,6 @@ if(UNIX AND NOT APPLE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") +-list(APPEND CMAKE_MODULE_PATH "${LINPHONE_OUTPUT_DIR}/cmake") + + set(APP_LIBRARY app-library) + include(application_info.cmake) +diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake +index 7f7fd573..48e3c716 100644 +--- a/linphone-app/cmake_builder/additional_steps.cmake ++++ b/linphone-app/cmake_builder/additional_steps.cmake +@@ -61,7 +61,7 @@ if (ENABLE_PACKAGING) + SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" + DOWNLOAD_COMMAND "" + CMAKE_GENERATOR ${CMAKE_GENERATOR} +- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} ++ CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} + ) + endif () + endif () +diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +index baea03cf..d06dcb74 100644 +--- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt ++++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +@@ -200,44 +200,6 @@ elseif (APPLE) + endif () + # install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_NAME}.app" DESTINATION "." USE_SOURCE_PERMISSIONS) + else()# Not Windows and Apple +- foreach (LIBRARY ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${LIBRARY} NAME) +- message("Changing RPATH of ${LIBRARY_FILENAME} from '${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}' to '$ORIGIN/../${CMAKE_INSTALL_LIBDIR}'") +- execute_process(COMMAND install_name_tool -rpath "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}" "$ORIGIN/../lib" "${LIBRARY}") +- execute_process(COMMAND install_name_tool -addrpath "$ORIGIN/../lib64" "${LIBRARY}") +- endforeach () +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_BINDIR}/" DESTINATION "${CMAKE_INSTALL_BINDIR}" USE_SOURCE_PERMISSIONS) +-#Just in case. This is useless because we have to use CMAKE_INSTALL_LIBDIR +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. this codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib") +- endif() +- if( EXISTS "${LINPHONE_OUTPUT_DIR}/lib64/") +- file(GLOB SHARED_LIBRARIES "${LINPHONE_OUTPUT_DIR}/lib64/*.so*") +- if( ENABLE_OPENH264 )# Remove openH264 lib from the installation. this codec will be download by user +- foreach(item ${SHARED_LIBRARIES}) +- get_filename_component(LIBRARY_FILENAME ${item} NAME) +- if("${LIBRARY_FILENAME}" MATCHES "^libopenh264.*$") +- list(REMOVE_ITEM SHARED_LIBRARIES ${item}) +- endif() +- endforeach(item) +- endif() +- install(FILES ${SHARED_LIBRARIES} DESTINATION "lib64") +- endif() +- install(DIRECTORY "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}" USE_SOURCE_PERMISSIONS) +- if(ENABLE_BUILD_VERBOSE) +- message("INSTALLATION : ${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_DATAROOTDIR}/" ) +- endif() +- file(GLOB PLUGINS_FILES "${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/mediastreamer/plugins/*") +- install(FILES ${PLUGINS_FILES} DESTINATION "plugins/mediastreamer/" ) + # Install desktop/icon files. + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../../assets/linphone.desktop.cmake" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") +diff --git a/linphone-app/linphoneqt_version.cmake b/linphone-app/linphoneqt_version.cmake +new file mode 100644 +index 00000000..a85d3455 +--- /dev/null ++++ b/linphone-app/linphoneqt_version.cmake +@@ -0,0 +1 @@ ++project(linphoneqt VERSION ${GUIX-SET-VERSION}) +\ No newline at end of file +diff --git a/linphone-app/src/config.h.cmake b/linphone-app/src/config.h.cmake +index 093539e0..5a238c70 100644 +--- a/linphone-app/src/config.h.cmake ++++ b/linphone-app/src/config.h.cmake +@@ -28,3 +28,4 @@ + #cmakedefine ENABLE_UPDATE_CHECK 1 + #cmakedefine EXECUTABLE_NAME "${EXECUTABLE_NAME}" + #cmakedefine MSPLUGINS_DIR "${MSPLUGINS_DIR}" ++#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}" +\ No newline at end of file +-- +2.31.0 + diff --git a/gnu/packages/patches/linphoneqt-tabbutton.patch b/gnu/packages/patches/linphoneqt-tabbutton.patch deleted file mode 100644 index 6b3214026e..0000000000 --- a/gnu/packages/patches/linphoneqt-tabbutton.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ecaab0f73d0b74bbfbf150286305fa6e12970037 Mon Sep 17 00:00:00 2001 -From: Ronan Abhamon -Date: Fri, 19 Jan 2018 14:42:01 +0100 -Subject: [PATCH] fix(SettingsWindow): rename icon property of TabButton to - iconName (issue with Qt 5.10 and new icon property) - ---- - ui/modules/Common/Form/Tab/TabButton.qml | 8 ++++---- - ui/views/App/Settings/SettingsWindow.qml | 14 +++++++------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/ui/modules/Common/Form/Tab/TabButton.qml b/ui/modules/Common/Form/Tab/TabButton.qml -index ad220ab2..a47bb20b 100644 ---- a/ui/modules/Common/Form/Tab/TabButton.qml -+++ b/ui/modules/Common/Form/Tab/TabButton.qml -@@ -12,8 +12,8 @@ Controls.TabButton { - - // --------------------------------------------------------------------------- - -- property string icon - property int iconSize: TabButtonStyle.icon.size -+ property string iconName - - readonly property bool _isSelected: parent.parent.currentItem === button - -@@ -66,9 +66,9 @@ Controls.TabButton { - Layout.leftMargin: TabButtonStyle.text.leftPadding - - icon: { -- var icon = button.icon -- return icon.length -- ? (icon + '_' + (button._isSelected ? 'selected' : 'normal')) -+ var iconName = button.iconName -+ return iconName.length -+ ? (iconName + '_' + (button._isSelected ? 'selected' : 'normal')) - : '' - } - iconSize: button.iconSize -diff --git a/ui/views/App/Settings/SettingsWindow.qml b/ui/views/App/Settings/SettingsWindow.qml -index b8f5a80f..58909544 100644 ---- a/ui/views/App/Settings/SettingsWindow.qml -+++ b/ui/views/App/Settings/SettingsWindow.qml -@@ -48,43 +48,43 @@ ApplicationWindow { - id: tabBar - - TabButton { -- icon: 'settings_sip_accounts' -+ iconName: 'settings_sip_accounts' - text: qsTr('sipAccountsTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_audio' -+ iconName: 'settings_audio' - text: qsTr('audioTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_video' -+ iconName: 'settings_video' - text: qsTr('videoTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_call' -+ iconName: 'settings_call' - text: qsTr('callsAndChatTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_network' -+ iconName: 'settings_network' - text: qsTr('networkTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiTab') - width: implicitWidth - } - - TabButton { -- icon: 'settings_advanced' -+ iconName: 'settings_advanced' - text: qsTr('uiAdvanced') - width: implicitWidth - } --- -2.21.0 - -- cgit 1.4.1 From f7408b7d2983825e7afb6b4166088a8f6dda6f70 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:21:12 -0400 Subject: gnu: msopenh264: Update to 1.2.1-21. * gnu/packages/linphone.scm (msopenh264) [source]: Switch to git repository. [version]: Update to 1.2.1. [patches]: Remove field. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 7337e0ef1e..5b5c57b357 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -887,44 +887,35 @@ and video calls or instant messaging capabilities to an application.") (deprecated-package "linphoneqt" linphone-desktop)) (define-public msopenh264 - (package - (name "msopenh264") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8")) - (patches - (list - ;; For support for OpenH264 version >= 2. - (origin - (method url-fetch) - (uri - (string-append "https://gitlab.linphone.org/BC/public/msopenh264/" - "commit/493d147d28c9a0f788ba4e50b47a1ce7b18bf326" - ".diff")) - (file-name "msopenh264-openh264.patch") - (sha256 - (base32 - "0mmd7nz5n9ian4rcwn200nldmy5j0dpdrna7r32rqnaw82bx3kdb"))))))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("openh264" ,openh264) - ("ortp" ,ortp))) - (synopsis "Media Streamer H.264 Codec") - (description "MsOpenH264 is an H.264 encoder/decoder plugin for -mediastreamer2 based on the openh264 library.") - (home-page "https://gitlab.linphone.org/BC/public/msopenh264") - (license license:gpl2+))) + (let ((commit "88697cc95140017760d6da408cb0efdc5e86e40a") + (revision "0")) + (package + (name "msopenh264") + (version (git-version "1.2.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/msopenh264.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10y3b6s934f2wbsf60b3p0g6hffizjqrj5in8l4sida2fjdxlwwy")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("openh264" ,openh264) + ("ortp" ,ortp))) + (synopsis "Media Streamer H.264 Codec") + (description "MsOpenH264 is an H.264 encoder/decoder plugin for + mediastreamer2 based on the openh264 library.") + (home-page "https://gitlab.linphone.org/BC/public/msopenh264") + (license license:gpl2+)))) (define-public mssilk (package -- cgit 1.4.1 From c4577a406f40798f0c5a37b5cb957befc61591ec Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 22:33:38 -0400 Subject: gnu: mssilk: Update to 1.1.1-8. * gnu/packages/linphone.scm (mssilk) [source]: Switch to git repository. [version]: Update to 1.1.1-8. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 50 +++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 5b5c57b357..03fcfdc6d4 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -918,30 +918,34 @@ and video calls or instant messaging capabilities to an application.") (license license:gpl2+)))) (define-public mssilk - (package - (name "mssilk") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "07ip0vd29d1n98lnqs5wpimcsmpm65yl7g5vk4hbqghcbsjw94lj")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer SILK Codec") - (description "MSSILK is a plugin of MediaStreamer, adding support for AMR + (let ((commit "dd0f31ee795faa7ea89e601b072dae4cd1df7e3f") + (revision "0")) + (package + (name "mssilk") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mssilk.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dann5fnzqp6wjlwc6bl2k9b6rvn6bznqb3qsi1kgv9dnq44cbr0")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO"))) ; Not required + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer SILK Codec") + (description "MSSILK is a plugin of MediaStreamer, adding support for AMR codec. It is based on the Skype's SILK implementation.") - (home-page "https://gitlab.linphone.org/BC/public/mssilk") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mssilk") + (license license:gpl2+)))) (define-public mswebrtc (package -- cgit 1.4.1 From f2ae919ca9837775fcbe266788386a1c5f6f6a2d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 19 Mar 2021 23:51:32 -0400 Subject: gnu: mswebrtc: Update to 1.1.1-23. * gnu/packages/linphone.scm (mswebrtc) [source]: Switch to git repository. [version]: Update to 1.1.1-23. [arguments]<#:phases>['copy-inputs]: New phase. [native-inputs]: Add webrtc and python-wrapper. --- gnu/packages/linphone.scm | 75 +++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 03fcfdc6d4..354140d64f 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -948,32 +948,57 @@ codec. It is based on the Skype's SILK implementation.") (license license:gpl2+)))) (define-public mswebrtc - (package - (name "mswebrtc") - (version "1.1.1") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "1wj28hl9myhshqmn64xg0jf07aw75gmnilb5rff6rcbdxim87mqr")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list - "-DENABLE_STATIC=NO"))) ; Not required - (inputs - `(("bctoolbox" ,bctoolbox) - ("mediastreamer2" ,mediastreamer2) - ("ortp" ,ortp))) - (synopsis "Media Streamer WebRTC Codec") - (description "MSWebRTC is a plugin of MediaStreamer, adding support for + (let ((commit "946ca706733f36a6b4923f04e569531125462d1d") + (revision "0")) + (package + (name "mswebrtc") + (version (git-version "1.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/mswebrtc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pfg9m6bpbv0f53nx72rdxhlyriax9pg4yj0gpwq8ha6lqnpwg1x")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list + "-DENABLE_STATIC=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'copy-inputs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((webrtc-from (assoc-ref inputs "webrtc")) + (webrtc-to (string-append (getcwd) "/webrtc"))) + (copy-recursively webrtc-from webrtc-to)) + #t))))) + (native-inputs + `(("webrtc" + ,(origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.linphone.org/BC/public/external/webrtc") + (commit "583acd27665cfadef8ab03eb85a768d308bd29dd"))) + (file-name + (git-file-name "webrtc-for-mswebrtc" version)) + (sha256 + (base32 + "1maqychrgwy0z4zypa03qp726l2finw64z6cymdzhd58ql3p1lvm")))) + ("python" ,python-wrapper))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("ortp" ,ortp))) + (synopsis "Media Streamer WebRTC Codec") + (description "MSWebRTC is a plugin of MediaStreamer, adding support for WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.") - (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") - (license license:gpl2+))) + (home-page "https://gitlab.linphone.org/BC/public/mswebrtc") + (license license:gpl2+)))) (define-public msamr (package -- cgit 1.4.1 From a99932503ebcc8190034de8489f9d2036cd453f6 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 20 Mar 2021 00:01:26 -0400 Subject: gnu: msamr: Update to 1.1.3-11. * gnu/packages/linphone.scm (msamr) [source]: Switch to git repository. [version]: Update to 1.1.3-11. [inputs]: Add bctoolbox. --- gnu/packages/linphone.scm | 56 +++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 354140d64f..2107560aa0 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -1001,30 +1001,34 @@ WebRTC codec. It includes features from WebRTC, such as, iSAC and AECM.") (license license:gpl2+)))) (define-public msamr - (package - (name "msamr") - (version "1.1.3") - (source - (origin - (method url-fetch) - (uri - (string-append "https://www.linphone.org/releases/sources/plugins/" - name "/" name "-" version ".tar.gz")) - (sha256 - (base32 "16c9f3z4wnj73k7y8gb0fgpr4axsm7b5zrbjvy8vsgz9gyg3agm5")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; No test target - #:configure-flags - (list "-DENABLE_STATIC=NO" ; Not required - "-DENABLE_WIDEBAND=YES"))) - (inputs - `(("mediastreamer2" ,mediastreamer2) - ("opencoreamr" ,opencore-amr) - ("ortp" ,ortp) - ("voamrwbenc" ,vo-amrwbenc))) - (synopsis "Media Streamer AMR Codec") - (description "MSAMR is a plugin of MediaStreamer, adding support for AMR + (let ((commit "5ab5c098299107048dfcbfc741f7392faef167bd") + (revision "0")) + (package + (name "msamr") + (version (git-version "1.1.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.linphone.org/BC/public/msamr") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1g79lw1qi1mlw3v1b0cixmqiwjql81gz9naakb15n8pvaag9aaqm")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test target + #:configure-flags + (list "-DENABLE_STATIC=NO" ; Not required + "-DENABLE_WIDEBAND=YES"))) + (inputs + `(("bctoolbox" ,bctoolbox) + ("mediastreamer2" ,mediastreamer2) + ("opencoreamr" ,opencore-amr) + ("ortp" ,ortp) + ("voamrwbenc" ,vo-amrwbenc))) + (synopsis "Media Streamer AMR Codec") + (description "MSAMR is a plugin of MediaStreamer, adding support for AMR codec. It is based on the opencore-amr implementation.") - (home-page "https://gitlab.linphone.org/BC/public/msamr") - (license license:gpl3+))) + (home-page "https://gitlab.linphone.org/BC/public/msamr") + (license license:gpl3+)))) -- cgit 1.4.1 From 5a4d0a653146442f9a17ebf1485dd89e8ab84dc4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 09:26:10 +0300 Subject: gnu: wavpack: Update to 5.4.0. * gnu/packages/audio.scm (wavpack): Update to 5.4.0. [source]: Download release tarball. [arguments]: Remove custom 'boostrap phase. [native-inputs]: Remove autoconf, automake, libtool. --- gnu/packages/audio.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 29ef0266ce..badeecd7b0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3259,31 +3259,18 @@ stretching and pitch scaling of audio. This package contains the library.") (define-public wavpack (package (name "wavpack") - (version "5.3.2") + (version "5.4.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dbry/WavPack") - (commit "e4e8d191e8dd74cbdbeaef3232c16a7ef517e68d"))) + (method url-fetch) + (uri (string-append "https://github.com/dbry/WavPack/releases/download/" + version "/wavpack-" version ".tar.xz")) (sha256 - (base32 "1zj8svk6giy1abq3940sz32ygz7zldppxl47852zgn5wfm3l2spx")) - (file-name (git-file-name name version)))) + (base32 "0ycbqarw25x7208jilh86vwwiqklr7f617jps9mllqc659mnmpjb")))) (build-system gnu-build-system) (arguments '(#:configure-flags - (list "--disable-static") - #:phases - (modify-phases %standard-phases - (replace 'bootstrap - ;; Running ./autogen.sh would cause premature configuration. - (lambda _ - (invoke "autoreconf" "-vif") - #t))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) + (list "--disable-static"))) (home-page "https://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description -- cgit 1.4.1 From d97030358923bc5b281a95c34a83cb10b9106977 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 10:38:25 +0300 Subject: gnu: wavpack: Enable test suite. * gnu/packages/audio.scm (wavpack)[arguments]: Add configure-flag to build test program. Use custom 'check phase to run test suite. --- gnu/packages/audio.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index badeecd7b0..32ca4d65e8 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3270,7 +3270,15 @@ stretching and pitch scaling of audio. This package contains the library.") (build-system gnu-build-system) (arguments '(#:configure-flags - (list "--disable-static"))) + (list "--disable-static" + "--enable-tests") + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./cli/wvtest" "--default" "--short")) + #t))))) (home-page "https://www.wavpack.com/") (synopsis "Hybrid lossless audio codec") (description -- cgit 1.4.1 From 8e3944f857ccbd5db32b58efa81b02ed76da5e66 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 10:56:02 +0200 Subject: gnu: fetchmail: Update to 6.4.18. * gnu/packages/mail.scm (fetchmail): Update to 6.4.18. Signed-off-by: Efraim Flashner --- 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 3e0ce99457..68c2fe2433 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -446,7 +446,7 @@ to run without any changes.") (define-public fetchmail (package (name "fetchmail") - (version "6.4.17") + (version "6.4.18") (source (origin (method url-fetch) @@ -454,7 +454,7 @@ to run without any changes.") (version-major+minor version) "/" "fetchmail-" version ".tar.xz")) (sha256 - (base32 "1ijh9l7pg2yk5s5h1yj3vpd1az31giqy9bjrna10daj13gqws6x4")))) + (base32 "17r5zfk9yh7jhgdb360dlzx5fx9lsbmalasx6zgxw9v9vjycjb9h")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) -- cgit 1.4.1 From 18b26a437cc95fa6818d0706344619f5418abb2d Mon Sep 17 00:00:00 2001 From: la snesne Date: Sun, 28 Mar 2021 18:05:08 +0900 Subject: gnu: krita: Update to 4.4.3. * gnu/packages/kde.scm (krita): Update to 4.4.3. Signed-off-by: Efraim Flashner --- gnu/packages/kde.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 213def42e3..4a989b32dd 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Prafulla Giri ;;; Copyright © 2020 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandros Theodotou +;;; Copyright © 2021 la snesne ;;; ;;; This file is part of GNU Guix. ;;; @@ -458,7 +459,7 @@ illustrate project schedules.") (define-public krita (package (name "krita") - (version "4.4.2") + (version "4.4.3") (source (origin (method url-fetch) (uri (string-append @@ -466,7 +467,7 @@ illustrate project schedules.") "/krita-" version ".tar.gz")) (sha256 (base32 - "14lprcv7xw6r19bmylcz4c1p1jfazmza2b4m48f3x7vmdv2sx5ln")))) + "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl")))) (build-system cmake-build-system) (arguments `(#:tests? #f -- cgit 1.4.1 From f9c507bbcc48a791433e283b3233cc9ed6754ea1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:23:04 +0000 Subject: gnu: Add cl-bodge-utilities. * gnu/packages/lisp-xyz.scm: (sbcl-bodge-utilities, cl-bodge-utilities, ecl-bodge-utilities): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d4bf75b231..673e3e82e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -120,6 +120,45 @@ portable between implementations.") (define-public ecl-alexandria (sbcl-package->ecl-package sbcl-alexandria)) +(define-public sbcl-bodge-utilities + (let ((commit "6304bac4abe06d53579e2c0fc4437d14ff077d9f") + (revision "1")) + (package + (name "sbcl-bodge-utilities") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/bodge-utilities") + (commit commit))) + (file-name (git-file-name "bodge-utilities" version)) + (sha256 + (base32 "1z1blj05q71vzh323qwyn9p3xs7v0mq2yhwfyzza5libp37wqm3c")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("claw" ,sbcl-claw) + ("dissect" ,sbcl-dissect) + ("local-time" ,sbcl-local-time) + ("log4cl" ,sbcl-log4cl) + ("split-sequence" ,sbcl-split-sequence) + ("static-vectors" ,sbcl-static-vectors) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (home-page "https://github.com/borodust/bodge-utilities") + (synopsis "Common Lisp utilities library for CL-BODGE") + (description + "This Common Lisp library provides utilities for the @emph{Bodge} library +collection.") + (license license:expat)))) + +(define-public ecl-bodge-utilities + (sbcl-package->ecl-package sbcl-bodge-utilities)) + +(define-public cl-bodge-utilities + (sbcl-package->cl-source-package sbcl-bodge-utilities)) + (define-public sbcl-golden-utils (let ((commit "9424419d867d5c2f819196ee41667a818a5058e7") (revision "1")) -- cgit 1.4.1 From 4f4ea0824000445f9d891fd519d4f2c3a47b7a90 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:15:24 +0000 Subject: gnu: Add cl-rtg-math. * gnu/packages/lisp-xyz.scm: (sbcl-rtg-math, cl-rtg-math, ecl-rtg-math): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 673e3e82e9..462e842171 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2929,6 +2929,39 @@ from GLSL as data.") (define-public cl-glsl-spec (sbcl-package->cl-source-package sbcl-glsl-spec)) +(define-public sbcl-rtg-math + (let ((commit "29fc5b3d0028a4a11a82355ecc8cca62662c69e0") + (revision "1")) + (package + (name "sbcl-rtg-math") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cbaggers/rtg-math") + (commit commit))) + (file-name (git-file-name "rtg-math" version)) + (sha256 + (base32 "0bhxxnv7ldkkb18zdxyz2rj2a3iawzq2kcp7cn5i91iby7n0082x")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("documentation-utils" ,sbcl-documentation-utils) + ("glsl-symbols" ,sbcl-glsl-spec))) + (home-page "https://github.com/cbaggers/rtg-math") + (synopsis "Common Lisp library of game-related math functions") + (description + "RTG-MATH provides a selection of the math routines most commonly needed +for making realtime graphics in Lisp.") + (license license:bsd-2)))) + +(define-public ecl-rtg-math + (sbcl-package->ecl-package sbcl-rtg-math)) + +(define-public cl-rtg-math + (sbcl-package->cl-source-package sbcl-rtg-math)) + (define-public sbcl-varjo (let ((commit "9e77f30220053155d2ef8870ceba157f75e538d4") (revision "1")) -- cgit 1.4.1 From 96df3fe765cc5dda3b31d4cbe29ed3ba9cf3d254 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 26 Mar 2021 23:28:27 +0000 Subject: gnu: Add cl-bodge-math. * gnu/packages/lisp-xyz.scm: (sbcl-bodge-math, cl-bodge-math, ecl-bodge-math): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 462e842171..ab258efdfd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15484,3 +15484,35 @@ immediately loaded.") (define-public cl-quickproject (sbcl-package->cl-source-package sbcl-quickproject)) + +(define-public sbcl-bodge-math + (let ((commit "9159b7faf88d440024c07110dbef2abddb20b9af") + (revision "1")) + (package + (name "sbcl-bodge-math") + (version (git-version "1.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borodust/bodge-math") + (commit commit))) + (file-name (git-file-name "bodge-math" version)) + (sha256 + (base32 "0r3vnl9lywn4ksy34apcv6j825qp7l1naddawr14v4lwacndb80v")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("bodge-utilities" ,sbcl-bodge-utilities) + ("rtg-math" ,sbcl-rtg-math))) + (home-page "https://github.com/borodust/bodge-math") + (synopsis "Common Lisp core math utilities of BODGE library collection") + (description + "This Common Lisp package contains the core math utilities of the +@emph{Bodge} library collection.") + (license license:expat)))) + +(define-public ecl-bodge-math + (sbcl-package->ecl-package sbcl-bodge-math)) + +(define-public cl-bodge-math + (sbcl-package->cl-source-package sbcl-bodge-math)) -- cgit 1.4.1 From fba2fa7ed842a6f75abe12058003bf853e0e9f52 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 29 Mar 2021 10:35:44 +0200 Subject: gnu: sbcl: Update to 2.1.3. * gnu/packages/lisp.scm (sbcl): Update to 2.1.3. --- 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 29b32956db..3704d226fe 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -400,14 +400,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.1.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "02scrqyp2izsd8xjm2k5j5lhn4pdhd202jlcb54ysmcqjd80awdp")))) + (base32 "1h6s3as8m72ik971zy7a8j1kqfyy5gzpv9ksy09ixv65a10ll3d9")))) (build-system gnu-build-system) (outputs '("out" "doc")) (native-inputs -- cgit 1.4.1 From 109f13c0981b8134c98a2326f22cc837ec523712 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:18 +0200 Subject: gnu: libspatialite: Update dependencies. * gnu/packages/geo.scm (libspatialite, spatialite-tools): Update dependencies. [inputs]: Replace proj.4 with proj and remove zlib which is not used anymore since libspatialite started using minizip. (libspatialite)[arguments]: Fix regex to not disable more tests than necessary. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 97fa83b86b..8c98534a4a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -442,9 +442,8 @@ writing GeoTIFF information tags.") ("librttopo" ,librttopo) ("libxml2" ,libxml2) ("minizip" ,minizip) - ("proj.4" ,proj.4) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) + ("proj" ,proj) + ("sqlite" ,sqlite))) (arguments `(#:configure-flags '("--enable-rttopo=yes") @@ -454,7 +453,7 @@ writing GeoTIFF information tags.") (add-after 'unpack 'ignore-broken-tests (lambda _ (substitute* '("test/Makefile.in") - (("\tcheck_sql_stm.*" all) "\tcheck_multithread$(EXEEXT) \\\n") + (("\tcheck_sql_stmt.* (check_sql_.*)" all tiny) (string-append "\t" tiny)) (("(\tch.*) check_v.*ble2.*$" all vt1) (string-append vt1 " \\\n")) (("\tch.* (check_v.*ble4.*)$" all vt4) (string-append "\t" vt4))) #t))))) @@ -1748,10 +1747,9 @@ associated attribute file (@file{.dbf}).") ("libspatialite" ,libspatialite) ("libxml2" ,libxml2) ("minizip" ,minizip) - ("proj.4" ,proj.4) + ("proj" ,proj) ("readosm" ,readosm) - ("sqlite" ,sqlite) - ("zlib" ,zlib))) + ("sqlite" ,sqlite))) (synopsis "Collection of command line tools for SpatiaLite") (description "@code{spatialite-tools} is a collection of Command Line Interface (CLI) -- cgit 1.4.1 From 5d32fa526d9d054f21fa3a40b7cb3e3cf468e4b9 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:19 +0200 Subject: gnu: Add libxlsxwriter. * gnu/packages/xml.scm (libxlsxwriter): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/xml.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index defc0323e6..130fe45995 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -29,6 +29,8 @@ ;;; Copyright © 2021 Michael Rohleder ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller +;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -77,6 +79,7 @@ #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix utils) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config)) @@ -215,6 +218,49 @@ hierarchical form with variable field lengths.") project (but it is usable outside of the Gnome platform).") (license license:x11))) +(define-public libxlsxwriter + (package + (name "libxlsxwriter") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jmcnamara/libxlsxwriter") + (commit (string-append "RELEASE_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "070pfqggia71z4ichr5yrwfndfz903z941ns72vy0lvb1mpp7g05")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled minizip source + '(begin + (delete-file-recursively "third_party/minizip") + #t)))) + (build-system gnu-build-system) + (arguments + `(#:test-target "test" + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "USE_STANDARD_TMPFILE=1" + "USE_SYSTEM_MINIZIP=1") + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + `(("minizip" ,minizip))) + (home-page "https://github.com/jmcnamara/libxlsxwriter") + (synopsis "C library for creating Excel XLSX files") + (description + "Libxlsxwriter is a C library that can be used to write text, numbers, +formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.") + (license (list license:bsd-2 + license:public-domain)))) ; third_party/md5 + ;; This is the latest stable release. (define-public libxmlplusplus (package -- cgit 1.4.1 From 3eb14c28d57e1e2c1a23e3d3a36e1091e10d5813 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:21 +0200 Subject: gnu: Add librasterlite2. * gnu/packages/geo.scm (librasterlite2): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8c98534a4a..d43b1a4e56 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -373,6 +373,63 @@ writing GeoTIFF information tags.") (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution."))))) +(define-public librasterlite2 + (package + (name "librasterlite2") + (version "1.1.0-beta1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://www.gaia-gis.it/gaia-sins/librasterlite2-sources/" + "librasterlite2-" version ".tar.gz")) + (sha256 + (base32 + "1x24gqp4hsq97c31ncwxblab0x0863q8v1z42jil7lvsq3glqa7p")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("curl" ,curl) + ("freetype" ,freetype) + ("freexl" ,freexl) + ("giflib" ,giflib) + ("libgeotiff" ,libgeotiff) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libpng" ,libpng) + ("librttopo" ,librttopo) + ("libspatialite" ,libspatialite) + ("libtiff" ,libtiff) + ("libwebp" ,libwebp) + ("libxml2" ,libxml2) + ("lz4" ,lz4) + ("minizip" ,minizip) + ("openjpeg" ,openjpeg) + ("proj" ,proj) + ("sqlite" ,sqlite) + ("zstd" ,zstd "lib"))) + (synopsis "Library to work with huge raster coverages using a SpatiaLite") + (description + "librasterlite2 is a library that stores and retrieves huge raster +coverages using a SpatiaLite DBMS.") + (home-page "https://www.gaia-gis.it/fossil/librasterlite2/index") + ;; For the genuine librasterlite-sources holds: + ;; Any of the licenses MPL1.1, GPL2+ or LGPL2.1+ may be picked. + ;; Files under src/control_points are from GRASS + ;; and are licensed under GPL2+ only. + ;; src/md5.[ch]: Placed into the public domain by Alexander Peslyak. + ;; The tools supporting the library (both rl2tool and wmslite) are + ;; licensed under the GPL v3 (or any subsequent version) terms. + ;; The test/*.svg files are placed in the public domain, except for + ;; test/Car_Yellow.svg which is licensed under the Free Art License 1.3. + (license (list license:gpl2+ + license:gpl3+ + license:lal1.3 + license:lgpl2.1+ + license:mpl1.1 + license:public-domain)))) + (define-public librttopo (package (name "librttopo") -- cgit 1.4.1 From 9bd2478e2ccca3da2edc74670bc4bf878cbb4f70 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:22 +0200 Subject: gnu: spatialite-gui: Update to 2.1.0-beta1. * gnu/packages/geo.scm (spatialite-gui): Update to 2.1.0-beta1. [inputs]: Replace proj.4 with proj and wxwidgets-2 with wxwidgets. Add curl, giflib, librasterlite2, librttopo, libwebp, libxlsxwriter, lz4, minizip, openjpeg, postgresql, virtualpg, zstd. Remove libgaiagraphics and zlib. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d43b1a4e56..a2f274b379 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -742,29 +742,39 @@ development.") (define-public spatialite-gui (package (name "spatialite-gui") - (version "1.7.1") + (version "2.1.0-beta1") (source (origin (method url-fetch) - (uri (string-append "https://www.gaia-gis.it/gaia-sins/spatialite_gui-" - version ".tar.gz")) + (uri (string-append + "https://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/" + "spatialite_gui-" version ".tar.gz")) (sha256 - (base32 - "1r05dz9pyc8vsd2wbqxcsracpfbaamz470rcyp2myfpqwznv376b")))) + (base32 "0cyv4cycl073p9lnnnglcb72qn71g8h9g5zn4gzw7swcy5nxjj5s")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("freexl" ,freexl) + `(("curl" ,curl) + ("freexl" ,freexl) ("geos" ,geos) - ("libgaiagraphics" ,libgaiagraphics) + ("giflib" ,giflib) ("libjpeg-turbo" ,libjpeg-turbo) + ("librasterlite2" ,librasterlite2) + ("librttopo" ,librttopo) ("libspatialite" ,libspatialite) + ("libwebp" ,libwebp) + ("libxlsxwriter" ,libxlsxwriter) ("libxml2" ,libxml2) - ("proj.4" ,proj.4) + ("lz4" ,lz4) + ("minizip" ,minizip) + ("openjpeg" ,openjpeg) + ("postgresql" ,postgresql) + ("proj" ,proj) ("sqlite" ,sqlite) - ("wxwidgets" ,wxwidgets-2) - ("zlib" ,zlib))) + ("virtualpg" ,virtualpg) + ("wxwidgets" ,wxwidgets) + ("zstd" ,zstd "lib"))) (arguments `(#:phases (modify-phases %standard-phases (add-after 'unpack 'fix-gui -- cgit 1.4.1 From 46884fc4dfb6647583c22e2c17cf92acf4b13670 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sun, 28 Mar 2021 10:40:23 +0200 Subject: gnu: libgaiagraphics: Remove package. The libgaiagraphics package was deprecated upstream in 2014 in favor of librasterlite2 and after the update of spatialite-gui there are no more packages that depend on it. * gnu/packages/geo.scm (libgaiagraphics): Remove variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a2f274b379..be05fbe711 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -294,36 +294,6 @@ and driving.") (home-page "https://wiki.gnome.org/Apps/Maps") (license license:gpl2+))) -(define-public libgaiagraphics - (package - (name "libgaiagraphics") - (version "0.5") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.gaia-gis.it/gaia-sins/libgaiagraphics-" - version ".tar.gz")) - (sha256 - (base32 - "076afqv417ag3hfvnif0qc7qscmnq1dsf6y431yygwgf34rjkayc")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("cairo" ,cairo) - ("libpng" ,libpng) - ("libjpeg-turbo" ,libjpeg-turbo) - ("libtiff" ,libtiff) - ("libgeotiff" ,libgeotiff) - ("proj.4" ,proj.4) - ("libxml2" ,libxml2) - ("zlib" ,zlib))) - (synopsis "Gaia common graphics support") - (description "libgaiagraphics is a library supporting - common-utility raster handling methods.") - (home-page "https://www.gaia-gis.it/fossil/libgaiagraphics/index") - (license license:lgpl3+))) - (define-public libgeotiff (package (name "libgeotiff") -- cgit 1.4.1 From 7c9016bbadee306d1d470a1b44fc2b640842281e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 29 Mar 2021 13:33:18 +0200 Subject: gnu: sbcl-ironclad: Update to 0.55. * gnu/packages/lisp-xyz.scm (sbcl-ironclad): Update to 0.55. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ab258efdfd..1e6880f90f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -2094,7 +2094,7 @@ also be supported.") (define-public sbcl-ironclad (package (name "sbcl-ironclad") - (version "0.54") + (version "0.55") (source (origin (method git-fetch) @@ -2102,7 +2102,7 @@ also be supported.") (url "https://github.com/sharplispers/ironclad/") (commit (string-append "v" version)))) (sha256 - (base32 "07g0wpvfqq2yk23prs890d4qvbnr3xd6w8ssd88g89xdg483wpvk")) + (base32 "1w4slnc4143w1gcff1wxsivzb8kcji0bpd7y9rld3sabay0qprwl")) (file-name (git-file-name name version)))) (build-system asdf-build-system/sbcl) (native-inputs -- cgit 1.4.1 From b53e7ae6b0307f88192b291a62509e65fc57e377 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:46:34 +0300 Subject: gnu: python-dropbox: Update to 11.5.0. * gnu/packages/file-systems.scm (python-dropbox): Update to 11.5.0. --- 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 9877e5c433..d7c34cd188 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1083,14 +1083,14 @@ compatible directories.") (define-public python-dropbox (package (name "python-dropbox") - (version "11.2.0") + (version "11.5.0") (source (origin (method url-fetch) (uri (pypi-uri "dropbox" version)) (sha256 (base32 - "0ml6z37k6nkhkiy483kvifs8im8z7vabd2g9jl6fkf1fzy3n6bym")))) + "16bxx9xqx2s4d9khrw57a0bj4q7nc6kq355wl4pfddn9cqvh9rg2")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; Tests require a network connection. (native-inputs -- cgit 1.4.1 From bece1445b80a7b22724aea5a1a281de53e5d7f8f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:47:18 +0300 Subject: gnu: python-pytest-flake8: Update to 1.0.7. * gnu/packages/python-check.scm (python-pytest-flake8): Update to 1.0.7. --- gnu/packages/python-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 2f449bf0eb..7f27966796 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -627,14 +627,14 @@ friendly library for concurrency and async I/O in Python.") (define-public python-pytest-flake8 (package (name "python-pytest-flake8") - (version "1.0.6") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "pytest-flake8" version)) (sha256 (base32 - "09vhn7r77s1yiqnlwfvh5585f904zpyd6620a90dpccfr1cbp0hv")))) + "0syx68xk5ss3hgp3nr2y122w0fgkzr5936ghsqrkymh3m5hrf9gh")))) (build-system python-build-system) (propagated-inputs `(("python-flake8" ,python-flake8))) -- cgit 1.4.1 From 2ccf9216456178ac837dcb6cd1ab9b5381ff6710 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:47:52 +0300 Subject: gnu: python-backcall: Update to 0.2.0. * gnu/packages/python-xyz.scm (python-backcall): Update to 0.2.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9f57992fdd..e6d8f7cd18 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7380,14 +7380,14 @@ installing @code{kernelspec}s for use with Jupyter frontends.") (define-public python-backcall (package (name "python-backcall") - (version "0.1.0") + (version "0.2.0") (source (origin (method url-fetch) (uri (pypi-uri "backcall" version)) (sha256 (base32 - "1r01dqch3f8fdj3n6fviw8hxqrs6w5v0qw4izmvqzry1w9dxiv1q")))) + "07jy4562lvnhkk6kfr3cphmizy88anlhmbwb8kdzlz2ypqkvzgaw")))) (build-system python-build-system) (home-page "https://github.com/takluyver/backcall/") (synopsis "Specifications for callback functions passed in to an API") -- cgit 1.4.1 From c4b3747ddfbab45c991f63d0e328d7e948393b0f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:48:17 +0300 Subject: gnu: python-astor: Update to 0.8.1. * gnu/packages/python-xyz.scm (python-astor): Update to 0.8.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e6d8f7cd18..d15c70a77c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20472,14 +20472,14 @@ of Python libraries for building Python applications.") (define-public python-astor (package (name "python-astor") - (version "0.7.1") + (version "0.8.1") (source (origin (method url-fetch) (uri (pypi-uri "astor" version)) (sha256 (base32 - "13gv6f2xz9i564byp21gcpc0l3w4cs23k1wbcam8kky2ls3hvhwm")))) + "0ppscdzzvxpznclkmhhj53iz314x3pfv4yc7c6gwxqgljgdgyvka")))) (build-system python-build-system) ;; FIXME: There are two errors and two test failures. (arguments `(#:tests? #f)) -- cgit 1.4.1 From 07481fec26717bd60956bb1aa2d5ccabdab0b42f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:56:30 +0300 Subject: gnu: python-tornado: Update to 6.1. * gnu/packages/python-web.scm (python-tornado): Update to 6.1. --- 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 21af15b0a9..c7dd18ad19 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1688,14 +1688,14 @@ connection to each user.") (define-public python-tornado-6 (package (name "python-tornado") - (version "6.0.4") + (version "6.1") (source (origin (method url-fetch) (uri (pypi-uri "tornado" version)) (sha256 (base32 - "1p5n7sw4580pkybywg93p8ddqdj9lhhy72rzswfa801vlidx9qhg")))) + "14cpzdv6p6qvk6vn02krdh5rcfdi174ifdbr5s6lcnymgcfyiiik")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 01cf99af9ccd4977fd46549b99172299814cdc6a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:56:58 +0300 Subject: gnu: python-pycodestyle: Update to 2.7.0. * gnu/packages/python-xyz.scm (python-pycodestyle): Update to 2.7.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d15c70a77c..9a0285036d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5595,14 +5595,14 @@ a simple netcat replacement with chaining support.") (define-public python-pycodestyle (package (name "python-pycodestyle") - (version "2.6.0") + (version "2.7.0") (source (origin (method url-fetch) (uri (pypi-uri "pycodestyle" version)) (sha256 (base32 - "0bhr6ia0hmgx3nhgibc9pmkzhlh1zcqk707i5fbxgs702ll7v2n5")))) + "1vqwmzmjdv331kmfq3q9j3as2x7r2r49lf83r9w4147pdg8c32f3")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From d41d96d8360c3e68a421a576cdf9c96d1287ffc9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:57:24 +0300 Subject: gnu: python-pyzmq: Update to 22.0.3. * gnu/packages/python-xyz.scm (python-pyzmq): Update to 22.0.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 9a0285036d..a439e35b11 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8475,13 +8475,13 @@ applications.") (define-public python-pyzmq (package (name "python-pyzmq") - (version "17.1.2") + (version "22.0.3") (source (origin (method url-fetch) (uri (pypi-uri "pyzmq" version)) (sha256 - (base32 "1pyxxrz60f88ffm0y6vpbx3q8jcr9ybz8fcilihwzwhh36n84ax7")))) + (base32 "0bgrn65cxfz1c1sjrgyq5dy1mkhppxxbizd5wvrl03cq4zhkrxpp")))) (build-system python-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 91741db5397174a2e96b4010c3c9ff53d34e8ef0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:57:47 +0300 Subject: gnu: python-pyflakes: Update to 2.3.1. * gnu/packages/python-xyz.scm (python-pyflakes): Update to 2.3.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a439e35b11..efdbcf896a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8564,14 +8564,14 @@ PEP 8.") (define-public python-pyflakes (package (name "python-pyflakes") - (version "2.2.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (pypi-uri "pyflakes" version)) (sha256 (base32 - "1j3zqbiwkyicvww499bblq33x0bjpzdrxajhaysr7sk7x5gdgcim")))) + "1ny10364ciqh4ripasj4zzv4145l21l3s85m3qlrvfq5pk58xg7m")))) (build-system python-build-system) (home-page "https://github.com/pyflakes/pyflakes") -- cgit 1.4.1 From 9095fccd0ea7789d5b87e5d1948d875d2029f7da Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 16:58:13 +0300 Subject: gnu: python-flake8: Update to 3.9.0. * gnu/packages/python-xyz.scm (python-flake8): Update to 3.9.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index efdbcf896a..cc9d9c2721 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8611,13 +8611,13 @@ complexity of Python source code.") (define-public python-flake8 (package (name "python-flake8") - (version "3.8.4") + (version "3.9.0") (source (origin (method url-fetch) (uri (pypi-uri "flake8" version)) (sha256 (base32 - "0fvcrsbyzjpcli8ldbpsdbpmf238nkvwc1dy4hy82lf63rvfinma")))) + "1w65iyjnrwipv4dbcqxh725ri7mdx01d6pjyggd97c0j5cvkx1vq")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 6960cfe9241c5f2ce05b65aaa901bf5e3e0cc198 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:03:24 +0300 Subject: gnu: python-beautifulsoup4: Update to 4.9.3. * gnu/packages/python-xyz.scm (python-beautifulsoup4): Update to 4.9.3. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cc9d9c2721..7b6c3aa9f9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7794,14 +7794,14 @@ the GObject Introspection bindings to libnotify for non-GTK applications.") (define-public python-beautifulsoup4 (package (name "python-beautifulsoup4") - (version "4.9.1") + (version "4.9.3") (source (origin (method url-fetch) (uri (pypi-uri "beautifulsoup4" version)) (sha256 (base32 - "1mvzlw3pzbhsvl3z8784s5h7iiflm2hggiy1fxyrrxwnbc8lvk3k")))) + "09gbd49mwz86k572r1231x2rdp82p42zlnw0bz9b9mfi58r9wwl4")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From dd880b6f53cce6bc845b19ad16a5948280665bf9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:04:04 +0300 Subject: gnu: python-soupsieve: Update to 2.2.1. * gnu/packages/python-xyz.scm (python-soupsieve): Update to 2.2.1. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7b6c3aa9f9..c90a89a411 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7837,14 +7837,14 @@ converts incoming documents to Unicode and outgoing documents to UTF-8.") (define-public python-soupsieve (package (name "python-soupsieve") - (version "2.0.1") + (version "2.2.1") (source (origin (method url-fetch) (uri (pypi-uri "soupsieve" version)) (sha256 (base32 - "0ch2rhvsbwfpvzm4kzy81rclbzr533yv83hzg1gx55byfa0w37d5")))) + "1k70gpn2d3vgdyxbdy536dgm4kchcraxz6lmgsfg3324iy2789q5")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;;XXX: 2 tests fail currently despite claming they were to be -- cgit 1.4.1 From be34826886508a52babd05477d89d39bae6ff454 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:18:38 +0300 Subject: gnu: perl-test-output: Update to 1.033. * gnu/packages/perl-check.scm (perl-test-output): Update to 1.033. --- gnu/packages/perl-check.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 117acd5d1a..a761ebffcf 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -1096,14 +1096,14 @@ classes in its inheritance tree in one single call.") (define-public perl-test-output (package (name "perl-test-output") - (version "1.031") + (version "1.033") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/B/BD/BDFOY/" "Test-Output-" version ".tar.gz")) (sha256 (base32 - "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q")))) + "0vjm62c7g3xxs3h4lba55dnpr4pg71yrhkdg5b9glxdh80klia7n")))) (build-system perl-build-system) (propagated-inputs `(("perl-capture-tiny" ,perl-capture-tiny) -- cgit 1.4.1 From 5dbc2e339264c11ff74580b9d8033e55d7c3bf17 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 29 Mar 2021 17:19:16 +0300 Subject: gnu: perl-params-util: Update to 1.102. * gnu/packages/perl.scm (perl-params-util): Update to 1.102. [source]: Update source URI. --- gnu/packages/perl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7203481d74..bf6dabf611 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8135,16 +8135,16 @@ designed for the more complex job, such as @code{Params::Validate}") (define-public perl-params-util (package (name "perl-params-util") - (version "1.07") + (version "1.102") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-" + "mirror://cpan/authors/id/R/RE/REHSACK/Params-Util-" version ".tar.gz")) (sha256 (base32 - "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h")))) + "00kl154zisf2zsl8yl6xa6yw54nhd9cja5d5fyigs96vhasb36s9")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Params-Util") (synopsis "Simple, compact and correct param-checking functions") -- cgit 1.4.1 From 35044d3e3ef183fd3b6986e3a86d6c7a1c8164a4 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:50 +0100 Subject: gnu: Add julia-constructionbase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-constructionbase): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 0d35cbde57..7fbb18347f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Nicolò Balzarotti +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +118,27 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +(define-public julia-constructionbase + (let ((commit "de77e2865b554f9b078fd8c35b593cce0554ae02")) + (package + (name "julia-constructionbase") + (version "1.1.0") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaObjects/ConstructionBase.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y79sfj0rds1skl9j16p9161hwa9khm0xc2m4hgjcbh5zzvyr57v")))) + (build-system julia-build-system) + (home-page "https://juliaobjects.github.io/ConstructionBase.jl/dev/") + (synopsis "Primitive functions for construction of objects") + (description "This very lightweight package provides primitive functions +for construction of objects.") + (license license:expat)))) + (define-public julia-datastructures (package (name "julia-datastructures") -- cgit 1.4.1 From 45debc7b855a97604d73da2dbf1b65bb5a080955 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:51 +0100 Subject: gnu: Add julia-macrotools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-macrotools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 7fbb18347f..5ba85f8bc0 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -344,6 +344,27 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") and printing JSON documents.") (license license:expat))) +(define-public julia-macrotools + (package + (name "julia-macrotools") + (version "0.5.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/MacroTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k4z2hyasd9cwxf4l61zk3w4ajs44k69wx6z1ghdn8f5p8xy217f")))) + (build-system julia-build-system) + (home-page "https://fluxml.ai/MacroTools.jl") + (synopsis "Tools for working with Julia code and expressions") + (description "This library provides tools for working with Julia code and +expressions. This includes a template-matching system and code-walking tools +that let you do deep transformations of code.") + (license license:expat))) + (define-public julia-mbedtls (package (name "julia-mbedtls") -- cgit 1.4.1 From a5edd83ddb3aec9a896848b6a8b40e8aefbf2f68 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:52 +0100 Subject: gnu: Add julia-nanmath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-nanmath): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 5ba85f8bc0..6508fa52af 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -435,6 +435,26 @@ TLS} and cryptography C libary for Julia.") wrappers.") (license license:expat))) +(define-public julia-nanmath + (package + (name "julia-nanmath") + (version "0.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlubin/NaNMath.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1hczhz00qj99w63vp627kwk02l2sr2qmzc2rkwwkdwvzy670p25q")))) + (build-system julia-build-system) + (home-page "https://github.com/mlubin/NaNMath.jl") + (synopsis "Implementations of basic math functions") + (description "Implementations of basic math functions which return +@code{NaN} instead of throwing a @code{DomainError}.") + (license license:expat))) + (define-public julia-orderedcollections (package (name "julia-orderedcollections") -- cgit 1.4.1 From 02543b524b0a73619d9ef6fae336015b12df3ffa Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:53 +0100 Subject: gnu: Add julia-reexport. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-reexport): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 6508fa52af..41acd06ee3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -522,6 +522,25 @@ languages like Fortran.") utilities for Julia.") (license license:expat))) +(define-public julia-reexport + (package + (name "julia-reexport") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/simonster/Reexport.jl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yhhja1zz6dy5f4fd19bdwd6jwgj7q4w3avzgyg1hjhmdl8jrh0s")))) + (build-system julia-build-system) + (home-page "https://github.com/simonster/Reexport.jl") + (synopsis "Re-export modules and symbols") + (description "This package provides tools to re-export modules and symbols.") + (license license:expat))) + (define-public julia-uris (package (name "julia-uris") -- cgit 1.4.1 From 57653707944f8907da23c729616902782d225ff0 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:54 +0100 Subject: gnu: Add julia-irtools. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-irtools): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 41acd06ee3..613b3bb9dc 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -276,6 +276,32 @@ implementing both a client and a server.") allows to interface with @file{.ini} files.") (license license:expat))) +(define-public julia-irtools + (package + (name "julia-irtools") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/IRTools.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wwzy77jcdnffnd5fr6xan7162g4wydz67igrq82wflwnrhlcx5y")))) + (arguments + '(#:tests? #f)) ;require Documenter, not packaged yet + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/FluxML/IRTools.jl") + (synopsis "Simple and flexible IR format") + (description "This package provides a simple and flexible IR format, +expressive enough to work with both lowered and typed Julia code, as well as +external IRs. It can be used with Julia metaprogramming tools such as +Cassette.") + (license license:expat))) + (define-public julia-jllwrappers (package (name "julia-jllwrappers") -- cgit 1.4.1 From be8022773741b4bb7b532511774246ea6d258106 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:55 +0100 Subject: gnu: Add julia-staticarrays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-staticarrays): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 613b3bb9dc..45d18d028f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -567,6 +567,31 @@ utilities for Julia.") (description "This package provides tools to re-export modules and symbols.") (license license:expat))) +(define-public julia-staticarrays + (package + (name "julia-staticarrays") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaArrays/StaticArrays.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01z8bcqwpfkp8p1h1r36pr5cc3798y76zkas7g3206pcsdhvlkz1")))) + (build-system julia-build-system) + (inputs + `(("julia-benchmarktools" ,julia-benchmarktools))) + (home-page "https://github.com/JuliaArrays/StaticArrays.jl") + (synopsis "Statically sized arrays") + (description "This package provides a framework for implementing +statically sized arrays in Julia, using the abstract type +@code{StaticArray{Size,T,N} <: AbstractArray{T,N}}. Subtypes of +@code{StaticArray} will provide fast implementations of common array and +linear algebra operations.") + (license license:expat))) + (define-public julia-uris (package (name "julia-uris") -- cgit 1.4.1 From a8e3be6aa124151420282d2576af916a89a1b23f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:56 +0100 Subject: gnu: Add julia-unitful. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-unitful): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 45d18d028f..7a3529fe8f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -625,3 +625,25 @@ linear algebra operations.") working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC 3986.") (license license:expat))) + +(define-public julia-unitful + (package + (name "julia-unitful") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PainterQubits/Unitful.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g5bhlvay9yk11c5dqwbzmb3q7lzj0cq5zchyk39d59fkvvmxvq3")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-constructionbase" ,julia-constructionbase))) + (home-page "https://painterqubits.github.io/Unitful.jl/stable/") + (synopsis "Physical units in Julia") + (description "This package supports SI units and also many other unit +system.") + (license license:expat))) -- cgit 1.4.1 From 651a55738973c36524c05b3e65b02bccfc352743 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:57 +0100 Subject: gnu: Add julia-abstractffts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-abstractffts): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 7a3529fe8f..4abeaa765f 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -24,6 +24,31 @@ #:use-module (guix build-system julia) #:use-module (gnu packages tls)) +(define-public julia-abstractffts + (package + (name "julia-abstractffts") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/AbstractFFTS.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0083pwdyxjb04i330ir9pc8kmp4bwk59lx1jgc9qi05y8j7xzbp0")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-unitful" ,julia-unitful))) + (home-page "https://github.com/JuliaGPU/Adapt.jl") + (synopsis "General framework for fast Fourier transforms (FFTs)") + (description "This package allows multiple FFT packages to co-exist with +the same underlying @code{fft(x)} and @code{plan_fft(x)} interface. It is +mainly not intended to be used directly. Instead, developers of packages that +implement FFTs (such as @code{FFTW.jl} or @code{FastTransforms.jl}) extend the +types/functions defined in AbstractFFTs.") + (license license:expat))) + (define-public julia-adapt (package (name "julia-adapt") -- cgit 1.4.1 From 9b8b132e639495d33098fd42a0d32d5117e5a799 Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 23 Mar 2021 20:45:58 +0100 Subject: gnu: Add julia-colortypes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-colortypes): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4abeaa765f..8d28aab7f1 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,32 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-colortypes + (package + (name "julia-colortypes") + (version "0.10.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaGraphics/ColorTypes.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "176hr3qbz7lncmykks2qaj3cqisnzim7wi5jwsca9ld26wwyvyqq")))) + (arguments + '(#:tests? #f)) ;require Documenter, not packaged yet + (build-system julia-build-system) + (propagated-inputs + `(("julia-fixedpointnumbers" ,julia-fixedpointnumbers))) + (home-page "https://github.com/JuliaGraphics/ColorTypes.jl") + (synopsis "Basic color types and constructor") + (description "This minimalistic package serves as the foundation for +working with colors in Julia. It defines basic color types and their +constructors, and sets up traits and show methods to make them easier to work +with.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit 1.4.1 From 13a8b866b193e65113620ee43eecbb8d94c1bbfb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:58 +0100 Subject: gnu: Add julia-colors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-colors): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 8d28aab7f1..ab238161e9 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,32 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-colors + (package + (name "julia-colors") + (version "0.12.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaGraphics/Colors.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "156zsszgwh6bmznsan0zyha6yvcxw3c5mvc5vr2qfsgxbyh36ln6")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-colortypes" ,julia-colortypes) + ("julia-fixedpointnumbers" ,julia-fixedpointnumbers) + ("julia-reexport" ,julia-reexport))) + (home-page "https://github.com/JuliaGraphics/Colors.jl") + (synopsis "Tools for dealing with color") + (description "This package provides a wide array of functions for dealing +with color. This includes conversion between colorspaces, measuring distance +between colors, simulating color blindness, parsing colors, and generating +color scales for graphics.") + (license license:expat))) + (define-public julia-colortypes (package (name "julia-colortypes") -- cgit 1.4.1 From fffb1e725b31d59d6825e8902a72f33f27de44c2 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:04:59 +0100 Subject: gnu: Add julia-example. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-example): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ab238161e9..f21ea0afb0 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -240,6 +240,26 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, @code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") (license license:expat))) +(define-public julia-example + (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) + (package + (name "julia-example") + (version "0.5.4") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaLang/Example.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v3z0d6gh6wfbypffy9m9rhh36px6fm5wjzq0y6rbmc95r0qpqlx")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaLang/Example.jl") + (synopsis "Module providing examples") + (description "This package provides various examples.") + (license license:expat)))) + (define-public julia-fixedpointnumbers (package (name "julia-fixedpointnumbers") -- cgit 1.4.1 From 658fca53e9dd04727144f1e7b30b77d1a1481f4f Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:00 +0100 Subject: gnu: Add julia-requires. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-requires): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index f21ea0afb0..8e95c8b7ed 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -664,6 +664,32 @@ utilities for Julia.") (description "This package provides tools to re-export modules and symbols.") (license license:expat))) +(define-public julia-requires + (package + (name "julia-requires") + (version "1.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaPackaging/Requires.jl/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03hyfy7c0ma45b0y756j76awi3az2ii4bz4s8cxm3xw9yy1z7b01")))) + (build-system julia-build-system) + (inputs ;required for test + `(("julia-example" ,julia-example))) + (propagated-inputs + `(("julia-colors" ,julia-colors))) + (home-page "https://github.com/JuliaPackaging/Requires.jl/") + (synopsis "Faster package loader") + (description "This package make loading packages faster, maybe. It +supports specifying glue code in packages which will load automatically when +another package is loaded, so that explicit dependencies (and long load times) +can be avoided.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit 1.4.1 From bb1ca1f372025e9e28513ae831c6e239404860a8 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:01 +0100 Subject: gnu: Add julia-chainrulescore. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrulescore): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 8e95c8b7ed..0da2452b89 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,31 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-chainrulescore + (package + (name "julia-chainrulescore") + (version "0.9.29") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRulesCore.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1k0iayw39n1ikkkhvyi4498vsnzc94skqs41gnd15632gxjfvki4")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-benchmarktools" ,julia-benchmarktools) + ("julia-staticarrays" ,julia-staticarrays))) + (propagated-inputs + `(("julia-compat" ,julia-compat))) + (home-page "https://github.com/JuliaDiff/ChainRulesCore.jl") + (synopsis "Common utilities used by downstream automatic differentiation tools") + (description "The package provides a light-weight dependency for defining +sensitivities for functions without the need to depend on ChainRules itself.") + (license license:expat))) + (define-public julia-colors (package (name "julia-colors") -- cgit 1.4.1 From dd7a77c34566c450945facbca0c0fb634e4246a5 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:02 +0100 Subject: gnu: Add julia-richardson. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-richardson): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 0da2452b89..b56fa5427e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -715,6 +715,33 @@ another package is loaded, so that explicit dependencies (and long load times) can be avoided.") (license license:expat))) +(define-public julia-richardson + (package + (name "julia-richardson") + (version "1.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/Richardson.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06v9ii3d7hh41fsrfklaa8ap55z5s017f888mrd1c18y4fx9i4nx")))) + (build-system julia-build-system) + (home-page "https://juliapackages.com/p/richardson") + (synopsis "Extrapolate function using Richardson method") + (description "This package provides a function extrapolate that +extrapolates a given function @code{f(x)} to @code{f(x0)}, evaluating @code{f} +only at a geometric sequence of points @code{> x0} (or optionally @code{< +x0}). The key algorithm is Richardson extrapolation using a Neville–Aitken +tableau, which adaptively increases the degree of an extrapolation polynomial +until convergence is achieved to a desired tolerance (or convergence stalls +due to e.g. floating-point errors). This allows one to obtain @code{f(x0)} to +high-order accuracy, assuming that @code{f(x0+h)} has a Taylor series or some +other power series in @code{h}.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit 1.4.1 From f6c5a8982b40539a2908e9a7d7801147adbd30d9 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:03 +0100 Subject: gnu: Add julia-finitedifferences. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-finitedifferences): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b56fa5427e..ed05af6497 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -285,6 +285,32 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, (description "This package provides various examples.") (license license:expat)))) +(define-public julia-finitedifferences + (package + (name "julia-finitedifferences") + (version "0.12.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/FiniteDifferences.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dcx34026xdpfmbjls3mrknl8ww62kxxfr77kfihbazsfg2gp5b4")))) + (build-system julia-build-system) + (inputs + `(("julia-benchmarktools" ,julia-benchmarktools))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-richardson" ,julia-richardson) + ("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaDiff/FiniteDifferences.jl") + (synopsis "Estimates derivatives with finite differences") + (description "This package calculates approximate derivatives numerically +using finite difference.") + (license license:expat))) + (define-public julia-fixedpointnumbers (package (name "julia-fixedpointnumbers") -- cgit 1.4.1 From 9eb293960a473c9cc56f66b6cae428516f9c3898 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:04 +0100 Subject: gnu: Add julia-chainrulestestutils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrulestestutils): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index ed05af6497..4e63c04c5e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -146,6 +146,38 @@ reading and writing faster.") sensitivities for functions without the need to depend on ChainRules itself.") (license license:expat))) +(define-public julia-chainrulestestutils + (package + (name "julia-chainrulestestutils") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRulesTestUtils.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pzs947adnb3cx1qd0cxp2fidk9szz0zsqbas90z1lhydykkvkil")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-compat" ,julia-compat) + ("julia-finitedifference" ,julia-finitedifferences))) + (home-page "https://github.com/JuliaDiff/ChainRulesTestUtils.jl") + (synopsis "Common utilities used by downstream automatic differentiation tools") + (description "This package is designed to help in testing +@code{ChainRulesCore.frule} and @code{ChainRulesCore.rrule} methods. The main +entry points are @code{ChainRulesTestUtils.frule_test}, +@code{ChainRulesTestUtils.rrule_test}, and +@code{ChainRulesTestUtils.test_scalar}. Currently this is done via testing the +rules against numerical differentiation (using @code{FiniteDifferences.jl}). + +@code{ChainRulesTestUtils.jl} is separated from @code{ChainRulesCore.jl} so that it +can be a test-only dependency, allowing it to have potentially heavy +dependencies, while keeping @code{ChainRulesCore.jl} as light-weight as possible.") + (license license:expat))) + (define-public julia-colors (package (name "julia-colors") -- cgit 1.4.1 From a0d3a73fc617eccc8f21a2b1e1164ca1c856ddeb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:05 +0100 Subject: gnu: Add julia-fillarrays. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-fillarrays): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4e63c04c5e..e3d2c9ff89 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -317,6 +317,30 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, (description "This package provides various examples.") (license license:expat)))) +(define-public julia-fillarrays + (package + (name "julia-fillarrays") + (version "0.11.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaArrays/FillArrays.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q1qn9pb5dmppddnmf8gggdqyvivqh3ffvbblhn37smcf9r5sy7d")))) + (build-system julia-build-system) + (inputs ;required by tests + `(("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaArrays/FillArrays.jl") + (synopsis "Lazy matrix representation") + (description "This package allows to lazily represent matrices filled with +a single entry, as well as identity matrices. This package exports the +following types: @code{Eye}, @code{Fill}, @code{Ones}, @code{Zeros}, +@code{Trues} and @code{Falses}.") + (license license:expat))) + (define-public julia-finitedifferences (package (name "julia-finitedifferences") -- cgit 1.4.1 From 2ca38ee4e70cdbd26a1faa719e1a4ec8ef6476e3 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:06 +0100 Subject: gnu: Add julia-commonsubexpressions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-commonsubexpressions): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index e3d2c9ff89..c5c04d6579 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -230,6 +230,28 @@ constructors, and sets up traits and show methods to make them easier to work with.") (license license:expat))) +(define-public julia-commonsubexpressions + (package + (name "julia-commonsubexpressions") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rdeits/CommonSubexpressions.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mgy90kk8ksv3l720kkk04gnhn4aqhh2dj4sp3x8yy3limngfjay")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/rdeits/CommonSubexpressions.jl") + (synopsis "Macro @code{@cse}") + (description "This package provides the @code{@cse} macro, which performs +common subexpression elimination.") + (license license:expat))) + (define-public julia-compat (package (name "julia-compat") -- cgit 1.4.1 From b91ad8324dec459181cb664863a36fd6616a63eb Mon Sep 17 00:00:00 2001 From: zimoun Date: Tue, 23 Mar 2021 20:46:41 +0100 Subject: gnu: Add julia-calculus. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-calculus): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index c5c04d6579..75b46a1c7c 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -121,6 +121,30 @@ operations. It can wrap any @code{IO} type automatically making incremental reading and writing faster.") (license license:expat))) +(define-public julia-calculus + (package + (name "julia-calculus") + (version "0.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/Calculus.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xh0ak2ycsjw2h86ja24ch3kn2d18zx3frrds78aimwdnqb1gdc2")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaMath/Calculus.jl") + (synopsis "Common utilities for automatic differentiation") + (description "This package provides tools for working with the basic +calculus operations of differentiation and integration. The @code{Calculus} +package produces approximate derivatives by several forms of finite +differencing or produces exact derivative using symbolic differentiation. It +can also be used to compute definite integrals by different numerical +methods.") + (license license:expat))) + (define-public julia-chainrulescore (package (name "julia-chainrulescore") -- cgit 1.4.1 From 7bf791ee8fdc23f01307098410dcb45eea656d70 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:07 +0100 Subject: gnu: Add julia-diffresults. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-diffresults): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 75b46a1c7c..885a851375 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -343,6 +343,28 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, @code{Accumulators}, @code{LinkedLists}, @code{SortedDicts} and many others.") (license license:expat))) +(define-public julia-diffresults + (package + (name "julia-diffresults") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffResults.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1w6p3yxajvclax5b9g7cr2jmbc7lvr5nk4gq0aljxdycdq1d2y3v")))) + (propagated-inputs + `(("julia-staticarrays" ,julia-staticarrays))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffResults.jl") + (synopsis "In-place differentiation methods of primal values at multi-order") + (description "This package provides the @code{DiffResult} type, which can +be passed to in-place differentiation methods instead of an output buffer.") + (license license:expat))) + (define-public julia-example (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) (package -- cgit 1.4.1 From df4be2e910ff7a394856f4006ecd262cd0136456 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:08 +0100 Subject: gnu: Add julia-difftests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-difftests): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 885a851375..9b04e1bd67 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -365,6 +365,26 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, be passed to in-place differentiation methods instead of an output buffer.") (license license:expat))) +(define-public julia-difftests + (package + (name "julia-difftests") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffTests.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rxpnd5zi3pxgdd38l5jm2sxc3q6p7g57fqgll2dsiin07y3my57")))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffTests.jl") + (synopsis "Common test functions for differentiation tools") + (description "This package contains a common suite of test functions for +stressing the robustness of differentiation tools.") + (license license:expat))) + (define-public julia-example (let ((commit "f968c69dea24f851d0c7e686db23fa55826b5388")) (package -- cgit 1.4.1 From 4d69758f5bc847c3bc36e1ae2b6b2416391c3913 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:09 +0100 Subject: gnu: Add julia-compilersupportlibraries-jll. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-compilersupportlibraries-jll): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9b04e1bd67..bde72e364d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -22,6 +22,7 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system julia) + #:use-module (gnu packages gcc) #:use-module (gnu packages tls)) (define-public julia-abstractffts @@ -298,6 +299,50 @@ provides a macro that lets you use the latest syntax in a backwards-compatible way.") (license license:expat))) +;;; TODO: Remove this autogenerated source package +;;; and build it from realse source using +(define-public julia-compilersupportlibraries-jll + (package + (name "julia-compilersupportlibraries-jll") + (version "0.4.0+1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (commit (string-append "CompilerSupportLibraries-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03j6xdvps259mhdzpjqf41l65w2l9sahvxg4wrp34hcf69wkrzpy")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"CompilerSupportLibraries\", \"" + (assoc-ref inputs "gfortran:lib") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs ;required by artifacts + `(("gfortran:lib" ,gfortran "lib"))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl") + (synopsis "Internal wrappers") + (description "This package provides compiler support for libraries. It is +an autogenerated source package constructed using @code{BinaryBuilder.jl}. The +originating @code{build_tarballs.jl} script can be found on the community +build tree Yggdrasil.") + (license license:expat))) + (define-public julia-constructionbase (let ((commit "de77e2865b554f9b078fd8c35b593cce0554ae02")) (package -- cgit 1.4.1 From 73052c70051cdbf54af9d88aac0b1a821c10b901 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:10 +0100 Subject: gnu: Add julia-openspecfun-jll. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-openspecfun-jll): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index bde72e364d..d99eadcfd4 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -23,6 +23,7 @@ #:use-module (guix git-download) #:use-module (guix build-system julia) #:use-module (gnu packages gcc) + #:use-module (gnu packages maths) #:use-module (gnu packages tls)) (define-public julia-abstractffts @@ -865,6 +866,52 @@ have arbitrary indices, similar to those found in some other programming languages like Fortran.") (license license:expat))) +;;; TODO: Remove this autogenerated source package +;;; and build it from realse source using +(define-public julia-openspecfun-jll +(let ((commit "6c505cce3bdcd9cd2b15b4f9362ec3a42c4da71c")) + (package + (name "julia-openspecfun-jll") + (version "0.5.3+4") ;tag not created upstream + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/OpenSpecFun_jll.jl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bl2gcgndsbiwhwy8fl070cjm1fyf9kxj6gkikgirmzgjl29iakn")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f ; no runtests.jl + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("generate_wrapper_header.*") + (string-append + "generate_wrapper_header(\"OpenSpecFun\", \"" + (assoc-ref inputs "openspecfun") "\")\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$")) + #t))))) + (inputs + `(("openspecfun" ,openspecfun))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers) + ("julia-compilersupportlibraries-jll" ,julia-compilersupportlibraries-jll))) + (home-page "https://github.com/JuliaBinaryWrappers/OpenSpecFun_jll.jl") + (synopsis "Internal wrappers") + (description "This package provides a wrapper for OpenSpecFun. It is an +autogenerated source package constructed using @code{BinaryBuilder.jl}. The +originating @code{build_tarballs.jl} script can be found on the community +build tree Yggdrasil.") + (license license:expat)))) + (define-public julia-parsers (package (name "julia-parsers") -- cgit 1.4.1 From 3d98a16ab4d4f35211d79f25bb46bf74629c1408 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:11 +0100 Subject: gnu: Add julia-specialfunctions. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-specialfunctions): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index d99eadcfd4..4bd5a1f9a3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1004,6 +1004,33 @@ high-order accuracy, assuming that @code{f(x0+h)} has a Taylor series or some other power series in @code{h}.") (license license:expat))) +(define-public julia-specialfunctions + (package + (name "julia-specialfunctions") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaMath/SpecialFunctions.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rfhrrkzi3ils7fklbn35ki1yp5x88fi71qknfwqyw4pk8cf8p80")))) + (build-system julia-build-system) + (inputs + `(("julia-chainrulestestutils" ,julia-chainrulestestutils))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-openspecfun-jll" ,julia-openspecfun-jll))) + (home-page "https://github.com/JuliaMath/SpecialFunctions.jl") + (synopsis "Special mathematical functions") + (description "This package provides special mathematical functions, +including Bessel, Hankel, Airy, error, Dawson, exponential (or sine and +cosine) integrals, eta, zeta, digamma, inverse digamma, trigamma, and +polygamma functions.") + (license license:expat))) + (define-public julia-staticarrays (package (name "julia-staticarrays") -- cgit 1.4.1 From 33e5152aeb1ae6d7dc4da792173492e92875a8d7 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:12 +0100 Subject: gnu: Add julia-diffrules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-diffrules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 4bd5a1f9a3..fe1ecf0c9d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -411,6 +411,31 @@ including, @code{CircularBuffer}, @code{Queue}, @code{Stack}, be passed to in-place differentiation methods instead of an output buffer.") (license license:expat))) +(define-public julia-diffrules + (package + (name "julia-diffrules") + (version "1.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/DiffRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cwjvj4gma7924fm3yas0nf0jlnwwx4v7fi79ii3s290lkdldzfl")))) + (propagated-inputs + `(("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions))) + (build-system julia-build-system) + (home-page "https://github.com/JuliaDiff/DiffRules.jl") + (synopsis "Primitive differentiation rules") + (description "This package provides primitive differentiation rules that +can be composed via various formulations of the chain rule. Using +@code{DiffRules}, new differentiation rules can defined, query whether or not +a given rule exists, and symbolically apply rules to simple Julia expressions.") + (license license:expat))) + (define-public julia-difftests (package (name "julia-difftests") -- cgit 1.4.1 From 397f8c48747a3fbb76c3fe5a3a67b9eae21f9cbb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:13 +0100 Subject: gnu: Add julia-chainrules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-chainrules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index fe1ecf0c9d..b526306984 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -147,6 +147,37 @@ can also be used to compute definite integrals by different numerical methods.") (license license:expat))) +(define-public julia-chainrules + (package + (name "julia-chainrules") + (version "0.7.54") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ChainRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1x4w71v8cw0vpba47h8f5xq4gyjfxbcvayzf7m41yg8gf49s9pkf")))) + (build-system julia-build-system) + (inputs ;required for test + `(("julia-chainrulestestutils" ,julia-chainrulestestutils) + ("julia-finitedifferences" ,julia-finitedifferences) + ("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions))) + (propagated-inputs + `(("julia-chainrulescore" ,julia-chainrulescore) + ("julia-compat" ,julia-compat) + ("julia-reexport" ,julia-reexport) + ("julia-requires" ,julia-requires))) + (home-page "https://github.com/JuliaDiff/ChainRules.jl") + (synopsis "Common utilities for automatic differentiation") + (description "The is package provides a variety of common utilities that +can be used by downstream automatic differentiation (AD) tools to define and +execute forward-, reverse-, and mixed-mode primitives.") + (license license:expat))) + (define-public julia-chainrulescore (package (name "julia-chainrulescore") -- cgit 1.4.1 From 57e034d568226b83974de817f8f09c3ba3ea2360 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:14 +0100 Subject: gnu: Add julia-forwarddiff. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-forwarddiff): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index b526306984..9a414fc739 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -592,6 +592,38 @@ scaled by a constant factor. Consequently, they have a fixed number of digits (bits) after the decimal (radix) point.") (license license:expat))) +(define-public julia-forwarddiff + (package + (name "julia-forwarddiff") + (version "0.10.17") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaDiff/ForwardDiff.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "17xaz4v0zr46p7w873w1fwf31phdnhr0vbdym9yr4flmpzi528jw")))) + (build-system julia-build-system) + (inputs ;required for tests + `(("julia-calculus" ,julia-calculus) + ("julia-difftests" ,julia-difftests))) + (propagated-inputs + `(("julia-commonsubexpressions" ,julia-commonsubexpressions) + ("julia-diffresults" ,julia-diffresults) + ("julia-diffrules" ,julia-diffrules) + ("julia-nanmath" ,julia-nanmath) + ("julia-specialfunctions" ,julia-specialfunctions) + ("julia-staticarrays" ,julia-staticarrays))) + (home-page "https://github.com/JuliaDiff/ForwardDiff.jl") + (synopsis "Methods to take multidimensional derivatives") + (description "This package implements methods to take derivatives, +gradients, Jacobians, Hessians, and higher-order derivatives of native Julia +functions (or any callable object, really) using forward mode automatic +differentiation (AD).") + (license license:expat))) + (define-public julia-http (package (name "julia-http") -- cgit 1.4.1 From 568cebc2583bc909b6ce3ed8fc53119d083f3864 Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:15 +0100 Subject: gnu: Add julia-zygoterules. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-zygoterules): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 9a414fc739..af8b41e82b 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1199,3 +1199,25 @@ working with @acronym{URIs,Uniform Resource Identifiers}, as defined in RFC (description "This package supports SI units and also many other unit system.") (license license:expat))) + +(define-public julia-zygoterules + (package + (name "julia-zygoterules") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/ZygoteRules.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "07i2mf6rr5b8i6l82qgwl5arsb5pwyyzyfasgnszhdqllk9501bs")))) + (build-system julia-build-system) + (propagated-inputs + `(("julia-macrotools" ,julia-macrotools))) + (home-page "https://github.com/FluxML/ZygoteRules.jl") + (synopsis "Add minimal custom gradients to Zygote") + (description "Minimal package which enables to add custom gradients to +Zygote, without depending on Zygote itself.") + (license license:expat))) -- cgit 1.4.1 From 13f7f06c498aa8cd9704ec78cd514c309042182d Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 25 Mar 2021 02:05:16 +0100 Subject: gnu: Add julia-zygote. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/julia-xyz.scm (julia-zygote): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/julia-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index af8b41e82b..cbff69117d 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1221,3 +1221,38 @@ system.") (description "Minimal package which enables to add custom gradients to Zygote, without depending on Zygote itself.") (license license:expat))) + +(define-public julia-zygote + (package + (name "julia-zygote") + (version "0.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FluxML/Zygote.jl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h2ph0lsisbkh8y4xgwzgw9p5zi243q8zzp5gfh3zw9pzkx6a1rf")))) + (build-system julia-build-system) + (arguments + `(#:tests? #f)) ;require CUDA, not packaged yet + (propagated-inputs + `(("julia-abstractffs" ,julia-abstractffts) + ("julia-chainrules" ,julia-chainrules) + ("julia-diffrules" ,julia-diffrules) + ("julia-fillarrays" ,julia-fillarrays) + ("julia-forwarddiff" ,julia-forwarddiff) + ("julia-irtools" ,julia-irtools) + ("julia-macrotools" ,julia-macrotools) + ("julia-nanmath" ,julia-nanmath) + ("julia-requires" ,julia-requires) + ("julia-specialfunctions" ,julia-specialfunctions) + ("julia-zygote-rules" ,julia-zygoterules))) + (home-page "https://fluxml.ai/Zygote.jl") + (synopsis "Automatic differentiation in Julia") + (description "Zygote provides source-to-source automatic +differentiation (AD) in Julia, and is the next-generation AD system for the +Flux differentiable programming framework.") + (license license:expat))) -- cgit 1.4.1 From a8bbda7f941ef1cd60972e24455cd50ab5c63706 Mon Sep 17 00:00:00 2001 From: David Dashyan Date: Mon, 29 Mar 2021 18:13:04 +0300 Subject: gnu: rtl8812au-aircrack-ng-linux-module: Update to 5.6.4.2-4.059e06a Signed-off-by: Leo Famulari --- 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 388b8aae8d..c5d3b31b8d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1167,8 +1167,8 @@ and should be used with caution, especially on untested models.") (license license:gpl3+))) ; see README.md (no licence headers) (define-public rtl8812au-aircrack-ng-linux-module - (let ((commit "62cb003043e4daeeba0b8805137fa604af450ed2") - (revision "3")) + (let ((commit "059e06a51be025fde5b2bec6565540b3d9981b0b") + (revision "4")) (package (name "rtl8812au-aircrack-ng-linux-module") (version (git-version "5.6.4.2" revision commit)) @@ -1180,7 +1180,7 @@ and should be used with caution, especially on untested models.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1kragxkjprjy7nl9h2rd0mwcry1ygw07zb1p2qkj7cmz0r2035yz")) + (base32 "0h6l2r3yj7j9zf11dw0zcdyn50ajnjw8yvv86dzlfj80dn75n98f")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From a1ed5c27baa91f31b3fc7b7befd1fe200321841f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:20:30 +0200 Subject: gnu: libgphoto2: Update to 2.5.27. * gnu/packages/photo.scm (libgphoto2): Update to 2.5.27. --- 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 4d679c7f02..21923108c6 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -240,14 +240,14 @@ data as produced by digital cameras.") (define-public libgphoto2 (package (name "libgphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/libgphoto/" version "/libgphoto2-" version ".tar.bz2")) (sha256 (base32 - "1m5wxap3x9z6x8s2gj3sw9lqwlmbgz00dv6z3h3qk15prfizwh3p")))) + "1ms06b3dj1p33aypcb16gg5pn7fylbylsk9cnnqa0j29qiw59f7q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit 1.4.1 From 4ccd3412162c41d7bf33274375b0ac9d2d84c2d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:20:34 +0200 Subject: gnu: gphoto2: Update to 2.5.27. * gnu/packages/photo.scm (gphoto2): Update to 2.5.27. --- 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 21923108c6..5fd57af4a5 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -271,14 +271,14 @@ from digital cameras.") (define-public gphoto2 (package (name "gphoto2") - (version "2.5.26") + (version "2.5.27") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gphoto/gphoto/" version "/gphoto2-" version ".tar.bz2")) (sha256 (base32 - "0bxbcn31xalsvjp8fra324hf2105y3ps7zlyfz11v71j0lxj2lvn")))) + "0f4d3q381jnnkcqkb2dj1k709skp65qihl5xm80zandvl69lw19h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit 1.4.1 From c0e60ccf9a53a0eb40de4630f0ef12a82731c469 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 28 Mar 2021 23:27:39 +0200 Subject: gnu: python-toml: Update to 0.10.2. * gnu/packages/python-build.scm (python-toml): Update to 0.10.2. --- gnu/packages/python-build.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 259fe163b5..15e671b2c2 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Tanguy Le Carrour ;;; Copyright © 2018, 2021 Maxim Cournoyer +;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,14 +72,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.") (define-public python-toml (package (name "python-toml") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (pypi-uri "toml" version)) (sha256 - (base32 - "03wbqm5cn685cwx2664hjdpz370njl7lf0yal8s0dkp5w4mn2swj")))) + (base32 "13z6rff86bzdpl094x0vmfvls779931xj90dlbs9kpfm138s3gdk")))) (build-system python-build-system) (arguments `(#:tests? #f)) ;no tests suite in release -- cgit 1.4.1 From 6a2c78288a77ce6d860f52b6f600cab5f199a1b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 15:15:03 +0200 Subject: gnu: git-lfs: Update to 2.13.3. * gnu/packages/version-control.scm (git-lfs): Update to 2.13.3. --- 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 95703e5e00..83780caef4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2722,7 +2722,7 @@ interrupted, published, and collaborated on while in progress.") (define-public git-lfs (package (name "git-lfs") - (version "2.13.2") + (version "2.13.3") (source (origin (method git-fetch) (uri (git-reference @@ -2731,7 +2731,7 @@ interrupted, published, and collaborated on while in progress.") (file-name (git-file-name name version)) (sha256 (base32 - "0gfpzdya48phwln61746ii78sq55mhzj938lz8x062xkkcsdvbf4")))) + "0r7dmqhkhz91d3n7qfpny483x8f1n88yya22j2fvx75rgg33z2sg")))) (build-system go-build-system) (arguments `(#:import-path "github.com/git-lfs/git-lfs" -- cgit 1.4.1 From 692c75eaa6c87c73ad2e20cbded6c32b9ae6b8a2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:06:18 +0200 Subject: gnu: flite: Update to 2.2. * gnu/packages/speech.scm (flite): Update to 2.2. [source]: Check out this git repository. --- gnu/packages/speech.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 687a3c10cf..093f6f957b 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016, 2019, 2020 Marius Bakke ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Nicolas Goaziou @@ -55,15 +55,16 @@ (define-public flite (package (name "flite") - (version "2.1") + (version "2.2") (source (origin - (method url-fetch) - (uri - (string-append "http://www.festvox.org/" name "/packed/" name - "-" version "/" name "-" version "-release.tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/festvox/flite") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "119b7l7pjb1l5raqq24p8rmhdqni49vjh2mgdryrfr575rm3yg67")))) + (base32 "1n0p81jzndzc1rzgm66kw9ls189ricy5v1ps11y0p2fk1p56kbjf")))) (build-system gnu-build-system) (arguments ;; XXX: -- cgit 1.4.1 From 9aaeb9bd957daa988a63ddddee8f4e7efdd7d979 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:31:57 +0200 Subject: gnu: wsjtx-hamlib: Update to 2.3.1. * gnu/packages/radio.scm (wsjtx-hamlib): Update to 2.3.1. [arguments]: Remove alleged 'fix-tests phase. --- gnu/packages/radio.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c10c91fd99..d669c43c87 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -844,7 +844,7 @@ users.") (package (inherit hamlib) (name "wsjtx-hamlib") - (version "2.3.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -853,7 +853,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ampwqs7p0g8pdnwpdrbvwyqag065n96amgb3v4z332nw0nxvm10")))) + (base32 "0m4yzjcqs7a1w4lghyyckpkiy96jxdjijddxarqr3a37cl2rz23j")))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -865,15 +865,7 @@ users.") "--with-lua-binding" "--with-python-binding" "--with-tcl-binding" - "--with-xml-support") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests/testloc.c" - (("dmmm2dec\\(deg, mmm, nesw\\);") - "dmmm2dec(deg, mmm, 0, nesw);")) - #t))))))) + "--with-xml-support"))))) (define-public wsjtx (package -- cgit 1.4.1 From 92dfa92d6d8a7df8b8e35096425445827fe4116b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 17:32:07 +0200 Subject: gnu: wsjtx: Update to 2.3.1. * gnu/packages/radio.scm (wsjtx): Update to 2.3.1. --- gnu/packages/radio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index d669c43c87..826693a538 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -870,7 +870,7 @@ users.") (define-public wsjtx (package (name "wsjtx") - (version "2.3.0") + (version "2.3.1") (source (origin (method git-fetch) @@ -879,7 +879,7 @@ users.") (commit (string-append "wsjtx-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qf8r88ssara3pddvd3jpv5phzxwnanvdj00dxgmzq0c2jqcy2a8")))) + (base32 "0mdr4l7zii08615yn7z91spnvnqm5i9390bra9lz3aqyxrsiim91")))) (build-system qt-build-system) (native-inputs `(("asciidoc" ,asciidoc) -- cgit 1.4.1 From 193f18169711de125ca6954a3047f138b369a33e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Mon, 29 Mar 2021 18:33:34 +0100 Subject: gnu: Add texlive-mathdesign. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 86cb1ee455..4107cc118c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7810,3 +7810,29 @@ support packages. Others are cmbright, hvmath and kerkis.") (license (list license:silofl1.1 ;for Arev Sans license:lppl1.3a ;for TeX support files license:gpl2)))) ;for ams-mdbch.sty + +(define-public texlive-mathdesign + (package + (inherit (simple-texlive-package + "texlive-mathdesign" + (list "/doc/fonts/mathdesign/" + "/dvips/mathdesign/" + "/fonts/enc/dvips/mathdesign/" + "/fonts/map/dvips/mathdesign/" + "/fonts/tfm/public/mathdesign/" + "/fonts/type1/public/mathdesign/" + "/fonts/vf/public/mathdesign/" + "/tex/latex/mathdesign/") + (base32 + "0jcby2sd0l3ank2drxc0qcf5d1cwa8idzh4g91h4nxk8zrzxj8nr") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/mathdesign") + (synopsis "Mathematical fonts to fit with particular text fonts") + (description "The Math Design project offers free mathematical +fonts that match with existing text fonts. To date, three free font +families are available: Adobe Utopia, URW Garamond and Bitstream +Charter. Mathdesign covers the whole LaTeX glyph set including AMS +symbols. Both roman and bold versions of these symbols can be used. +Moreover, there is a choice between three greek fonts (two of them +created by the Greek Font Society).") + (license license:gpl2+))) -- cgit 1.4.1 From ebeb018ca32c3da0dc820440b2da8d229f78946b Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 10:58:18 +0200 Subject: gnu: nyacc: Update to 1.03.6. * gnu/packages/mes.scm (nyacc): Update to 1.03.6. Signed-off-by: Christopher Baines --- gnu/packages/mes.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index b4b7bcb6b5..750ec2e67a 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,14 +99,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public nyacc (package (inherit nyacc-0.99) - (version "1.03.0") + (version "1.03.6") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/nyacc-" version ".tar.gz")) (sha256 (base32 - "1vdiqpm3p0ndmpmkzcpkpjvgklfsk4wxrhkixdxbczpafdfl635p")) + "1s7kli288l4pizjaarx8m6jg7g0mgfy8rpbs9lpzg8la7wr5rvp4")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From ce29fa76f4d96a530ccc4c3ce5f0085c491f964c Mon Sep 17 00:00:00 2001 From: Alexandr Vityazev Date: Tue, 23 Mar 2021 13:26:01 +0300 Subject: gnu: emacs-org-roam: Update to 1.2.3-0.8ad57b1. * gnu/packages/emacs-xyz.scm (emacs-org-roam): Update to 1.2.3-0.8ad57b1. [propagated-inputs]: Replace emacs-org-ref with emacs-org and remove emacs-company. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 50 ++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ead2144b42..52191f3ebc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26566,34 +26566,36 @@ snippets for Emacs.") (license license:expat)))) (define-public emacs-org-roam - (package - (name "emacs-org-roam") - (version "1.2.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/org-roam/org-roam") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0n8c0yxqb62i39kn0d5x83s96vwc0nbg0sx5hplffnbkfbj88bba")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-company" ,emacs-company) - ("emacs-dash" ,emacs-dash) - ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3) - ("emacs-f" ,emacs-f) - ("emacs-org-ref" ,emacs-org-ref) - ("emacs-s" ,emacs-s))) - (home-page "https://github.com/org-roam/org-roam/") - (synopsis "Non-hierarchical note-taking with Org mode") - (description "Emacs Org Roam is a solution for taking non-hierarchical + (let ((commit "8ad57b121831eda8d226faa14ff2ba7ab652849c") + (revision "0") + (version "1.2.3")) + (package + (name "emacs-org-roam") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/org-roam/org-roam") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "162qhb6rkpl1n0l8yhnwgagsx56ykaj9lchsny1id5z1257kgw9w")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-emacsql-sqlite3" ,emacs-emacsql-sqlite3) + ("emacs-f" ,emacs-f) + ("emacs-org" ,emacs-org) + ("emacs-s" ,emacs-s))) + (home-page "https://github.com/org-roam/org-roam/") + (synopsis "Non-hierarchical note-taking with Org mode") + (description "Emacs Org Roam is a solution for taking non-hierarchical notes with Org mode. Notes are captured without hierarchy and are connected by tags. Notes can be found and created quickly. Org Roam should also work as a plug-and-play solution for anyone already using Org mode for their personal wiki.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-roam-bibtex (package -- cgit 1.4.1 From 7162e5b88208d00188dd9c7b22e0fcde2871fb55 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 22:38:18 +0200 Subject: gnu: gegl: Refer to dot. * gnu/packages/gimp.scm (gegl)[arguments]: Add a new 'refer-to-dot phase. --- gnu/packages/gimp.scm | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 4bdc4ee42e..86b42e0fab 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages build-tools) #:use-module (gnu packages documentation) + #:use-module (gnu packages graphviz) #:use-module (gnu packages pkg-config) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -229,6 +230,16 @@ provided, as well as a framework to add new color models and data types.") (list "-Dintrospection=false") #:phases (modify-phases %standard-phases + (add-after 'unpack 'refer-to-dot + ;; Without ‘dot’ in $PATH, (at least) the GIMP would fail to start + ;; with an extremely obtuse ‘GEGL operation missing!’ error. + (lambda _ + (substitute* "gegl/gegl-dot.c" + (("\"dot ") + (format #f "\"~a " (which "dot")))) + (substitute* "operations/common/introspect.c" + (("g_find_program_in_path \\(\"dot\"\\)") + (format #f "g_strdup (\"~a\")" (which "dot")))))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; Multiply some poorly-chosen time-outs for busy build machines. @@ -249,6 +260,7 @@ provided, as well as a framework to add new color models and data types.") ("json-glib" ,json-glib))) (inputs `(("cairo" ,cairo) + ("graphviz" ,graphviz) ("pango" ,pango) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo))) -- cgit 1.4.1 From 6aaa8269b82d50e43405847a479ffaeb0b569fa5 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Mon, 29 Mar 2021 03:19:09 -0400 Subject: gnu: linphone-desktop: Fix linphone accounts functionality. The Linphone accounts were not able to do TLS authentication against the Linphone servers, and multiple plugins used by the Linphone accounts were not loaded. This change should fix this. * gnu/packages/linphone.scm (linphone-desktop)[phases](post-install): Modify phase. Signed-off-by: Maxim Cournoyer --- gnu/packages/linphone.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 2107560aa0..deda49a4bc 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -839,10 +839,14 @@ and video calls or instant messaging capabilities to an application.") ;; Remove unnecessary Qt configuration file. (delete-file (string-append out "/bin/qt.conf")) ;; Not using the FHS exposes an issue where the client - ;; refers to its own "share" directory, which lacks files + ;; refers to its own directories, which lacks files ;; installed by the dependencies. + (symlink (string-append liblinphone "/lib") + (string-append out "/lib")) (symlink (string-append liblinphone "/share/sounds") (string-append out "/share/sounds")) + (symlink (string-append liblinphone "/share/linphone/rootca.pem") + (string-append out "/share/linphone/rootca.pem")) (mkdir-p (dirname grammar-dest)) (symlink (string-append liblinphone "/share/belr/grammars") grammar-dest))))))) -- cgit 1.4.1 From de2e36411feb2f29edfed563b3ad143f8a9ea3d7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Mar 2021 17:31:32 +0200 Subject: gnu: metis: Add 'release-monitoring-url' property. * gnu/packages/maths.scm (metis)[properties]: New field. --- gnu/packages/maths.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 565f109f47..2e072e7d82 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018, 2020 Kei Kebreau -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018, 2019, 2020 Paul Garlick @@ -3305,6 +3305,9 @@ YACC = bison -pscotchyy -y -b y (sha256 (base32 "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn")))) + (properties + `((release-monitoring-url + . "http://glaros.dtc.umn.edu/gkhome/metis/metis/download"))) (build-system cmake-build-system) (inputs `(("blas" ,openblas))) -- cgit 1.4.1 From 3104a743f9b26ae0c41bcd2cbdc82588a5311be1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 29 Mar 2021 17:48:52 +0200 Subject: services: rottlog: Add /var/log/mcron.log to '%default-rotations'. Fixes . Reported by Leo Famulari . * gnu/services/admin.scm (%rotated-files): Add "/var/log/mcron.log". --- gnu/services/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index b34b990f32..763a4434e4 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jan Nieuwenhuizen -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. @@ -80,7 +80,7 @@ (define %rotated-files ;; Syslog files subject to rotation. '("/var/log/messages" "/var/log/secure" "/var/log/debug" - "/var/log/maillog")) + "/var/log/maillog" "/var/log/mcron.log")) (define %default-rotations (list (log-rotation ;syslog files -- cgit 1.4.1 From 02f664a0a3dd3a936213e687802bdc62f2a10983 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 10 Mar 2021 13:26:20 +1100 Subject: gnu: python-poppler-qt5: Update to 21.1.0. * gnu/packages/pdf.scm (python-poppler-qt5): Update to 21.1.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 00468fa814..cbbdf68f5b 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -309,14 +309,14 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") (define-public python-poppler-qt5 (package (name "python-poppler-qt5") - (version "0.24.2") + (version "21.1.0") (source (origin (method url-fetch) (uri (pypi-uri "python-poppler-qt5" version)) (sha256 (base32 - "0l69llw1fzwz8y90q0qp9q5pifbrqjjbwii7di54dwghw5fc6w1r")))) + "0b82gm4i75q5v19kfbq0h4y0b2vcwr2213zkhxh6l0h45kdndmxd")))) (build-system python-build-system) (arguments `(;; There are no tests. The check phase just causes a rebuild. -- cgit 1.4.1 From aae012e91e66e3edcc486db7bd4939fb34ed3b24 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 29 Mar 2021 23:51:04 +0200 Subject: gnu: gimp: Properly handle missing optional ‘dot’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gimp.scm (gimp)[source]: Add a patch to fix a fatal error when ‘dot’ is not in $PATH. (gegl)[arguments]: Move the 'refer-to-dot phase... [inputs]: ...and graphviz... (gegl-for-glimpse)[arguments]: ...here, and... [inputs]: ...here, respectively. (glimpse)[inputs]: Use gegl-for-glimpse gegl variant. --- gnu/packages/gimp.scm | 63 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 86b42e0fab..a0f6b7ca11 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -230,16 +230,6 @@ provided, as well as a framework to add new color models and data types.") (list "-Dintrospection=false") #:phases (modify-phases %standard-phases - (add-after 'unpack 'refer-to-dot - ;; Without ‘dot’ in $PATH, (at least) the GIMP would fail to start - ;; with an extremely obtuse ‘GEGL operation missing!’ error. - (lambda _ - (substitute* "gegl/gegl-dot.c" - (("\"dot ") - (format #f "\"~a " (which "dot")))) - (substitute* "operations/common/introspect.c" - (("g_find_program_in_path \\(\"dot\"\\)") - (format #f "g_strdup (\"~a\")" (which "dot")))))) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; Multiply some poorly-chosen time-outs for busy build machines. @@ -260,7 +250,6 @@ provided, as well as a framework to add new color models and data types.") ("json-glib" ,json-glib))) (inputs `(("cairo" ,cairo) - ("graphviz" ,graphviz) ("pango" ,pango) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo))) @@ -281,14 +270,25 @@ buffers.") (package (name "gimp") (version "2.10.22") - (source (origin - (method url-fetch) - (uri (string-append "https://download.gimp.org/pub/gimp/v" - (version-major+minor version) - "/gimp-" version ".tar.bz2")) - (sha256 - (base32 - "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")))) + (source + (origin + (method url-fetch) + (uri (string-append "https://download.gimp.org/pub/gimp/v" + (version-major+minor version) + "/gimp-" version ".tar.bz2")) + (sha256 + (base32 "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")) + (patches + (list (origin + ;; This upstream patch fixes a mandatory dependency on ‘dot’: + ;; . + (method url-fetch) + (uri (string-append "https://github.com/GNOME/gimp/commit/" + "2cae9b9acf9da98c4c9990819ffbd5aabe23017e" + ".patch")) + (sha256 + (base32 + "1xd5lmy1j9p6p1ka7dyj1b9jmfcra1r62rma07vzw2v4vig0khc0"))))))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML @@ -556,6 +556,29 @@ healing the border, increasing the resolution while adding detail, and transferring the style of an image.") (license license:gpl3+))) +(define gegl-for-glimpse + ;; Remove this when GIMP commit 2cae9b9acf9da98c4c9990819ffbd5aabe23017e + ;; makes it into Glimpse. + (package + (inherit gegl) + (arguments + (substitute-keyword-arguments (package-arguments gegl) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'refer-to-dot + ;; XXX Without ‘dot’ in $PATH, Glimpse would fail to start with an + ;; extremely obtuse ‘GEGL operation missing!’ error. + (lambda _ + (substitute* "gegl/gegl-dot.c" + (("\"dot ") + (format #f "\"~a " (which "dot")))) + (substitute* "operations/common/introspect.c" + (("g_find_program_in_path \\(\"dot\"\\)") + (format #f "g_strdup (\"~a\")" (which "dot")))))))))) + (inputs + `(,@(package-inputs gegl) + ("graphviz" ,graphviz))))) + (define-public glimpse (package (name "glimpse") @@ -635,7 +658,7 @@ transferring the style of an image.") ("poppler-data" ,poppler-data) ("python" ,python-2) ; optional, Python support ("python2-pygtk" ,python2-pygtk) ; optional, Python support - ("gegl" ,gegl))) + ("gegl" ,gegl-for-glimpse))) ; XXX see comment in gegl-for-glimpse (home-page "https://glimpse-editor.github.io/") (synopsis "Glimpse Image Editor") (description "The Glimpse Image Editor is an application for image -- cgit 1.4.1 From 9feef62b73e284e106717a386624d6da90750a3d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 30 Mar 2021 02:10:19 +0200 Subject: gnu: zstd: Downgrade to 1.4.4 and make security graft saner. * gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/compression.scm (zstd-1.4.9): Remove. (zstd/fixed): New variable. Apply patch. (zstd)[replacement]: Graft with zstd/fixed. --- gnu/local.mk | 1 + gnu/packages/compression.scm | 19 +++--- .../zstd-CVE-2021-24031_CVE-2021-24032.patch | 68 ++++++++++++++++++++++ 3 files changed, 76 insertions(+), 12 deletions(-) create mode 100644 gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 40732ca696..deb4ddcede 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1824,6 +1824,7 @@ dist_patch_DATA = \ %D%/packages/patches/yggdrasil-extra-config.patch \ %D%/packages/patches/ytnef-CVE-2021-3403.patch \ %D%/packages/patches/ytnef-CVE-2021-3404.patch \ + %D%/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch \ %D%/packages/patches/zziplib-CVE-2018-16548.patch MISC_DISTRO_FILES = \ diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ef73e6038b..5ed4b4ce98 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -1409,7 +1409,7 @@ or junctions, and always follows hard links.") "v" version "/zstd-" version ".tar.gz")) (sha256 (base32 "05ckxap00qvc0j51d3ci38150cxsw82w7s9zgd5fgzspnzmp1vsr")))) - (replacement zstd-1.4.9) + (replacement zstd/fixed) (build-system gnu-build-system) (outputs '("out" ;1.2MiB executables and documentation "lib" ;1.2MiB shared library and headers @@ -1469,21 +1469,16 @@ speed.") license:public-domain ; zlibWrapper/examples/fitblk* license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} -(define-public zstd-1.4.9 +(define zstd/fixed (package (inherit zstd) - (name "zstd") - (version "1.4.9") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/facebook/zstd/releases/download/" - "v" version "/zstd-" version ".tar.gz")) - (sha256 - (base32 "14yj7309gsvg39rki4xqnd6w5idmqi0655v1fc0mk1m2kvhp9b19")))) - (arguments - (substitute-keyword-arguments (package-arguments zstd) - ((#:tests? _ #t) #f))))) + (inherit (package-source zstd)) + (patches + (search-patches + ;; From Ubuntu focal-security + "zstd-CVE-2021-24031_CVE-2021-24032.patch")))))) (define-public pzstd (package/inherit zstd diff --git a/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch b/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch new file mode 100644 index 0000000000..48b5eb18eb --- /dev/null +++ b/gnu/packages/patches/zstd-CVE-2021-24031_CVE-2021-24032.patch @@ -0,0 +1,68 @@ +Description: fix race condition allowing attackers to access destination file + This commit addresses https://github.com/facebook/zstd/issues/2491. + . + Note that a downside of this solution is that it is global: `umask()` affects + all file creation calls in the process. I believe this is safe since + `fileio.c` functions should only ever be used in the zstd binary, and these + are (almost) the only files ever created by zstd, and AIUI they're only + created in a single thread. So we can get away with messing with global state. + . + Note that this doesn't change the permissions of files created by `dibio.c`. + I'm not sure what those should be... +Author: W. Felix Handte +Origin: upstream +Bug: https://github.com/facebook/zstd/issues/2491 +Bug-Debian: https://github.com/facebook/zstd/issues/2491 +Applied-Upstream: commit:a774c5797399040af62db21d8a9b9769e005430e +Reviewed-by: Étienne Mollier +Last-Update: 2021-03-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/programs/fileio.c ++++ b/programs/fileio.c +@@ -606,11 +606,11 @@ FIO_openDstFile(FIO_prefs_t* const prefs + FIO_remove(dstFileName); + } } + +- { FILE* const f = fopen( dstFileName, "wb" ); ++ { const int old_umask = UTIL_umask(0177); /* u-x,go-rwx */ ++ FILE* const f = fopen( dstFileName, "wb" ); ++ UTIL_umask(old_umask); + if (f == NULL) { + DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno)); +- } else if(srcFileName != NULL && strcmp (srcFileName, stdinmark)) { +- chmod(dstFileName, 00600); + } + return f; + } +--- a/programs/util.c ++++ b/programs/util.c +@@ -54,6 +54,15 @@ int UTIL_getFileStat(const char* infilen + return 1; + } + ++int UTIL_umask(int mode) { ++#if PLATFORM_POSIX_VERSION > 0 ++ return umask(mode); ++#else ++ /* do nothing, fake return value */ ++ return mode; ++#endif ++} ++ + int UTIL_setFileStat(const char *filename, stat_t *statbuf) + { + int res = 0; +--- a/programs/util.h ++++ b/programs/util.h +@@ -136,6 +136,10 @@ int UTIL_isSameFile(const char* file1, c + int UTIL_compareStr(const void *p1, const void *p2); + int UTIL_isCompressedFile(const char* infilename, const char *extensionList[]); + const char* UTIL_getFileExtension(const char* infilename); ++/** ++ * Wraps umask(). Does nothing when the platform doesn't have that concept. ++ */ ++int UTIL_umask(int mode); + + #ifndef _MSC_VER + U32 UTIL_isFIFO(const char* infilename); -- cgit 1.4.1 From aed51ecea87f9b5045cc888cd1d9653a27813164 Mon Sep 17 00:00:00 2001 From: zimoun Date: Fri, 26 Mar 2021 09:05:15 +0100 Subject: gnu: guix: Fix openrc init scripts. Fixes . * gnu/packages/package-management.scm (guix)[arguments]: Fix openrc init. * nix/local.mk (openrcservicedir): Likewise. Signed-off-by: Efraim Flashner --- gnu/packages/package-management.scm | 2 +- nix/local.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index de549fd094..6ee0bc74e9 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -212,7 +212,7 @@ $(prefix)/etc/init.d\n"))) (substitute* "nix/local.mk" (("^openrcservicedir = .*$") (string-append "openrcservicedir = \ -$(prefix)/etc/init.d\n"))) +$(prefix)/etc/openrc\n"))) (invoke "sh" "bootstrap"))) (add-before 'build 'use-host-compressors diff --git a/nix/local.mk b/nix/local.mk index d2ce349d9c..7c438ea78c 100644 --- a/nix/local.mk +++ b/nix/local.mk @@ -181,7 +181,7 @@ etc/init.d/guix-daemon: etc/init.d/guix-daemon.in \ mv "$@.tmp" "$@" # The service script for openrc. -openrcservicedir = $(sysconfdir)/init.d +openrcservicedir = $(sysconfdir)/openrc nodist_openrcservice_DATA = etc/openrc/guix-daemon etc/openrc/guix-daemon: etc/openrc/guix-daemon.in \ -- cgit 1.4.1 From d978c1cfeb3dbb09c3921e56ed0616ad8ea6e85e Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Mon, 29 Mar 2021 21:45:26 +0200 Subject: gnu: grokmirror: Update to 2.0.8. * gnu/packages/version-control.scm (grokmirror): Update to 2.0.8. Signed-off-by: Efraim Flashner --- 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 83780caef4..e7fa6e6777 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2330,7 +2330,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (define-public grokmirror (package (name "grokmirror") - (version "2.0.5") + (version "2.0.8") (source (origin (method git-fetch) @@ -2340,7 +2340,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "006ar3kc6fw1sq300ar9np4a63qzzsdama6cv30wh65v5mqw1mnv")))) + (base32 "0zfiwjw02df3mzpawp9jx61iwp0nhcf6y03cs8022l0hkvc7blbr")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test suite -- cgit 1.4.1 From 9098745b181b3022587a35afd255f7ff1d41ac86 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 30 Mar 2021 11:03:08 +0300 Subject: gnu: zziplib/fixed: Add missing library symlinks. Fixes , , . * gnu/packages/compression.scm (zziplib/fixed)[arguments]: Add new phase to create missing library symlinks. --- gnu/packages/compression.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 5ed4b4ce98..37a7d230fe 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2017, 2018 Leo Famulari ;;; Copyright © 2015 Jeff Mickey -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice @@ -1786,7 +1786,20 @@ timestamps in the file header with a fixed time (1 January 2008). (sha256 (base32 "0i6bpa2b13z19alm6ig80364dnin1w28cvif18k6wkkb0w3dzp8y")))) - (arguments `()) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-compatibility-symlinks + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/lib") + (map (lambda (lib new-symlink) + (symlink lib new-symlink)) + (list "libzzip.so.13" "libzzipfseeko.so.13" + "libzzipmmapped.so.13" "libzzipwrap.so.13") + (list "libzzip-0.so.13" "libzzipfseeko-0.so.13" + "libzzipmmapped-0.so.13" "libzzipwrap-0.so.13"))) + #t))))) (native-inputs `(("python" ,python) ,@(alist-delete "python" -- cgit 1.4.1 From 1b6e7157cd30ffc2b29779fe6d5cb4ddbbc6f331 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 30 Mar 2021 17:14:12 +0100 Subject: gnu: Add texlive-bera. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 4107cc118c..85678ff4be 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7836,3 +7836,26 @@ symbols. Both roman and bold versions of these symbols can be used. Moreover, there is a choice between three greek fonts (two of them created by the Greek Font Society).") (license license:gpl2+))) + +(define-public texlive-bera + (package + (inherit (simple-texlive-package + "texlive-bera" + (list "/doc/fonts/bera/" + "/fonts/afm/public/bera/" + "/fonts/map/dvips/bera/" + "/fonts/tfm/public/bera/" + "/fonts/type1/public/bera/" + "/fonts/vf/public/bera/" + "/tex/latex/bera/") + (base32 + "1pkmhhr6ah44xhipjr7nianv03hr4w4bn45xcvp264yw6ymqzqwr") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/bera") + (synopsis "Bera fonts") + (description "The @code{bera} package contains the Bera Type 1 +fonts and files to use the fonts with LaTeX. Bera is a set of three +font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger +descendant) and Bera Mono (monospaced/typewriter). The Bera family is +a repackaging, for use with TeX, of the Bitstream Vera family.") + (license license:silofl1.1))) -- cgit 1.4.1 From 3c5e1412e3ef769df8e4826d0aedabaa3aa0d631 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:30:55 -0400 Subject: gnu: WebKitGTK: Update to 2.32.0 [fixes CVE-2021-{1788,1844,1871}]. * gnu/packages/webkit.scm (webkitgtk): Update to 2.32.0. [arguments]: Add -DENABLE_GAMEPAD=OFF to #:configure-flags. --- gnu/packages/webkit.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d8378354bd..083c8ccb08 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -226,14 +226,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.30.6") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh")) + "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) @@ -244,6 +244,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") #:configure-flags (list "-DPORT=GTK" "-DENABLE_GTKDOC=ON" ; No doc by default + ;; Requires libmanette, new dependency added in 2.32.0. + ;; TODO Decide if we should enable this + "-DENABLE_GAMEPAD=OFF" "-DUSE_SYSTEMD=OFF" (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" -- cgit 1.4.1 From 254b3310501e42f0bf4f016f46881fc3cbea7c5d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:30:01 +0200 Subject: gnu: minicom: Update to 2.8. * gnu/packages/engineering.scm (minicom): Update to 2.8. --- gnu/packages/engineering.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 8d7ba9c1da..57464e1834 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2017 Julien Lepiller -;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018, 2019 Jonathan Brielmaier ;;; Copyright © 2018, 2019, 2020 Arun Isaac @@ -1248,7 +1248,7 @@ replacement for the OpenDWG libraries.") (define-public minicom (package (name "minicom") - (version "2.7.1") + (version "2.8") (source (origin (method git-fetch) @@ -1256,13 +1256,16 @@ replacement for the OpenDWG libraries.") (url "https://salsa.debian.org/minicom-team/minicom.git") (commit (string-append "v" version)))) (sha256 - (base32 "0f36wv015zpz1x895qv0z6marlynzyh0d5mfkyd7lfyy2xd1i2w0")) + (base32 "0kfihxbh9qkjk9m1932ajyqx384c2aj3d9yaphh3i9i7y1shxlpx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-lock-dir=/var/lock") #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) (replace 'bootstrap ;; autogen.sh needlessly hard-codes aclocal-1.14. (lambda _ -- cgit 1.4.1 From f7158350b2c4df3186297effdef94574ceec7d88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:48:02 +0200 Subject: gnu: xscreensaver: Update to 5.45. * gnu/packages/xdisorg.scm (xscreensaver): Update to 5.45. --- 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 56ac53edec..6ee997add0 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -1473,7 +1473,7 @@ less if you are working in front of the screen at night.") (define-public xscreensaver (package (name "xscreensaver") - (version "5.44") + (version "5.45") (source (origin (method url-fetch) @@ -1481,7 +1481,7 @@ less if you are working in front of the screen at night.") (string-append "https://www.jwz.org/xscreensaver/xscreensaver-" version ".tar.gz")) (sha256 - (base32 "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k")))) + (base32 "03fmyjlwjinzv7mih6n07glmys8s877snd8zijk2c0ds6rkxy5kh")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit 1.4.1 From 6ff782683bb07ffb5564a26db342a870e9a55e8e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 11:58:43 +0200 Subject: gnu: autocutsel: Update to 0.10.1. * gnu/packages/xdisorg.scm (autocutsel): Update to 0.10.1. --- 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 6ee997add0..725ea0afd6 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2249,7 +2249,7 @@ Wayland.") (define-public autocutsel (package (name "autocutsel") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/sigmike/autocutsel" @@ -2257,7 +2257,7 @@ Wayland.") "autocutsel-" version ".tar.gz")) (sha256 (base32 - "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2")))) + "05zb85imp42birvrc320q20r98qddc5vxx169dnl753l5za0czpi")))) (build-system gnu-build-system) (arguments '(#:tests? #f)) ; no "check" target -- cgit 1.4.1 From 5cf90c43cab457ca789862e456556af7f092063a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 12:03:31 +0200 Subject: gnu: hikari: Update to 2.2.3. * gnu/packages/wm.scm (hikari): Update to 2.2.3. --- 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 6105a98f14..d3c76d7988 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -2404,14 +2404,14 @@ read and write, and compatible with JSON.") (define-public hikari (package (name "hikari") - (version "2.2.2") + (version "2.2.3") (source (origin (method url-fetch) (uri (string-append "https://hikari.acmelabs.space/releases/" "hikari-" version ".tar.gz")) (sha256 - (base32 "1qsd1qb4bn24jh5658gxmfg6hk9p7g235gsbvnjrbfdjqsv8r6yz")))) + (base32 "1d023cphzi15k434n60l1rp5awxmdijvsxfrm59fmsvd5rjxh9q7")))) (build-system gnu-build-system) (native-inputs `(("bmake" ,bmake) -- cgit 1.4.1 From 634d9845a6b4e362f32ba369ae42851719455ba3 Mon Sep 17 00:00:00 2001 From: methuselah-0 Date: Tue, 30 Mar 2021 11:18:09 +0200 Subject: gnu: vsftpd: Use CentOS version and patches. * gnu/packages/ftp.scm (vftpd)[source]: Use CentOS source RPM. [arguments]: Adapt the 'unpack phase, and apply CentOS patches in a new 'apply-CentOS-patches phase. [inputs]: Add openssl, linux-pam, and libcap. [native-inputs]: Add p7zip and cpio. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/ftp.scm | 117 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 81 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index b178063556..78c496c378 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -2,8 +2,9 @@ ;;; Copyright © 2014, 2015, 2018 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Rene Saavedra +;;; Copyright © 2021 David Larsson ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,12 +29,14 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages check) + #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libidn) + #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) @@ -251,40 +254,82 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - (package - (name "vsftpd") - (version "3.0.3") - (source (origin - (method url-fetch) - (uri (string-append "https://security.appspot.com/downloads/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("LDFLAGS=-lcrypt") - #:tests? #f ; No tests exist. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr") (assoc-ref outputs "out"))) - #t)) - (add-before 'install 'mkdir - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p out) - (mkdir (string-append out "/sbin")) - (mkdir (string-append out "/man")) - (mkdir (string-append out "/man/man5")) - (mkdir (string-append out "/man/man8")) - #t))) - (delete 'configure)))) - (synopsis "vsftpd FTP daemon") - (description "@command{vsftpd} is a daemon that listens on a TCP socket + ;; Use a significantly patched CentOS variant supporting TLSv1.2, ‘email + ;; passwords’, and XXX davidl: anything else? + (let ((upstream-version "3.0.3") + (centos-version "8.3.2011") + (revision "32.el8")) + (package + (name "vsftpd") + (version (string-append upstream-version "." revision)) + (source + (origin + (method url-fetch) + (uri (string-append + "https://vault.centos.org/centos/" centos-version + "/AppStream/Source/SPackages/vsftpd-" upstream-version "-" + revision ".src.rpm")) + (sha256 + (base32 "1xl0kqcismf82hl99klqbvvpylpyk1yr1qjy5hd8f80cj4lyl0f4")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("LDFLAGS=-lcrypt -lssl -pie") + #:tests? #f ; no tests exist + #:phases + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (invoke "7z" "e" source "-ocpio") + (invoke "cpio" "-idmv" + (string-append "--file=cpio/vsftpd-" + ,upstream-version "-" ,revision + ".src.cpio")) + (invoke "tar" "xvf" + (string-append "vsftpd-" ,upstream-version ".tar.gz")) + (chdir (string-append "vsftpd-" ,upstream-version)))) + (add-after 'unpack 'apply-CentOS-patches + ;; Apply all patches as enumerated in vsftpd.spec, in order: + ;; simply using FIND-FILES would silently corrupt the result. + (lambda _ + (call-with-input-file "../vsftpd.spec" + (lambda (port) + (use-modules (ice-9 rdelim)) + (let loop () + (let ((line (read-line port))) + (unless (eof-object? line) + (when (string-prefix? "Patch" line) + (let* ((space (string-rindex line #\space)) + (patch (string-drop line (+ 1 space)))) + (format #t "Applying '~a'.\n" patch) + (invoke "patch" "-Np1" + "-i" (string-append "../" patch)))) + (loop)))))))) + (add-after 'unpack 'patch-installation-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("/usr") (assoc-ref outputs "out"))) + #t)) + (add-before 'install 'mkdir + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p out) + (mkdir (string-append out "/sbin")) + (mkdir (string-append out "/man")) + (mkdir (string-append out "/man/man5")) + (mkdir (string-append out "/man/man8")) + #t))) + (delete 'configure)))) + (native-inputs + ;; Used to unpack the source RPM. + `(("p7zip" ,p7zip) + ("cpio" ,cpio))) + (inputs + `(("libcap" ,libcap) + ("linux-pam" ,linux-pam) + ("openssl" ,openssl))) + (home-page "https://security.appspot.com/vsftpd.html") + (synopsis "Share files securely over FTP or FTPS") + (description "@command{vsftpd} is a daemon that listens on a TCP socket for clients and gives them access to local files via File Transfer Protocol.") - (home-page "https://security.appspot.com/vsftpd.html") - (license gpl2))) + (license gpl2)))) -- cgit 1.4.1 From e04c04683bdc5a12868295c126b67136b7bbd25a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:32:59 +0200 Subject: gnu: nq: Update to 0.4. * gnu/packages/admin.scm (nq): Update to 0.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 df7973395d..292a4bc2a2 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4502,7 +4502,7 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.") (define-public nq (package (name "nq") - (version "0.3.1") + (version "0.4") (source (origin (method git-fetch) @@ -4511,7 +4511,7 @@ the XMODEM/YMODEM/ZMODEM file transfer protocols.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1db96ykz35r273jyhf7cdknqk4p2jj9l8gbz7pjy1hq4pb6ffk99")))) + (base32 "0sdamjzvmf6cxhjmd1rjvn7zm6k10fp5n6vabyxd3yl30cgrxw2i")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) -- cgit 1.4.1 From 614defcd765508ea135e754f9a01fdc8a8aaa1cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:33:59 +0200 Subject: gnu: vsftp: Apply unstaged fixes. * gnu/packages/ftp.scm (vsftpd): Update comment. [version]: Separate version and revision with a hyphen. --- 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 78c496c378..9715c3e770 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -254,14 +254,14 @@ directory comparison and more.") (properties '((upstream-name . "FileZilla"))))) (define-public vsftpd - ;; Use a significantly patched CentOS variant supporting TLSv1.2, ‘email - ;; passwords’, and XXX davidl: anything else? + ;; Use a significantly patched CentOS variant with TLSv1.2 support and + ;; further bug and security fixes. (let ((upstream-version "3.0.3") (centos-version "8.3.2011") (revision "32.el8")) (package (name "vsftpd") - (version (string-append upstream-version "." revision)) + (version (string-append upstream-version "-" revision)) (source (origin (method url-fetch) -- cgit 1.4.1 From 9abfeefa9532a45e775783f410332fd03f26abfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:48:03 +0200 Subject: gnu: nginx: Update to 1.19.9. * gnu/packages/web.scm (nginx): Update to 1.19.9. --- 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 ae41588037..eb225eea45 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -367,14 +367,14 @@ the same, being completely separated from the Internet.") ;; ’stable’ and recommends that “in general you deploy the NGINX mainline ;; branch at all times” (https://www.nginx.com/blog/nginx-1-6-1-7-released/) ;; Consider updating the nginx-documentation package together with this one. - (version "1.19.8") + (version "1.19.9") (source (origin (method url-fetch) (uri (string-append "https://nginx.org/download/nginx-" version ".tar.gz")) (sha256 (base32 - "01cb6hsaik1sfjihbrldmwrcn54gk4plfy350sl1b4rml6qik29h")))) + "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("pcre" ,pcre) -- cgit 1.4.1 From 8b61b6f5122f1e88019991269ab3c8c647ccbced Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:54:15 +0200 Subject: gnu: nginx-documentation: Update to 1.19.9-2696-f85798c1c70a. * gnu/packages/web.scm (nginx-documentation): Update to 1.19.9-2696-f85798c1c70a. --- gnu/packages/web.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index eb225eea45..7bc638ba88 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -457,9 +457,9 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (define-public nginx-documentation ;; This documentation should be relevant for the current nginx package. - (let ((version "1.19.8") - (revision 2673) - (changeset "4398fd0f0341")) + (let ((version "1.19.9") + (revision 2696) + (changeset "f85798c1c70a")) (package (name "nginx-documentation") (version (simple-format #f "~A-~A-~A" version revision changeset)) @@ -471,7 +471,7 @@ and as a proxy to reduce the load on back-end HTTP or mail servers.") (file-name (string-append name "-" version)) (sha256 (base32 - "1pds76h19fadmymyr6pnfh72ql6vizpv2628lqcrpqhxgwa6hcbg")))) + "1ksl32jw6h3qzyxxlsdjag7fcjvk3md3hdxn6ljs8pr2nhk1v6cs")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no test suite -- cgit 1.4.1 From a8b59a032d56664348d270cfb6713f9424baf4c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 22:54:44 +0200 Subject: gnu: avidemux: Update to 2.7.8. * gnu/packages/video.scm (avidemux): Update to 2.7.8. [arguments]: Adjust to updated bundled ffmpeg-4.2.4. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 05502a1d1a..09bf701ae5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2686,7 +2686,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.7.6") + (version "2.7.8") (source (origin (method url-fetch) (uri (string-append @@ -2694,7 +2694,7 @@ for use with HTML5 video.") "avidemux_" version ".tar.gz")) (sha256 (base32 - "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s")) + "00blv5455ry3bb86zyzk1xmq3rbqmbif62khc0kq3whza97l12k2")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -2727,7 +2727,7 @@ for use with HTML5 video.") #:phases ;; Make sure files inside the included ffmpeg tarball are ;; patch-shebanged. - (let ((ffmpeg "ffmpeg-4.2.3")) + (let ((ffmpeg "ffmpeg-4.2.4")) (modify-phases %standard-phases (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ -- cgit 1.4.1 From e8aa983cd0695a262d498f47ac6520b475b47059 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:02:10 +0200 Subject: gnu: vim: Update to 8.2.2677. * gnu/packages/vim.scm (vim): Update to 8.2.2677. --- 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 0a73d9e402..92ce1213c4 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -71,7 +71,7 @@ (define-public vim (package (name "vim") - (version "8.2.2632") + (version "8.2.2677") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0f80im1swja58n99696zslyzapsx8pyf545pmpzvy173ymnvm6nq")))) + "13y58h0nnd5jpqk8nhpcdhg6m2drfnrfbiv4cjh9qmkjw47i0qir")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From c9b852a99022c8b23a8e5b507a437f92b01a9301 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:05:45 +0200 Subject: gnu: quickjs: Update to 2021-03-27. * gnu/packages/javascript.scm (quickjs): Update to 2021-03-27. --- gnu/packages/javascript.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index 00e89612a5..bb3a8063e3 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -597,14 +597,14 @@ roots, or wrestle with obscure build systems.") (define-public quickjs (package (name "quickjs") - (version "2020-11-08") + (version "2021-03-27") (source (origin (method url-fetch) (uri (string-append "https://bellard.org/quickjs/quickjs-" version ".tar.xz")) (sha256 (base32 - "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f")))) + "06pywwpmfwjz225h59wf90q96a2fd66qfcw5xa6m6y9k9k7glnx4")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From de3fe06ab7bc56be65f041d38b8390ed1fbcb3ae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:13:24 +0200 Subject: gnu: sg3-utils: Update to 1.46. * gnu/packages/scsi.scm (sg3-utils): Update to 1.46. --- gnu/packages/scsi.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index 803f49931e..4c3bfd7e33 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Chris Marusich -;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -27,14 +27,14 @@ (define-public sg3-utils (package (name "sg3-utils") - (version "1.45") + (version "1.46") (source (origin (method url-fetch) (uri (string-append "http://sg.danny.cz/sg/p/sg3_utils-" version ".tar.xz")) (sha256 (base32 - "1vmjb17y33a73sv7jg8fzs6bhr7yh2k9sba81sjiyf1pvi3vbnn7")))) + "185rlxppnsmi6q7garfhglmw31gji2ff24xg2yjk3klk1fqnihjr")))) (build-system gnu-build-system) (home-page "http://sg.danny.cz/sg/sg3_utils.html") (synopsis "SCSI device utilities") -- cgit 1.4.1 From 4b8c687a7c1addb6c81e0a6fad45b7736bf8a6e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 30 Mar 2021 23:13:39 +0200 Subject: gnu: libupnp: Update to 1.14.4. * gnu/packages/upnp.scm (libupnp): Update to 1.14.4. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 33f3fb21c0..307ea14e96 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.2") + (version "1.14.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "0w62sn95fnp12qwz5nid6ksg2h9k0k6rinz00p8m3jd4j5dh9qzz")))) + (base32 "0qxydxf11dnq5rd33pa35mc5i5li7xdysc7ph23bisbh63srwr6d")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit 1.4.1 From b4635adf859a209ccc50dcdfa9eb71c97bcb194e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:48:54 +0200 Subject: gnu: butt: Update to 0.1.29. * gnu/packages/audio.scm (butt): Update to 0.1.29. --- gnu/packages/audio.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 32ca4d65e8..eff45af80f 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5129,14 +5129,14 @@ while still staying in time.") (define-public butt (package (name "butt") - (version "0.1.28") + (version "0.1.29") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/butt/butt/butt-" version "/butt-" version ".tar.gz")) (sha256 (base32 - "1rbp4v6dlyapld6y4aqbpfmcaiafa06f2zqd1rhk4r3ld3bndafm")))) + "0nbz0z4d7krvhmnwn10594gwc61gn2dlb5fazmynjfisrfdswqlg")))) (build-system gnu-build-system) (arguments `(#:phases @@ -5173,7 +5173,7 @@ while still staying in time.") version "_manual.pdf")) (sha256 (base32 - "04wz2sqhk22h9gymwh5r6kp6sxc994mia8rg9lwpmy1r18w4pvsl")))))) + "1hhgdhdg5s86hjcbwh856gcd3kcch0i5xgi3i3v02zz3xmzl7gg3")))))) (home-page "https://danielnoethen.de/butt/") (synopsis "Audio streaming tool") (description "Butt is a tool to stream audio to a ShoutCast or -- cgit 1.4.1 From e3dc5819f9c6c5fdcbfa14775372a9e443744f71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:49:07 +0200 Subject: gnu: youtube-dl: Update to 2021.03.31. * gnu/packages/video.scm (youtube-dl): Update to 2021.03.31. --- 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 09bf701ae5..a22b73b24f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.25") + (version "2021.03.31") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "0ps8ydx4hbj6sl0m760zdm9pvhccjmwvx680i4akz3lk4z9wy0x3")) + "1svcgrhq1yxpcd6k3piqs5paalrcsq9bm79h5ras1g7yjzid05gj")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From fea1eea452e9659b79f88fa80a45ca7c03cded1f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 00:58:17 +0200 Subject: gnu: perl-net-dns: Update to 1.30. * gnu/packages/networking.scm (perl-net-dns): Update to 1.30. --- 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 ecc6f57f4e..7dd484fa94 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1922,7 +1922,7 @@ private (reserved).") (define-public perl-net-dns (package (name "perl-net-dns") - (version "1.28") + (version "1.30") (source (origin (method url-fetch) @@ -1933,7 +1933,7 @@ private (reserved).") (string-append "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-" version ".tar.gz"))) (sha256 - (base32 "0kh2qbhxv005pqb35mdk2bld7cg7xnxl12qvdwv30sgd91aqica7")))) + (base32 "1nm560xjg173wvv736ai3ib1gwssyy41gi0yv4j5fqamfav70ph5")))) (build-system perl-build-system) (inputs `(("perl-digest-hmac" ,perl-digest-hmac))) -- cgit 1.4.1 From fa76e52d874549582a1e21e2ec2ca0b6b41362cb Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Sun, 28 Mar 2021 15:12:38 +0200 Subject: gnu: Add guile-imanifest. * gnu/packages/guile-xyz.scm (guile-imanifest): New variable. Signed-off-by: Christopher Baines --- gnu/packages/guile-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c798bed817..e2ee5454a0 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -91,6 +91,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages noweb) #:use-module (gnu packages nss) + #:use-module (gnu packages package-management) #:use-module (gnu packages password-utils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -1745,6 +1746,35 @@ The library is shipped with documentation in Info format and usage examples.") (define-public guile3.0-ics (deprecated-package "guile3.0-ics" guile-ics)) +(define-public guile-imanifest + (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0") + (revision "0")) + (package + (name "guile-imanifest") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~brown121407/guile-imanifest") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0i5qllcrhdjhspyj7j9h4dc9y37d3cfbpackmybm3030qgfxqirf")))) + (build-system guile-build-system) + (native-inputs + `(("guile" ,guile-3.0))) + (propagated-inputs + `(("guile-readline" ,guile-readline) + ("guile-colorized" ,guile-colorized) + ("guix" ,guix))) + (home-page "https://sr.ht/~brown121407/guile-imanifest") + (synopsis "Interactive Guix manifests") + (description "This package provides functions to generate Guix manifests +interactively. It works by scanning an alist of package categories, to ask the +user which package sets would they like to install from it.") + (license license:gpl3+)))) + (define-public guile-wisp (package (name "guile-wisp") -- cgit 1.4.1 From f92e8e5ed1c01ec87a88b1bb71a898da5f20fb8c Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 24 Mar 2021 04:04:05 +0100 Subject: gnu: Add emacs-julia-repl. * gnu/packages/emacs-xyz.scm (emacs-julia-repl): New variable. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 52191f3ebc..92aa2e40b4 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -95,6 +95,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Stefan Reichör +;;; Copyright © 2021 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -8736,6 +8737,29 @@ E-Prime forbids the use of the \"to be\" form to strengthen your writing.") programming language.") (license license:expat))) +(define-public emacs-julia-repl + (package + (name "emacs-julia-repl") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpapp/julia-repl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11vpqqnxqj9nxh8kccj4y6h3f8lib6jxnsk6vxc2j2fqw6alnafm")))) + (build-system emacs-build-system) + (home-page "https://github.com/tpapp/julia-repl") + (synopsis "Minor mode for interacting with a Julia REPL") + (description "This package provides a minor mode for interacting with a +Julia REPL running inside Emacs. The julia process is started in an ANSI +terminal (term), which allows text formatting and colors, and interaction with +the help system and the debugger. It is recommended that you use this minor +mode with the package emacs-julia-mode.") + (license license:expat))) + (define-public emacs-smex (package (name "emacs-smex") -- cgit 1.4.1 From f27bdad0a7a3c3d6edbfa2c6809f19592fe5ba56 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 24 Mar 2021 04:04:06 +0100 Subject: gnu: Add emacs-julia-snail. * gnu/packages/emacs-xyz.scm (emacs-julia-snail): New variable. Signed-off-by: Christopher Baines --- gnu/packages/emacs-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 92aa2e40b4..7fe8ab5c83 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8760,6 +8760,46 @@ the help system and the debugger. It is recommended that you use this minor mode with the package emacs-julia-mode.") (license license:expat))) +(define-public emacs-julia-snail + (package + (name "emacs-julia-snail") + (version "1.0.0rc4") ;rc5 requires CSTParser (julia package) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gcv/julia-snail") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y")))) + (build-system emacs-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'JuliaSnail-jl + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "JuliaSnail.jl" + (string-append out "/share/emacs/site-lisp/"))) + #t))))) + (inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s) + ("emacs-spinner" ,emacs-spinner) + ("emacs-xref" ,emacs-xref))) + (propagated-inputs + `(("libvterm" ,libvterm) + ("emacs-julia-mode" ,emacs-julia-mode) ;required by parser + ("emacs-parsec" ,emacs-parsec) ;required by parser + ("emacs-vterm" ,emacs-vterm))) + (home-page "https://github.com/gcv/julia-snail") + (synopsis "Development environment and REPL interaction package for Julia") + (description "This package provides a development environment and REPL +interaction package for Julia in the spirit of Common Lisp’s SLIME and +Clojure’s CIDER. It enables convenient and dynamic REPL-driven development.") + (license license:gpl3))) + (define-public emacs-smex (package (name "emacs-smex") -- cgit 1.4.1 From 9ce963d8b3dc480c3bb4b797cf7e2eda0a3aca99 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 31 Mar 2021 09:44:27 +0200 Subject: gnu: mumi: Update to 0.0.1-4.887471f. * gnu/packages/mail.scm (mumi): Update to 0.0.1-4.887471f. --- gnu/packages/mail.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 68c2fe2433..fdbbaf1784 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Langlois ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Gábor Boskovits -;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus +;;; Copyright © 2018, 2019, 2020, 2021 Ricardo Wurmus ;;; Copyright © 2019, 2020 Tanguy Le Carrour ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Justus Winter @@ -3873,8 +3873,8 @@ It is a replacement for the @command{urlview} program.") (license license:gpl2+))) (define-public mumi - (let ((commit "8c82c8f104ff0013e2bfb3d6b4277280f32446a6") - (revision "3")) + (let ((commit "887471f7785c74dd8ee5d300d3b1fb58e011c2cb") + (revision "4")) (package (name "mumi") (version (git-version "0.0.1" revision commit)) @@ -3886,7 +3886,7 @@ It is a replacement for the @command{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "1gkwagy7qplzq2x2zqsbrwhlilxviqb0dqhrvnnhxd7z8wvyzcsi")))) + "1lmnnfa42j0bcscxbyx5y48v4l0hyvnh4kq4sjrqw92v0h93iksg")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From b0b0257ed30084ff95694653482890bc7061f9c0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 12:42:57 +0300 Subject: gnu: python-icalendar: Update to 4.0.7. * gnu/packages/python-xyz.scm (python-icalendar): Update to 4.0.7. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c90a89a411..74aee4a3c2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11060,13 +11060,13 @@ minimal and fast API targeting the following uses: (define-public python-icalendar (package (name "python-icalendar") - (version "4.0.5") + (version "4.0.7") (source (origin (method url-fetch) (uri (pypi-uri "icalendar" version)) (sha256 (base32 - "14ynjj65kfmlcvpb7k097w789wvxncd3cr3xz5m1jz9yl9v6vv5q")))) + "19574j3jwssm2dkqykih4568xqfgjsa3hcd79yl5s2vfys3qvh8g")))) (build-system python-build-system) (propagated-inputs `(("python-dateutil" ,python-dateutil) -- cgit 1.4.1 From 26133b1f33c8fbce63ed058df80f3e5181803f68 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 31 Mar 2021 12:08:50 +0100 Subject: gnu: Add texlive-fourier. * gnu/packages/tex.scm: 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 85678ff4be..66844ed321 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7859,3 +7859,28 @@ font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger descendant) and Bera Mono (monospaced/typewriter). The Bera family is a repackaging, for use with TeX, of the Bitstream Vera family.") (license license:silofl1.1))) + +(define-public texlive-fourier + (package + (inherit (simple-texlive-package + "texlive-fourier" + (list "/doc/fonts/fourier/" + "/fonts/afm/public/fourier/" + "/fonts/map/dvips/fourier/" + "/fonts/tfm/public/fourier/" + "/fonts/type1/public/fourier/" + "/fonts/vf/public/fourier/" + "/tex/latex/fourier/") + (base32 + "1vs2xdx6f6hd01zlslx3y93g3dsa7k3yhqpnhgkizgjmz0r9ipz1") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/fourier") + (synopsis "Utopia fonts for LaTeX documents") + (description "Fourier-GUTenberg is a LaTeX typesetting system +which uses Adobe Utopia as its standard base font. Fourier-GUTenberg +provides all complementary typefaces needed to allow Utopia based TeX +typesetting including an extensive mathematics set and several other +symbols. The system is absolutely stand-alone; apart from Utopia and +Fourier no other typefaces are required. Utopia is a registered +trademark of Adobe Systems Incorporated.") + (license license:lppl))) -- cgit 1.4.1 From 58e9e0e1428e362777ccbb317df2d051ff76ce5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:12:24 +0300 Subject: gnu: plink-ng: Update to 2.00a2.3. * gnu/packages/bioinformatics.scm (plink-ng): Update to 2.00a2.3. [arguments]: Adjust make-flags. --- gnu/packages/bioinformatics.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a81c873371..49ae8b155f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6290,7 +6290,7 @@ subsequent visualization, annotation and storage of results.") (define-public plink-ng (package (inherit plink) (name "plink-ng") - (version "1.90b4") + (version "2.00a2.3") (source (origin (method git-fetch) @@ -6299,14 +6299,13 @@ subsequent visualization, annotation and storage of results.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02npdwgkpfkdnhw819rhj5kw02a5k5m90b14zq9zzya4hyg929c0")))) + (base32 "1p88lz9agzjlspjhciz61qjc36cfniv4nkxszyy0njqyc5rzc0cd")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" - "ZLIB=-lz" - "-f" "Makefile.std") + "ZLIB=-lz") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir -- cgit 1.4.1 From 977ea2c0a35da76a034f1a14f7af26b937d795fb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:14:48 +0300 Subject: gnu: plink-ng: Sort inputs alphabetically. * gnu/packages/bioinformatics.scm (plink-ng)[inputs]: Sort alphabetically. --- 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 49ae8b155f..5af8d0b412 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6318,9 +6318,9 @@ subsequent visualization, annotation and storage of results.") (install-file "plink" bin) #t)))))) (inputs - `(("zlib" ,zlib) - ("lapack" ,lapack) - ("openblas" ,openblas))) + `(("lapack" ,lapack) + ("openblas" ,openblas) + ("zlib" ,zlib))) (home-page "https://www.cog-genomics.org/plink/") (license license:gpl3+))) -- cgit 1.4.1 From 5f3f2a7cc8e186a33c0c3175f765afdc3e78be18 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:20:08 +0300 Subject: gnu: plink-ng: Remove custom install phase. * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Adjust make-flags and remove custom 'install phase. --- 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 5af8d0b412..cf2a8deea2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6305,18 +6305,14 @@ subsequent visualization, annotation and storage of results.") '(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" - "ZLIB=-lz") + "ZLIB=-lz" + (string-append "PREFIX=" (assoc-ref %outputs "out")) + "DESTDIR=") #:phases (modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ (chdir "1.9") #t)) - (delete 'configure) ; no "configure" script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((bin (string-append (assoc-ref outputs "out") - "/bin/"))) - (install-file "plink" bin) - #t)))))) + (delete 'configure)))) ; no "configure" script (inputs `(("lapack" ,lapack) ("openblas" ,openblas) -- cgit 1.4.1 From 04ba7a196ab23539f1c7897ca5349fa635c5e88d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 31 Mar 2021 14:27:41 +0300 Subject: gnu: plink-ng: Build prettify binary. * gnu/packages/bioinformatics.scm (plink-ng)[arguments]: Adjust make-flags to also build prettify. --- gnu/packages/bioinformatics.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index cf2a8deea2..ae45ff8d3c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6302,10 +6302,12 @@ subsequent visualization, annotation and storage of results.") (base32 "1p88lz9agzjlspjhciz61qjc36cfniv4nkxszyy0njqyc5rzc0cd")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no "check" target + `(#:tests? #f ;no "check" target #:make-flags (list "BLASFLAGS=-llapack -lopenblas" "CFLAGS=-Wall -O2 -DDYNAMIC_ZLIB=1" "ZLIB=-lz" + "BIN=plink prettify" + (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out")) "DESTDIR=") #:phases -- cgit 1.4.1 From 383b02a370252c08eb1d43ac94d659c1d3993a35 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:22 +0000 Subject: gnu: libvirt: Update to 7.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (libvirt): Update to 7.1.0. [source]: Remove libvirt-create-machine-cgroup.patch, add libvirt-do-not-create-var-dirs.patch. [build-system]: Switch to meson-build-system. [arguments]: Use meson-0.55. Adapt #:configure-flags for meson, there is no need for --docdir anymore. Remove fix-BOURNE_SHELL-definition phase. Add fix-sysconfdir-and-localstatedir phase. Adapt disable-broken-tests to meson. [native-inputs]: Add python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete. * gnu/packages/patches/libvirt-do-not-create-var-dirs.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add new patch, remove the other. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 +- .../patches/libvirt-create-machine-cgroup.patch | 48 ------------- .../patches/libvirt-do-not-create-var-dirs.patch | 30 +++++++++ gnu/packages/virtualization.scm | 78 +++++++++------------- 4 files changed, 64 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch create mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index deb4ddcede..d8c548b0eb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1262,7 +1262,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch deleted file mode 100644 index 585ac237e1..0000000000 --- a/gnu/packages/patches/libvirt-create-machine-cgroup.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= - -Date: Fri, 1 Nov 2019 17:29:00 +0100 -Subject: [PATCH] vircgroup: Ensure /machine group is associated with its - parent. - -Call first virCgroupNew on the parent group virCgroupNewPartition if -it is available on before the creation of the child group. This -ensures that the creation of a first level group on the unified -architecture, as the check at virCgroupV2ParseControllersFile as the -parent file is there. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 ---- - src/util/vircgroup.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c -index b46f20abfd..33c61f2d45 100644 ---- a/src/util/vircgroup.c -+++ b/src/util/vircgroup.c -@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, - if (virCgroupSetPartitionSuffix(path, &newPath) < 0) - goto cleanup; - -- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) -- goto cleanup; -- - if (STRNEQ(newPath, "/")) { - char *tmp; - parentPath = g_strdup(newPath); -@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) - goto cleanup; -+ } - -+ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) -+ goto cleanup; -+ -+ if (parent) { - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) - goto cleanup; - } --- -2.23.0 - diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch new file mode 100644 index 0000000000..6b89d49fd4 --- /dev/null +++ b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch @@ -0,0 +1,30 @@ +We define localstatedir as /var, and so we shouldn't be installing empty +directories there. + +diff --git a/src/meson.build b/src/meson.build +index f13b85b74e..58040f2c5d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') + ) + endif + +- +-# Install empty directories +- +-virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', +-] +- +-meson.add_install_script( +- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(), +- virt_install_dirs, +-) +- +- + # Check driver files + + if host_machine.system() == 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c6929b9f1a..7a34f8db1f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1065,64 +1066,49 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (search-patches "libvirt-do-not-create-var-dirs.patch")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=nobody" - "--with-qemu-group=kvm" - "--with-polkit" - (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" - ,name "-" ,version) - "--sysconfdir=/etc" - "--localstatedir=/var") + `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. + #:configure-flags + (list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dpolkit=enabled") #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. + (add-after 'unpack 'fix-sysconfdir-and-localstatedir (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determine where - ;; the RPC headers are located. Tell it to look in the right place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) + (substitute* "meson.build" + ;; We set the prefix to be the package output, but we need + ;; localstatedir to be /var. Sadly the build system doesn't + ;; seem to allow that easily. + (("localstatedir = prefix / get_option\\('localstatedir'\\)") + "localstatedir = get_option('localstatedir')") + ;; On the other hand, we keep sysconfdir using the prefix so + ;; that we install configuration files in the package output. + ;; However, we need to make sure the C code refers to /etc via + ;; SYSCONFDIR, and not the read-only configuration in the + ;; package output. + (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") + "set_quoted('SYSCONFDIR', '/etc')")) #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails - "virnetsockettest" ; tries to network - "virshtest"))) ; fails - (substitute* "tests/Makefile.in" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) - "")) - #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var" - make-flags)))))) + (substitute* "tests/meson.build" + (("\\{ 'name': 'commandtest'.*") "") ; hangs idly + (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails + (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to network + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1149,7 +1135,9 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit 1.4.1 From 52ed12afcb4618f0a9801b10799d8bbdffe87878 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:23 +0000 Subject: gnu: python-libvirt: Update to 7.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (python-libvirt): Update to 7.1.0. Signed-off-by: Ludovic Courtès --- 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 7a34f8db1f..e1b780bbe1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) + (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 7573ab22d7400a16d81228c6500331a293887cae Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:24 +0000 Subject: gnu: libvirt-glib: Update to 4.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e1b780bbe1..8fcdb660ce 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit 1.4.1 From 5eb05ede0bf0cfe3080a24eea783f0fbc2ed4015 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:25 +0000 Subject: gnu: virt-manager: Update to 3.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0. [arguments]: Remove #:test-target. Remove fix-qemu-img-reference phase. Adapt check phase to use pytest, although they still do not run. [native-inputs]: Add python-docutils. Suggest adding python-pytest to enable tests. Signed-off-by: Ludovic Courtès --- gnu/packages/virtualization.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8fcdb660ce..ab7d8deec6 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,11 +1238,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) + "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1260,12 +1259,6 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) - (add-after 'unpack 'fix-qemu-img-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) - #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1296,11 +1289,12 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + (invoke "dbus-run-session" "--" "pytest" "--uitests")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1330,7 +1324,9 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) + ("rst2man" ,python-docutils) ;; The following are required for running the tests + ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit 1.4.1 From fe0826d5c9264184cc7c9e754d8a486d03865c05 Mon Sep 17 00:00:00 2001 From: Valentin Herrmann Date: Sun, 21 Mar 2021 12:23:23 +0100 Subject: services: xorg: Export %default-xorg-server-arguments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/xorg.scm (%default-xorg-server-arguments): Export. Signed-off-by: Ludovic Courtès --- gnu/services/xorg.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 60611dc77d..17d983ff8d 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -68,6 +68,8 @@ %default-xorg-modules %default-xorg-fonts + %default-xorg-server-arguments + xorg-wrapper xorg-start-command xinitrc -- cgit 1.4.1 From 4f547c50f9bc478fd7c8bb9d481e2e376b969e8a Mon Sep 17 00:00:00 2001 From: muradm Date: Mon, 22 Mar 2021 19:09:48 +0300 Subject: services: sysctl: Export record field accessors. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/sysctl.scm (sysctl-configuration-sysctl) (sysctl-configuration-settings): Export. Signed-off-by: Ludovic Courtès --- gnu/services/sysctl.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/services/sysctl.scm b/gnu/services/sysctl.scm index aaea7cc30d..80ed2ff46f 100644 --- a/gnu/services/sysctl.scm +++ b/gnu/services/sysctl.scm @@ -25,6 +25,8 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (sysctl-configuration + sysctl-configuration-sysctl + sysctl-configuration-settings sysctl-service-type %default-sysctl-settings)) -- cgit 1.4.1 From 1410383dee23da457eabcf9162196c3a57fb8950 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 15:40:40 +0200 Subject: gnu: Remove unnecessary imports from (gnu packages gnome). * gnu/packages/gnome.scm: Remove unnecessary #:use-module forms. In particular, the (guix store) import led to a name clash with 'build' from (gnu packages build-tools). --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e8af1c41f..1e2ee4a46e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -201,7 +201,6 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu artwork) - #:use-module ((guix build utils) #:select (modify-phases)) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system glib-or-gtk) @@ -215,8 +214,6 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix gexp) - #:use-module (guix monads) - #:use-module (guix store) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -- cgit 1.4.1 From f233bb170b072cf4801b2f229593b9680ea0224c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 15:57:02 +0200 Subject: gnu: julia-commonsubexpressions: Fix Texinfo syntax. * gnu/packages/julia-xyz.scm (julia-commonsubexpressions)[synopsis] [description]: Fix Texinfo syntax. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index cbff69117d..85949ec9e8 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -304,8 +304,8 @@ with.") (propagated-inputs `(("julia-macrotools" ,julia-macrotools))) (home-page "https://github.com/rdeits/CommonSubexpressions.jl") - (synopsis "Macro @code{@cse}") - (description "This package provides the @code{@cse} macro, which performs + (synopsis "@code{@@cse} macro for Julia") + (description "This package provides the @code{@@cse} macro, which performs common subexpression elimination.") (license license:expat))) -- cgit 1.4.1 From cb7b577bcfa19d28a4c5dcc42449a6e019285539 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 31 Mar 2021 17:06:19 +0200 Subject: gnu: guix: Update to 8f9052d. * gnu/packages/package-management.scm (guix): Update to 8f9052d. --- 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 6ee0bc74e9..a6469e133d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -132,8 +132,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.2.0") - (commit "6e7ba45357078b31a369b23f8a9f38302dfcbb10") - (revision 18)) + (commit "8f9052d5434a3a11e7b4ff14d6b0090256e08aa4") + (revision 19)) (package (name "guix") @@ -149,7 +149,7 @@ (commit commit))) (sha256 (base32 - "14zzhjdd7igkc8vpv06hn375085n10mljv8wwpnk6r4a6r8qg5d3")) + "0jqxabl9sqn7dd1l9q62zm9f7w274q44dya24akina8wwfi5yc4k")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From fbc186c1562a7d6513c3c306c044b08d3e857624 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 30 Mar 2021 17:12:15 -0400 Subject: gnu: git-annex: Update to 8.20210330. * gnu/packages/haskell-apps.scm (git-annex): Update to 8.20210330. Signed-off-by: Efraim Flashner --- gnu/packages/haskell-apps.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index d7d5a0223a..8128c5425e 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -342,14 +342,14 @@ to @code{cabal repl}).") (define-public git-annex (package (name "git-annex") - (version "8.20210310") + (version "8.20210330") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "git-annex/git-annex-" version ".tar.gz")) (sha256 - (base32 "1a4pr9z2li3wns1xycz7735nzzsv3cs8milr0q74k5qcqk5f22nx")))) + (base32 "07dhxlmnj48drgndcplafc7xhby0w3rks68fz9wsppxan929240p")))) (build-system haskell-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From ce4ffdef9c081d8428ea6da115d072235b00d2e1 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Wed, 31 Mar 2021 18:04:41 +1100 Subject: gnu: strawberry: Update to 0.9.2. * gnu/packages/music.scm (strawberry): Update to 0.9.2. [arguments]: Remove unused configure flags. Signed-off-by: Efraim Flashner --- gnu/packages/music.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 98cd3583cc..41e9372c6f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2021 Leo Prikler ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -449,7 +450,7 @@ playing your music.") (define-public strawberry (package (name "strawberry") - (version "0.8.5") + (version "0.9.2") (source (origin (method git-fetch) (uri (git-reference @@ -458,7 +459,7 @@ playing your music.") (file-name (git-file-name name version)) (sha256 (base32 - "0lfbbmhfzwlhnjhzfk5zn8h71cabx47pzfkcw2nylkbqkz83r57r")) + "0d9asg21j9ai23sb35cimws8bd8fsnpha777rgscraa7i09q0rx2")) (modules '((guix build utils) (ice-9 regex))) (snippet @@ -482,9 +483,6 @@ playing your music.") (build-system cmake-build-system) (arguments `(#:test-target "run_strawberry_tests" - #:configure-flags - (list "-DUSE_SYSTEM_TAGLIB=TRUE" - "-DBUILD_TESTS=TRUE") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program -- cgit 1.4.1 From c891799bc7945f44490fc51d81d9115c30352662 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:25 -0400 Subject: gnu: linux-libre: Update to 5.11.11. * gnu/packages/linux.scm (linux-libre-5.11-version): Update to 5.11.11. (linux-libre-5.11-pristine-source): Update hash. * gnu/packages/aux-files/linux-libre/5.11-x86_64.conf: Update for linux-libre@5.11.11. --- gnu/packages/aux-files/linux-libre/5.11-x86_64.conf | 2 +- gnu/packages/linux.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf index 178bb220d7..99d3cf74e2 100644 --- a/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.11-x86_64.conf @@ -8212,7 +8212,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c5d3b31b8d..77980b9980 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -354,7 +354,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.11-version "5.11.10") +(define-public linux-libre-5.11-version "5.11.11") (define deblob-scripts-5.11 (linux-libre-deblob-scripts linux-libre-5.11-version @@ -362,7 +362,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0yvr80g200hdryz54gdnzj4fl38pf7g4qbgj475rhcfwixhp1j7n"))) (define-public linux-libre-5.11-pristine-source (let ((version linux-libre-5.11-version) - (hash (base32 "07fw48sy8p17jmm24x3rl99cwxiwhwjrxnmy3g542w9kzawaqwnk"))) + (hash (base32 "1fc3yl4srzla3cbihgnry0pqmgcc17zv0zlkk9zpx99371hpay0a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.11))) -- cgit 1.4.1 From 60dfd36fda23b619b969f3cde6b3dd238996e2b1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:37 -0400 Subject: gnu: linux-libre 5.10: Update to 5.10.27. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.27. (linux-libre-5.10-pristine-source): Update hash. * gnu/packages/aux-files/linux-libre/5.10-x86_64.conf: Update for linux-libre@5.10.27. --- gnu/packages/aux-files/linux-libre/5.10-x86_64.conf | 2 +- gnu/packages/linux.scm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf index 4836307163..189e4e16b4 100644 --- a/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf +++ b/gnu/packages/aux-files/linux-libre/5.10-x86_64.conf @@ -8146,7 +8146,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 77980b9980..f22b421b61 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,7 +370,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.26") +(define-public linux-libre-5.10-version "5.10.27") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version @@ -378,7 +378,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hh27ccqimagr3aij7ygwikxw66y63sqwd0xlf49bhpjd090r9a7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "10hlc020imxxh71nvxhnnmd66bcxndfyi78v7wv7y5mcy4rjhlzw"))) + (hash (base32 "1nb95ll66kxiz702gs903n3gy5ialz8cin58l19rqaai55kck7fr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 771f2e7c5654bfc6420e82892e0eca9cbe4ef535 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:10:54 -0400 Subject: gnu: linux-libre 5.4: Update to 5.4.109. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.109. (linux-libre-5.4-pristine-source): 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 f22b421b61..5d098ed0ce 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -383,7 +383,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.108") +(define-public linux-libre-5.4-version "5.4.109") (define deblob-scripts-5.4 (linux-libre-deblob-scripts linux-libre-5.4-version @@ -391,7 +391,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1xghbbnaisjd0k1klbyn1p7r6r4x5a1bpmkm56a3gh2zvw4s7mj8"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0wi1ql7brfsdzvwbxrxvg12zfm54lbdjvfzxk1l3xlqvq83sq4pj"))) + (hash (base32 "1vmpc6yrr2zm4m3naflwik5111jr8hy0mnyddwk31l0p4xbg8smc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 02db13e02348ac5ba07474634142d183faa73f1a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:12 -0400 Subject: gnu: linux-libre 4.19: Update to 4.19.184. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.184. (linux-libre-4.19-pristine-source): 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 5d098ed0ce..7b299c08d7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -396,7 +396,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.183") +(define-public linux-libre-4.19-version "4.19.184") (define deblob-scripts-4.19 (linux-libre-deblob-scripts linux-libre-4.19-version @@ -404,7 +404,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1jiaw0as1ippkrjdpd52657w5mz9qczg3y2hlra7m9k0xawwiqlf"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1xd5hjdjbsw7kpj9csgi8kk4ki3z46sqbiigjsr71psivxfxkkxs"))) + (hash (base32 "0z5pgal8775rf7pvpxq47dnghr42al2k9py0s9jl3js2wamgdyix"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 4a5aec9c4224d3e7c9fd5cd004605867c84d8e38 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:29 -0400 Subject: gnu: linux-libre 4.14: Update to 4.14.228. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.228. (linux-libre-4.14-pristine-source): 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 7b299c08d7..79e7f83454 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -409,7 +409,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.227") +(define-public linux-libre-4.14-version "4.14.228") (define deblob-scripts-4.14 (linux-libre-deblob-scripts linux-libre-4.14-version @@ -417,7 +417,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1qij18inijj6c3ma8hv98yjagnzxdxyn134da9fd23ky8q6hbvky"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "1iz029v407xv81prrvg4gr2ql8hvm0mpj21x9picwv05pk2d68h7"))) + (hash (base32 "0nw1jf6x5a990n69aw2da4s4lc1c7mnwiwcda40bl2rkmd24s1qm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 38894abe6a53aa235261159e321bac091b79f5fe Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:11:46 -0400 Subject: gnu: linux-libre 4.9: Update to 4.9.264. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.264. (linux-libre-4.9-pristine-source): 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 79e7f83454..08d83fcd10 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -422,7 +422,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.263") +(define-public linux-libre-4.9-version "4.9.264") (define deblob-scripts-4.9 (linux-libre-deblob-scripts linux-libre-4.9-version @@ -430,7 +430,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fxajshb75siq39lj5h8xvhdj8lcmddkslwlyj65rhlwk6g2r4b2"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "1dhmgyg6asqg1pmhnzqymwz4bm6gy8gi0n2gr794as38dhn2szwz"))) + (hash (base32 "1df2dv26c9z6zsdlqzbcc60f2pszh0hx1n94v65jswlb72a2mipc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 9287c6d8f56fae1928e4e253065a93fc747c8a2e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 30 Mar 2021 13:12:00 -0400 Subject: gnu: linux-libre 4.4: Update to 4.4.264. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.264. (linux-libre-4.4-pristine-source): 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 08d83fcd10..8a6ae502dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.263") +(define-public linux-libre-4.4-version "4.4.264") (define deblob-scripts-4.4 (linux-libre-deblob-scripts linux-libre-4.4-version @@ -443,7 +443,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0hhin1jpfkd6nwrb6xqxjzl3hdxy4pn8a15hy2d3d83yw6pflbsf"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1qqh3n09pn87n6f7ain3am8k7j043vzm65qcvccq9as129y5w1a2"))) + (hash (base32 "1b0d735qnk0bcqn9gdsjqxhk8pkb3597ya9f34lv1vjfaqkkxk7l"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From 172b85aa99e62f3b765df530f38e465c7eb4ac8d Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:12 +0100 Subject: gnu: r-bisquerna: Move to (gnu packages bioconductor). * gnu/packages/cran.scm (r-bisquerna): Move this variable from here... * gnu/packages/bioconductor.scm (r-bisquerna): ...to here. --- gnu/packages/bioconductor.scm | 26 ++++++++++++++++++++++++++ gnu/packages/cran.scm | 25 ------------------------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 0bcd9a67cd..87822419c4 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1315,6 +1315,32 @@ naming and share the same rich and consistent \"Vector API\" as much as possible.") (license license:artistic2.0))) +;; This is a CRAN package, but it depends on r-biobase from Bioconductor. +(define-public r-bisquerna + (package + (name "r-bisquerna") + (version "1.0.4") + (source (origin + (method url-fetch) + (uri (cran-uri "BisqueRNA" version)) + (sha256 + (base32 + "01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2")))) + (properties `((upstream-name . "BisqueRNA"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-limsolve" ,r-limsolve))) + (home-page "https://www.biorxiv.org/content/10.1101/669911v1") + (synopsis "Decomposition of bulk expression with single-cell sequencing") + (description "This package provides tools to accurately estimate cell type +abundances from heterogeneous bulk expression. A reference-based method +utilizes single-cell information to generate a signature matrix and +transformation of bulk expression for accurate regression based estimates. +A marker-based method utilizes known cell-specific marker genes to measure +relative abundances across samples.") + (license license:gpl3))) + ;; This is a CRAN package, but it depends on r-bsgenome-hsapiens-ucsc-hg19 ;; from Bioconductor. (define-public r-deconstructsigs diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e90e2b3363..18a614e7e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2839,31 +2839,6 @@ where the bound function accepts additional arguments.") bindings that call a C++ function.") (license license:expat))) -(define-public r-bisquerna - (package - (name "r-bisquerna") - (version "1.0.4") - (source (origin - (method url-fetch) - (uri (cran-uri "BisqueRNA" version)) - (sha256 - (base32 - "01g34n87ml7n3pck77497ddgbv3rr5p4153ac8ninpgjijlm3jw2")))) - (properties `((upstream-name . "BisqueRNA"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-limsolve" ,r-limsolve))) - (home-page "https://www.biorxiv.org/content/10.1101/669911v1") - (synopsis "Decomposition of bulk expression with single-cell sequencing") - (description "This package provides tools to accurately estimate cell type -abundances from heterogeneous bulk expression. A reference-based method -utilizes single-cell information to generate a signature matrix and -transformation of bulk expression for accurate regression based estimates. -A marker-based method utilizes known cell-specific marker genes to measure -relative abundances across samples.") - (license license:gpl3))) - (define-public r-auc (package (name "r-auc") -- cgit 1.4.1 From 928221850883482f1c8c30c678a43b8a887aef3e Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:13 +0100 Subject: gnu: r-absfiltergsea: Move to (gnu packages bioconductor). * gnu/packages/cran.scm (r-absfiltergsea): Move this variable from here... * gnu/packages/bioconductor.scm (r-absfiltergsea): ...to here. --- gnu/packages/bioconductor.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/cran.scm | 27 --------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 87822419c4..3d147bcb0a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1315,6 +1315,34 @@ naming and share the same rich and consistent \"Vector API\" as much as possible.") (license license:artistic2.0))) +;; This is a CRAN package, but it depends on r-biobase and r-limma from Bioconductor. +(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))) + ;; This is a CRAN package, but it depends on r-biobase from Bioconductor. (define-public r-bisquerna (package diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 18a614e7e4..044ad8f5bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26618,33 +26618,6 @@ include Markov models of discrete and continuous trait evolution and constant rate speciation and extinction.") (license license:gpl2+))) -(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))) - (define-public r-calculus (package (name "r-calculus") -- cgit 1.4.1 From 23686ba3eb7c56fc9aeb5785df8703c7f795f766 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 17 Mar 2021 21:14:14 +0100 Subject: Revert "Revert some commits that caused `guix pull` to fail." This reverts commit 8ec0ca8faff62f19426f22aeb1bd59a8950ca05a. --- gnu/packages/bioconductor.scm | 333 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/bioinformatics.scm | 305 ------------------------------------ 2 files changed, 333 insertions(+), 305 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 3d147bcb0a..ccf468e420 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1233,6 +1233,39 @@ data. In addition, provides numerous plotting functions for commonly used visualizations.") (license license:artistic2.0))) +(define-public r-delayedarray + (package + (name "r-delayedarray") + (version "0.16.2") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "DelayedArray" version)) + (sha256 + (base32 + "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + (properties + `((upstream-name . "DelayedArray"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-s4vectors" ,r-s4vectors) + ("r-iranges" ,r-iranges) + ("r-matrix" ,r-matrix) + ("r-matrixgenerics" ,r-matrixgenerics))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/DelayedArray") + (synopsis "Delayed operations on array-like objects") + (description + "Wrapping an array-like object (typically an on-disk object) in a +@code{DelayedArray} object allows one to perform common array operations on it +without loading the object in memory. In order to reduce memory usage and +optimize performance, operations on the object are either delayed or executed +using a block processing mechanism. Note that this also works on in-memory +array-like objects like @code{DataFrame} objects (typically with Rle columns), +@code{Matrix} objects, and ordinary arrays and data frames.") + (license license:artistic2.0))) + (define-public r-bluster (package (name "r-bluster") @@ -1613,6 +1646,35 @@ structure.") microarrays.") (license license:artistic2.0))) +(define-public r-annotationdbi + (package + (name "r-annotationdbi") + (version "1.52.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "AnnotationDbi" version)) + (sha256 + (base32 + "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) + (properties + `((upstream-name . "AnnotationDbi"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biobase" ,r-biobase) + ("r-biocgenerics" ,r-biocgenerics) + ("r-dbi" ,r-dbi) + ("r-iranges" ,r-iranges) + ("r-rsqlite" ,r-rsqlite) + ("r-s4vectors" ,r-s4vectors))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/AnnotationDbi") + (synopsis "Annotation database interface") + (description + "This package provides user interface and database connection code for +annotation data packages using SQLite data storage.") + (license license:artistic2.0))) + (define-public r-annotationforge (package (name "r-annotationforge") @@ -1645,6 +1707,148 @@ microarrays.") databases. Packages produced are intended to be used with AnnotationDbi.") (license license:artistic2.0))) +(define-public r-biobase + (package + (name "r-biobase") + (version "2.50.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biobase" version)) + (sha256 + (base32 + "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) + (properties + `((upstream-name . "Biobase"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics))) + (home-page "https://bioconductor.org/packages/Biobase") + (synopsis "Base functions for Bioconductor") + (description + "This package provides functions that are needed by many other packages +on Bioconductor or which replace R functions.") + (license license:artistic2.0))) + +(define-public r-biomart + (package + (name "r-biomart") + (version "2.46.3") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "biomaRt" version)) + (sha256 + (base32 + "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) + (properties + `((upstream-name . "biomaRt"))) + (build-system r-build-system) + (propagated-inputs + `(("r-annotationdbi" ,r-annotationdbi) + ("r-biocfilecache" ,r-biocfilecache) + ("r-httr" ,r-httr) + ("r-openssl" ,r-openssl) + ("r-progress" ,r-progress) + ("r-rappdirs" ,r-rappdirs) + ("r-stringr" ,r-stringr) + ("r-xml" ,r-xml) + ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/biomaRt") + (synopsis "Interface to BioMart databases") + (description + "biomaRt provides an interface to a growing collection of databases +implementing the @url{BioMart software suite, http://www.biomart.org}. The +package enables retrieval of large amounts of data in a uniform way without +the need to know the underlying database schemas or write complex SQL queries. +Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, +Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt +users direct access to a diverse set of data and enable a wide range of +powerful online queries from gene annotation to database mining.") + (license license:artistic2.0))) + +(define-public r-biocparallel + (package + (name "r-biocparallel") + (version "1.24.1") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "BiocParallel" version)) + (sha256 + (base32 + "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) + (properties + `((upstream-name . "BiocParallel"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + ;; Remove generated documentation. + (for-each delete-file + '("inst/doc/BiocParallel_BatchtoolsParam.pdf" + "inst/doc/Introduction_To_BiocParallel.pdf" + "inst/doc/Errors_Logs_And_Debugging.pdf" + "inst/doc/BiocParallel_BatchtoolsParam.R" + "inst/doc/Introduction_To_BiocParallel.R" + "inst/doc/Errors_Logs_And_Debugging.R")) + + ;; Remove time-dependent macro + (substitute* '("inst/doc/BiocParallel_BatchtoolsParam.Rnw" + "inst/doc/Introduction_To_BiocParallel.Rnw" + "inst/doc/Errors_Logs_And_Debugging.Rnw" + "vignettes/BiocParallel_BatchtoolsParam.Rnw" + "vignettes/Introduction_To_BiocParallel.Rnw" + "vignettes/Errors_Logs_And_Debugging.Rnw") + (("\\today") "later")) + + ;; Initialize the random number generator seed when building. + (substitute* "R/internal_rng_stream.R" + (("\"L'Ecuyer-CMRG\"\\)" m) + (string-append + m "; if (!is.na(Sys.getenv(\"SOURCE_DATE_EPOCH\"))) {set.seed(100)}\n")))))))) + (propagated-inputs + `(("r-futile-logger" ,r-futile-logger) + ("r-snow" ,r-snow) + ("r-bh" ,r-bh))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/BiocParallel") + (synopsis "Bioconductor facilities for parallel evaluation") + (description + "This package provides modified versions and novel implementation of +functions for parallel evaluation, tailored to use with Bioconductor +objects.") + (license (list license:gpl2+ license:gpl3+)))) + +(define-public r-biostrings + (package + (name "r-biostrings") + (version "2.58.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Biostrings" version)) + (sha256 + (base32 + "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) + (properties + `((upstream-name . "Biostrings"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-crayon" ,r-crayon) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/Biostrings") + (synopsis "String objects and algorithms for biological sequences") + (description + "This package provides memory efficient string containers, string +matching algorithms, and other utilities, for fast manipulation of large +biological sequences or sets of sequences.") + (license license:artistic2.0))) + (define-public r-category (package (name "r-category") @@ -1845,6 +2049,37 @@ translation between different chromosome sequence naming conventions (e.g., names in their natural, rather than lexicographic, order.") (license license:artistic2.0))) +(define-public r-genomicranges + (package + (name "r-genomicranges") + (version "1.42.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "GenomicRanges" version)) + (sha256 + (base32 + "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) + (properties + `((upstream-name . "GenomicRanges"))) + (build-system r-build-system) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://bioconductor.org/packages/GenomicRanges") + (synopsis "Representation and manipulation of genomic intervals") + (description + "This package provides tools to efficiently represent and manipulate +genomic annotations and alignments is playing a central role when it comes to +analyzing high-throughput sequencing data (a.k.a. NGS data). The +GenomicRanges package defines general purpose containers for storing and +manipulating genomic intervals and variables defined along a genome.") + (license license:artistic2.0))) + (define-public r-gostats (package (name "r-gostats") @@ -1925,6 +2160,25 @@ Enrichment Analysis} (GSEA).") the Human Protein Atlas project.") (license license:artistic2.0))) +(define-public r-limma + (package + (name "r-limma") + (version "3.46.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "limma" version)) + (sha256 + (base32 + "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) + (build-system r-build-system) + (home-page "http://bioinf.wehi.edu.au/limma") + (synopsis "Package for linear models for microarray and RNA-seq data") + (description "This package can be used for the analysis of gene expression +studies, especially the use of linear models for analysing designed experiments +and the assessment of differential expression. The analysis methods apply to +different technologies, including microarrays, RNA-seq, and quantitative PCR.") + (license license:gpl2+))) + (define-public r-rbgl (package (name "r-rbgl") @@ -2029,6 +2283,49 @@ reports together for a particular project that can be viewed in a web browser.") (license license:artistic2.0))) +(define-public r-rsamtools + (package + (name "r-rsamtools") + (version "2.6.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "Rsamtools" version)) + (sha256 + (base32 + "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) + (properties + `((upstream-name . "Rsamtools"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-biocparallel" ,r-biocparallel) + ("r-biostrings" ,r-biostrings) + ("r-bitops" ,r-bitops) + ("r-genomeinfodb" ,r-genomeinfodb) + ("r-genomicranges" ,r-genomicranges) + ("r-iranges" ,r-iranges) + ("r-rhtslib" ,r-rhtslib) + ("r-s4vectors" ,r-s4vectors) + ("r-xvector" ,r-xvector))) + (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") + (synopsis "Interface to samtools, bcftools, and tabix") + (description + "This package provides an interface to the @code{samtools}, +@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence +Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed +tab-delimited (tabix) files.") + (license license:expat))) + (define-public r-shortread (package (name "r-shortread") @@ -2164,6 +2461,42 @@ annotation infrastructure.") coding changes and predict coding outcomes.") (license license:artistic2.0))) +(define-public r-xvector + (package + (name "r-xvector") + (version "0.30.0") + (source (origin + (method url-fetch) + (uri (bioconductor-uri "XVector" version)) + (sha256 + (base32 + "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) + (properties + `((upstream-name . "XVector"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-system-zlib + (lambda _ + (substitute* "DESCRIPTION" + (("zlibbioc, ") "")) + (substitute* "NAMESPACE" + (("import\\(zlibbioc\\)") "")) + #t))))) + (inputs + `(("zlib" ,zlib))) + (propagated-inputs + `(("r-biocgenerics" ,r-biocgenerics) + ("r-iranges" ,r-iranges) + ("r-s4vectors" ,r-s4vectors))) + (home-page "https://bioconductor.org/packages/XVector") + (synopsis "Representation and manpulation of external sequences") + (description + "This package provides memory efficient S4 classes for storing sequences +\"externally\" (behind an R external pointer, or on disk).") + (license license:artistic2.0))) + (define-public r-geneplotter (package (name "r-geneplotter") diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ae45ff8d3c..9e7423637c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7693,311 +7693,6 @@ including VCF header and contents in RDF and JSON.") (home-page "https://github.com/vcflib/bio-vcf") (license license:expat))) -(define-public r-limma - (package - (name "r-limma") - (version "3.46.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "limma" version)) - (sha256 - (base32 - "1xxv493q1kip9bjfv7v7k5dnq7hz7gvl80i983v4mvwavhgnbxfz")))) - (build-system r-build-system) - (home-page "http://bioinf.wehi.edu.au/limma") - (synopsis "Package for linear models for microarray and RNA-seq data") - (description "This package can be used for the analysis of gene expression -studies, especially the use of linear models for analysing designed experiments -and the assessment of differential expression. The analysis methods apply to -different technologies, including microarrays, RNA-seq, and quantitative PCR.") - (license license:gpl2+))) - -(define-public r-xvector - (package - (name "r-xvector") - (version "0.30.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "XVector" version)) - (sha256 - (base32 - "1pqljikg4f6jb7wgm5537zwgq5b013nyz1agjrwfq2cljb0ym6lq")))) - (properties - `((upstream-name . "XVector"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (inputs - `(("zlib" ,zlib))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors))) - (home-page "https://bioconductor.org/packages/XVector") - (synopsis "Representation and manpulation of external sequences") - (description - "This package provides memory efficient S4 classes for storing sequences -\"externally\" (behind an R external pointer, or on disk).") - (license license:artistic2.0))) - -(define-public r-genomicranges - (package - (name "r-genomicranges") - (version "1.42.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "GenomicRanges" version)) - (sha256 - (base32 - "0j4py5g6pdj35xhlaqhxxhg55j9l4mcdk3yck4dgyavv5f2dh24i")))) - (properties - `((upstream-name . "GenomicRanges"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/GenomicRanges") - (synopsis "Representation and manipulation of genomic intervals") - (description - "This package provides tools to efficiently represent and manipulate -genomic annotations and alignments is playing a central role when it comes to -analyzing high-throughput sequencing data (a.k.a. NGS data). The -GenomicRanges package defines general purpose containers for storing and -manipulating genomic intervals and variables defined along a genome.") - (license license:artistic2.0))) - -(define-public r-biobase - (package - (name "r-biobase") - (version "2.50.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biobase" version)) - (sha256 - (base32 - "11kgc4flywlm3i18603558l8ksv91c24vkc5fnnbcd375i2dhhd4")))) - (properties - `((upstream-name . "Biobase"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics))) - (home-page "https://bioconductor.org/packages/Biobase") - (synopsis "Base functions for Bioconductor") - (description - "This package provides functions that are needed by many other packages -on Bioconductor or which replace R functions.") - (license license:artistic2.0))) - -(define-public r-annotationdbi - (package - (name "r-annotationdbi") - (version "1.52.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "AnnotationDbi" version)) - (sha256 - (base32 - "0zqxgh3nx6y8ry12s2vss2f4axz5vpqxha1y4ifhhcx4zhpzsglr")))) - (properties - `((upstream-name . "AnnotationDbi"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biobase" ,r-biobase) - ("r-biocgenerics" ,r-biocgenerics) - ("r-dbi" ,r-dbi) - ("r-iranges" ,r-iranges) - ("r-rsqlite" ,r-rsqlite) - ("r-s4vectors" ,r-s4vectors))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/AnnotationDbi") - (synopsis "Annotation database interface") - (description - "This package provides user interface and database connection code for -annotation data packages using SQLite data storage.") - (license license:artistic2.0))) - -(define-public r-biomart - (package - (name "r-biomart") - (version "2.46.3") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "biomaRt" version)) - (sha256 - (base32 - "0gwmd0ykpv0gyh34c56g5m12lil20fvig49f3ih1jxrxf3q4wmq7")))) - (properties - `((upstream-name . "biomaRt"))) - (build-system r-build-system) - (propagated-inputs - `(("r-annotationdbi" ,r-annotationdbi) - ("r-biocfilecache" ,r-biocfilecache) - ("r-httr" ,r-httr) - ("r-openssl" ,r-openssl) - ("r-progress" ,r-progress) - ("r-rappdirs" ,r-rappdirs) - ("r-stringr" ,r-stringr) - ("r-xml" ,r-xml) - ("r-xml2" ,r-xml2))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/biomaRt") - (synopsis "Interface to BioMart databases") - (description - "biomaRt provides an interface to a growing collection of databases -implementing the @url{BioMart software suite, http://www.biomart.org}. The -package enables retrieval of large amounts of data in a uniform way without -the need to know the underlying database schemas or write complex SQL queries. -Examples of BioMart databases are Ensembl, COSMIC, Uniprot, HGNC, Gramene, -Wormbase and dbSNP mapped to Ensembl. These major databases give biomaRt -users direct access to a diverse set of data and enable a wide range of -powerful online queries from gene annotation to database mining.") - (license license:artistic2.0))) - -(define-public r-biocparallel - (package - (name "r-biocparallel") - (version "1.24.1") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "BiocParallel" version)) - (sha256 - (base32 - "1iryicvmcagcrj29kp49mqhiq2kn72j4idj380hi9illmdrg9ism")))) - (properties - `((upstream-name . "BiocParallel"))) - (build-system r-build-system) - (propagated-inputs - `(("r-futile-logger" ,r-futile-logger) - ("r-snow" ,r-snow) - ("r-bh" ,r-bh))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/BiocParallel") - (synopsis "Bioconductor facilities for parallel evaluation") - (description - "This package provides modified versions and novel implementation of -functions for parallel evaluation, tailored to use with Bioconductor -objects.") - (license (list license:gpl2+ license:gpl3+)))) - -(define-public r-biostrings - (package - (name "r-biostrings") - (version "2.58.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Biostrings" version)) - (sha256 - (base32 - "1rbqhs73mhfr1gi0rx28jiyan7i3hb45ai3jpl1656fnrhgjfxq5")))) - (properties - `((upstream-name . "Biostrings"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-crayon" ,r-crayon) - ("r-iranges" ,r-iranges) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/Biostrings") - (synopsis "String objects and algorithms for biological sequences") - (description - "This package provides memory efficient string containers, string -matching algorithms, and other utilities, for fast manipulation of large -biological sequences or sets of sequences.") - (license license:artistic2.0))) - -(define-public r-rsamtools - (package - (name "r-rsamtools") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "Rsamtools" version)) - (sha256 - (base32 - "040pggkwglc6wy90qnc7xcdnaj0v3iqlykvvsl74241409qly554")))) - (properties - `((upstream-name . "Rsamtools"))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-system-zlib - (lambda _ - (substitute* "DESCRIPTION" - (("zlibbioc, ") "")) - (substitute* "NAMESPACE" - (("import\\(zlibbioc\\)") "")) - #t))))) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-biocparallel" ,r-biocparallel) - ("r-biostrings" ,r-biostrings) - ("r-bitops" ,r-bitops) - ("r-genomeinfodb" ,r-genomeinfodb) - ("r-genomicranges" ,r-genomicranges) - ("r-iranges" ,r-iranges) - ("r-rhtslib" ,r-rhtslib) - ("r-s4vectors" ,r-s4vectors) - ("r-xvector" ,r-xvector))) - (home-page "https://bioconductor.org/packages/release/bioc/html/Rsamtools.html") - (synopsis "Interface to samtools, bcftools, and tabix") - (description - "This package provides an interface to the @code{samtools}, -@code{bcftools}, and @code{tabix} utilities for manipulating SAM (Sequence -Alignment / Map), FASTA, binary variant call (BCF) and compressed indexed -tab-delimited (tabix) files.") - (license license:expat))) - -(define-public r-delayedarray - (package - (name "r-delayedarray") - (version "0.16.2") - (source (origin - (method url-fetch) - (uri (bioconductor-uri "DelayedArray" version)) - (sha256 - (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) - (properties - `((upstream-name . "DelayedArray"))) - (build-system r-build-system) - (propagated-inputs - `(("r-biocgenerics" ,r-biocgenerics) - ("r-s4vectors" ,r-s4vectors) - ("r-iranges" ,r-iranges) - ("r-matrix" ,r-matrix) - ("r-matrixgenerics" ,r-matrixgenerics))) - (native-inputs - `(("r-knitr" ,r-knitr))) - (home-page "https://bioconductor.org/packages/DelayedArray") - (synopsis "Delayed operations on array-like objects") - (description - "Wrapping an array-like object (typically an on-disk object) in a -@code{DelayedArray} object allows one to perform common array operations on it -without loading the object in memory. In order to reduce memory usage and -optimize performance, operations on the object are either delayed or executed -using a block processing mechanism. Note that this also works on in-memory -array-like objects like @code{DataFrame} objects (typically with Rle columns), -@code{Matrix} objects, and ordinary arrays and data frames.") - (license license:artistic2.0))) - (define-public r-summarizedexperiment (package (name "r-summarizedexperiment") -- cgit 1.4.1 From 6b703a9aa872d26639359d56ac2811c11ed84b14 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 31 Mar 2021 21:23:28 +0200 Subject: gnu: mumi: Update to 0.0.1-5.9f070bd. * gnu/packages/mail.scm (mumi): Update to 0.0.1-5.9f070bd. --- 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 fdbbaf1784..489053544b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3873,8 +3873,8 @@ It is a replacement for the @command{urlview} program.") (license license:gpl2+))) (define-public mumi - (let ((commit "887471f7785c74dd8ee5d300d3b1fb58e011c2cb") - (revision "4")) + (let ((commit "9f070bd90adc67064cd8aff4e40f303d5957ef4a") + (revision "5")) (package (name "mumi") (version (git-version "0.0.1" revision commit)) @@ -3886,7 +3886,7 @@ It is a replacement for the @command{urlview} program.") (file-name (git-file-name name version)) (sha256 (base32 - "1lmnnfa42j0bcscxbyx5y48v4l0hyvnh4kq4sjrqw92v0h93iksg")))) + "1ym1j3nzy8qhd1ydadccbgm0nckkmnq3vnz9qh9x8rasx7zg1ldp")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- cgit 1.4.1 From 94c77c9a0f7a1a4d7665d8fe566547016d2588d9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 31 Mar 2021 22:01:21 +0200 Subject: gnu: gimp: Ship a copy of the gegl patch. As Ludo' rightly points out, GitHub's patches are probably as stable as their tarballs. * gnu/packages/gimp.scm (gimp)[source]: Use SEARCH-PATCHES instead of an origin. * gnu/packages/patches/gimp-make-gegl-introspect-optional.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gimp.scm | 12 +----- .../gimp-make-gegl-introspect-optional.patch | 43 ++++++++++++++++++++++ 3 files changed, 45 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/gimp-make-gegl-introspect-optional.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d8c548b0eb..3eeae5e96a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1082,6 +1082,7 @@ dist_patch_DATA = \ %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/gimp-make-gegl-introspect-optional.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-tests-timer.patch \ %D%/packages/patches/glib-CVE-2021-27218.patch \ diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index a0f6b7ca11..eee958171c 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -278,17 +278,7 @@ buffers.") "/gimp-" version ".tar.bz2")) (sha256 (base32 "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d")) - (patches - (list (origin - ;; This upstream patch fixes a mandatory dependency on ‘dot’: - ;; . - (method url-fetch) - (uri (string-append "https://github.com/GNOME/gimp/commit/" - "2cae9b9acf9da98c4c9990819ffbd5aabe23017e" - ".patch")) - (sha256 - (base32 - "1xd5lmy1j9p6p1ka7dyj1b9jmfcra1r62rma07vzw2v4vig0khc0"))))))) + (patches (search-patches "gimp-make-gegl-introspect-optional.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML diff --git a/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch b/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch new file mode 100644 index 0000000000..4dd1ab74a8 --- /dev/null +++ b/gnu/packages/patches/gimp-make-gegl-introspect-optional.patch @@ -0,0 +1,43 @@ +From 2cae9b9acf9da98c4c9990819ffbd5aabe23017e Mon Sep 17 00:00:00 2001 +From: Jehan +Date: Mon, 14 Dec 2020 19:53:38 +0100 +Subject: [PATCH] app: make "gegl:introspect" an optional operation dependency. + +Check at runtime for the operation availability and set the "Show Image +Graph" action active depending on this check. + +This goes with discussions to make this operation optional with a +runtime check for the tool `dot`. +See: https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/84 +--- + app/actions/debug-actions.c | 6 ++++++ + app/sanity.c | 1 - + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c +index 6be4422b228..22ca38b15ea 100644 +--- a/app/actions/debug-actions.c ++++ b/app/actions/debug-actions.c +@@ -103,4 +103,10 @@ void + debug_actions_update (GimpActionGroup *group, + gpointer data) + { ++#define SET_SENSITIVE(action,condition) \ ++ gimp_action_group_set_action_sensitive (group, action, (condition) != 0) ++ ++ SET_SENSITIVE ("debug-show-image-graph", gegl_has_operation ("gegl:introspect")); ++ ++#undef SET_SENSITIVE + } +diff --git a/app/sanity.c b/app/sanity.c +index 015801a396e..6374ac1ad20 100644 +--- a/app/sanity.c ++++ b/app/sanity.c +@@ -650,7 +650,6 @@ sanity_check_gegl_ops (void) + "gegl:hue-chroma", + "gegl:illusion", + "gegl:image-gradient", +- "gegl:introspect", + "gegl:invert-gamma", + "gegl:invert-linear", + "gegl:lens-blur", -- cgit 1.4.1 From 82cdde4f4c23f3f80856766492104062bd631940 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 1 Apr 2021 09:07:52 +0200 Subject: gnu: emacs-gif-screencast: Update to 1.2. * gnu/packages/emacs-xyz.scm (emacs-gif-screencast): Update to 1.2. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7fe8ab5c83..f2f94c497f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -19280,7 +19280,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") (define-public emacs-gif-screencast (package (name "emacs-gif-screencast") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) @@ -19290,7 +19290,7 @@ try completing. See @code{fish-completion-fallback-on-bash-p}.") (file-name (git-file-name name version)) (sha256 (base32 - "1g1by8lvf8c9vzm4wwsi5kp285kaj0ahsl54048ympin4pi0njw9")))) + "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh")))) (build-system emacs-build-system) (inputs `(("scrot" ,scrot) -- cgit 1.4.1 From 3772f95dc7bca694446121e1cef9bf4d78bfba55 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 10:47:06 +0300 Subject: gnu: ilmbase: Update to 2.5.5. * gnu/packages/graphics.scm (ilmbase): Update to 2.5.5. --- gnu/packages/graphics.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4a301d387a..3c9cf18bbc 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Tomáš Čech ;;; Copyright © 2016, 2019 Leo Famulari ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus -;;; Copyright © 2016, 2018 Efraim Flashner +;;; Copyright © 2016, 2018, 2021 Efraim Flashner ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2017 Manolis Fragkiskos Ragkousis ;;; Copyright © 2017, 2018 Ben Woodcroft @@ -753,7 +753,7 @@ many more.") (define-public ilmbase (package (name "ilmbase") - (version "2.5.2") + (version "2.5.5") (source (origin (method git-fetch) (uri (git-reference @@ -762,7 +762,7 @@ many more.") (file-name (git-file-name "ilmbase" version)) (sha256 (base32 - "1vf8bqld2bpcdi99jbr043y6vp01cp3fvbiasrn66xn91mf6imbn")) + "0mjzb3fd8b9pcqmrgy5cdsmvqd70hmlvjnfypi66v59h3fhrmgd8")) (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system cmake-build-system) (arguments -- cgit 1.4.1 From 7e0e98aed6d9c9003d09ce156602a74b48b01d66 Mon Sep 17 00:00:00 2001 From: pricly_yellow Date: Tue, 30 Mar 2021 11:31:17 +0000 Subject: gnu: waybar: Update to 0.9.5. * gnu/packages/wm.scm (waybar): Update to 0.9.5. [inputs]: Replace fmt-6 with fmt, spdlog-1.7 with spdlog. * gnu/packages/logging.scm (spdlog-1.7): Remove variable. * gnu/packages/pretty-print.scm (fmt-6): Same. Signed-off-by: Efraim Flashner --- gnu/packages/logging.scm | 16 ---------------- gnu/packages/pretty-print.scm | 13 ------------- gnu/packages/wm.scm | 8 ++++---- 3 files changed, 4 insertions(+), 33 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index b879fecebc..6a4975e435 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -214,19 +214,3 @@ library.") ;; spdlog is under Expat license, but the bundled fmt library in ;; "include/spdlog/fmt/bundled" is under BSD 2 clause license. (license (list license:expat license:bsd-2)))) - -(define-public spdlog-1.7 - (package - (inherit spdlog) - (name "spdlog") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gabime/spdlog") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ryaa22ppj60461hcdb8nk7jwj84arp4iw4lyw594py92g4vnx3j")))))) diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index af02fd91a9..4662a1e717 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -189,19 +189,6 @@ to @code{IOStreams}.") ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) -(define-public fmt-6 - (package - (inherit fmt) - (name "fmt") - (version "6.2.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" - version "/fmt-" version ".zip")) - (sha256 - (base32 "06l8g59frbsbwj15kg6x2bbn6p8yidh6wzsigdhbdjncvm1agzll")))))) - (define-public source-highlight (package (name "source-highlight") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d3c76d7988..4df1af27cb 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1569,7 +1569,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.9.4") + (version "0.9.5") (source (origin (method git-fetch) @@ -1578,10 +1578,10 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy")))) + (base32 "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q")))) (build-system meson-build-system) (inputs `(("date" ,date) - ("fmt" ,fmt-6) + ("fmt" ,fmt) ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) @@ -1590,7 +1590,7 @@ modules for building a Wayland compositor.") ("libmpdclent" ,libmpdclient) ("libnl" ,libnl) ("pulseaudio" ,pulseaudio) - ("spdlog" ,spdlog-1.7) + ("spdlog" ,spdlog) ("wayland" ,wayland))) (native-inputs `(("gcc" ,gcc-8) ; for #include -- cgit 1.4.1 From 9ece9f162b793637ab89aadb14d39ce75179fc91 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Tue, 30 Mar 2021 18:14:46 +1100 Subject: gnu: taglib: Update to 1.12. * gnu/packages/mp3.scm (taglib): Update to 1.12. Signed-off-by: Efraim Flashner --- gnu/packages/mp3.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 675e18ed7e..dadaccdd88 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -208,7 +208,7 @@ a highly stable and efficient implementation.") (define-public taglib (package (name "taglib") - (version "1.12-beta-1") + (version "1.12") (source (origin (method git-fetch) (uri (git-reference @@ -217,7 +217,7 @@ a highly stable and efficient implementation.") (file-name (git-file-name name version)) (sha256 (base32 - "1mp6w2ikniw8w6d5wr0h20j0ijg8jw7s9dli5a8k9znpznvxpym4")))) + "0q7dkn5rh9v6b0scmcp2qmjv3iransafmpn6jvgid0yq75m2nqd2")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; Tests are not ran with BUILD_SHARED_LIBS on. -- cgit 1.4.1 From 190912cb8e4011c7a4ffe6c2baa69d7b39139580 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 30 Mar 2021 19:49:17 +0100 Subject: gnu: services: web: Cleanup whitespace. Replace tabs with spaces, and delete trailing whitespace. * gnu/services/web.scm: Cleanup whitespace. --- gnu/services/web.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index aa688a4328..1aad695c8b 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -840,8 +840,8 @@ of index files." (requirement '(networking)) (start #~(make-forkexec-constructor '(#$(file-append package "/sbin/fcgiwrap") - "-s" #$socket) - #:user #$user #:group #$group)) + "-s" #$socket) + #:user #$user #:group #$group)) (stop #~(make-kill-destructor))))))) (define fcgiwrap-activation @@ -863,7 +863,7 @@ of index files." (extensions (list (service-extension shepherd-root-service-type fcgiwrap-shepherd-service) - (service-extension account-service-type + (service-extension account-service-type fcgiwrap-accounts) (service-extension activation-service-type fcgiwrap-activation))) @@ -1946,24 +1946,24 @@ root=/srv/gemini (documentation "Run the agate Gemini server.") (start (let ((agate (file-append package "/bin/agate"))) #~(make-forkexec-constructor - (list #$agate - "--content" #$content - "--cert" #$cert - "--key" #$key - "--addr" #$@addr + (list #$agate + "--content" #$content + "--cert" #$cert + "--key" #$key + "--addr" #$@addr #$@(if lang (list "--lang" lang) '()) - #$@(if hostname - (list "--hostname" hostname) - '()) - #$@(if silent? '("--silent") '()) - #$@(if serve-secret? '("--serve-secret") '()) - #$@(if log-ip? '("--log-ip") '())) - #:user #$user #:group #$group - #:log-file #$log-file))) + #$@(if hostname + (list "--hostname" hostname) + '()) + #$@(if silent? '("--silent") '()) + #$@(if serve-secret? '("--serve-secret") '()) + #$@(if log-ip? '("--log-ip") '())) + #:user #$user #:group #$group + #:log-file #$log-file))) (stop #~(make-kill-destructor))))))) - + (define agate-accounts (match-lambda (($ _ _ _ _ _ -- cgit 1.4.1 From 264f7189e8fa20f4ab3da7f5e98fdd15d5eb4231 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 30 Mar 2021 19:57:38 +0100 Subject: gnu: services: web: Have fcgiwrap log to a file. This makes it easier to access the output. * gnu/services/web.scm (fcgiwrap-shepherd-service): Pass #:log-file to make-forkexec-constructor. --- 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 1aad695c8b..bfcdfe7421 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -841,7 +841,8 @@ of index files." (start #~(make-forkexec-constructor '(#$(file-append package "/sbin/fcgiwrap") "-s" #$socket) - #:user #$user #:group #$group)) + #:user #$user #:group #$group + #:log-file "/var/log/fcgiwrap.log")) (stop #~(make-kill-destructor))))))) (define fcgiwrap-activation -- cgit 1.4.1 From 3db4a00d43fe64e02d9452ba203a3015790f5167 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 31 Mar 2021 22:36:39 +0100 Subject: gnu: sbcl-postmodern: Update to 1.32.9. * gnu/packages/lisp-xyz.scm (sbcl-postmodern): Update to 1.32.9. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 1e6880f90f..6ea2f0966c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -10021,7 +10021,7 @@ approach to templating.") (define-public sbcl-postmodern (package (name "sbcl-postmodern") - (version "1.32.8") + (version "1.32.9") (source (origin (method git-fetch) @@ -10030,7 +10030,7 @@ approach to templating.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0vr5inbr8dldf6dsl0qj3h2yrnnsayzfwxfzwkn1pk7xbns2l78q")))) + (base32 "137jci4hn4vlxf48y39k0di27kc89kvxy3brmn3vl9xq56sy6mhz")))) (build-system asdf-build-system/sbcl) (native-inputs `(("fiveam" ,sbcl-fiveam))) -- cgit 1.4.1 From a266c9fab88954b7c0fc0516e0a4c9834819dbc5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 31 Mar 2021 22:32:32 +0100 Subject: gnu: Add cl-conspack. * gnu/packages/lisp-xyz.scm: (sbcl-cl-conspack, cl-conspack, ecl-cl-conspack): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6ea2f0966c..658f0fbd2a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15516,3 +15516,51 @@ immediately loaded.") (define-public cl-bodge-math (sbcl-package->cl-source-package sbcl-bodge-math)) + +(define-public sbcl-cl-conspack + (let ((commit "fc8473bc6f929696b03b43820596b7c976c4678e") + (revision "1")) + (package + (name "sbcl-cl-conspack") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/conspack/cl-conspack") + (commit commit))) + (file-name (git-file-name "cl-conspack" version)) + (sha256 + (base32 "0b7qzvsrpvnw12hqhjmz0b02sigj0kdjy55j4k7xzmj8684cs8bx")))) + (build-system asdf-build-system/sbcl) + ;; FIXME: (Sharlatan-20210331T220652+0100): Test are disabled because of: + ;; + ;; Error while trying to load definition for system cl-conspack-test + ;; from pathname .../cl-conspack/cl-conspack-test.asd: + ;; Error opening .../checkl/formalize-tmpGHU3ALSV.fasl": Permission denied + ;; + ;; It looks like the issues is in CheckL itself as other packages keep + ;; failing test where it's in use. + (arguments + '(#:tests? #f + #:asd-files '("cl-conspack.asd"))) + (native-inputs + `(("checkl" ,sbcl-checkl))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("closer-mop" ,sbcl-closer-mop) + ("fast-io" ,sbcl-fast-io) + ("ieee-floats" ,sbcl-ieee-floats) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("trivial-utf-8" ,sbcl-trivial-utf-8))) + (home-page "https://github.com/conspack/cl-conspack") + (synopsis "CONSPACK implementation for Common Lisp") + (description + "This package provides a CONSPACK implementation for Common Lisp.") + (license license:bsd-3)))) + +(define-public ecl-cl-conspack + (sbcl-package->ecl-package sbcl-cl-conspack)) + +(define-public cl-conspack + (sbcl-package->cl-source-package sbcl-cl-conspack)) -- cgit 1.4.1 From bbd04a4cc832a6d40a128fe449efe88cf5fd7bc9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 1 Apr 2021 12:06:06 +0200 Subject: gnu: cuirass: Update home page. * gnu/packages/ci.scm (cuirass)[home-page]: Update it. --- gnu/packages/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 15d1cb5317..cdfe725a65 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -175,5 +175,5 @@ (description "Cuirass is a continuous integration tool using GNU Guix. It is intended as a replacement for Hydra.") - (home-page "https://www.gnu.org/software/guix/") + (home-page "https://guix.gnu.org/cuirass/") (license l:gpl3+)))) -- cgit 1.4.1 From b82cc0b90e271ef1cd1bd91f3f1ae729918eccd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 13:00:52 +0300 Subject: gnu: qemu-for-american-fuzzy-lop: Fix build. * gnu/packages/debug.scm (qemu-for-american-fuzzy-lop)[source]: Add patch. * gnu/packages/patches/qemu-glibc-2.30.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/debug.scm | 5 +-- gnu/packages/patches/qemu-glibc-2.30.patch | 57 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/qemu-glibc-2.30.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3eeae5e96a..b037b397c3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1610,6 +1610,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-build-info-manual.patch \ %D%/packages/patches/qemu-CVE-2021-20203.patch \ %D%/packages/patches/qemu-glibc-2.27.patch \ + %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qpdfview-qt515-compat.patch \ %D%/packages/patches/qrcodegen-cpp-make-install.patch \ %D%/packages/patches/qt4-ldflags.patch \ diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index b3a000e6e3..f67f32a7f8 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017, 2019, 2020 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020, 2021 Efraim Flashner ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 @@ -269,7 +269,8 @@ down the road.") (base32 "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) (patches - (search-patches "qemu-glibc-2.27.patch")))) + (search-patches "qemu-glibc-2.27.patch" + "qemu-glibc-2.30.patch")))) (build-system gnu-build-system) (arguments `(;; Running tests in parallel can occasionally lead to failures, like: diff --git a/gnu/packages/patches/qemu-glibc-2.30.patch b/gnu/packages/patches/qemu-glibc-2.30.patch new file mode 100644 index 0000000000..1b74dee4ac --- /dev/null +++ b/gnu/packages/patches/qemu-glibc-2.30.patch @@ -0,0 +1,57 @@ +This patch was taken from NixOS +https://raw.githubusercontent.com/Mindavi/nixpkgs/1a737743a829746e48f4869ac517ff29c23c9d09/pkgs/tools/security/afl/qemu-patches/syscall-glibc2_30.diff +It is based on an unmerged patch against american-fuzzy-lop and was +never merged upstream because the author was unable to sign Google's CLA. +Based on https://github.com/google/AFL/commit/6c917e3d63a2a0685d58c3518524f9615b001893.patch + +--- qemu-2.10.0-clean/linux-user/syscall.c 2020-03-12 18:47:47.898592169 +0100 ++++ qemu-2.10.0/linux-user/syscall.c 2020-03-13 09:13:42.461809699 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include // https://lkml.org/lkml/2019/6/3/988 + #include + #include + #ifdef __ia64__ +@@ -256,7 +257,9 @@ static type name (type1 arg1,type2 arg2, + #endif + + #ifdef __NR_gettid +-_syscall0(int, gettid) ++// taken from https://patchwork.kernel.org/patch/10862231/ ++#define __NR_sys_gettid __NR_gettid ++_syscall0(int, sys_gettid) + #else + /* This is a replacement for the host gettid() and must return a host + errno. */ +@@ -6219,7 +6222,7 @@ static void *clone_func(void *arg) + cpu = ENV_GET_CPU(env); + thread_cpu = cpu; + ts = (TaskState *)cpu->opaque; +- info->tid = gettid(); ++ info->tid = sys_gettid(); + task_settid(ts); + if (info->child_tidptr) + put_user_u32(info->tid, info->child_tidptr); +@@ -6363,9 +6366,9 @@ static int do_fork(CPUArchState *env, un + mapping. We can't repeat the spinlock hack used above because + the child process gets its own copy of the lock. */ + if (flags & CLONE_CHILD_SETTID) +- put_user_u32(gettid(), child_tidptr); ++ put_user_u32(sys_gettid(), child_tidptr); + if (flags & CLONE_PARENT_SETTID) +- put_user_u32(gettid(), parent_tidptr); ++ put_user_u32(sys_gettid(), parent_tidptr); + ts = (TaskState *)cpu->opaque; + if (flags & CLONE_SETTLS) + cpu_set_tls (env, newtls); +@@ -11402,7 +11405,7 @@ abi_long do_syscall(void *cpu_env, int n + break; + #endif + case TARGET_NR_gettid: +- ret = get_errno(gettid()); ++ ret = get_errno(sys_gettid()); + break; + #ifdef TARGET_NR_readahead + case TARGET_NR_readahead: -- cgit 1.4.1 From 4172b2eef592012baf64c91cc425e097bde10c7a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 1 Apr 2021 13:02:54 +0300 Subject: gnu: american-fuzzy-lop: Update to 2.57b. * gnu/packages/debug.scm (american-fuzzy-lop): Update to 2.57b. --- gnu/packages/debug.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f67f32a7f8..4ead19c398 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -184,7 +184,7 @@ tools that process C/C++ code.") (_ "UNSUPPORTED")))) (package (name "american-fuzzy-lop") - (version "2.56b") ;It seems all releases have the 'b' suffix + (version "2.57b") ;It seems all releases have the 'b' suffix (source (origin (method git-fetch) @@ -192,7 +192,7 @@ tools that process C/C++ code.") (url "https://github.com/google/AFL") (commit (string-append "v" version)))) (sha256 - (base32 "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1")) + (base32 "0ks0s8iizp7mpc9mlpv126rsny0dkljfsw68689g9jiisjz2z530")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs -- cgit 1.4.1 From ae15c3fa7ee4e5f6f37ed6faa89df7f797c712e0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 May 2020 22:16:44 +0300 Subject: gnu: american-fuzzy-lop: Add support for powerpc-linux. * gnu/packages/debug.scm (american-fuzzy-lop): Add case for powerpc-linux. (qemu-for-american-fuzzy-lop): Same. --- gnu/packages/debug.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 4ead19c398..3a29886b0e 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -179,6 +179,7 @@ tools that process C/C++ code.") ("aarch64-linux" "aarch64") ("armhf-linux" "arm") ("mips64el-linux" "mips64el") + ("powerpc-linux" "ppc") ;; Prevent errors when querying this package on unsupported ;; platforms, e.g. when running "guix package --search=" (_ "UNSUPPORTED")))) @@ -254,6 +255,7 @@ down the road.") ("aarch64-linux" "aarch64") ("armhf-linux" "arm") ("mips64el-linux" "mips64el") + ("powerpc-linux" "ppc") ;; Prevent errors when querying this package on unsupported ;; platforms, e.g. when running "guix package --search=" (_ "UNSUPPORTED")))) -- cgit 1.4.1 From aa03d32eb1d2c41ee6251b3df59eb5177bdf5d82 Mon Sep 17 00:00:00 2001 From: qblade Date: Sun, 28 Mar 2021 00:54:47 +0000 Subject: services: kmscon: Add font-engine and font-size fields. * gnu/services/base.scm (): Add font-engine and font-size fields. (kmscon-service-type): Honor them. * doc/guix.texi (Base Services): Document them. --- doc/guix.texi | 6 ++++++ gnu/services/base.scm | 13 +++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index f08c529c63..115a7d9bd7 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15190,6 +15190,12 @@ in automatically without prompting for their login name or password. @item @code{hardware-acceleration?} (default: #f) Whether to use hardware acceleration. +@item @code{font-engine} (default: @code{"pango"}) +Font engine used in Kmscon. + +@item @code{font-size} (default: @code{12}) +Font size used in Kmscon. + @item @code{kmscon} (default: @var{kmscon}) The Kmscon package to use. diff --git a/gnu/services/base.scm b/gnu/services/base.scm index f50bcfdcb4..a8214ae96f 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2021 qblade ;;; ;;; This file is part of GNU Guix. ;;; @@ -2304,7 +2305,11 @@ This service is not part of @var{%base-services}." (auto-login kmscon-configuration-auto-login (default #f)) (hardware-acceleration? kmscon-configuration-hardware-acceleration? - (default #f))) ; #t causes failure + (default #f)) ; #t causes failure + (font-engine kmscon-configuration-font-engine + (default "pango")) + (font-size kmscon-configuration-font-size + (default 12))) (define kmscon-service-type (shepherd-service-type @@ -2315,13 +2320,17 @@ This service is not part of @var{%base-services}." (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))) + (hardware-acceleration? (kmscon-configuration-hardware-acceleration? config)) + (font-engine (kmscon-configuration-font-engine config)) + (font-size (kmscon-configuration-font-size config))) (define kmscon-command #~(list #$(file-append kmscon "/bin/kmscon") "--login" "--vt" #$virtual-terminal "--no-switchvt" ;Prevent a switch to the virtual terminal. + "--font-engine" #$font-engine + "--font-size" #$(number->string font-size) #$@(if hardware-acceleration? '("--hwaccel") '()) "--login" "--" #$login-program #$@login-arguments -- cgit 1.4.1 From 95ef58f03e7fc9edbe5758a85ac7b3f983c0c5ae Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 1 Apr 2021 13:00:55 +0100 Subject: gnu: Add texlive-utopia. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 66844ed321..d45fe3045b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7884,3 +7884,25 @@ symbols. The system is absolutely stand-alone; apart from Utopia and Fourier no other typefaces are required. Utopia is a registered trademark of Adobe Systems Incorporated.") (license license:lppl))) + +(define-public texlive-utopia + (package + (inherit (simple-texlive-package + "texlive-utopia" + (list "/doc/fonts/utopia/" + "/fonts/afm/adobe/utopia/" + "/fonts/tfm/adobe/utopia/" + "/fonts/type1/adobe/utopia/" + "/fonts/vf/adobe/utopia/") + (base32 + "113wgkfz4z0ls2grxxfj17l42a1yv9r5ipcd0156xnfsrqvqzxfc") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/utopia") + (synopsis "Adobe Utopia fonts") + (description "The Adobe Standard Encoding set of the Utopia font +family, as contributed to the X Consortium. The set comprises upright +and italic shapes in medium and bold weights. Macro support and +matching maths fonts are provided by the @code{fourier} and +@code{mathdesign} font packages.") + (license (license:fsf-free + "http://mirrors.ctan.org/fonts/utopia/README")))) -- cgit 1.4.1 From 6def029ab90b7e31d2ab02a97a15c3ca51b11be3 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:38 +0100 Subject: gnu: python-urwid: Update to 2.1.2. * gnu/packages/python-xyz.scm (python-urwid): Update to 2.1.2. [properties]: New field. (python2-urwid): Stay at 2.1.0. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 74aee4a3c2..38b35ee9bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7631,24 +7631,35 @@ computing.") (define-public python-urwid (package (name "python-urwid") - (version "2.1.0") + (version "2.1.2") (source (origin (method url-fetch) (uri (pypi-uri "urwid" version)) (sha256 (base32 - "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8")))) + "1bky2bra6673xx8jy0826znw6cmxs89wcwwzda8d025j3jffx2sq")))) (build-system python-build-system) (home-page "http://urwid.org") (synopsis "Console user interface library for Python") (description "Urwid is a curses-based UI/widget library for Python. It includes many features useful for text console applications.") + (properties `((python2-variant . ,(delay python2-urwid)))) (license license:lgpl2.1+))) (define-public python2-urwid - (package-with-python2 python-urwid)) + (let ((base (package-with-python2 + (strip-python2-variant python-urwid)))) + (package/inherit base + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "urwid" version)) + (sha256 + (base32 + "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8"))))))) (define-public python-urwidtrees (package -- cgit 1.4.1 From a45c110c9d77fe7969b992c3090f8b09aa461205 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:39 +0100 Subject: gnu: Add python-urwid-readline. * gnu/packages/python-xyz.scm (python-urwid-readline): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 38b35ee9bf..bcf5d05b20 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7661,6 +7661,40 @@ features useful for text console applications.") (base32 "11ndnhxd41m13darf5s0c6bafdpkzq1l6mfb04wbzdmyc1hg75h8"))))))) +(define-public python-urwid-readline + (package + (name "python-urwid-readline") + (version "0.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rr-/urwid_readline") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0sq5qgxj7gcfww3ww7idr87isnmp0hi36n241b3q395x1zafdv22")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest")) + #t))))) + (propagated-inputs + `(("python-urwid" ,python-urwid))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/rr-/urwid_readline") + (synopsis "Text input widget for urwid that supports readline shortcuts") + (description + "This package provides a textbox edit widget for @code{python-urwid} that +supports @code{readline} shortcuts.") + (license license:expat))) + (define-public python-urwidtrees (package (name "python-urwidtrees") -- cgit 1.4.1 From 536fa1bd236f958fdbdb518cd406d28493755538 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:40 +0100 Subject: gnu: Add python-matrix-client. * gnu/packages/matrix.scm (python-matrix-client): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/matrix.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/matrix.scm b/gnu/packages/matrix.scm index a8d9d66ee7..5c2b194d07 100644 --- a/gnu/packages/matrix.scm +++ b/gnu/packages/matrix.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2020 Alex ter Weele ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Michael Rohleder +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,30 @@ #:use-module (guix download) #:use-module (guix packages)) +(define-public python-matrix-client + (package + (name "python-matrix-client") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "matrix-client" version)) + (sha256 + (base32 + "1mgjd0ymf9mvqjkvgx3xjhxap7rzdmpa21wfy0cxbw2xcswcrqyw")))) + (build-system python-build-system) + (propagated-inputs + `(("python-requests" ,python-requests))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-runner" ,python-pytest-runner) + ("python-responses" ,python-responses))) + (home-page + "https://github.com/matrix-org/matrix-python-sdk") + (synopsis "Client-Server SDK for Matrix") + (description "This package provides client-server SDK for Matrix.") + (license license:asl2.0))) + (define-public python-matrix-synapse-ldap3 (package (name "python-matrix-synapse-ldap3") -- cgit 1.4.1 From b8ebe6dee815ad5611707c29d9ffed50595fdb55 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:41 +0100 Subject: gnu: Add python-flake8-continuation. * gnu/packages/python-xyz.scm (python-flake8-continuation): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bcf5d05b20..e24a9410f0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8735,6 +8735,34 @@ design problems in your program. It contains warnings that don't belong in pyflakes and pycodestyle.") (license license:expat))) +(define-public python-flake8-continuation + (package + (name "python-flake8-continuation") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-continuation" version)) + (sha256 + (base32 + "0dzaw8jr7yhlabxhrblnrizxx17xa9ngjnbr1kidg5lapq6b9q1y")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8) + ("python-pycodestyle" ,python-pycodestyle) + ("python-six" ,python-six))) + (home-page "https://github.com/planetlabs/flake8-continuation") + (synopsis "Flake8 Line Continuation Plugin") + (description "A Flake8 plugin that checks for the line continuation +style to be in the preferred method according to PEP-8, specifically: +@quotation +The preferred way of wrapping long lines is by using Python's implied +line continuation inside parentheses, brackets and braces. Long lines +can be broken over multiple lines by wrapping expressions in parentheses. +These should be used in preference to using a backslash for line continuation. +@end quotation") + (license license:asl2.0))) + (define-public python-flake8-implicit-str-concat (package (name "python-flake8-implicit-str-concat") -- cgit 1.4.1 From f7c7ccde2912ce7825e3ca5ef38dd2fe9644f441 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:42 +0100 Subject: gnu: Add python-flake8-quotes. * gnu/packages/python-xyz.scm (python-flake8-quotes): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e24a9410f0..dac857a83d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8901,6 +8901,25 @@ first-class forward references that stub files use.") lints.") (license license:bsd-2))) +(define-public python-flake8-quotes + (package + (name "python-flake8-quotes") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "flake8-quotes" version)) + (sha256 + (base32 + "0ph5s6lxgpzz4an0ax6s5xjqypqmngwr5b1i0h9pqhzghplic49z")))) + (build-system python-build-system) + (propagated-inputs + `(("python-flake8" ,python-flake8))) + (home-page "https://github.com/zheller/flake8-quotes/") + (synopsis "Flake8 lint for quotes") + (description "This package provides a Flake8 lint for quotes.") + (license license:expat))) + (define-public python-autoflake (package (name "python-autoflake") -- cgit 1.4.1 From 685fa3f55f242d7884a3b6fac3fe4bbf9409064c Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:44 +0100 Subject: gnu: Add python-zulip. * gnu/packages/python-xyz.scm (python-zulip): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 5c55e08fb2..329b5f3322 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan ;;; Copyright © 2020, 2021 Robert Karszniewicz +;;; Copyright © 2020 Giacomo Leidi ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,6 +90,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages man) #:use-module (gnu packages markup) + #:use-module (gnu packages matrix) #:use-module (gnu packages mono) #:use-module (gnu packages mpd) #:use-module (gnu packages ncurses) @@ -2859,4 +2861,51 @@ social and chat platform.") designed for experienced users.") (license license:gpl2+))) +(define-public python-zulip + (package + (name "python-zulip") + (version "0.7.1") + (source + (origin + ;; There is no source on Pypi. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/python-zulip-api") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0da1ki1v252avy27j6d7snnc0gyq0xa9fypm3qdmxhw2w79d6q36")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'cd-to-zulip-dir + (lambda _ + (chdir "zulip") + #t)) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (let ((test-zulip "../tools/test-zulip")) + (when tests? + (add-installed-pythonpath inputs outputs) + (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) + (patch-shebang test-zulip) + (invoke test-zulip)) + #t)))))) + (propagated-inputs + `(("python-matrix-client" ,python-matrix-client) + ("python-pyopenssl" ,python-pyopenssl) + ("python-requests" ,python-requests) + ("python-six" ,python-six))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-distro" ,python-distro) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/zulip/python-zulip-api") + (synopsis "Zulip's API Python bindings") + (description + "This package provides Python bindings to Zulip's API.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit 1.4.1 From 673031c7628ed7ad9accfb98aa45f3da7cbc75ce Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Mon, 28 Dec 2020 22:32:45 +0100 Subject: gnu: Add zulip-term. * gnu/packages/messaging.scm (zulip-term): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/messaging.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 329b5f3322..388e7f2ead 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -103,6 +103,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -2908,4 +2909,55 @@ designed for experienced users.") "This package provides Python bindings to Zulip's API.") (license license:asl2.0))) +(define-public zulip-term + (package + (name "zulip-term") + (version "0.5.2") + (source + (origin + ;; Pypi package doesn't ship tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/zulip/zulip-terminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xhhy3v4wck74a83avil0rnmsi2grrh03cww19n5mv80p2q1cjmf")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "setup.py" + (("\\=\\=1\\.7") ">=1.7") ; pytest-mock + (("\\=\\=2\\.5") ">=2.5") ; pytest-cov + (("4\\.5\\.2") "4.4.2")) ; lxml + #t)))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Delete failing tests. + (delete-file "tests/cli/test_run.py") + (invoke "pytest")) + #t))))) + (inputs + `(("python-beautifulsoup4" ,python-beautifulsoup4) + ("python-lxml" ,python-lxml) + ("python-mypy-extensions" ,python-mypy-extensions) + ("python-urwid" ,python-urwid) + ("python-urwid-readline" ,python-urwid-readline) + ("python-zulip" ,python-zulip))) + (native-inputs + `(("python-distro" ,python-distro) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-mock" ,python-pytest-mock))) + (home-page "https://github.com/zulip/zulip-terminal") + (synopsis "Zulip's official terminal client") + (description "This package contains Zulip's official terminal client.") + (license license:asl2.0))) + ;;; messaging.scm ends here -- cgit 1.4.1 From f1442560906de4863c89a6f8c1c08169ee0738cb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 13:29:52 +0200 Subject: gnu: foo2zjs: Update to 20200610.1. No functional changes. * gnu/packages/cups.scm (foo2zjs): Update to 20200610.1. [source]: Use a Web-archived tarball. --- gnu/packages/cups.scm | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index b18273109e..5213563a6a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -749,14 +749,15 @@ printer/driver specific, but spooler-independent PPD file.") (define-public foo2zjs (package (name "foo2zjs") - (version "20200610") - (source (origin - (method url-fetch) - ;; XXX: This is an unversioned URL! - (uri "http://foo2zjs.rkkda.com/foo2zjs.tar.gz") - (sha256 - (base32 - "11ddx6wf8b5ksl4fqw6fnyz9m3y470lryyrskkya2bsch2bvj9lg")))) + (version "20200610.1") + (source + (origin + (method url-fetch) + ;; The upstream tarball is unversioned: use a stable snapshot. + (uri (string-append "https://web.archive.org/web/20210224094943if_/" + "http://foo2zjs.rkkda.com/foo2zjs.tar.gz")) + (sha256 + (base32 "03ncif50n7ck7drggqxbc7w0kgzdb90ha0dbvqk98ky8lw3k76xd")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From 3a638b105941525b428cf83e454e387a025d132a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:03:47 +0200 Subject: gnu: mame: Update to 0.230. * gnu/packages/emulators.scm (mame): Update to 0.230. --- 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 1cd23c3e6c..c4611bf34f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1589,7 +1589,7 @@ This is a part of the TiLP project.") (define-public mame (package (name "mame") - (version "0.229") + (version "0.230") (source (origin (method git-fetch) @@ -1598,7 +1598,7 @@ This is a part of the TiLP project.") (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "0s5q6fjk739p1bfh72fmh35xi13fwbrgjqrn45i5xzx3v3gadmbg")) + (base32 "0dk8q2691pycv9mq77h6sdfwjnwdrfwrblf8nwyykrmdawzi56ks")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. -- cgit 1.4.1 From 36934d5060ff7d9c126ea9f13db9306c93c8585a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:17:58 +0200 Subject: gnu: youtube-dl: Update to 2021.04.01. * gnu/packages/video.scm (youtube-dl): Update to 2021.04.01. --- 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 a22b73b24f..4cd36cbd7f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.03.31") + (version "2021.04.01") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1svcgrhq1yxpcd6k3piqs5paalrcsq9bm79h5ras1g7yjzid05gj")) + "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From 9be20668ebed006d156882e4d604a9e19bf45b59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 14:28:57 +0200 Subject: gnu: librsvg@2.50: Update to 2.50.3. * gnu/packages/crates-io.scm (rust-lopdf-0.25): Rename to... (rust-lopdf-0.26): ...to this, updated to 0.26.0. [arguments]: Update #:cargo-inputs' rust-time-0.1 to rust-time-0.2. * gnu/packages/gnome.scm (librsvg): Update to 2.50.3. [arguments]: Update #:cargo-development-inputs's rust-lopdf-0.25 to rust-lopdf-0.26. --- gnu/packages/crates-io.scm | 9 ++++----- gnu/packages/gnome.scm | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f3d6c92e11..ae4e91f764 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22307,10 +22307,10 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) -(define-public rust-lopdf-0.25 +(define-public rust-lopdf-0.26 (package (name "rust-lopdf") - (version "0.25.0") + (version "0.26.0") (source (origin (method url-fetch) @@ -22318,8 +22318,7 @@ image together with its neighboring pixels.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1yb4yj1a8a88w78hz9msg65xbkyx5n4d9gm1xb2c67zaj1xvyw1i")))) + (base32 "1wqnmibs8qzi6pr3ig4h3sg6bfkkgyv4ngdng81x069725r056ml")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -22335,7 +22334,7 @@ image together with its neighboring pixels.") ("rust-nom" ,rust-nom-5) ("rust-pom" ,rust-pom-3) ("rust-rayon" ,rust-rayon-1) - ("rust-time" ,rust-time-0.1)))) + ("rust-time" ,rust-time-0.2)))) (home-page "https://github.com/J-F-Liu/lopdf") (synopsis "Rust library for PDF document manipulation") (description diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e2ee4a46e..ed6d433cf9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3367,7 +3367,7 @@ library.") (define-public librsvg-next (package (name "librsvg") - (version "2.50.2") + (version "2.50.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3375,7 +3375,7 @@ library.") "librsvg-" version ".tar.xz")) (sha256 (base32 - "1lsnl08b5pjf01q3agixjd53islw5rqkc38r31rlmm2crrqz44b2")) + "0n79i4wj9hm0d3bbn4xvknq5ylhqs16pvhaqr1rxspx9wfc8lad4")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") @@ -3431,7 +3431,7 @@ library.") ("rust-chrono" ,rust-chrono-0.4) ("rust-criterion" ,rust-criterion-0.3) ("rust-float-cmp" ,rust-float-cmp-0.8) - ("rust-lopdf" ,rust-lopdf-0.25) + ("rust-lopdf" ,rust-lopdf-0.26) ("rust-png" ,rust-png-0.16) ("rust-predicates" ,rust-predicates-1) ("rust-tempfile" ,rust-tempfile-3)) -- cgit 1.4.1 From 5e4ddfb5374fc6b0aad6aa19b2c7a09b012c68e6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 1 Apr 2021 14:15:14 +0200 Subject: gnu: psm2: Update to 11.2.185. Fixes a bug introduced with the Open MPI 4.1.0 update in commit ee21803288cb2fd4dcfa9091d4fe4080a795a1ab, whereby the new version of Open MPI would not compile PSM2 support because our version of PSM2 was too old. Consequently, Open MPI would fall back to UCX and users would get poor performance on Omni-Path networks. * gnu/packages/linux.scm (psm2): Update to 11.2.185. --- 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 8a6ae502dc..5e08331652 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -7126,7 +7126,7 @@ privileges.") (define-public psm2 (package (name "psm2") - (version "11.2.86") + (version "11.2.185") (source (origin (method git-fetch) (uri (git-reference @@ -7135,7 +7135,7 @@ privileges.") (file-name (git-file-name name version)) (sha256 (base32 - "1hiqzcmc97lzhaqjva82vf8irgg038cciypsv2brw90ak09n6vwf")))) + "062hg4r6gz7pla9df70nqs5i2a3mp1wszmp4l0g771fykhhrxsjg")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit 1.4.1 From 8ec03ed5475ca7919a7d11541ff8cbf33a9ffe67 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 15:34:38 +0200 Subject: gnu: perl-data-validate-ip: Update to 0.30 [fixes CVE-2021-29662]. * gnu/packages/networking.scm (perl-data-validate-ip): Update to 0.30. --- 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 7dd484fa94..75f0fa5d95 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1895,7 +1895,7 @@ loop.") (define-public perl-data-validate-ip (package (name "perl-data-validate-ip") - (version "0.27") + (version "0.30") (source (origin (method url-fetch) @@ -1903,7 +1903,7 @@ loop.") "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-" version ".tar.gz")) (sha256 - (base32 "1mmppyzsh1w2z2h86kvzqxy56wxgs62a3kf8nvcnz76bblir5ap1")))) + (base32 "074adrlvkiahj1fdc9nvb95dpfyjzm2jzhi90m8xaw4bw5ipcbzy")))) (build-system perl-build-system) (native-inputs `(("perl-test-requires" ,perl-test-requires))) -- cgit 1.4.1 From 24652f9cdc66ae13b6b2159a2bddd4375ec4d3fb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 1 Apr 2021 15:48:13 +0200 Subject: gnu: fe: Fix hash. * gnu/packages/text-editors.scm (fe): Update hash. Development version (2.0) has been rebased on top of latest stable release (1.9). --- 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 c671095793..3af1aec94b 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -965,7 +965,7 @@ The basic features of Geany are: (define-public fe (package (name "fe") - ;; Stable release is 1.8. However, this development version + ;; Stable release is 1.9. However, this development version ;; introduces support for UTF-8. (version "2.0") (source (origin @@ -974,7 +974,7 @@ The basic features of Geany are: "fe-" version ".tar.gz")) (sha256 (base32 - "1hwws7si1752z6hp61zxznvgsb6846lp8zl1hn5ddhsbafwalwb9")))) + "10mk5wc3dsdp46b3hkjyd740gcdv6m1gvlr3p8xjxf55b3vfs0la")))) (build-system gnu-build-system) (arguments `(#:tests? #f ;no test -- cgit 1.4.1 From ae40c478b53e91679b5ed87bd6840ef79c31b377 Mon Sep 17 00:00:00 2001 From: qblade Date: Thu, 1 Apr 2021 15:59:53 +0200 Subject: gnu: Add emacs-showtip. * gnu/packages/emacs-xyz.scm (emacs-showtip): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f2f94c497f..1147ad5f00 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25598,6 +25598,28 @@ can specify how popup-displaying functions occupy the screen.") (home-page "https://github.com/wasamasa/shackle") (license license:gpl3+)))) +(define-public emacs-showtip + (let ((commit "930da302809a4257e8d69425455b29e1cc91949b") + (revision "0")) + (package + (name "emacs-showtip") + (version (git-version "0.01" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacsorphanage/showtip") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "01zak0zhha6dp7a2hm28d065gjnc462iwpsfyxhbxgfzcdlicqc7")))) + (build-system emacs-build-system) + (home-page "https://github.com/emacsorphanage/showtip") + (synopsis "Show tip at cursor") + (description + "This library provide one function to show tooltip near the cursor.") + (license license:gpl2+)))) + (define-public emacs-helm-lacarte (let ((commit "40a6c449720be521435b6b1da7911af3a0b9dca0") (revision "1")) -- cgit 1.4.1 From f3044da6fcaa3ff847eabc43dba817905ca79890 Mon Sep 17 00:00:00 2001 From: qblade Date: Thu, 1 Apr 2021 16:06:24 +0200 Subject: gnu: Add emacs-sdcv. * gnu/packages/emacs-xyz.scm (emacs-sdcv): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1147ad5f00..d6ca0c6d52 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25620,6 +25620,34 @@ can specify how popup-displaying functions occupy the screen.") "This library provide one function to show tooltip near the cursor.") (license license:gpl2+)))) +(define-public emacs-sdcv + ;; No tagged version upstream. + (let ((commit "943ae3e90cc9a0a88a37cc710acd7424fd4defc4" ) + (revision "0")) + (package + (name "emacs-sdcv") + (version (git-version "1.5.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/stardiviner/sdcv.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0i1ylvw7p46pkf3yyyzcdmdhsspzymnnnvx8s0i7vynngr5x0vzh")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-popup" ,emacs-popup) + ("emacs-pos-tip" ,emacs-pos-tip) + ("emacs-showtip" ,emacs-showtip))) + (home-page "https://www.emacswiki.org/emacs/download/sdcv.el") + (synopsis "Emacs interface for @code{sdcv}") + (description + "This plugin translates words with @code{sdcv}, and displays +translation using a tooltip or in a dedicated buffer.") + (license license:gpl3+)))) + (define-public emacs-helm-lacarte (let ((commit "40a6c449720be521435b6b1da7911af3a0b9dca0") (revision "1")) -- cgit 1.4.1 From 0a822a74abd81118653f482b1f8a1c0078e6eb18 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:14 +0200 Subject: gnu: rust-rocket-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ae4e91f764..c47a848b68 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33078,14 +33078,14 @@ MessagePack format.") (define-public rust-rocket-0.4 (package (name "rust-rocket") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1sb6i0y65hq4wy4awa14diyv19wcd1sii2mfjdlcwam3mbbfbisg")))) + (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From f811f13660d2bbb04ddc259998565f5b91981e3c Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:22 +0200 Subject: gnu: rust-rocket-codegen-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-codegen-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c47a848b68..3622d56285 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33115,14 +33115,14 @@ and speed.") (define-public rust-rocket-codegen-0.4 (package (name "rust-rocket-codegen") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n4k00fwwabvkjvnl62gwdc5v7rsg6bnmmwwiwm5bzpmdnqm94ai")))) + (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 9c9a36de732ea8485e47e84b888e121233f68452 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Thu, 1 Apr 2021 16:34:25 +0200 Subject: gnu: rust-rocket-http-0.4: Update to 0.4.7 [fixes CVE-2021-29935]. * gnu/packages/crates-io.scm (rust-rocket-http-0.4): Update to 0.4.7. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3622d56285..09ae151ea1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33143,14 +33143,14 @@ and speed.") (define-public rust-rocket-http-0.4 (package (name "rust-rocket-http") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) (uri (crate-uri "rocket_http" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0msjjclqcgh8kpa54b4kv6zbybambc9kmkfm1q5adiq3fbg8gl59")))) + (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 77eaf5fcd1e9d64c52f6d42d44a5d1ea72344d4e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 1 Apr 2021 22:17:02 +0200 Subject: gnu: Fix packages that were importing Guile modules from the host. Those packages were importing (ice-9 match) & co. from the host Guile, which could potentially lead to different derivations depending on the Guile in use. Uncovered by the warning emitted by 'gexp-modules'. * gnu/packages/admin.scm (inxi-minimal)[arguments]: Remove Guile modules from #:modules. * gnu/packages/dns.scm (ddclient)[arguments]: Likewise. * gnu/packages/tex.scm (texlive-latex-koma-script)[arguments]: Likewise. * gnu/packages/java.scm (openjdk11)[arguments]: Likewise for #:imported-modules. --- gnu/packages/admin.scm | 5 +---- gnu/packages/dns.scm | 4 +--- gnu/packages/java.scm | 7 ++----- gnu/packages/tex.scm | 3 +-- 4 files changed, 5 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 292a4bc2a2..d5b4d34323 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3761,10 +3761,7 @@ Python loading in HPC environments.") (native-inputs `(("gzip" ,gzip))) (arguments - `(#:modules - ((guix build utils) - (ice-9 match) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 37f8c3a6be..6d146e6264 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -1050,9 +1050,7 @@ LuaJIT, both a resolver library and a daemon.") ("perl-digest-sha1" ,perl-digest-sha1) ("perl-io-socket-ssl" ,perl-io-socket-ssl))) (arguments - `(#:modules ((guix build utils) - (ice-9 match) - (srfi srfi-26)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 37716e01d5..207f136513 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2107,11 +2107,8 @@ new Date();")) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) (arguments - `(#:imported-modules - ((guix build syscalls) - (ice-9 binary-ports) - (rnrs bytevectors) - ,@%gnu-build-system-modules) + `(#:imported-modules ((guix build syscalls) + ,@%gnu-build-system-modules) #:tests? #f; requires jtreg ;; TODO package jtreg #:configure-flags diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index d45fe3045b..ec21221ea1 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6752,8 +6752,7 @@ produce either PostScript or PDF output.") "1vz9zg7s5w52xr323zgglzprfrvba2zvyzf6b8vrdf4wdghlpv4z")))) (build-system trivial-build-system) (arguments - `(#:modules ((guix build utils) - (ice-9 match)) + `(#:modules ((guix build utils)) #:builder (begin (use-modules (guix build utils) -- cgit 1.4.1 From 5a63a471a7ae78240db772750a3db2d250712f71 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:04 +0200 Subject: gnu: python-ipaddress: Update to 1.0.23. * gnu/packages/python-xyz.scm (python-ipaddress): Update to 1.0.23. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dac857a83d..973e3349c4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9776,13 +9776,13 @@ implementations of ASN.1-based codecs and protocols.") (define-public python-ipaddress (package (name "python-ipaddress") - (version "1.0.22") + (version "1.0.23") (source (origin (method url-fetch) (uri (pypi-uri "ipaddress" version)) (sha256 (base32 - "0b570bm6xqpjwqis15pvdy6lyvvzfndjvkynilcddjj5x98wfimi")))) + "1qp743h30s04m3cg3yk3fycad930jv17q7dsslj4mfw0jlvf1y5p")))) (build-system python-build-system) (home-page "https://github.com/phihag/ipaddress") (synopsis "IP address manipulation library") -- cgit 1.4.1 From 8667a2a58d482883192d53eb25a9070208675e45 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:13 +0200 Subject: gnu: python-tabulate: Update to 0.8.9. * gnu/packages/python-xyz.scm (python-tabulate): Update to 0.8.9. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 973e3349c4..cd75634d99 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -13361,13 +13361,13 @@ It uses LR parsing and does extensive error checking.") (define-public python-tabulate (package (name "python-tabulate") - (version "0.8.7") + (version "0.8.9") (source (origin (method url-fetch) (uri (pypi-uri "tabulate" version)) (sha256 (base32 - "01shi7bmj09f0bcm5s0c9skys063lzp76p0n4a2xmg041ni269yv")))) + "19qkdz8xwk5jxa5xn53mnk76qnh4ysm81vzj664jw1b0azr167gb")))) (build-system python-build-system) (arguments ;; FIXME: The pypi release tarball is missing a 'test/common.py' -- cgit 1.4.1 From 079a7f2c65c51da7b53b0e5ef44c516dc8eaab6e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 1 Apr 2021 22:36:22 +0200 Subject: gnu: python-pyserial: Update to 3.5. * gnu/packages/python-xyz.scm (python-pyserial): Update to 3.5. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index cd75634d99..55bd9360f2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14321,14 +14321,14 @@ relays publish about themselves.") (define-public python-pyserial (package (name "python-pyserial") - (version "3.4") + (version "3.5") (source (origin (method url-fetch) (uri (pypi-uri "pyserial" version)) (sha256 (base32 - "09y68bczw324a4jb9a1cfwrbjhq179vnfkkkrybbksp0vqgl0bbf")))) + "1nyd4m4mnrz8scbfqn4zpq8gnbl4x42w5zz62vcgpzqd2waf0xrw")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: 3/49 tests are failing. -- cgit 1.4.1 From b1ed32dae06fdc0bc50fc69cc7c9e836ecc6a4e3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 2 Apr 2021 10:08:45 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210401. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210401. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 658f0fbd2a..e1a5a9a7a6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3417,10 +3417,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "0bc05cc73257670ab241853b9cc9ccb68940fe44")) + (let ((commit "6e8315613d496089ba858c13afabb2c0f6d28740")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "10" commit)) + (version (git-version "2.4" "11" commit)) (source (origin (method git-fetch) @@ -3430,7 +3430,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "1kg6illspvb5647pm0x819ag2n7njnqvrm18jzgd28vk6nlkrcmq")))) + "121jk3irxaz8jnmhjnpdypb9shwd844rf4b3x94y1ig4dxw7gx6h")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From d01837ca0d1f2805a119571dfab436726157eeac Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:43 +0100 Subject: Revert "gnu: virt-manager: Update to 3.2.0." This reverts commit 5eb05ede0bf0cfe3080a24eea783f0fbc2ed4015. --- gnu/packages/virtualization.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index ab7d8deec6..8fcdb660ce 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "3.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1238,10 +1238,11 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) + "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command + #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1259,6 +1260,12 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) + (add-after 'unpack 'fix-qemu-img-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "virtconv/formats.py" + (("/usr(/bin/qemu-img)" _ suffix) + (string-append (assoc-ref inputs "qemu") suffix))) + #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1289,12 +1296,11 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") - (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "pytest" "--uitests")) + (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1324,9 +1330,7 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) - ("rst2man" ,python-docutils) ;; The following are required for running the tests - ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit 1.4.1 From 614e95619b26b48b2973bf9eb63b6184d446983c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:49 +0100 Subject: Revert "gnu: libvirt-glib: Update to 4.0.0." This reverts commit 7573ab22d7400a16d81228c6500331a293887cae. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8fcdb660ce..e1b780bbe1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "4.0.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.xz")) + "libvirt-glib-" version ".tar.gz")) (sha256 (base32 - "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) - (build-system meson-build-system) + "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) + (build-system gnu-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit 1.4.1 From d42f6b091660d1717064b2d75fe0c29a0c24f96a Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:53 +0100 Subject: Revert "gnu: python-libvirt: Update to 7.1.0." This reverts commit 52ed12afcb4618f0a9801b10799d8bbdffe87878. --- 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 e1b780bbe1..7a34f8db1f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "7.1.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))) + (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From bd9e14085668217b5657e57ca5b13a4a55360d9c Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Thu, 1 Apr 2021 22:50:56 +0100 Subject: Revert "gnu: libvirt: Update to 7.1.0." The update causes virsh to fail . This reverts commit 383b02a370252c08eb1d43ac94d659c1d3993a35. --- gnu/local.mk | 2 +- .../patches/libvirt-create-machine-cgroup.patch | 48 +++++++++++++ .../patches/libvirt-do-not-create-var-dirs.patch | 30 --------- gnu/packages/virtualization.scm | 78 +++++++++++++--------- 4 files changed, 94 insertions(+), 64 deletions(-) create mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch delete mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index b037b397c3..f2d595f2cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1263,7 +1263,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ + %D%/packages/patches/libvirt-create-machine-cgroup.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gnu/packages/patches/libvirt-create-machine-cgroup.patch new file mode 100644 index 0000000000..585ac237e1 --- /dev/null +++ b/gnu/packages/patches/libvirt-create-machine-cgroup.patch @@ -0,0 +1,48 @@ +From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?= + +Date: Fri, 1 Nov 2019 17:29:00 +0100 +Subject: [PATCH] vircgroup: Ensure /machine group is associated with its + parent. + +Call first virCgroupNew on the parent group virCgroupNewPartition if +it is available on before the creation of the child group. This +ensures that the creation of a first level group on the unified +architecture, as the check at virCgroupV2ParseControllersFile as the +parent file is there. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1760233 +--- + src/util/vircgroup.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c +index b46f20abfd..33c61f2d45 100644 +--- a/src/util/vircgroup.c ++++ b/src/util/vircgroup.c +@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, + if (virCgroupSetPartitionSuffix(path, &newPath) < 0) + goto cleanup; + +- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) +- goto cleanup; +- + if (STRNEQ(newPath, "/")) { + char *tmp; + parentPath = g_strdup(newPath); +@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, + + if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0) + goto cleanup; ++ } + ++ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) ++ goto cleanup; ++ ++ if (parent) { + if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) < 0) + goto cleanup; + } +-- +2.23.0 + diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch deleted file mode 100644 index 6b89d49fd4..0000000000 --- a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch +++ /dev/null @@ -1,30 +0,0 @@ -We define localstatedir as /var, and so we shouldn't be installing empty -directories there. - -diff --git a/src/meson.build b/src/meson.build -index f13b85b74e..58040f2c5d 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') - ) - endif - -- --# Install empty directories -- --virt_install_dirs += [ -- localstatedir / 'cache' / 'libvirt', -- localstatedir / 'lib' / 'libvirt' / 'images', -- localstatedir / 'lib' / 'libvirt' / 'filesystems', -- localstatedir / 'lib' / 'libvirt' / 'boot', --] -- --meson.add_install_script( -- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog.path(), -- virt_install_dirs, --) -- -- - # Check driver files - - if host_machine.system() == 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7a34f8db1f..c6929b9f1a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,7 +18,6 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari -;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1066,49 +1065,64 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "7.1.0") + (version "5.8.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) + (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) (patches - (search-patches "libvirt-do-not-create-var-dirs.patch")))) - (build-system meson-build-system) + (search-patches "libvirt-create-machine-cgroup.patch")))) + (build-system gnu-build-system) (arguments - `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. - #:configure-flags - (list "-Ddriver_qemu=enabled" - "-Dqemu_user=nobody" - "-Dqemu_group=kvm" - "-Dpolkit=enabled") + `(#:configure-flags + (list "--with-qemu" + "--with-qemu-user=nobody" + "--with-qemu-group=kvm" + "--with-polkit" + (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" + ,name "-" ,version) + "--sysconfdir=/etc" + "--localstatedir=/var") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-sysconfdir-and-localstatedir + (add-before 'configure 'fix-BOURNE_SHELL-definition + ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. (lambda _ - (substitute* "meson.build" - ;; We set the prefix to be the package output, but we need - ;; localstatedir to be /var. Sadly the build system doesn't - ;; seem to allow that easily. - (("localstatedir = prefix / get_option\\('localstatedir'\\)") - "localstatedir = get_option('localstatedir')") - ;; On the other hand, we keep sysconfdir using the prefix so - ;; that we install configuration files in the package output. - ;; However, we need to make sure the C code refers to /etc via - ;; SYSCONFDIR, and not the read-only configuration in the - ;; package output. - (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") - "set_quoted('SYSCONFDIR', '/etc')")) + (substitute* "config.h.in" + (("/bin/sh") (which "sh"))) + #t)) + (add-before 'configure 'patch-libtirpc-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libvirt uses an m4 macro instead of pkg-config to determine where + ;; the RPC headers are located. Tell it to look in the right place. + (substitute* "configure" + (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 + (string-append (assoc-ref inputs "libtirpc") + "/include/tirpc"))) #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (substitute* "tests/meson.build" - (("\\{ 'name': 'commandtest'.*") "") ; hangs idly - (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails - (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to network - #t))))) + (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "qemuhotplugtest" ; fails + "virnetsockettest" ; tries to network + "virshtest"))) ; fails + (substitute* "tests/Makefile.in" + (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) + "")) + #t))) + (replace 'install + ;; Since the sysconfdir and localstatedir should be /etc and /var + ;; at runtime, we must prevent writing to them at installation + ;; time. + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install" + "sysconfdir=/tmp/etc" + "localstatedir=/tmp/var" + make-flags)))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1135,9 +1149,7 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper) - ("python-docutils" ,python-docutils) ;for rst2html - ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' + ("python" ,python-wrapper))) (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit 1.4.1 From a890880cf66cd2f625d648898a5c55cf3222a451 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 1 Apr 2021 22:48:00 +0800 Subject: gnu: Add python-smartypants. * gnu/packages/python-xyz.scm (python-smartypants): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 55bd9360f2..68e53c3f92 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24331,3 +24331,44 @@ number of words, syllables, and sentences.") "This package provides a Python library that can parse OPML, FOAF, and iGoogle subscription lists.") (license license:expat))) + +(define-public python-smartypants + (package + (name "python-smartypants") + (version "2.0.1") + (source + (origin + ;; There's no source tarball for 2.0.1 on PyPI. + (method git-fetch) + (uri (git-reference + (url "https://github.com/leohemsted/smartypants.py") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Its `setup.py test` doesn't report failure with exit status, so + ;; we use `nose` instead. + (lambda _ + (invoke "nosetests" "-v" "--exclude=^load_tests$")))))) + (native-inputs + ;; For tests. + `(("python-docutils" ,python-docutils) + ("python-nose" ,python-nose) + ("python-pygments" ,python-pygments))) + (home-page "https://github.com/leohemsted/smartypants.py") + (synopsis "Translate punctuation characters into smart quotes") + (description + "@command{smartpants} can perform the following transformations: +@enumerate +@item Straight quotes ( \" and ' ) into \"curly\" quote HTML entities +@item Backticks-style quotes (``like this'') into \"curly\" quote HTML +entities +@item Dashes (-- and ---) into en- and em-dash entities +@item Three consecutive dots (... or . . .) into an ellipsis entity +@end enumerate") + (license license:bsd-3))) -- cgit 1.4.1 From efb895146097fa14a8a38fe6de127f01aaf2a37b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 1 Apr 2021 22:49:48 +0800 Subject: gnu: Add python-typogrify. * gnu/packages/python-xyz.scm (python-typogrify): New variable. --- gnu/packages/python-xyz.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 68e53c3f92..f2b1551df5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24372,3 +24372,34 @@ entities @item Three consecutive dots (... or . . .) into an ellipsis entity @end enumerate") (license license:bsd-3))) + +(define-public python-typogrify + (package + (name "python-typogrify") + (version "2.0.7") + (source (origin + (method url-fetch) + (uri (pypi-uri "typogrify" version)) + (sha256 + (base32 + "0f6b2gnnxjbx1fbmkcscc6qjr4hi78kwm1wx4b766ha3va66dr4b")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests" "-v")))))) + (propagated-inputs + `(("python-smartypants" ,python-smartypants))) + (native-inputs + ;; For tests. + `(("python-nose" ,python-nose))) + (home-page "https://github.com/mintchaos/typogrify") + (synopsis "Filters to transform text into typographically-improved HTML") + (description + "@code{typogrify} provides a set of custom filters that automatically +apply various transformations to plain text in order to yield +typographically-improved HTML. While often used in conjunction with Jinja and +Django template systems, the filters can be used in any environment.") + (license license:bsd-3))) -- cgit 1.4.1 From 566408da843faa4bac083c83c6047ca074283a7c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:13:55 -0400 Subject: gnu: asio: Update to 1.18.1. * gnu/packages/networking.scm (asio): Update to 1.18.1. (asio-1.12): New variable. * gnu/packages/emulators.scm (mame)[inputs]: Use asio-1.12, otherwise it fails to build. --- gnu/packages/emulators.scm | 2 +- gnu/packages/networking.scm | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index c4611bf34f..8bfcfc57a7 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1743,7 +1743,7 @@ This is a part of the TiLP project.") ("texinfo" ,texinfo))) (inputs `(("alsa-lib" ,alsa-lib) - ("asio" ,asio) + ("asio" ,asio-1.12) ;the bundled copy is at 1.11 ("expat" ,expat) ("flac" ,flac) ("fontconfig" ,fontconfig) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 75f0fa5d95..0fc289df54 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -3027,7 +3027,8 @@ eight bytes) tools ;; Either BSD-3 or GPL-2 can be used. (license (list license:bsd-3 license:gpl2)))) -(define-public asio +;;; This is an old version required by rested. +(define-public asio-1.12 (package (name "asio") (version "1.12.2") @@ -3054,6 +3055,18 @@ low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.") (license license:boost1.0))) +(define-public asio + (package + (inherit asio-1.12) + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asio/asio/" + version " (Stable)/asio-" version ".tar.bz2")) + (sha256 + (base32 "04wi69d72l1p5c7d63z1dz06zn8pdqsbgx1if98dszs9ymfqgyaa")))))) + (define-public shadowsocks ;; There are some security fixes after the last release. (let* ((commit "e332ec93e9c90f1cbee676b022bf2c5d5b7b1239") -- cgit 1.4.1 From 7822b15f041bc28b80e1d959cf33de01be814530 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:01 -0400 Subject: gnu: restbed: Update to 4.7. * gnu/packages/networking.scm (restbed): Update to 4.7. --- gnu/packages/networking.scm | 97 ++++++++++++++++++++++----------------------- 1 file changed, 48 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0fc289df54..0f2e1659b4 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3332,57 +3332,56 @@ never see any machines other than the one Dante is running on.") (license (license:non-copyleft "file://LICENSE")))) (define-public restbed - (let ((commit "6eb385fa9051203f28bf96cc1844bbb5a9a6481f")) - (package - (name "restbed") - (version (git-version "4.6" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Corvusoft/restbed/") - (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0k60i5drklqqrb4khb25fzkgz9y0sncxf1sp6lh2bm1m0gh0661n")))) - (build-system cmake-build-system) - (inputs - `(("asio" ,asio) - ("catch" ,catch-framework) - ("openssl" ,openssl))) - (arguments - `(#:tests? #f - #:configure-flags - '("-DBUILD_TESTS=NO" - "-DBUILD_EXAMPLES=NO" - "-DBUILD_SSL=NO" - "-DBUILD_SHARED=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'apply-patches-and-fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((asio (assoc-ref inputs "asio")) - (catch (assoc-ref inputs "catch")) - (openssl (assoc-ref inputs "openssl"))) - (substitute* "cmake/Findasio.cmake" - (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" asio "/include\" )"))) - (substitute* "cmake/Findcatch.cmake" - (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" catch "/include\" )"))) - (substitute* "cmake/Findopenssl.cmake" - (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) - (string-append begin " \"" openssl "/include\" )"))))))))) - (synopsis "Asynchronous RESTful functionality to C++11 applications") - (description "Restbed is a comprehensive and consistent programming + (package + (name "restbed") + (version "4.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Corvusoft/restbed/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "055qicb773a599dsqbcz5xf0xj1wpk33mdrkyi0fsmyjmn8d2p9d")))) + (build-system cmake-build-system) + (inputs + `(("asio" ,asio-1.12) + ("catch" ,catch-framework) + ("openssl" ,openssl))) + (arguments + `(#:tests? #f + #:configure-flags + '("-DBUILD_TESTS=NO" + "-DBUILD_EXAMPLES=NO" + "-DBUILD_SSL=NO" + "-DBUILD_SHARED=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'apply-patches-and-fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((asio (assoc-ref inputs "asio")) + (catch (assoc-ref inputs "catch")) + (openssl (assoc-ref inputs "openssl"))) + (substitute* "cmake/Findasio.cmake" + (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" asio "/include\" )"))) + (substitute* "cmake/Findcatch.cmake" + (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" catch "/include\" )"))) + (substitute* "cmake/Findopenssl.cmake" + (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) + (string-append begin " \"" openssl "/include\" )"))))))))) + (synopsis "Asynchronous RESTful functionality to C++11 applications") + (description "Restbed is a comprehensive and consistent programming model for building applications that require seamless and secure communication over HTTP.") - (home-page "https://github.com/Corvusoft/restbed") - (license license:agpl3+)))) + (home-page "https://github.com/Corvusoft/restbed") + (license license:agpl3+))) (define-public restinio (package -- cgit 1.4.1 From 0b25557bea82d837d499c72c3de7f27c394fda33 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:21 -0400 Subject: gnu: restinio: Update to 0.6.13. * gnu/packages/networking.scm (restinio): Update to 0.6.13. --- 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 0f2e1659b4..8cdb674ff3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3386,7 +3386,7 @@ communication over HTTP.") (define-public restinio (package (name "restinio") - (version "0.6.1.1") + (version "0.6.13") (source (origin (method git-fetch) (uri (git-reference @@ -3395,7 +3395,7 @@ communication over HTTP.") (file-name (git-file-name name version)) (sha256 (base32 - "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5")))) + "0gb0yc88hdzwm08zdiviay6s08q427za33kfbygib7bdzp2wr2dm")))) (build-system cmake-build-system) (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. `(("zlib" ,zlib) -- cgit 1.4.1 From cf86b9af53678cb4276e031957e150a98a88a664 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 12:14:29 -0400 Subject: gnu: Add nettle-3.7. While nettle cannot be upgraded wholesale on the master branch, we can at least also offer the latest version available. * gnu/packages/nettle.scm (nettle-3.5, nettle-3.7): New variables. (nettle): Redefine as a binding to nettle-3.5, which is the current version. --- gnu/packages/nettle.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index f5e7188ff0..753e2d6e7e 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,7 +72,7 @@ cryptographic toolkits for object-oriented languages or in applications themselves.") (license gpl2+))) -(define-public nettle +(define-public nettle-3.5 ;; This version is not API-compatible with version 2. In particular, lsh ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) @@ -89,3 +90,17 @@ themselves.") ;; Build "fat" binaries where the right implementation is chosen ;; at run time based on CPU features (starting from 3.1.) `(cons "--enable-fat" ,flags)))))) + +(define-public nettle-3.7 + (package (inherit nettle-3.5) + (version "3.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/nettle/nettle-" + version ".tar.gz")) + (sha256 + (base32 + "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald")))))) + +;;; Upgrading Nettle on master would cause 10000+ packages to be rebuilt. +(define-public nettle nettle-3.5) -- cgit 1.4.1 From 67a5e112b1f3527538b7dcbccbb26a5594861d0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 08:16:32 -0400 Subject: gnu: opendht: Update to 2.2.0rc4. * gnu/packages/patches/opendht-fix-jami.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. * gnu/packages/networking.scm (opendht): Update to 2.2.0rc4. [patches]: Remove field. [inputs]: Use nettle-3.7. [native-inputs]: Move restinio to... [propagated-inputs]: ... here. --- gnu/local.mk | 1 - gnu/packages/networking.scm | 13 ++++++------ gnu/packages/patches/opendht-fix-jami.patch | 33 ----------------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 gnu/packages/patches/opendht-fix-jami.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f2d595f2cc..1a72e896a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1470,7 +1470,6 @@ dist_patch_DATA = \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ - %D%/packages/patches/opendht-fix-jami.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 8cdb674ff3..f0e95c6ed0 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3428,40 +3428,39 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.1.4") + (version "2.2.0rc4") ;jami requires >= 2.2.0 (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 - "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) + "1wc0f6cnvnlmhxnx64nxqgsx93k4g7ljdaqjl40ml74jg3nqrzcl")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle) + ("nettle" ,nettle-3.7) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy ("fmt" ,fmt))) (propagated-inputs `(("gnutls" ,gnutls) ;included in opendht/crypto.h - ("msgpack" ,msgpack))) ;included in several installed headers + ("msgpack" ,msgpack) ;included in several installed headers + ("restinio" ,restinio))) ;included in opendht/http.h (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("restinio" ,restinio) ;headers only library ("libtool" ,libtool) ("cppunit" ,cppunit))) (arguments `(#:tests? #f ; Tests require network connection. #:configure-flags - '(;; "-DOPENDHT_TESTS=on" + '(;;"-DOPENDHT_TESTS=on" "-DOPENDHT_TOOLS=off" "-DOPENDHT_PYTHON=off" "-DOPENDHT_PROXY_SERVER=on" diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch deleted file mode 100644 index 9718a84a41..0000000000 --- a/gnu/packages/patches/opendht-fix-jami.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrien=20B=C3=A9raud?= -Date: Tue, 30 Jun 2020 10:42:49 -0400 -Subject: [PATCH 1/4] http/request: make terminate public - ---- - include/opendht/http.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/opendht/http.h b/include/opendht/http.h -index cc8d5f9..46b722c 100644 ---- a/include/opendht/http.h -+++ b/include/opendht/http.h -@@ -294,6 +294,7 @@ public: - * User action to cancel the Request and call the completion callbacks. - */ - void cancel(); -+ void terminate(const asio::error_code& ec); - - private: - using OnCompleteCb = std::function; -@@ -320,8 +321,6 @@ private: - - void connect(std::vector&& endpoints, HandlerCb cb = {}); - -- void terminate(const asio::error_code& ec); -- - void post(); - - void handle_request(const asio::error_code& ec); --- -2.27.0 - -- cgit 1.4.1 From 45136b3673bcdba21fa0d1fd6edb3d388a645fcc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 13:08:10 -0400 Subject: gnu: pjproject: Update to 2.11. * gnu/packages/telephony.scm (pjproject): Update to 2.11. Remove trailing #t. [patches]: Delete field. The patches are preserved because pjproject-jami still needs them. --- gnu/packages/telephony.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5c8d247e68..af7148bf84 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami ;;; @@ -723,7 +723,7 @@ your calls and messages.") (define-public pjproject (package (name "pjproject") - (version "2.10") + (version "2.11") (source (origin (method git-fetch) @@ -733,12 +733,8 @@ your calls and messages.") (file-name (git-file-name name version)) (sha256 (base32 - "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + "1kn9g1x1vmh4130ghph8mldz5m89gsjs4vpdzlzm98m3808gk5an")) (modules '((guix build utils))) - ;; The patches upstream status can be tracked at: - ;; https://github.com/pjsip/pjproject/pull/2501. - (patches (search-patches "pjproject-correct-the-cflags-field.patch" - "pjproject-fix-pkg-config-ldflags.patch")) (snippet '(begin ;; Remove bundled libraries. @@ -746,8 +742,7 @@ your calls and messages.") (substitute* "aconfigure.ac" (("third_party/build/os-auto.mak") "")) (substitute* "Makefile" - (("third_party/build") "")) - #t)))) + (("third_party/build") "")))))) (build-system gnu-build-system) (outputs '("out" "debug" "static")) (arguments @@ -785,8 +780,7 @@ your calls and messages.") ;; Make all the files writable to prevent the following error: ;; "autom4te: cannot open aconfigure: Permission denied". (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'build 'build-dep (lambda _ (invoke "make" "dep"))) ;; The check phases is moved after the install phase so to @@ -800,8 +794,7 @@ your calls and messages.") (with-directory-excursion out (for-each (lambda (f) (rename-file f (string-append s "/" (basename f)))) - (find-files "." "\\.a$"))) - #t))) + (find-files "." "\\.a$")))))) (add-after 'install 'check (assoc-ref %standard-phases 'check)) (add-before 'patch-source-shebangs 'autoconf @@ -844,8 +837,7 @@ your calls and messages.") ;; Disable the pjnath and pjsua tests, which require an actual ;; network and an actual sound card, respectively. (("pjnath-test pjmedia-test pjsip-test pjsua-test") - "pjmedia-test pjsip-test")) - #t))))) + "pjmedia-test pjsip-test"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From 3d913c1ed80470fde408a6f4509e8ae1277f40fb Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 1 Aug 2020 15:05:09 -0400 Subject: gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375. The custom pjproject package used by Jami is updated with the latest patches found in the 20210326.1.cfba013 release of Jami. * gnu/packages/jami.scm (%jami-version): Update to 20210326.1.cfba013. (jami-source) [snippet]: Update comment. Add client-electron and client-ios to the list of deleted directories. Remove client-windows from the list, as it no longer exists. (jami-apply-dependency-patches): Update comment. Ignore whitespace when applying patches, otherwise the pjproject patches would not apply. (pjproject-jami): Add comment. [source]: Define the source; the parent pjproject package was updated was updated to 2.11, but the patches only apply against 2.10. [phases] : Update the list of patches used with those found in the release tarball. --- gnu/packages/jami.scm | 52 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3773c1ab0a..35d84bb37b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2019, 2020 Jan Wielkiewicz -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +63,7 @@ #:use-module (guix utils) #:use-module (srfi srfi-1)) -(define %jami-version "20200710.1.6bd18d2") +(define %jami-version "20210326.1.cfba013") (define* (jami-source #:key keep-contrib-patches?) "Return an origin object of the tarball release sources archive of Jami. @@ -78,7 +78,7 @@ of Jami." (modules '((guix build utils))) (snippet `(begin - ;; Delete over 200 MiB of bundled tarballs. The contrib directory + ;; Delete multiple MiBs of bundled tarballs. The contrib directory ;; contains the custom patches for pjproject and other libraries used ;; by Savoir-faire Linux. (if ,keep-contrib-patches? @@ -86,21 +86,21 @@ of Jami." (delete-file-recursively "daemon/contrib")) ;; Remove code from unused Jami clients. (for-each delete-file-recursively '("client-android" + "client-electron" + "client-ios" "client-macosx" - "client-uwp" - "client-windows")) - #t)) + "client-uwp")))) (sha256 (base32 - "0lg61jv39x7kc9lq30by246xb6gcgp1rzj49ak7ff8nqpfzyfvva")))) + "1h0avma8bdzyznkz39crjyv2888bii4f49md15jg7970dyp5pdyz")))) (define %sfl-patches (jami-source #:keep-contrib-patches? #t)) (define %jami-sources (jami-source)) -;; Savoir-faire Linux modifies many libraries to add features -;; to Jami. This procedure makes applying patches to a given -;; package easy. +;; Savoir-faire Linux maintains a set of patches for some key dependencies +;; (currently pjproject and ffmpeg) of Jami that haven't yet been integrated +;; upstream. This procedure simplifies the process of applying these patches.x (define jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) (let ((patches-directory "sfl-patches")) @@ -112,15 +112,30 @@ of Jami." dep-name)) (for-each (lambda (file) - (invoke "patch" "--force" "-p1" "-i" + (invoke "patch" "--force" "--ignore-whitespace" "-p1" "-i" (string-append patches-directory "/" file ".patch"))) patches)))) +;;; Jami maintains pjproject patches that add the ability to do ICE over TCP, +;;; among other things. The patches are currently based on pjproject 2.10. (define-public pjproject-jami (package (inherit pjproject) (name "pjproject-jami") + (version "2.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + (patches (search-patches + "pjproject-correct-the-cflags-field.patch" + "pjproject-fix-pkg-config-ldflags.patch")))) (native-inputs `(("sfl-patches" ,%sfl-patches) ,@(package-native-inputs pjproject))) @@ -140,14 +155,19 @@ of Jami." "0004-multiple_listeners" "0005-fix_ebusy_turn" "0006-ignore_ipv6_on_transport_check" - "0007-pj_ice_sess" + "0007-upnp-srflx-nat-assisted-cand" "0008-fix_ioqueue_ipv6_sendto" "0009-add-config-site" - ;; Note: The base pjproject is already patched with - ;; "0010-fix-pkgconfig". + ;; Already taken care of via the origin patches. + ;;"0010-fix-pkgconfig" "0011-fix-tcp-death-detection" - "0012-fix-turn-shutdown-crash")) - #t)))))))) + "0012-fix-turn-shutdown-crash" + "0013-Assign-unique-local-preferences-for-candidates-with-" + "0014-Add-new-compile-time-setting-PJ_ICE_ST_USE_TURN_PERM" + "0015-update-local-preference-for-peer-reflexive-candidate" + "0016-use-addrinfo-instead-CFHOST" + "0017-CVE-2020-15260" + "0018-CVE-2021-21375")))))))))) ;; The following variables are configure flags used by ffmpeg-jami. They're ;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to -- cgit 1.4.1 From 3f742c77ef26d38bce0ce99619491ade8686a77f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 16:57:54 -0400 Subject: ffmpeg-jami: Apply patches from Jami 20210326.1.cfba013. * gnu/packages/jami.scm (ffmpeg-jami): Remove trailing #t. [phases] : Add libopusdec-enable-FEC and libopusenc-enable-FEC to the list of patches to apply. --- gnu/packages/jami.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 35d84bb37b..9d5d00c60c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -403,21 +403,22 @@ of Jami." `(modify-phases ,phases (add-after 'unpack 'make-git-checkout-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) ;; These patches come from: ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "ffmpeg" - #:patches - '("remove-mjpeg-log" - "change-RTCP-ratio" - "rtp_ext_abs_send_time")) - #t)))))))))) + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time" + "libopusdec-enable-FEC" + "libopusenc-enable-FEC")))))))))))) (define-public libring (package -- cgit 1.4.1 From 2cfd4770afca54382de3ddd04dedd15303ad38ec Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 17:02:30 -0400 Subject: gnu: libring: Update to 20210326.1.cfba013. * gnu/packages/jami.scm (libring): Update to 20210326.1.cfba013. Remove trailing #t. [inputs]: Remove boost, flac, gmp, gsm, libogg, libva, opus, pcre, libsamplerate, libsndfile, libvorbis, libx264, libvdpau, zlib, python, python-wrapper, restinio, and libx11. Add libgit2 and webrtc-audio-processing. [native-inputs]: Remove cppunit. Add gcc-8. [make-flags]: Add the V=1 flag. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 71 +++++++++++++++++---------------------------------- 1 file changed, 23 insertions(+), 48 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 9d5d00c60c..768039a9ea 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -26,20 +26,16 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) - #:use-module (gnu packages boost) - #:use-module (gnu packages check) - #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) - #:use-module (gnu packages multiprecision) #:use-module (gnu packages networking) - #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) @@ -50,6 +46,7 @@ #:use-module (gnu packages telephony) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) + #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages webkit) #:use-module (gnu packages xiph) @@ -60,8 +57,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) - #:use-module (guix utils) - #:use-module (srfi srfi-1)) + #:use-module (guix utils)) (define %jami-version "20210326.1.cfba013") @@ -428,71 +424,50 @@ of Jami." (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) + ("asio" ,asio) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) ("ffmpeg" ,ffmpeg-jami) - ("flac" ,flac) - ("gmp" ,gmp) - ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) ("libarchive" ,libarchive) + ("libgit2" ,libgit2) ("libnatpmp" ,libnatpmp) - ("libogg" ,libogg) - ("libva" ,libva) + ("libsecp256k1" ,libsecp256k1) + ("libupnp" ,libupnp) ("opendht" ,opendht) - ("opus" ,opus) - ("pcre" ,pcre) + ("openssl" ,openssl) + ("pjproject" ,pjproject-jami) ("pulseaudio" ,pulseaudio) - ("libsamplerate" ,libsamplerate) - ("libsndfile" ,libsndfile) ("speex" ,speex) ("speexdsp" ,speexdsp) - ("libupnp" ,libupnp) - ("libvorbis" ,libvorbis) - ("libx264" ,libx264) - ("libvdpau" ,libvdpau) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("openssl" ,openssl) - ("libsecp256k1" ,libsecp256k1) - ("python" ,python) - ("python-wrapper" ,python-wrapper) - ("restinio" ,restinio) - ("libx11" ,libx11) - ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. - ("pjproject" ,pjproject-jami))) + ("webrtc-audio-processing" ,webrtc-audio-processing) + ("yaml-cpp" ,yaml-cpp))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("gcc" ,gcc-8) ;charconv requires GCC 8.1+ ("libtool" ,libtool) + ("perl" ,perl) ;to generate manpages with pod2man ("pkg-config" ,pkg-config) - ("which" ,which) - ("cppunit" ,cppunit) - ("perl" ,perl))) ; Needed for documentation. + ("which" ,which))) (arguments `(#:tests? #f ; The tests fail to compile due to missing headers. + #:make-flags '("V=1") ;build verbosely #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "daemon") - #t)) + (chdir "daemon"))) (add-before 'build 'add-lib-dir (lambda _ - (mkdir-p "src/lib") - #t))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library and daemon implementing the Jami core -functionality.") + (mkdir-p "src/lib")))))) + (synopsis "Jami core library and daemon") + (description "This package provides a library and daemon implementing the +Jami core functionality. Jami is a secure and distributed voice, video and +chat communication platform that requires no centralized server and leaves the +power of privacy in the hands of the user. It supports the SIP and IAX +protocols, as well as decentralized calling using P2P-DHT.") (home-page "https://jami.net/") (license license:gpl3+))) -- cgit 1.4.1 From 40a5f7904a482500840332b18917a22163750785 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 21:03:16 -0400 Subject: gnu: libringclient: Update to 20210326.1.cfba013. * gnu/packages/jami.scm (libringclient): Update to 20210326.1.cfba013. Remove trailing #t. Do not inherit from libring. [version, source]: Specify fields. [propagated-inputs]: Remove qttools. Move libring to ... [inputs]: ... here. Add network-manager. [configure-flags] Define the RING_XML_INTERFACES_DIR and LIBWRAP variables. [phases]{fix-dbus-interfaces-path}: Delete. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 768039a9ea..2d52b4bb6a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -473,37 +473,39 @@ protocols, as well as decentralized calling using P2P-DHT.") (define-public libringclient (package - (inherit libring) (name "libringclient") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) + (inputs + `(("libring" ,libring) + ("network-manager" ,network-manager))) (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) + `(("qtbase" ,qtbase))) ; Qt is included in several installed headers. (arguments `(#:tests? #f ; There is no testsuite. #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) + (let ((libring (assoc-ref %build-inputs "libring"))) + (list (string-append "-DRING_XML_INTERFACES_DIR=" + libring "/share/dbus-1/interfaces") + (string-append "-DRING_BUILD_DIR=" libring "/include") + ;; Use LIBWRAP, which removes the requirement on DBus. Qt + ;; links with the dbus library in Guix, which expects to find + ;; its configuration under /etc rather than /usr/share/dbus-1, + ;; which is perhaps the reason the auto-launching of dring + ;; doesn't work on foreign distributions. + "-DENABLE_LIBWRAP=true")) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "lrc") - #t)) - (add-before 'configure 'fix-dbus-interfaces-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) - (string-append (assoc-ref inputs "libring") - dbus-interfaces-path-suffix)))))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library common to all Jami clients.") + (chdir "lrc")))))) + (synopsis "Jami client library") + (description "This package provides a library common to all Jami clients. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -- cgit 1.4.1 From 60e64e28f3a5d8eaf5659b655af9b027eb396f1f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 30 Mar 2021 22:45:34 -0400 Subject: gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome. * gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ... (jami-gnome): ... this, in prevision to the soon released Jami Qt client. (jami): Define as obsoleted by jami-gnome. [inputs]: Sort lexico-graphically. Add libappindicator and network-manager. [native-inputs]: Add a comment and fix a typo. Remove doxygen. [propagated-inputs]: Remove evolution-data-server. [synopsis]: More explicitly describe what this package is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 54 ++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 2d52b4bb6a..e65e477b79 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -509,44 +510,49 @@ decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -(define-public jami +(define-public jami-gnome (package - (inherit libring) - (name "jami") + (name "jami-gnome") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) + `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ("sqlite" ,sqlite))) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) + ("glib:bin" ,glib "bin"))) ;for glib-compile-resources (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) + `(("libring" ,libring) ; Contains 'dring', the daemon, which is + ; automatically started by DBus. + ("adwaita-icon-theme" ,adwaita-icon-theme))) (arguments `(#:tests? #f ; There is no testsuite. #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "client-gnome") - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") + (chdir "client-gnome")))))) + (synopsis "Jami client for GNOME") + (description "This package provides a Jami client for the GNOME desktop. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) + +;;; Keep this until the Qt client matures enough to become the +;;; main 'jami' client. +(define-public jami + (deprecated-package "jami" jami-gnome)) -- cgit 1.4.1 From e6b447cf756831e8339e6462647004d88132fa07 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:13:57 -0400 Subject: gnu: Add jami-qt. * gnu/packages/jami.scm (jami-qt): New variable. --- gnu/packages/jami.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e65e477b79..e1f6d412be 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -33,6 +33,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -55,6 +56,7 @@ #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -556,3 +558,68 @@ decentralized calling using P2P-DHT.") ;;; main 'jami' client. (define-public jami (deprecated-package "jami" jami-gnome)) + +(define-public jami-qt + (package + (name "jami-qt") ;to be renamed 'jami' at some point + (version %jami-version) + ;; The Qt client code is not yet part of the release tarball; fetch it + ;; from git for now. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.jami.net/savoirfairelinux/jami-client-qt.git") + (commit "ae21c17da5e8f730ae3895ccbc4da8047e3be1eb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + ;; TODO: Uncomment after switching back to the tarball source. + ;; (add-after 'unpack 'change-directory + ;; (lambda _ + ;; (chdir "client-qt"))) + (add-after 'install 'wrap + ;; The program fails to find the QtWebEngineProcess program, so we + ;; set QTWEBENGINEPROCESS_PATH to help it. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (qtwebengineprocess (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)))) + (find-files bin ".*")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (inputs + `(("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("qtwebchannel" ,qtwebchannel) + ("qtmultimedia" ,qtmultimedia) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2))) + (propagated-inputs + `(("libring" ,libring))) ;for dring + (home-page "https://jami.net") + (synopsis "Qt Jami client") + (description "This package provides the Jami Qt client. Jami is a secure +and distributed voice, video and chat communication platform that requires no +centralized server and leaves the power of privacy in the hands of the user. +It supports the SIP and IAX protocols, as well as decentralized calling using +P2P-DHT.") + (license license:gpl3+))) -- cgit 1.4.1 From 532c0e745aa81b5ac5ed8cb2b4f9b02aa720d9a9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 2 Apr 2021 11:47:17 -0400 Subject: gnu: libringclient: Disable the libwrap feature. As it causes video calls to segfault. * gnu/packages/jami.scm (libringclient): Set -DENABLE_LIBWRAP to false for the time being. --- gnu/packages/jami.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index e1f6d412be..0ba293ca93 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -497,7 +497,11 @@ protocols, as well as decentralized calling using P2P-DHT.") ;; its configuration under /etc rather than /usr/share/dbus-1, ;; which is perhaps the reason the auto-launching of dring ;; doesn't work on foreign distributions. - "-DENABLE_LIBWRAP=true")) + + ;; FIXME: Disabled for now, as it causes a segfault when + ;; attempting video calls (see: + ;; https://git.jami.net/savoirfairelinux/ring-lrc/-/issues/466). + "-DENABLE_LIBWRAP=false")) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory -- cgit 1.4.1 From 23ea84cdf07c9b6bd4a61d14e5cb6009060f87cf Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:31 -0400 Subject: build-system: Rewrite node build system. * guix/build/node-build-system.scm: Rewrite it. * guix/build-system/node.scm: Adjust accordingly. * gnu/packages/node-xyz.scm (node-semver): Likewise. Co-authored-by: Timothy Sample --- gnu/packages/node-xyz.scm | 6 +- guix/build-system/node.scm | 27 ++--- guix/build/node-build-system.scm | 207 ++++++++++++++++++--------------------- 3 files changed, 110 insertions(+), 130 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index b1d6d4ce59..60cc005ea4 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -261,7 +261,11 @@ function with browser support.") "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p")))) (build-system node-build-system) (arguments - `(#:tests? #f)) ;; FIXME: Tests depend on node-tap + '(#:tests? #f ; FIXME: Tests depend on node-tap + #:phases + (modify-phases %standard-phases + ;; The only dependency to check for is tap, which we don't have. + (delete 'configure)))) (home-page "https://github.com/npm/node-semver") (synopsis "Parses semantic versions strings") (description diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index a8c5eed09b..4991ed53a5 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2019 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -17,7 +18,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix build-system node) - #:use-module (guix store) #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix derivations) @@ -25,22 +25,15 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) - #:export (npm-meta-uri - %node-build-system-modules + #:export (%node-build-system-modules node-build node-build-system)) -(define (npm-meta-uri name) - "Return a URI string for the metadata of node module NAME found in the npm -registry." - (string-append "https://registry.npmjs.org/" name)) - (define %node-build-system-modules ;; Build-side modules imported by default. `((guix build node-build-system) (guix build json) - (guix build union) - ,@%gnu-build-system-modules)) ;; TODO: Might be not needed + ,@%gnu-build-system-modules)) (define (default-node) "Return the default Node package." @@ -76,7 +69,7 @@ registry." (define* (node-build store name inputs #:key - (npm-flags ''()) + (test-target "test") (tests? #t) (phases '(@ (guix build node-build-system) %standard-phases)) @@ -86,8 +79,6 @@ registry." (guile #f) (imported-modules %node-build-system-modules) (modules '((guix build node-build-system) - (guix build json) - (guix build union) (guix build utils)))) "Build SOURCE using NODE and INPUTS." (define builder @@ -97,12 +88,10 @@ registry." #:source ,(match (assoc-ref inputs "source") (((? derivation? source)) (derivation->output-path source)) - ((source) - source) - (source - source)) + ((source) source) + (source source)) #:system ,system - #:npm-flags ,npm-flags + #:test-target ,test-target #:tests? ,tests? #:phases ,phases #:outputs %outputs @@ -129,5 +118,5 @@ registry." (define node-build-system (build-system (name 'node) - (description "The standard Node build system") + (description "The Node build system") (lower lower))) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 7799f03595..a55cab237c 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 David Thompson -;;; Copyright © 2016 Jelle Licht +;;; Copyright © 2016, 2020 Jelle Licht +;;; Copyright © 2019, 2021 Timothy Sample ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,144 +20,130 @@ (define-module (guix build node-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) - #:use-module (guix build json) - #:use-module (guix build union) #:use-module (guix build utils) + #:use-module (guix build json) + #:use-module (ice-9 ftw) #:use-module (ice-9 match) - #:use-module (ice-9 popen) - #:use-module (ice-9 regex) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%standard-phases node-build)) ;; Commentary: ;; -;; Builder-side code of the standard Node/npm package build procedure. +;; Builder-side code of the standard Node/NPM package install procedure. ;; ;; Code: -(define* (read-package-data #:key (filename "package.json")) - (call-with-input-file filename - (lambda (port) - (read-json port)))) +(define (set-home . _) + (with-directory-excursion ".." + (let loop ((i 0)) + (let ((dir (string-append "npm-home-" (number->string i)))) + (if (directory-exists? dir) + (loop (1+ i)) + (begin + (mkdir dir) + (setenv "HOME" (string-append (getcwd) "/" dir)) + (format #t "set HOME to ~s~%" (getenv "HOME"))))))) + #t) -(define* (build #:key inputs #:allow-other-keys) - (define (build-from-package-json? package-file) - (let* ((package-data (read-package-data #:filename package-file)) - (scripts (assoc-ref package-data "scripts"))) - (assoc-ref scripts "build"))) - "Build a new node module using the appropriate build system." - ;; XXX: Develop a more robust heuristic, allow override - (cond ((file-exists? "gulpfile.js") - (invoke "gulp")) - ((file-exists? "gruntfile.js") - (invoke "grunt")) - ((file-exists? "Makefile") - (invoke "make")) - ((and (file-exists? "package.json") - (build-from-package-json? "package.json")) - (invoke "npm" "run" "build"))) +(define (module-name module) + (let* ((package.json (string-append module "/package.json")) + (package-meta (call-with-input-file package.json read-json))) + (assoc-ref package-meta "name"))) + +(define (index-modules input-paths) + (define (list-modules directory) + (append-map (lambda (x) + (if (string-prefix? "@" x) + (list-modules (string-append directory "/" x)) + (list (string-append directory "/" x)))) + (filter (lambda (x) + (not (member x '("." "..")))) + (or (scandir directory) '())))) + (let ((index (make-hash-table (* 2 (length input-paths))))) + (for-each (lambda (dir) + (let ((nm (string-append dir "/lib/node_modules"))) + (for-each (lambda (module) + (hash-set! index (module-name module) module)) + (list-modules nm)))) + input-paths) + index)) + +(define* (patch-dependencies #:key inputs #:allow-other-keys) + + (define index (index-modules (map cdr inputs))) + + (define (resolve-dependencies package-meta meta-key) + (fold (lambda (key+value acc) + (match key+value + ('@ acc) + ((key . value) (acons key (hash-ref index key value) acc)))) + '() + (or (assoc-ref package-meta meta-key) '()))) + + (with-atomic-file-replacement "package.json" + (lambda (in out) + (let ((package-meta (read-json in))) + (assoc-set! package-meta "dependencies" + (append + '(@) + (resolve-dependencies package-meta "dependencies") + (resolve-dependencies package-meta "peerDependencies"))) + (assoc-set! package-meta "devDependencies" + (append + '(@) + (resolve-dependencies package-meta "devDependencies"))) + (write-json package-meta out)))) #t) -(define* (link-npm-dependencies #:key inputs #:allow-other-keys) - (define (inputs->node-inputs inputs) - "Filter the directory part from INPUTS." - (filter (lambda (input) - (match input - ((name . _) (node-package? name)))) - inputs)) - (define (inputs->directories inputs) - "Extract the directory part from INPUTS." - (match inputs - (((names . directories) ...) - directories))) - (define (make-node-path root) - (string-append root "/lib/node_modules/")) - - (let ((input-node-directories (inputs->directories - (inputs->node-inputs inputs)))) - (union-build "node_modules" - (map make-node-path input-node-directories)) +(define* (configure #:key outputs inputs #:allow-other-keys) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "--offline" "--ignore-scripts" "install") #t)) -(define configure link-npm-dependencies) +(define* (build #:key inputs #:allow-other-keys) + (let ((package-meta (call-with-input-file "package.json" read-json))) + (if (and=> (assoc-ref package-meta "scripts") + (lambda (scripts) + (assoc-ref scripts "build"))) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "run" "build")) + (format #t "there is no build script to run~%")) + #t)) -(define* (check #:key tests? #:allow-other-keys) +(define* (check #:key tests? inputs #:allow-other-keys) "Run 'npm test' if TESTS?" (if tests? - ;; Should only be enabled once we know that there are tests - (invoke "npm" "test")) + (let ((npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "test")) + (format #t "test suite not run~%")) #t) -(define (node-package? name) - "Check if NAME correspond to the name of an Node package." - (string-prefix? "node-" name)) +(define* (repack #:key inputs #:allow-other-keys) + (invoke "tar" "-czf" "../package.tgz" ".") + #t) (define* (install #:key outputs inputs #:allow-other-keys) - "Install the node module to the output store item. The module itself is -installed in a subdirectory of @file{node_modules} and its runtime dependencies -as defined by @file{package.json} are symlinked into a @file{node_modules} -subdirectory of the module's directory. Additionally, binaries are installed in -the @file{bin} directory." - (let* ((out (assoc-ref outputs "out")) - (target (string-append out "/lib")) - (binaries (string-append out "/bin")) - (data (read-package-data)) - (modulename (assoc-ref data "name")) - (binary-configuration (match (assoc-ref data "bin") - (('@ configuration ...) configuration) - ((? string? configuration) configuration) - (#f #f))) - (dependencies (match (assoc-ref data "dependencies") - (('@ deps ...) deps) - (#f #f)))) - (mkdir-p target) - (copy-recursively "." (string-append target "/node_modules/" modulename)) - ;; Remove references to dependencies - (delete-file-recursively - (string-append target "/node_modules/" modulename "/node_modules")) - (cond - ((string? binary-configuration) - (begin - (mkdir-p binaries) - (symlink (string-append target "/node_modules/" modulename "/" - binary-configuration) - (string-append binaries "/" modulename)))) - ((list? binary-configuration) - (for-each - (lambda (conf) - (match conf - ((key . value) - (begin - (mkdir-p (dirname (string-append binaries "/" key))) - (symlink (string-append target "/node_modules/" modulename "/" - value) - (string-append binaries "/" key)))))) - binary-configuration))) - (when dependencies - (mkdir-p - (string-append target "/node_modules/" modulename "/node_modules")) - (for-each - (lambda (dependency) - (let ((dependency (car dependency))) - (symlink - (string-append (assoc-ref inputs (string-append "node-" dependency)) - "/lib/node_modules/" dependency) - (string-append target "/node_modules/" modulename - "/node_modules/" dependency)))) - dependencies)) + "Install the node module to the output store item." + (let ((out (assoc-ref outputs "out")) + (npm (string-append (assoc-ref inputs "node") "/bin/npm"))) + (invoke npm "--prefix" out + "--global" + "--offline" + "--loglevel" "info" + "--production" + "install" "../package.tgz") #t)) - (define %standard-phases (modify-phases gnu:%standard-phases + (add-after 'unpack 'set-home set-home) + (add-before 'configure 'patch-dependencies patch-dependencies) (replace 'configure configure) (replace 'build build) - (replace 'install install) - (delete 'check) - (add-after 'install 'check check) - (delete 'strip))) + (replace 'check check) + (add-before 'install 'repack repack) + (replace 'install install))) (define* (node-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args) -- cgit 1.4.1 From c39092c7b8cb6ba39efedae78a8356e2e4ad76ee Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:32 -0400 Subject: gnu: Add libuv-for-node * gnu/packages/libevent.scm (libuv-for-node): New variable. --- gnu/packages/libevent.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 7109d9a88d..0e683570d3 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -134,6 +134,22 @@ 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)))) +(define-public libuv-for-node + ;; When upgrading Node, also upgrade this. Get the version from + ;; https://github.com/nodejs/node/blob/master/deps/uv/include/uv/version.h + (package + (inherit libuv) + (name "libuv") + (version "1.40.0") + (source (origin + (method url-fetch) + (uri (string-append "https://dist.libuv.org/dist/v" version + "/libuv-v" version ".tar.gz")) + (sha256 + (base32 + "1551k3ab27vbg9517l9b4iqbramwxdkwgpf53knas05cbfwhvab1")))) + (properties '((hidden? . #t))))) + (define-public perl-anyevent (package (name "perl-anyevent") -- cgit 1.4.1 From 7728aa24c53e6eeafb03527457ad796976cb443a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:33 -0400 Subject: gnu: node: Use license prefix. * gnu/packages/node.scm (node)[license]: Use prefix for license. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a0df3d2cad..82a2ca7ce0 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -26,7 +26,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages node) - #:use-module ((guix licenses) #:select (expat)) + #:use-module ((guix licenses) #:prefix license:) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix packages) #:use-module (guix derivations) @@ -207,7 +207,7 @@ event-driven, non-blocking I/O model that makes it lightweight and efficient, perfect for data-intensive real-time applications that run across distributed devices.") (home-page "https://nodejs.org/") - (license expat) + (license license:expat) (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h -- cgit 1.4.1 From 0c0c484613ed1b0dabf7a3292aedad9ec5eeb81d Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:34 -0400 Subject: gnu: Add node-bootstrap. * gnu/packages/node (node-bootstrap): Add hidden alias for node. --- gnu/packages/node.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 82a2ca7ce0..73d022d87f 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -211,6 +211,11 @@ devices.") (properties '((max-silent-time . 7200) ;2h, needed on ARM (timeout . 21600))))) ;6h +;; This should be the latest version of node that still builds without +;; depending on llhttp. +(define-public node-bootstrap + (hidden-package node)) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From f540ee5ef845946228c0e2e4cffadccd36069922 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:35 -0400 Subject: gnu: Add node-semver-bootstrap. * gnu/packages/node.scm (node-semver-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 73d022d87f..773cef3716 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages icu4c) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) + #:use-module (gnu packages node-xyz) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -216,6 +217,35 @@ devices.") (define-public node-bootstrap (hidden-package node)) +;; Duplicate of node-semver +(define-public node-semver-bootstrap + (package + (name "node-semver") + (version "7.2.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/npm/node-semver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "06biknqb05r9xsmcflm3ygh50pjvdk84x6r79w43kmck4fn3qn5p")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/npm/node-semver") + (properties '((hidden? . #t))) + (synopsis "Parses semantic versions strings") + (description + "@code{node-semver} is a JavaScript implementation of the +@uref{https://semver.org/, SemVer.org} specification.") + (license license:isc))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 972f2a2affe4837c75e7760cdaa5f913dfb061dc Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:36 -0400 Subject: gnu: Add node-ms-bootstrap. * gnu/packages/node.scm (node-ms-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 773cef3716..1d17502df7 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -31,8 +31,10 @@ #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system gnu) + #:use-module (guix build-system node) #:use-module (gnu packages) #:use-module (gnu packages adns) #:use-module (gnu packages base) @@ -246,6 +248,34 @@ devices.") @uref{https://semver.org/, SemVer.org} specification.") (license license:isc))) +(define-public node-ms-bootstrap + (package + (name "node-ms") + (version "2.1.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/vercel/ms.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pjxzbi4j8pinlsc7yxvfrh0b47kb2dc4lfc2rjq4wx5bdwl33fj")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/zeit/ms#readme") + (properties '((hidden? . #t))) + (synopsis "Tiny millisecond conversion utility") + (description "Use this package to easily convert various time +formats to milliseconds.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 2cc5883b2149d09cad5d2fe04cf8f7c6e73a0ade Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:37 -0400 Subject: gnu: Add node-binary-search-bootstrap. * gnu/packages/node.scm (node-binary-search-bootstrap): New variable. --- gnu/packages/node.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 1d17502df7..21d6052c06 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -276,6 +276,33 @@ devices.") formats to milliseconds.") (license license:expat))) +(define-public node-binary-search-bootstrap + (package + (name "node-binary-search") + (version "1.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/darkskyapp/binary-search.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1xr2msdc143cd3xwgq7n3rhzy7j8wrnaidxl0r6l6b6g3mpbpjig")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (home-page "https://github.com/darkskyapp/binary-search#readme") + (properties '((hidden? . #t))) + (synopsis "Tiny binary search function with comparators") + (description "This package is a binary search function for Node.js.") + (license license:cc0))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 2780cea3f8b90d7feb3e21b92b9637abdaa58a76 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:38 -0400 Subject: gnu: Add node-debug-bootstrap. * gnu/packages/node.scm (node-debug-bootstrap): New variable. --- gnu/packages/node.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 21d6052c06..6c4c02265d 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -303,6 +303,36 @@ formats to milliseconds.") (description "This package is a binary search function for Node.js.") (license license:cc0))) +(define-public node-debug-bootstrap + (package + (name "node-debug") + (version "4.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/visionmedia/debug.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08g52r1d4yqcsfdfb7n5if33d4cghaq75gx5n9hj6m6fd8jfp2pi")))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs `(("node-ms" ,node-ms-bootstrap))) + (home-page "https://github.com/visionmedia/debug#readme") + (properties '((hidden? . #t))) + (synopsis "Small debugging utility") + (description "This package contains a tiny JavaScript debugging +utility modelled after Node.js core's debugging technique. It works in +Node.js and web browsers.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 6b930e524292026f81ca04688f83d0bcf195e0cf Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:39 -0400 Subject: gnu: Add node-llparse-builder-bootstrap. * gnu/packages/node.scm (node-llparse-builder-bootstrap): New variable. --- gnu/packages/node.scm | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6c4c02265d..570d4521ac 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -333,6 +333,71 @@ utility modelled after Node.js core's debugging technique. It works in Node.js and web browsers.") (license license:expat))) +(define-public node-llparse-builder-bootstrap + (package + (name "node-llparse-builder") + (version "1.5.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse-builder.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0r82iiwqsb73k2fxw7842rjjiixllxpyc6yl9cq4ma6ybkf6xmzm")) + (modules '((guix build utils))) + (snippet + '(begin + ;; FIXME: Unneeded runtime dependency. + ;; https://github.com/indutny/llparse-builder/pull/2 + (substitute* "package.json" + (("\"@types/debug.*,") "")) + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/node/invoke.ts" + "src/node/base.ts" + "src/node/consume.ts" + "src/node/match.ts" + "src/node/error.ts" + "src/node/pause.ts" + "src/edge.ts" + "src/utils.ts" + "src/loop-checker/index.ts" + "src/loop-checker/lattice.ts" + "src/code/field.ts" + "src/span-allocator.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/builder.js" + "--bundle" + "src/builder.ts"))))))) + (inputs + `(("node-binary-search" ,node-binary-search-bootstrap) + ("node-debug" ,node-debug-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/indutny/llparse-builder#readme") + (properties '((hidden? . #t))) + (synopsis "Graph builder for consumption by llparse") + (description "This package builds graphs for consumption by llparse.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 82e7f7c029c36e9e1109ca7f1c191cceca27b278 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:40 -0400 Subject: gnu: Add node-llparse-frontend-bootstrap. * gnu/packages/node.scm (node-llparse-frontend-bootstrap): New variable. --- gnu/packages/node.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 570d4521ac..16c3decdd4 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -398,6 +398,62 @@ Node.js and web browsers.") (description "This package builds graphs for consumption by llparse.") (license license:expat))) +(define-public node-llparse-frontend-bootstrap + (package + (name "node-llparse-frontend") + (version "3.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse-frontend.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rm9g4ifyip30svm5cgnf0gx7d45jgh4mpf2hkd092xhngmfvicc")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/frontend.ts" + "src/code/field-value.ts" + "src/container/index.ts" + "src/container/wrap.ts" + "src/node/sequence.ts" + "src/node/single.ts" + "src/node/table-lookup.ts" + "src/trie/index.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/frontend.js" + "--bundle" + "src/frontend.ts"))))))) + (inputs + `(("node-debug" ,node-debug-bootstrap) + ("node-llparse-builder" ,node-llparse-builder-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/indutny/llparse-frontend#readme") + (properties '((hidden? . #t))) + (synopsis "Frontend for the llparse compiler") + (description "This package is a frontend for the llparse compiler.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 91b78f371e13fb0116055d5987f65641467044ad Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:41 -0400 Subject: gnu: Add node-llparse-bootstrap. * gnu/packages/node.scm (node-llparse-bootstrap): New variable. --- gnu/packages/node.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 16c3decdd4..5336012e43 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -454,6 +454,62 @@ Node.js and web browsers.") (description "This package is a frontend for the llparse compiler.") (license license:expat))) +(define-public node-llparse-bootstrap + (package + (name "node-llparse") + (version "7.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/indutny/llparse.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10da273iy2if88hp79cwms6c8qpsl1fkgzll6gmqyx5yxv5mkyp6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* '("src/compiler/index.ts" + "src/implementation/c/node/base.ts" + "src/implementation/c/node/table-lookup.ts" + "src/implementation/c/compilation.ts" + "src/implementation/c/helpers/match-sequence.ts" + "src/implementation/c/code/mul-add.ts") + (("\\* as assert") "assert") + (("\\* as debugAPI") "debugAPI")) + #t)))) + (build-system node-build-system) + (arguments + `(#:node ,node-bootstrap + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=lib/api.js" + "--bundle" + "src/api.ts"))))))) + (inputs + `(("node-debug" ,node-debug-bootstrap) + ("node-llparse-frontend" ,node-llparse-frontend-bootstrap))) + (native-inputs + `(("esbuild" ,esbuild))) + (home-page "https://github.com/nodejs/llparse#readme") + (properties '((hidden? . #t))) + (synopsis "Compile incremental parsers to C code") + (description "This package offers an API for compiling an incremental +parser definition into a C output.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") -- cgit 1.4.1 From 31c4d89073bdbe2b807ccf7b172df6db200f8d32 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:42 -0400 Subject: gnu: Add llhttp-bootstrap. * gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/node.scm (llhttp-bootstrap): New variable. --- gnu/local.mk | 1 + gnu/packages/node.scm | 70 +++++++++++++++ .../patches/llhttp-bootstrap-CVE-2020-8287.patch | 100 +++++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1a72e896a8..1269bf0e47 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1368,6 +1368,7 @@ dist_patch_DATA = \ %D%/packages/patches/linux-pam-no-setfsuid.patch \ %D%/packages/patches/lirc-localstatedir.patch \ %D%/packages/patches/lirc-reproducible-build.patch \ + %D%/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch \ %D%/packages/patches/llvm-3.5-fix-clang-build-with-gcc5.patch \ %D%/packages/patches/llvm-9-fix-bitcast-miscompilation.patch \ %D%/packages/patches/llvm-9-fix-lpad-miscompilation.patch \ diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 5336012e43..26025c5d7c 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -510,6 +510,76 @@ Node.js and web browsers.") parser definition into a C output.") (license license:expat))) +(define-public llhttp-bootstrap + (package + (name "llhttp") + (version "2.1.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nodejs/llhttp.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0pqj7kyyzr1zs4h9yzn5rdxnxspm3wqgsv00765dd42fszlmrmk8")) + (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix imports for esbuild. + ;; https://github.com/evanw/esbuild/issues/477 + (substitute* "src/llhttp/http.ts" + (("\\* as assert") "assert")) + (substitute* "Makefile" + (("npx ts-node bin/generate.ts") + "node bin/generate.js")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags (list (string-append "CLANG=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + "PREFIX=") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((esbuild (string-append (assoc-ref inputs "esbuild") + "/bin/esbuild"))) + (invoke esbuild + "--platform=node" + "--outfile=bin/generate.js" + "--bundle" "bin/generate.ts")))) + (add-before 'install 'create-install-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (dir) + (mkdir-p (string-append out dir))) + (list "/lib" "/include" "/src")) + #t))) + (add-after 'install 'install-src + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (src-dir (string-append out "/src"))) + (install-file "build/c/llhttp.c" src-dir) + (install-file "src/native/api.c" src-dir) + (install-file "src/native/http.c" src-dir) + #t)))))) + (native-inputs + `(("esbuild" ,esbuild) + ("node" ,node-bootstrap) + ("node-semver" ,node-semver-bootstrap) + ("node-llparse-bootstrap" ,node-llparse-bootstrap))) + (home-page "https://github.com/nodejs/llhttp") + (properties '((hidden? . #t))) + (synopsis "Parser for HTTP messages") + (description "This is a rewrite of +@url{https://github.com/nodejs/http-parser, http-parser} using +@url{https://github.com/nodejs/llparse, llparse} to generate the C +source files.") + (license license:expat))) + (define-public libnode (package/inherit node (name "libnode") diff --git a/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch new file mode 100644 index 0000000000..215c920e53 --- /dev/null +++ b/gnu/packages/patches/llhttp-bootstrap-CVE-2020-8287.patch @@ -0,0 +1,100 @@ +This patch comes from upstream. It corresponds to a patch applied to +the generated C source code for llhttp included in Node.js 14.16.0 +(see commit 641f786bb1a1f6eb1ff8750782ed939780f2b31a). That commit +fixes CVE-2020-8287. With this patch, the output of our +llhttp-bootstrap package matches the files included in Node.js 14.16.0 +exactly. + +commit e9b36ea64709c35ca66094d5cf3787f444029601 +Author: Fedor Indutny +Date: Sat Oct 10 19:56:01 2020 -0700 + + http: unset `F_CHUNKED` on new `Transfer-Encoding` + + Duplicate `Transfer-Encoding` header should be a treated as a single, + but with original header values concatenated with a comma separator. In + the light of this, even if the past `Transfer-Encoding` ended with + `chunked`, we should be not let the `F_CHUNKED` to leak into the next + header, because mere presence of another header indicates that `chunked` + is not the last transfer-encoding token. + +diff --git a/src/llhttp/http.ts b/src/llhttp/http.ts +index f4f1a6e..0a0c365 100644 +--- a/src/llhttp/http.ts ++++ b/src/llhttp/http.ts +@@ -460,11 +460,19 @@ export class HTTP { + .match([ ' ', '\t' ], n('header_value_discard_ws')) + .otherwise(checkContentLengthEmptiness); + ++ // Multiple `Transfer-Encoding` headers should be treated as one, but with ++ // values separate by a comma. ++ // ++ // See: https://tools.ietf.org/html/rfc7230#section-3.2.2 ++ const toTransferEncoding = this.unsetFlag( ++ FLAGS.CHUNKED, ++ 'header_value_te_chunked'); ++ + n('header_value_start') + .otherwise(this.load('header_state', { + [HEADER_STATE.UPGRADE]: this.setFlag(FLAGS.UPGRADE, fallback), + [HEADER_STATE.TRANSFER_ENCODING]: this.setFlag( +- FLAGS.TRANSFER_ENCODING, 'header_value_te_chunked'), ++ FLAGS.TRANSFER_ENCODING, toTransferEncoding), + [HEADER_STATE.CONTENT_LENGTH]: n('header_value_content_length_once'), + [HEADER_STATE.CONNECTION]: n('header_value_connection'), + }, 'header_value')); +@@ -847,6 +855,11 @@ export class HTTP { + return span.start(span.end(this.node(next))); + } + ++ private unsetFlag(flag: FLAGS, next: string | Node): Node { ++ const p = this.llparse; ++ return p.invoke(p.code.and('flags', ~flag), this.node(next)); ++ } ++ + private setFlag(flag: FLAGS, next: string | Node): Node { + const p = this.llparse; + return p.invoke(p.code.or('flags', flag), this.node(next)); +diff --git a/test/request/transfer-encoding.md b/test/request/transfer-encoding.md +index a7d1681..b0891d6 100644 +--- a/test/request/transfer-encoding.md ++++ b/test/request/transfer-encoding.md +@@ -353,6 +353,38 @@ off=106 headers complete method=3 v=1/1 flags=200 content_length=0 + off=106 error code=15 reason="Request has invalid `Transfer-Encoding`" + ``` + ++## POST with `chunked` and duplicate transfer-encoding ++ ++ ++```http ++POST /post_identity_body_world?q=search#hey HTTP/1.1 ++Accept: */* ++Transfer-Encoding: chunked ++Transfer-Encoding: deflate ++ ++World ++``` ++ ++```log ++off=0 message begin ++off=5 len=38 span[url]="/post_identity_body_world?q=search#hey" ++off=44 url complete ++off=54 len=6 span[header_field]="Accept" ++off=61 header_field complete ++off=62 len=3 span[header_value]="*/*" ++off=67 header_value complete ++off=67 len=17 span[header_field]="Transfer-Encoding" ++off=85 header_field complete ++off=86 len=7 span[header_value]="chunked" ++off=95 header_value complete ++off=95 len=17 span[header_field]="Transfer-Encoding" ++off=113 header_field complete ++off=114 len=7 span[header_value]="deflate" ++off=123 header_value complete ++off=125 headers complete method=3 v=1/1 flags=200 content_length=0 ++off=125 error code=15 reason="Request has invalid `Transfer-Encoding`" ++``` ++ + ## POST with `chunked` before other transfer-coding (lenient) + + TODO(indutny): should we allow it even in lenient mode? (Consider disabling -- cgit 1.4.1 From f6c43c932a39bfa73a9750daadcd20f505ddc939 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 30 Mar 2021 01:27:43 -0400 Subject: gnu: Add node-lts. * gnu/packages/node.scm (node-lts): New variable. * guix/build-system/node.scm (default-node): Use it. --- gnu/packages/node.scm | 135 +++++++++++++++++++++++++++++++++++++++++++++ guix/build-system/node.scm | 2 +- 2 files changed, 136 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 26025c5d7c..4e80dd4d4e 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -580,6 +580,141 @@ parser definition into a C output.") source files.") (license license:expat))) +(define-public node-lts + (package + (inherit node) + (version "14.16.0") + (source (origin + (method url-fetch) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version ".tar.xz")) + (sha256 + (base32 + "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf")) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove bundled software, where possible + (for-each delete-file-recursively + '("deps/cares" + "deps/icu-small" + "deps/nghttp2" + "deps/openssl" + "deps/zlib")) + (substitute* "Makefile" + ;; Remove references to bundled software. + (("deps/uv/uv.gyp") "") + (("deps/zlib/zlib.gyp") "")) + #t)))) + (arguments + (substitute-keyword-arguments (package-arguments node) + ((#:configure-flags configure-flags) + ''("--shared-cares" + "--shared-libuv" + "--shared-nghttp2" + "--shared-openssl" + "--shared-zlib" + "--shared-brotli" + "--with-intl=system-icu")) + ((#:phases phases) + `(modify-phases ,phases + (replace 'configure + ;; Node's configure script is actually a python script, so we can't + ;; run it with bash. + (lambda* (#:key outputs (configure-flags '()) inputs + #:allow-other-keys) + (let* ((prefix (assoc-ref outputs "out")) + (flags (cons (string-append "--prefix=" prefix) + configure-flags))) + (format #t "build directory: ~s~%" (getcwd)) + (format #t "configure flags: ~s~%" flags) + ;; Node's configure script expects the CC environment variable to + ;; be set. + (setenv "CC" ,(cc-for-target)) + (apply invoke + (string-append (assoc-ref inputs "python") + "/bin/python3") + "configure" flags)))) + (replace 'patch-files + (lambda* (#:key inputs #:allow-other-keys) + ;; Fix hardcoded /bin/sh references. + (substitute* '("lib/child_process.js" + "lib/internal/v8_prof_polyfill.js" + "test/parallel/test-child-process-spawnsync-shell.js" + "test/parallel/test-fs-write-sigxfsz.js" + "test/parallel/test-stdio-closed.js" + "test/sequential/test-child-process-emfile.js") + (("'/bin/sh'") + (string-append "'" (which "sh") "'"))) + + ;; Fix hardcoded /usr/bin/env references. + (substitute* '("test/parallel/test-child-process-default-options.js" + "test/parallel/test-child-process-env.js" + "test/parallel/test-child-process-exec-env.js") + (("'/usr/bin/env'") + (string-append "'" (which "env") "'"))) + + ;; 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 + '("test/parallel/test-cluster-master-error.js" + "test/parallel/test-cluster-master-kill.js")) + + ;; These require a DNS resolver. + (for-each delete-file + '("test/parallel/test-dns.js" + "test/parallel/test-dns-lookupService-promises.js")) + + ;; FIXME: This test fails randomly: + ;; https://github.com/nodejs/node/issues/31213 + (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") + + ;; FIXME: These tests fail on armhf-linux: + ;; https://github.com/nodejs/node/issues/31970 + ,@(if (target-arm32?) + '((for-each delete-file + '("test/parallel/test-zlib.js" + "test/parallel/test-zlib-brotli.js" + "test/parallel/test-zlib-brotli-flush.js" + "test/parallel/test-zlib-brotli-from-brotli.js" + "test/parallel/test-zlib-brotli-from-string.js" + "test/parallel/test-zlib-convenience-methods.js" + "test/parallel/test-zlib-random-byte-pipes.js" + "test/parallel/test-zlib-write-after-flush.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")) + + ;; Replace pre-generated llhttp sources + (let ((llhttp (assoc-ref inputs "llhttp"))) + (copy-file (string-append llhttp "/src/llhttp.c") + "deps/llhttp/src/llhttp.c") + (copy-file (string-append llhttp "/src/api.c") + "deps/llhttp/src/api.c") + (copy-file (string-append llhttp "/src/http.c") + "deps/llhttp/src/http.c") + (copy-file (string-append llhttp "/include/llhttp.h") + "deps/llhttp/include/llhttp.h")) + #t)))))) + (inputs + `(("c-ares" ,c-ares) + ("icu4c" ,icu4c-67) + ("libuv" ,libuv-for-node) + ("llhttp" ,llhttp-bootstrap) + ("google-brotli" ,google-brotli) + ("nghttp2" ,nghttp2 "lib") + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + (alist-replace "python" (list python-3) + (package-native-inputs node))))) + (define-public libnode (package/inherit node (name "libnode") diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 4991ed53a5..98f63f87ef 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -39,7 +39,7 @@ "Return the default Node package." ;; Lazily resolve the binding to avoid a circular dependency. (let ((node (resolve-interface '(gnu packages node)))) - (module-ref node 'node))) + (module-ref node 'node-lts))) (define* (lower name #:key source inputs native-inputs outputs system target -- cgit 1.4.1 From 68ed5de405a3570aff099ff1fd5fd238b5576fcd Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 18:42:05 +0200 Subject: gnu: python-pikepdf: Update to 2.10.0 [fixes CVE-2021-29421]. * gnu/packages/python-xyz.scm (python-pikepdf): Update to 2.10.0. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f2b1551df5..2a876670ff 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5856,13 +5856,13 @@ the OleFileIO module from PIL, the Python Image Library.") (define-public python-pikepdf (package (name "python-pikepdf") - (version "2.9.1") + (version "2.10.0") (source (origin (method url-fetch) (uri (pypi-uri "pikepdf" version)) (sha256 - (base32 "1n53fhdgnq9yxvm2m039vl8l2kg3fkln3pm0wv4rzj0gvpq9rhcr")))) + (base32 "09wfj1hjvj3r9gv7ywrqd7h3d0bz64bvils8sm3ghj90jhalb03s")))) (build-system python-build-system) (arguments `(#:tests? #false)) ;require python-xmp-toolkit -- cgit 1.4.1 From c18c8d3e9c2d3377f6109096dbf04b8668f324de Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 19:22:33 +0200 Subject: gnu: wpa-supplicant-minimal: Fix CVE-2021-30004. * gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/admin.scm (wpa-supplicant-minimal): Apply patch. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 3 +- .../patches/wpa-supplicant-CVE-2021-30004.patch | 115 +++++++++++++++++++++ 3 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1269bf0e47..1a767a6c89 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1803,6 +1803,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-CVE-2021-27803.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2021-30004.patch \ %D%/packages/patches/x265-arm-flags.patch \ %D%/packages/patches/xf86-video-ark-remove-mibstore.patch \ %D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d5b4d34323..2b12b5d5e4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1658,7 +1658,8 @@ features of sudo with a fraction of the codebase.") (string-append "#" line))) #t)) (patches - (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) + (search-patches "wpa-supplicant-CVE-2021-27803.patch" + "wpa-supplicant-CVE-2021-30004.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch b/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch new file mode 100644 index 0000000000..8c8ba93355 --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-CVE-2021-30004.patch @@ -0,0 +1,115 @@ +From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen +Date: Sat, 13 Mar 2021 18:19:31 +0200 +Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters + +The supported hash algorithms do not use AlgorithmIdentifier parameters. +However, there are implementations that include NULL parameters in +addition to ones that omit the parameters. Previous implementation did +not check the parameters value at all which supported both these cases, +but did not reject any other unexpected information. + +Use strict validation of digest algorithm parameters and reject any +unexpected value when validating a signature. This is needed to prevent +potential forging attacks. + +Signed-off-by: Jouni Malinen +--- + src/tls/pkcs1.c | 21 +++++++++++++++++++++ + src/tls/x509v3.c | 20 ++++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c +index bbdb0d7..5761dfe 100644 +--- a/src/tls/pkcs1.c ++++ b/src/tls/pkcs1.c +@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo", ++ hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk, + os_free(decrypted); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "PKCS #1: Unexpected digest algorithm parameters"); ++ os_free(decrypted); ++ return -1; ++ } + + if (!asn1_oid_equal(&oid, hash_alg)) { + char txt[100], txt2[100]; +diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c +index a8944dd..df337ec 100644 +--- a/src/tls/x509v3.c ++++ b/src/tls/x509v3.c +@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length); + + pos = hdr.payload; + end = pos + hdr.length; +@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier", ++ hdr.payload, hdr.length); + da_end = hdr.payload + hdr.length; + + if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) { +@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer, + os_free(data); + return -1; + } ++ wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters", ++ next, da_end - next); ++ ++ /* ++ * RFC 5754: The correct encoding for the SHA2 algorithms would be to ++ * omit the parameters, but there are implementation that encode these ++ * as a NULL element. Allow these two cases and reject anything else. ++ */ ++ if (da_end > next && ++ (asn1_get_next(next, da_end - next, &hdr) < 0 || ++ !asn1_is_null(&hdr) || ++ hdr.payload + hdr.length != da_end)) { ++ wpa_printf(MSG_DEBUG, ++ "X509: Unexpected digest algorithm parameters"); ++ os_free(data); ++ return -1; ++ } + + if (x509_sha1_oid(&oid)) { + if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) { +-- +cgit v0.12 + -- cgit 1.4.1 From 55fca8eee28756758ac0fd3358cd3768658f1bd7 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 19:24:11 +0200 Subject: gnu: hostapd: Fix CVE-2021-30004. * gnu/packages/admin.scm (hostapd)[patches]: Apply 'wpa-supplicant-CVE-2021-30004.patch'. --- gnu/packages/admin.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2b12b5d5e4..2963f3e049 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1825,7 +1825,8 @@ command.") (base32 "1mrbvg4v7vm7mknf0n29mf88k3s4a4qj6r4d51wq8hmjj1m7s7c8")) (patches - (search-patches "wpa-supplicant-CVE-2021-27803.patch")))) + (search-patches "wpa-supplicant-CVE-2021-27803.patch" + "wpa-supplicant-CVE-2021-30004.patch")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 591c930337556f1a242fc8f7a891a4409d18da84 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 2 Apr 2021 12:38:29 -0400 Subject: gnu: jami: Add debug outputs. * gnu/packages/jami.scm (libring, libringclient, jami-gnome, jami-qt): Add a "debug" output. --- gnu/packages/jami.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 0ba293ca93..42b15cee9b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -425,6 +425,7 @@ of Jami." (version %jami-version) (source %jami-sources) (build-system gnu-build-system) + (outputs '("out" "debug")) (inputs `(("alsa-lib" ,alsa-lib) ("asio" ,asio) @@ -480,6 +481,7 @@ protocols, as well as decentralized calling using P2P-DHT.") (version %jami-version) (source %jami-sources) (build-system cmake-build-system) + (outputs '("out" "debug")) (inputs `(("libring" ,libring) ("network-manager" ,network-manager))) @@ -522,6 +524,7 @@ decentralized calling using P2P-DHT.") (version %jami-version) (source %jami-sources) (build-system cmake-build-system) + (outputs '("out" "debug")) (inputs `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) @@ -579,6 +582,7 @@ decentralized calling using P2P-DHT.") (base32 "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) (build-system qt-build-system) + (outputs '("out" "debug")) (arguments `(#:tests? #f ;no test suite #:phases -- cgit 1.4.1 From f4dc8ac6dfa036d98aa0990ae22268a9650899d0 Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Fri, 2 Apr 2021 21:33:02 +0200 Subject: gnu: curl: Update to 7.76.0 [security fixes]. Fixes CVE-2021-22876 and CVE-2021-22890. * gnu/packages/curl.scm (curl/fixed): New variable. (curl)[replacement]: New field. * gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/curl.scm | 15 +++++ .../patches/curl-7.76-use-ssl-cert-env.patch | 64 ++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1a767a6c89..0d472072ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -920,6 +920,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-contribs-lib.patch \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/curl-use-ssl-cert-env.patch \ + %D%/packages/patches/curl-7.76-use-ssl-cert-env.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ %D%/packages/patches/cyrus-sasl-ac-try-run-fix.patch \ diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 730676875c..94dc51cfc5 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -62,6 +62,7 @@ (base32 "12w7gskrglg6qrmp822j37fmbr0icrcxv7rib1fy5xiw80n5z7cr")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) + (replacement curl/fixed) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.2 MiB of man3 pages @@ -151,6 +152,20 @@ tunneling, and so on.") (name "curl-minimal") (inputs (alist-delete "openldap" (package-inputs curl)))))) +(define-public curl/fixed + (package + (inherit curl) + (version "7.76.0") + (source + (origin + (inherit (package-source curl)) + (uri (string-append "https://curl.haxx.se/download/curl-" + version ".tar.xz")) + (patches (search-patches "curl-7.76-use-ssl-cert-env.patch")) + (sha256 + (base32 + "1j2g04m6als6hmqzvddv84c31m0x90bfgyz3bjrwdkarbkby40k3")))))) + (define-public kurly (package (name "kurly") diff --git a/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch b/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch new file mode 100644 index 0000000000..24be6e31d9 --- /dev/null +++ b/gnu/packages/patches/curl-7.76-use-ssl-cert-env.patch @@ -0,0 +1,64 @@ +Make libcurl respect the SSL_CERT_{DIR,FILE} variables by default. The variables +are fetched during initialization to preserve thread-safety (curl_global_init(3) +must be called when no other threads exist). + +This fixes network functionality in rust:cargo, and probably removes the need +for other future workarounds. +=================================================================== +--- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100 +@@ -134,6 +134,9 @@ + # pragma warning(default:4232) /* MSVC extension, dllimport identity */ + #endif + ++char * Curl_ssl_cert_dir = NULL; ++char * Curl_ssl_cert_file = NULL; ++ + /** + * curl_global_init() globally initializes curl given a bitwise set of the + * different features of what to initialize. +@@ -155,6 +158,9 @@ + #endif + } + ++ Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); ++ Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); ++ + if(!Curl_ssl_init()) { + DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); + return CURLE_FAILED_INIT; +@@ -260,6 +266,9 @@ + Curl_ssl_cleanup(); + Curl_resolver_global_cleanup(); + ++ free(Curl_ssl_cert_dir); ++ free(Curl_ssl_cert_file); ++ + #ifdef WIN32 + Curl_win32_cleanup(init_flags); + #endif +diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c +--- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 ++++ curl-7.66.0/lib/url.c 2020-01-02 16:21:11.563880346 +0100 +@@ -524,6 +524,21 @@ + if(result) + return result; + #endif ++ extern char * Curl_ssl_cert_dir; ++ extern char * Curl_ssl_cert_file; ++ if(Curl_ssl_cert_dir) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH], Curl_ssl_cert_dir)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAPATH_PROXY], Curl_ssl_cert_dir)) ++ return result; ++ } ++ ++ if(Curl_ssl_cert_file) { ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE], Curl_ssl_cert_file)) ++ return result; ++ if(result = Curl_setstropt(&set->str[STRING_SSL_CAFILE_PROXY], Curl_ssl_cert_file)) ++ return result; ++ } + } + + set->wildcard_enabled = FALSE; -- cgit 1.4.1 From 48f7aa1cd104096daccc8a4859021f1e1177f525 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 18 Mar 2021 00:46:45 -0700 Subject: gnu: vtk: Update to 9.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/image-processing.scm (vtk): Update to 9.0.1. [source](snippet): Remove bundled "ogg" directory as well. [arguments]: Adjust #:configure-flags. Add #:phases. [inputs]: Add LIBOGG. * gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch: Update. Co-authored-by: Ludovic Courtès --- gnu/packages/image-processing.scm | 65 +++++++++++++--------- .../vtk-fix-freetypetools-build-failure.patch | 14 ++--- 2 files changed, 45 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 7205336d53..f944a61186 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021 Oleh Malyi ;;; Copyright © 2021 Felix Gruber +;;; Copyright © 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,7 +247,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "8.2.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -254,7 +255,7 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) + "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v")) (patches (search-patches "vtk-fix-freetypetools-build-failure.patch")) (modules '((guix build utils))) @@ -264,35 +265,46 @@ many popular formats.") (lambda (dir) (delete-file-recursively (string-append "ThirdParty/" dir "/vtk" dir))) - ;; ogg, pugixml depended upon unconditionally + ;; pugixml depended upon unconditionally '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" - "netcdf" "png" "sqlite" "theora" "tiff" "zlib")) + "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) #t)))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. #:configure-flags '(;"-DBUILD_TESTING:BOOL=TRUE" - ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=TRUE" ; not honored - "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=TRUE" - "-DVTK_USE_SYSTEM_EIGEN:BOOL=TRUE" - "-DVTK_USE_SYSTEM_EXPAT:BOOL=TRUE" - "-DVTK_USE_SYSTEM_FREETYPE:BOOL=TRUE" - "-DVTK_USE_SYSTEM_GL2PS:BOOL=TRUE" - "-DVTK_USE_SYSTEM_GLEW:BOOL=TRUE" - "-DVTK_USE_SYSTEM_HDF5:BOOL=TRUE" - "-DVTK_USE_SYSTEM_JPEG:BOOL=TRUE" - "-DVTK_USE_SYSTEM_JSONCPP:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=TRUE" - "-DVTK_USE_SYSTEM_LZ4:BOOL=TRUE" - "-DVTK_USE_SYSTEM_NETCDF:BOOL=TRUE" - "-DVTK_USE_SYSTEM_PNG:BOOL=TRUE" - ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=TRUE" ; breaks IO/CityGML - "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE" - "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE" - "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE" - "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE") + ; ; not honored + "-DVTK_USE_EXTERNAL=OFF" ;; default + "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" + ;"-DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=ON" ; breaks IO/CityGML + "-DVTK_MODULE_USE_EXTERNAL_VTK_sqlite=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON" + ) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "Common/Core/vtkFloatingPointExceptions.cxx" + (("") "")) + (substitute* "Common/Core/CMakeLists.txt" + (("fenv.h") "cfenv"))))) #:tests? #f)) ;XXX: test data not included (inputs `(("double-conversion" ,double-conversion) @@ -305,7 +317,6 @@ many popular formats.") ("hdf5" ,hdf5) ("jpeg" ,libjpeg-turbo) ("jsoncpp" ,jsoncpp) - ;("libogg" ,libogg) ("libtheora" ,libtheora) ("libX11" ,libx11) ("libxml2" ,libxml2) @@ -320,6 +331,10 @@ many popular formats.") ("tiff" ,libtiff) ("xorgproto" ,xorgproto) ("zlib" ,zlib))) + (propagated-inputs + ;; VTK's 'VTK-vtk-module-find-packages.cmake' calls + ;; 'find_package(THEORA)', which in turns looks for libogg. + `(("libogg" ,libogg))) (home-page "https://vtk.org/") (synopsis "Libraries for 3D computer graphics") (description diff --git a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch index 6988e65872..23f651b5eb 100644 --- a/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch +++ b/gnu/packages/patches/vtk-fix-freetypetools-build-failure.patch @@ -17,20 +17,16 @@ diff --git a/Rendering/FreeType/vtkFreeTypeTools.cxx b/Rendering/FreeType/vtkFre index c54289dc60..03b899c4da 100644 --- a/Rendering/FreeType/vtkFreeTypeTools.cxx +++ b/Rendering/FreeType/vtkFreeTypeTools.cxx -@@ -387,11 +387,8 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() +@@ -378,8 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMapCache() } - + //---------------------------------------------------------------------------- -FT_CALLBACK_DEF(FT_Error) --vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id, -- FT_Library lib, -- FT_Pointer request_data, -- FT_Face* face) +-vtkFreeTypeToolsFaceRequester( +static FT_Error vtkFreeTypeToolsFaceRequester( -+ FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) + FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face) { #if VTK_FTFC_DEBUG_CD - printf("vtkFreeTypeToolsFaceRequester()\n"); --- +-- 2.30.1 -- cgit 1.4.1 From e025de68c353e8cfac7172bb60db03eb8586415a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Apr 2021 09:00:36 +0200 Subject: gnu: vtk: Add 'release-monitoring-url' property. * gnu/packages/image-processing.scm (vtk)[properties]: New field. --- gnu/packages/image-processing.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index f944a61186..2795eaf130 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 John Darrington ;;; Copyright © 2017, 2019 Ricardo Wurmus -;;; Copyright © 2014 Ludovic Courtès +;;; Copyright © 2014, 2021 Ludovic Courtès ;;; Copyright © 2014 Mark H Weaver ;;; Copyright © 2016 Eric Bavier ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice @@ -270,6 +270,7 @@ many popular formats.") "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib")) #t)))) + (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. -- cgit 1.4.1 From 6f97e43687893b4a50ce1da1d03a7ec6ffc6f449 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 2 Apr 2021 22:17:16 +0200 Subject: gnu: ktouch: Remove unnecessary build phase. * gnu/packages/education.scm (ktouch)[arguments]: Remove. --- gnu/packages/education.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index a1f1b0dfba..589c32838c 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -689,17 +689,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib")))) (build-system qt-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-makefiles - (lambda* (#:key inputs #:allow-other-keys) - (let ((qtdec (assoc-ref inputs "qtdeclarative"))) - (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make" - "src/CMakeFiles/ktouch.dir/build.make") - (("/gnu/store/.*qmlcachegen") - (string-append qtdec "/bin/qmlcachegen")))) - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) -- cgit 1.4.1 From 6f6b0ea0d4761dd6c468d209a10f4420fcadd886 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Apr 2021 23:13:46 +0200 Subject: gnu: lldpd: Update to 1.0.9. * gnu/packages/networking.scm (lldpd): Update to 1.0.9. --- 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 f0e95c6ed0..7cbf1de9bf 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3837,14 +3837,14 @@ thousands of connections is clearly realistic with today's hardware.") (define-public lldpd (package (name "lldpd") - (version "1.0.8") + (version "1.0.9") (source (origin (method url-fetch) (uri (string-append "https://media.luffy.cx/files/lldpd/lldpd-" version ".tar.gz")) (sha256 - (base32 "1vrxr8lgkw7q6ixaaili6ac7i0j0326194s498n2dxihdvkh1llq")) + (base32 "1xa9953hl2c94zi4ngaxyi2yw3dax1ab16118wriwawm4lqynr3b")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From 8d89d3c9bf7cacd9c79b4aacf348044d4fe7800b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 2 Apr 2021 23:14:13 +0200 Subject: gnu: pidgin: Update to 2.14.2. * gnu/packages/messaging.scm (pidgin): Update to 2.14.2. [source]: Remove pidgin-vv-gst.patch. * gnu/packages/patches/pidgin-vv-gst.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/messaging.scm | 8 ++---- gnu/packages/patches/pidgin-vv-gst.patch | 48 -------------------------------- 3 files changed, 3 insertions(+), 54 deletions(-) delete mode 100644 gnu/packages/patches/pidgin-vv-gst.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0d472072ae..26976f73cd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1525,7 +1525,6 @@ dist_patch_DATA = \ %D%/packages/patches/picard-fix-id3-rename-test.patch \ %D%/packages/patches/picprog-non-intel-support.patch \ %D%/packages/patches/pidgin-add-search-path.patch \ - %D%/packages/patches/pidgin-vv-gst.patch \ %D%/packages/patches/pinball-const-fix.patch \ %D%/packages/patches/pinball-cstddef.patch \ %D%/packages/patches/pinball-missing-separators.patch \ diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 388e7f2ead..e8b67c03bc 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -788,7 +788,7 @@ authentication.") (define-public pidgin (package (name "pidgin") - (version "2.14.1") + (version "2.14.2") (source (origin (method url-fetch) @@ -796,11 +796,9 @@ authentication.") (string-append "mirror://sourceforge/pidgin/Pidgin/" version "/pidgin-" version ".tar.gz")) (sha256 - (base32 "1c4dzxg9c3d9zfqqa7jwijj9rv9fm6w95igmpljwy88lxq7v5w11")) + (base32 "19r297ynxizdj357ihmy0sgpgfikdzblkszlwlqnsr3lvbjhhsg1")) (patches - (search-patches - "pidgin-add-search-path.patch" - "pidgin-vv-gst.patch")) + (search-patches "pidgin-add-search-path.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/pidgin-vv-gst.patch b/gnu/packages/patches/pidgin-vv-gst.patch deleted file mode 100644 index e0553dd119..0000000000 --- a/gnu/packages/patches/pidgin-vv-gst.patch +++ /dev/null @@ -1,48 +0,0 @@ -Name: Gary Kramlich -Date: 2020-07-12 -Source: https://keep.imfreedom.org/pidgin/pidgin/rev/39ac50435cfb - -diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c ---- a/libpurple/mediamanager.c -+++ b/libpurple/mediamanager.c -@@ -2231,6 +2231,7 @@ - purple_media_manager_unregister_gst_device(PurpleMediaManager *manager, - GstDevice *device) - { -+#ifdef USE_VV - GList *i; - gchar *name; - gchar *device_class; -@@ -2277,6 +2278,7 @@ - - g_free(name); - g_free(device_class); -+#endif /* USE_VV */ - } - - static gboolean -@@ -2304,7 +2306,7 @@ - static void - purple_media_manager_init_device_monitor(PurpleMediaManager *manager) - { --#if GST_CHECK_VERSION(1, 4, 0) -+#if GST_CHECK_VERSION(1, 4, 0) && defined(USE_VV) - GstBus *bus; - GList *i; - -@@ -2334,6 +2336,7 @@ - PurpleMediaElementType type) - { - GList *result = NULL; -+#ifdef USE_VV - GList *i; - - for (i = manager->priv->elements; i; i = i->next) { -@@ -2347,6 +2350,7 @@ - result = g_list_prepend(result, info); - } - } -+#endif /* USE_VV */ - - return result; - } -- cgit 1.4.1 From 7bf82f5ede57c9c5344ddb1d4dcfe694eb306bef Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 22 Feb 2021 22:58:31 -0500 Subject: gnu: containerd: Update to 1.4.4. * gnu/packages/docker.scm (containerd): Update to 1.4.4. Delete trailing #t. [arguments]: Set a MAKE-FLAGS binding. [phases]{patch-paths}: Patch the reference to 'unpigz'. {build, install}: Use the MAKE-FLAGS variable. [inputs]: Add pigz. * gnu/packages/patches/containerd-test-with-go1.13.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. --- gnu/local.mk | 1 - gnu/packages/docker.scm | 86 ++++++++++++---------- .../patches/containerd-test-with-go1.13.patch | 21 ------ 3 files changed, 46 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/patches/containerd-test-with-go1.13.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 26976f73cd..d5fd714669 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -912,7 +912,6 @@ dist_patch_DATA = \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ - %D%/packages/patches/containerd-test-with-go1.13.patch \ %D%/packages/patches/coreutils-ls.patch \ %D%/packages/patches/cpufrequtils-fix-aclocal.patch \ %D%/packages/patches/crawl-upgrade-saves.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 5c6292c122..6083ed780b 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell @@ -177,7 +177,7 @@ Python without keeping their credentials in a Docker configuration file.") (define-public containerd (package (name "containerd") - (version "1.3.10") + (version "1.4.4") (source (origin (method git-fetch) @@ -186,49 +186,55 @@ Python without keeping their credentials in a Docker configuration file.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10fz7359aydbz0yb01qkrsq2diypayfal618lvvb1x0gvgkp526i")))) + (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/containerd/containerd" - #:phases - (modify-phases %standard-phases - (add-after 'chdir 'patch-paths - (lambda* (#:key inputs import-path outputs #:allow-other-keys) - ;; TODO: Patch "socat", "unpigz". - (with-directory-excursion (string-append "src/" import-path) - (substitute* "./runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref outputs "out") - "/bin/containerd-shim\"\n"))) - (substitute* "./vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand[ \t]*=.*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") ; ) - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) ;) - #t))) - (replace 'build - (lambda* (#:key import-path (make-flags '()) #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (apply invoke "make" make-flags)))) - (replace 'install - (lambda* (#:key import-path outputs (make-flags '()) #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) "install" - make-flags)))))))) + (let ((make-flags (list (string-append "VERSION=" version) + "REVISION=0"))) + `(#:import-path "github.com/containerd/containerd" + #:phases + (modify-phases %standard-phases + (add-after 'chdir 'patch-paths + (lambda* (#:key inputs import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand[ \t]*=.*") + (string-append "DefaultCommand = \"" + (assoc-ref inputs "runc") + "/sbin/runc\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/testutil\ +/loopback/loopback_linux.go" + (("exec\\.Command\\(\"losetup\"") + (string-append "exec.Command(\"" + (assoc-ref inputs "util-linux") + "/sbin/losetup\""))) + (substitute* "archive/compression/compression.go" + (("exec\\.LookPath\\(\"unpigz\"\\)") + (string-append "\"" (assoc-ref inputs "pigz") + "/bin/unpigz\", error(nil)")))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (apply invoke "make" ',make-flags)))) + (replace 'install + (lambda* (#:key import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (let* ((out (assoc-ref outputs "out"))) + (apply invoke "make" (string-append "DESTDIR=" out) "install" + ',make-flags))))))))) (inputs `(("btrfs-progs" ,btrfs-progs) ("libseccomp" ,libseccomp) + ("pigz" ,pigz) ("runc" ,runc) ("util-linux" ,util-linux))) (native-inputs diff --git a/gnu/packages/patches/containerd-test-with-go1.13.patch b/gnu/packages/patches/containerd-test-with-go1.13.patch deleted file mode 100644 index 964adee9e6..0000000000 --- a/gnu/packages/patches/containerd-test-with-go1.13.patch +++ /dev/null @@ -1,21 +0,0 @@ -Compatibility fix for go 1.13, flag.Parse() shouldn't be called during -package initialization. -https://golang.org/doc/go1.13#testing ---- a/client_test.go 2020-02-12 14:50:28.991245371 -0500 -+++ b/client_test.go 2020-02-12 15:12:37.383523980 -0500 -@@ -49,7 +49,6 @@ - flag.StringVar(&address, "address", defaultAddress, "The address to the containerd socket for use in the tests") - flag.BoolVar(&noDaemon, "no-daemon", false, "Do not start a dedicated daemon for the tests") - flag.BoolVar(&noCriu, "no-criu", false, "Do not run the checkpoint tests") -- flag.Parse() - } - - func testContext() (context.Context, context.CancelFunc) { -@@ -59,6 +58,7 @@ - } - - func TestMain(m *testing.M) { -+ flag.Parse() - if testing.Short() { - os.Exit(m.Run()) - } -- cgit 1.4.1 From 86c39376cc00ed19758a2861c11f85fa5b94cda4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 23 Feb 2021 00:03:01 -0500 Subject: gnu: runc: Update to 1.0.0-rc93. * gnu/packages/virtualization.scm (runc): Update to 1.0.0-rc93. [source]: Remove the patches field. [phases]{unpack}: Remove override. {build}: Add the man target. {check}: Make conditional based on TESTS?. {install}: Add the install-man target. [native-inputs]: Add go-github-com-go-md2man. [home-page]: Update. * gnu/packages/patches/runc-CVE-2019-5736.patch: Delete file. * gnu/local.mk: Un-register it. --- gnu/local.mk | 1 - gnu/packages/patches/runc-CVE-2019-5736.patch | 343 -------------------------- gnu/packages/virtualization.scm | 31 +-- 3 files changed, 11 insertions(+), 364 deletions(-) delete mode 100644 gnu/packages/patches/runc-CVE-2019-5736.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d5fd714669..a1a08fa911 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1645,7 +1645,6 @@ dist_patch_DATA = \ %D%/packages/patches/rnp-disable-ruby-rnp-tests.patch \ %D%/packages/patches/rnp-unbundle-googletest.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ - %D%/packages/patches/runc-CVE-2019-5736.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-1.45-linker-locale.patch \ diff --git a/gnu/packages/patches/runc-CVE-2019-5736.patch b/gnu/packages/patches/runc-CVE-2019-5736.patch deleted file mode 100644 index f629fcbfb4..0000000000 --- a/gnu/packages/patches/runc-CVE-2019-5736.patch +++ /dev/null @@ -1,343 +0,0 @@ -Fix CVE-2019-5736: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5736 -https://seclists.org/oss-sec/2019/q1/119 - -Patch copied from upstream source repository: - -https://github.com/opencontainers/runc/commit/0a8e4117e7f715d5fbeef398405813ce8e88558b - -From 0a8e4117e7f715d5fbeef398405813ce8e88558b Mon Sep 17 00:00:00 2001 -From: Aleksa Sarai -Date: Wed, 9 Jan 2019 13:40:01 +1100 -Subject: [PATCH] nsenter: clone /proc/self/exe to avoid exposing host binary - to container - -There are quite a few circumstances where /proc/self/exe pointing to a -pretty important container binary is a _bad_ thing, so to avoid this we -have to make a copy (preferably doing self-clean-up and not being -writeable). - -We require memfd_create(2) -- though there is an O_TMPFILE fallback -- -but we can always extend this to use a scratch MNT_DETACH overlayfs or -tmpfs. The main downside to this approach is no page-cache sharing for -the runc binary (which overlayfs would give us) but this is far less -complicated. - -This is only done during nsenter so that it happens transparently to the -Go code, and any libcontainer users benefit from it. This also makes -ExtraFiles and --preserve-fds handling trivial (because we don't need to -worry about it). - -Fixes: CVE-2019-5736 -Co-developed-by: Christian Brauner -Signed-off-by: Aleksa Sarai ---- - libcontainer/nsenter/cloned_binary.c | 268 +++++++++++++++++++++++++++ - libcontainer/nsenter/nsexec.c | 11 ++ - 2 files changed, 279 insertions(+) - create mode 100644 libcontainer/nsenter/cloned_binary.c - -diff --git a/libcontainer/nsenter/cloned_binary.c b/libcontainer/nsenter/cloned_binary.c -new file mode 100644 -index 000000000..c8a42c23f ---- /dev/null -+++ b/libcontainer/nsenter/cloned_binary.c -@@ -0,0 +1,268 @@ -+/* -+ * Copyright (C) 2019 Aleksa Sarai -+ * Copyright (C) 2019 SUSE LLC -+ * -+ * Licensed under the Apache License, Version 2.0 (the "License"); -+ * you may not use this file except in compliance with the License. -+ * You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+#define _GNU_SOURCE -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Use our own wrapper for memfd_create. */ -+#if !defined(SYS_memfd_create) && defined(__NR_memfd_create) -+# define SYS_memfd_create __NR_memfd_create -+#endif -+#ifdef SYS_memfd_create -+# define HAVE_MEMFD_CREATE -+/* memfd_create(2) flags -- copied from . */ -+# ifndef MFD_CLOEXEC -+# define MFD_CLOEXEC 0x0001U -+# define MFD_ALLOW_SEALING 0x0002U -+# endif -+int memfd_create(const char *name, unsigned int flags) -+{ -+ return syscall(SYS_memfd_create, name, flags); -+} -+#endif -+ -+/* This comes directly from . */ -+#ifndef F_LINUX_SPECIFIC_BASE -+# define F_LINUX_SPECIFIC_BASE 1024 -+#endif -+#ifndef F_ADD_SEALS -+# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) -+# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) -+#endif -+#ifndef F_SEAL_SEAL -+# define F_SEAL_SEAL 0x0001 /* prevent further seals from being set */ -+# define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */ -+# define F_SEAL_GROW 0x0004 /* prevent file from growing */ -+# define F_SEAL_WRITE 0x0008 /* prevent writes */ -+#endif -+ -+#define RUNC_SENDFILE_MAX 0x7FFFF000 /* sendfile(2) is limited to 2GB. */ -+#ifdef HAVE_MEMFD_CREATE -+# define RUNC_MEMFD_COMMENT "runc_cloned:/proc/self/exe" -+# define RUNC_MEMFD_SEALS \ -+ (F_SEAL_SEAL | F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE) -+#endif -+ -+static void *must_realloc(void *ptr, size_t size) -+{ -+ void *old = ptr; -+ do { -+ ptr = realloc(old, size); -+ } while(!ptr); -+ return ptr; -+} -+ -+/* -+ * Verify whether we are currently in a self-cloned program (namely, is -+ * /proc/self/exe a memfd). F_GET_SEALS will only succeed for memfds (or rather -+ * for shmem files), and we want to be sure it's actually sealed. -+ */ -+static int is_self_cloned(void) -+{ -+ int fd, ret, is_cloned = 0; -+ -+ fd = open("/proc/self/exe", O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -ENOTRECOVERABLE; -+ -+#ifdef HAVE_MEMFD_CREATE -+ ret = fcntl(fd, F_GET_SEALS); -+ is_cloned = (ret == RUNC_MEMFD_SEALS); -+#else -+ struct stat statbuf = {0}; -+ ret = fstat(fd, &statbuf); -+ if (ret >= 0) -+ is_cloned = (statbuf.st_nlink == 0); -+#endif -+ close(fd); -+ return is_cloned; -+} -+ -+/* -+ * Basic wrapper around mmap(2) that gives you the file length so you can -+ * safely treat it as an ordinary buffer. Only gives you read access. -+ */ -+static char *read_file(char *path, size_t *length) -+{ -+ int fd; -+ char buf[4096], *copy = NULL; -+ -+ if (!length) -+ return NULL; -+ -+ fd = open(path, O_RDONLY | O_CLOEXEC); -+ if (fd < 0) -+ return NULL; -+ -+ *length = 0; -+ for (;;) { -+ int n; -+ -+ n = read(fd, buf, sizeof(buf)); -+ if (n < 0) -+ goto error; -+ if (!n) -+ break; -+ -+ copy = must_realloc(copy, (*length + n) * sizeof(*copy)); -+ memcpy(copy + *length, buf, n); -+ *length += n; -+ } -+ close(fd); -+ return copy; -+ -+error: -+ close(fd); -+ free(copy); -+ return NULL; -+} -+ -+/* -+ * A poor-man's version of "xargs -0". Basically parses a given block of -+ * NUL-delimited data, within the given length and adds a pointer to each entry -+ * to the array of pointers. -+ */ -+static int parse_xargs(char *data, int data_length, char ***output) -+{ -+ int num = 0; -+ char *cur = data; -+ -+ if (!data || *output != NULL) -+ return -1; -+ -+ while (cur < data + data_length) { -+ num++; -+ *output = must_realloc(*output, (num + 1) * sizeof(**output)); -+ (*output)[num - 1] = cur; -+ cur += strlen(cur) + 1; -+ } -+ (*output)[num] = NULL; -+ return num; -+} -+ -+/* -+ * "Parse" out argv and envp from /proc/self/cmdline and /proc/self/environ. -+ * This is necessary because we are running in a context where we don't have a -+ * main() that we can just get the arguments from. -+ */ -+static int fetchve(char ***argv, char ***envp) -+{ -+ char *cmdline = NULL, *environ = NULL; -+ size_t cmdline_size, environ_size; -+ -+ cmdline = read_file("/proc/self/cmdline", &cmdline_size); -+ if (!cmdline) -+ goto error; -+ environ = read_file("/proc/self/environ", &environ_size); -+ if (!environ) -+ goto error; -+ -+ if (parse_xargs(cmdline, cmdline_size, argv) <= 0) -+ goto error; -+ if (parse_xargs(environ, environ_size, envp) <= 0) -+ goto error; -+ -+ return 0; -+ -+error: -+ free(environ); -+ free(cmdline); -+ return -EINVAL; -+} -+ -+static int clone_binary(void) -+{ -+ int binfd, memfd; -+ ssize_t sent = 0; -+ -+#ifdef HAVE_MEMFD_CREATE -+ memfd = memfd_create(RUNC_MEMFD_COMMENT, MFD_CLOEXEC | MFD_ALLOW_SEALING); -+#else -+ memfd = open("/tmp", O_TMPFILE | O_EXCL | O_RDWR | O_CLOEXEC, 0711); -+#endif -+ if (memfd < 0) -+ return -ENOTRECOVERABLE; -+ -+ binfd = open("/proc/self/exe", O_RDONLY | O_CLOEXEC); -+ if (binfd < 0) -+ goto error; -+ -+ sent = sendfile(memfd, binfd, NULL, RUNC_SENDFILE_MAX); -+ close(binfd); -+ if (sent < 0) -+ goto error; -+ -+#ifdef HAVE_MEMFD_CREATE -+ int err = fcntl(memfd, F_ADD_SEALS, RUNC_MEMFD_SEALS); -+ if (err < 0) -+ goto error; -+#else -+ /* Need to re-open "memfd" as read-only to avoid execve(2) giving -EXTBUSY. */ -+ int newfd; -+ char *fdpath = NULL; -+ -+ if (asprintf(&fdpath, "/proc/self/fd/%d", memfd) < 0) -+ goto error; -+ newfd = open(fdpath, O_RDONLY | O_CLOEXEC); -+ free(fdpath); -+ if (newfd < 0) -+ goto error; -+ -+ close(memfd); -+ memfd = newfd; -+#endif -+ return memfd; -+ -+error: -+ close(memfd); -+ return -EIO; -+} -+ -+int ensure_cloned_binary(void) -+{ -+ int execfd; -+ char **argv = NULL, **envp = NULL; -+ -+ /* Check that we're not self-cloned, and if we are then bail. */ -+ int cloned = is_self_cloned(); -+ if (cloned > 0 || cloned == -ENOTRECOVERABLE) -+ return cloned; -+ -+ if (fetchve(&argv, &envp) < 0) -+ return -EINVAL; -+ -+ execfd = clone_binary(); -+ if (execfd < 0) -+ return -EIO; -+ -+ fexecve(execfd, argv, envp); -+ return -ENOEXEC; -+} -diff --git a/libcontainer/nsenter/nsexec.c b/libcontainer/nsenter/nsexec.c -index 28269dfc0..7750af35e 100644 ---- a/libcontainer/nsenter/nsexec.c -+++ b/libcontainer/nsenter/nsexec.c -@@ -534,6 +534,9 @@ void join_namespaces(char *nslist) - free(namespaces); - } - -+/* Defined in cloned_binary.c. */ -+extern int ensure_cloned_binary(void); -+ - void nsexec(void) - { - int pipenum; -@@ -549,6 +552,14 @@ void nsexec(void) - if (pipenum == -1) - return; - -+ /* -+ * We need to re-exec if we are not in a cloned binary. This is necessary -+ * to ensure that containers won't be able to access the host binary -+ * through /proc/self/exe. See CVE-2019-5736. -+ */ -+ if (ensure_cloned_binary() < 0) -+ bail("could not ensure we are a cloned binary"); -+ - /* Parse all of the netlink configuration. */ - nl_parse(pipenum, &config); - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index c6929b9f1a..b365d722f9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1564,17 +1564,16 @@ monitor/GPU.") (define-public runc (package (name "runc") - (version "1.0.0-rc6") + (version "1.0.0-rc93") (source (origin (method url-fetch) (uri (string-append "https://github.com/opencontainers/runc/releases/" "download/v" version "/runc.tar.xz")) (file-name (string-append name "-" version ".tar.xz")) - (patches (search-patches "runc-CVE-2019-5736.patch")) (sha256 (base32 - "1c7832dq70slkjh8qp2civ1wxhhdd2hrx84pq7db1mmqc9fdr3cc")))) + "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" @@ -1584,35 +1583,27 @@ monitor/GPU.") #:tests? #f #:phases (modify-phases %standard-phases - (replace 'unpack - (lambda* (#:key source import-path #:allow-other-keys) - ;; Unpack the tarball into 'runc' instead of 'runc-1.0.0-rc5'. - (let ((dest (string-append "src/" import-path))) - (mkdir-p dest) - (invoke "tar" "-C" (string-append "src/" import-path) - "--strip-components=1" - "-xvf" source)))) (replace 'build (lambda* (#:key import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) - ;; XXX: requires 'go-md2man'. - ;; (invoke "make" "man") - (invoke "make")))) - ;; (replace 'check - ;; (lambda _ - ;; (invoke "make" "localunittest"))) + (invoke "make" "all" "man")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "localunittest")))) (replace 'install (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (let ((out (assoc-ref outputs "out"))) - (invoke "make" "install" "install-bash" + (invoke "make" "install" "install-bash" "install-man" (string-append "PREFIX=" out))))))))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("go-md2man" ,go-github-com-go-md2man) + ("pkg-config" ,pkg-config))) (inputs `(("libseccomp" ,libseccomp))) (synopsis "Open container initiative runtime") - (home-page "https://www.opencontainers.org/") + (home-page "https://opencontainers.org/") (description "@command{runc} is a command line client for running applications packaged according to the -- cgit 1.4.1 From 086069aad94aa70c3bb1f3c36b2486947805b344 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:38:55 +0200 Subject: gnu: emacs-auctex: Update to 13.0.6. * gnu/packages/emacs-xyz.scm (emacs-auctex): Update to 13.0.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d6ca0c6d52..5aaeae3c82 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2251,14 +2251,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "13.0.5") + (version "13.0.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "072wwsqfl8n2gi2inbp0s8k1ydr6fh1zyvc3rgynwzibjjniy319")))) + (base32 "00wp388rh2nnk8fam53kilykg90jylps31qxv9ijy1lsp1hqdjys")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). -- cgit 1.4.1 From 7087d4ba457d2fff54903eee3d573cccd832e9e5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:42:22 +0200 Subject: gnu: emacs-ggtags: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-ggtags): Update to 0.9.0. [source]: Update archive extension. --- gnu/packages/emacs-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5aaeae3c82..e1f572aa97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2563,15 +2563,15 @@ into mode hooks and is intended to be used that way.") (define-public emacs-ggtags (package (name "emacs-ggtags") - (version "0.8.13") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/ggtags-" - version ".el")) + version ".tar")) (sha256 (base32 - "1qa7lcrcmf76sf6dy8sxbg4adq7rg59fm0n5848w3qxgsr0h45fg")))) + "0p79x9g94jynl83ndvqp9349vhgkzxzhnc517r8hn44iqxqf6ghg")))) (build-system emacs-build-system) (inputs `(("global" ,global))) -- cgit 1.4.1 From 8066441df7e1acf8c203fd0fb19ae2f5360870b7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:43:25 +0200 Subject: gnu: emacs-posframe: Update to 0.9.0. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 0.9.0. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e1f572aa97..7e3aefd3b2 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12577,14 +12577,14 @@ shuangpin, wubi and cangjie.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "0.8.8") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "1ij6brzcxv9viz37qafcinlfx5l20w8x8s6786r1rsda5n1xsmvd")))) + (base32 "14x63713lbvmp24733j7pqkwvcnhpcgv7pprr8sykan3jnjnnzh3")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From 3ee3fd7b76d15ba6f6d6c94cbb22c7ef8874116e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:43:57 +0200 Subject: gnu: emacs-tramp: Update to 2.5.0.3. * gnu/packages/emacs-xyz.scm (emacs-tramp): Update to 2.5.0.3. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7e3aefd3b2..34cb5faa9e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23627,14 +23627,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.5.0.2") + (version "2.5.0.3") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "16f782rjkmxxs5sz3wv4d46i7hbl483ashmrkvljf7lpnrl91s93")))) + (base32 "0c77d1ihn17lzk9jb7ss346ryprnbii1zmijl6zj0kk4lm8fpfl3")))) (build-system emacs-build-system) (arguments `(#:emacs ,emacs ;need D-Bus -- cgit 1.4.1 From 18ffc38730deb5bee43d076115ec7cbb3787252e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 11:51:02 +0200 Subject: gnu: mgba: Update to 0.9.0. * gnu/packages/emulators.scm (mgba): Update to 0.9.0. --- 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 8bfcfc57a7..8482f679e2 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -540,7 +540,7 @@ The following systems are supported: (define-public mgba (package (name "mgba") - (version "0.8.4") + (version "0.9.0") (source (origin (method git-fetch) @@ -549,7 +549,7 @@ The following systems are supported: (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq")) + (base32 "16v08m9irping65d94vb5skp4m6nc63zj6bfajbzhmf944dswmi5")) (modules '((guix build utils))) (snippet ;; Make sure we don't use the bundled software. -- cgit 1.4.1 From 1d89098b1869ca4039b09ef16c7ce8e4f3263470 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:01:51 +0200 Subject: gnu: emacs-org: Update to 9.4.5. * gnu/packages/emacs-xyz.scm (emacs-org): Update to 9.4.5. (emacs-org-contrib): Update to 20210329. --- gnu/packages/emacs-xyz.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34cb5faa9e..239915fffe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11009,13 +11009,13 @@ passive voice.") (name "emacs-org") ;; emacs-org-contrib inherits from this package. Please update it as ;; well. - (version "9.4.4") + (version "9.4.5") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/org-" version ".tar")) (sha256 - (base32 "05ma8n6hr10323d85ay8ai0xrpc9q2m93n8avqh7j9fmmb3bhr0b")))) + (base32 "0h5qhrd984vf17qc227wz68191xfgbpq32dyhw0lcz2d9i0pl3xk")))) (build-system emacs-build-system) (arguments `(#:phases @@ -11036,7 +11036,7 @@ passive voice.") (doc-dir (string-append share "/doc/" ,name "-" ,version))) (install-file "org.info" info-dir) (install-file "orgguide.info" info-dir) - ;; XXX: "orgcard.pdf" is not built in Org 9.4.4. + ;; XXX: "orgcard.pdf" is not built in Org 9.4.5. ;; (install-file "orgcard.pdf" doc-dir) ) #t))))) @@ -11052,14 +11052,14 @@ programming and reproducible research.") (package (inherit emacs-org) (name "emacs-org-contrib") - (version "20201222") + (version "20210329") (source (origin (method url-fetch) (uri (string-append "https://orgmode.org/elpa/" "org-plus-contrib-" version ".tar")) (sha256 - (base32 "1pa8h5dpi5yj3j7v0aaby8sjwxvmgnbip2ilyl5pac1rlbz0jn40")) + (base32 "1l0ycz77hwmjb4sffhabb0d0hg1c9ypxbpbyv8xj5ib4nbi87f2h")) ;; ob-sclang.el is packaged separately to avoid the dependency on ;; SuperCollider and qtwebengine. (modules '((guix build utils))) -- cgit 1.4.1 From 385b63d35ec4263399c567162023be3816f5d65c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:11:53 +0200 Subject: gnu: rust-smallvec-1: Update to 1.6.1. * gnu/packages/crates-io.scm (rust-smallvec-1): Update to 1.6.1. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09ae151ea1..e22d90d1ce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38878,7 +38878,7 @@ I/O programming.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.4.1") + (version "1.6.1") (source (origin (method url-fetch) @@ -38887,7 +38887,7 @@ I/O programming.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0gqgmbfj8228lc55xxg331flizzwq6hfyy6gw4j2y6hni6fwnmrp")))) + "0kk08axr0ybfbjzk65a41k84mb6sfhyajmfndaka9igkx34kf3zy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit 1.4.1 From 88de8287b30d9f61bf316a8580865fdf0e5411c5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:14:20 +0200 Subject: gnu: Add rust-nibble-vec-0.1. * gnu/packages/crates-io.scm (rust-nibble-vec-0.1): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e22d90d1ce..a033448b7c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24841,6 +24841,27 @@ cryptographic library.") release (fork of debug_unreachable)") (license license:expat))) +(define-public rust-nibble-vec-0.1 + (package + (name "rust-nibble-vec") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nibble_vec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hsdp3s724s30hkqz74ky6sqnadhp2xwcj1n1hzy4vzkz4yxi9bp")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-smallvec" ,rust-smallvec-1)))) + (home-page "https://github.com/michaelsproul/rust_nibble_vec") + (synopsis "Vector data-structure for half-byte values") + (description "NibbleVec is a data structure for storing a sequence of half-bytes.") + (license license:expat))) + (define-public rust-nickel-0.11 (package (name "rust-nickel") -- cgit 1.4.1 From 95446f64f85875573e3af0b806d01961d1536f58 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:15:27 +0200 Subject: gnu: Add rust-endian-type-0.1. * gnu/packages/crates-io.scm (rust-endian-type-0.1): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a033448b7c..eeefcedb5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12977,6 +12977,26 @@ Standard.") "Streaming transcoding for encoding_rs.") (license (list license:asl2.0 license:expat)))) +(define-public rust-endian-type-0.1 + (package + (name "rust-endian-type") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "endian-type" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bbh88zaig1jfqrm7w3gx0pz81kw2jakk3055vbgapw3dmk08ky3")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/Lolirofle/endian-type") + (synopsis "Type safe wrappers for types with a defined byte order") + (description + "This crates provides type safe wrappers for types with a defined byte +order.") + (license license:expat))) + (define-public rust-enum-as-inner-0.3 (package (name "rust-enum-as-inner") -- cgit 1.4.1 From 68bb965f32ca750e9365a378715f6963bff4499c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:16:34 +0200 Subject: gnu: Add rust-radix-trie-0.2. * gnu/packages/crates-io.scm (rust-radix-trie-0.2): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eeefcedb5b..d9f88d52b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31080,6 +31080,31 @@ that must be shared-mutable, but merely may use atomic instructions to do so.") radix.") (license license:asl2.0))) +(define-public rust-radix-trie-0.2 + (package + (name "rust-radix-trie") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "radix_trie" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zaq3im5ss03w91ij11cj97vvzc5y1f3064d9pi2ysnwziww2sf0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-endian-type" ,rust-endian-type-0.1) + ("rust-nibble-vec" ,rust-nibble-vec-0.1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/michaelsproul/rust_radix_trie") + (synopsis "Generic radix trie data-structure") + (description + "This is a Radix Trie implementation in Rust, building on the lessons +learnt from TrieMap and Sequence Trie.") + (license license:expat))) + (define-public rust-rand-0.8 (package (name "rust-rand") -- cgit 1.4.1 From 493f45aa94c50908dc9793d4edad4daec516e504 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:18:07 +0200 Subject: gnu: Add rust-nix-0.20. * gnu/packages/crates-io.scm (rust-nix-0.20): New variable. (rust-nix-0.19): Inherit from above. --- gnu/packages/crates-io.scm | 38 +++++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d9f88d52b2..bcb0365553 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -24947,8 +24947,36 @@ selectors. You can use the jQuery-like syntax to query and manipulate an HTML document quickly.") (license (list license:expat license:asl2.0)))) +(define-public rust-nix-0.20 + (package + (name "rust-nix") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12n1syfd967hblrcrrqk63a4s1h4hsybfqwblh71rihvv8cli6zs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/nix-rust/nix") + (synopsis "Rust friendly bindings to *nix APIs") + (description + "Nix seeks to provide friendly bindings to various *nix platform APIs. +The goal is to not provide a 100% unified interface, but to unify what can be +while still providing platform specific APIs.") + (license license:expat))) + (define-public rust-nix-0.19 (package + (inherit rust-nix-0.20) (name "rust-nix") (version "0.19.1") (source @@ -24958,7 +24986,6 @@ document quickly.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1wk1pmaf9pv84sc4jf19gm1as2yq3ydwcx0n5nc1bpsgzq6bmk5j")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; test suite hangs #:cargo-inputs @@ -24973,14 +25000,7 @@ document quickly.") ("rust-rand" ,rust-rand-0.6) ("rust-semver" ,rust-semver-0.9) ("rust-sysctl" ,rust-sysctl-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/nix-rust/nix") - (synopsis "Rust friendly bindings to *nix APIs") - (description - "Nix seeks to provide friendly bindings to various *nix platform APIs. -The goal is to not provide a 100% unified interface, but to unify what can be -while still providing platform specific APIs.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.18 (package -- cgit 1.4.1 From 55413f9bcb51d0a6d74fe6dcf16821c50fbfc200 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:19:43 +0200 Subject: gnu: Add rust-rustyline-8. * gnu/packages/crates-io.scm (rust-rustyline-8): New variable. --- gnu/packages/crates-io.scm | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bcb0365553..32e941ea4d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35226,17 +35226,17 @@ sub-processes using a fork-like interface.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2)))))) -(define-public rust-rustyline-7 +(define-public rust-rustyline-8 (package (name "rust-rustyline") - (version "7.1.0") + (version "8.0.0") (source (origin (method url-fetch) (uri (crate-uri "rustyline" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v1czmy3ir7d06xldp8bg94l97hrm15hcgdxxkq3cwbizhdk09w2")))) + (base32 "14z8hyx33ygyhm5ihcl9n2g646dawlw3ajavnbbb3vnizjbvbqdr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -35248,19 +35248,51 @@ sub-processes using a fork-like interface.") ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) - ("rust-nix" ,rust-nix-0.19) + ("rust-nix" ,rust-nix-0.20) + ("rust-radix-trie" ,rust-radix-trie-0.2) ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-smallvec" ,rust-smallvec-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-utf8parse" ,rust-utf8parse-0.2) ("rust-winapi" ,rust-winapi-0.3) - ("skim" ,skim-0.7)))) + ("skim" ,skim)))) (home-page "https://github.com/kkawakam/rustyline") (synopsis "Readline implementation in Rust") (description - "Rustyline, a readline implementation based on the linenoise package.") + "Rustyline is a readline implementation based on the linenoise package.") (license license:expat))) +(define-public rust-rustyline-7 + (package + (inherit rust-rustyline-8) + (name "rust-rustyline") + (version "7.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v1czmy3ir7d06xldp8bg94l97hrm15hcgdxxkq3cwbizhdk09w2")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-dirs-next" ,rust-dirs-next-2) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.19) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("skim" ,skim-0.7)))))) + (define-public rust-rustyline-6 (package (inherit rust-rustyline-7) -- cgit 1.4.1 From 3f1cc80ac6afef31a8f85cdac172b8669b7722c3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 12:21:12 +0200 Subject: gnu: Add rust-hamcrest2-0.3. * gnu/packages/crates-io.scm (rust-hamcrest2-0.3): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32e941ea4d..32440e2fe5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17271,6 +17271,29 @@ highlighting for a large number of languages, git integration, and automatic paging.") (license (list license:expat license:asl2.0)))) +(define-public rust-hamcrest2-0.3 + (package + (name "rust-hamcrest2") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hamcrest2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x8hx7jyzz2bl0wf6nir62imd26yhp6qcr7zf76cjpg05p33gy29")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-num" ,rust-num-0.2) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/Valloric/hamcrest2-rust") + (synopsis "Rust port of the Hamcrest testing library") + (description + "This package provides a port of the Hamcrest testing library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-handlebars-2 (package (name "rust-handlebars") -- cgit 1.4.1 From 39f69aff21720c8d3c884200fb301a23346f8c6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 3 Apr 2021 14:10:28 +0200 Subject: gnu: nushell: Update to 0.29.0. * gnu/packages/shells.scm (nushell): Update to 0.29.0. (rust-nu-ansi-term-0.29): (rust-nu-cli-0.29): (rust-nu-command-0.29): (rust-nu-data-0.29): (rust-nu-engine-0.29): (rust-nu-json-0.29): (rust-nu-parser-0.29): (rust-nu-plugin-0.29): (rust-nu-plugin-binaryview-0.29): (rust-nu-plugin-chart-0.29): (rust-nu-plugin-fetch-0.29): (rust-nu-plugin-from-bson-0.29): (rust-nu-plugin-from-sqlite-0.29): (rust-nu-plugin-inc-0.29): (rust-nu-plugin-match-0.29): (rust-nu-plugin-post-0.29): (rust-nu-plugin-ps-0.29): (rust-nu-plugin-s3-0.29): (rust-nu-plugin-sys-0.29): (rust-nu-plugin-textview-0.29): (rust-nu-plugin-to-bson-0.29): (rust-nu-plugin-to-sqlite-0.29): (rust-nu-plugin-tree-0.29): (rust-nu-plugin-xpath-0.29): (rust-nu-protocol-0.29): (rust-nu-source-0.29): (rust-nu-stream-0.29): (rust-nu-test-support-0.29): (rust-nu-value-ext-0.29): Update to 0.29. --- gnu/packages/shells.scm | 647 +++++++++++++++++++++++++----------------------- 1 file changed, 339 insertions(+), 308 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 62b7dc75fd..5ab3642dea 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -940,7 +940,7 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.28.0") + (version "0.29.0") (source (origin (method git-fetch) @@ -949,7 +949,7 @@ files and text.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0kbynyk4c0r2qi78mdchx6d0d0c7phz2sxj5cqwsz4gjziibhr7j")))) + (base32 "0x7r8ipvypf6py2h03pdqr8pal6vyp6mskvss1rr8f0bcy3gr725")))) (build-system cargo-build-system) (arguments `(#:rust ,rust-1.47 @@ -961,38 +961,39 @@ files and text.") ("rust-futures" ,rust-futures-0.3) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-cli" ,rust-nu-cli-0.28) - ("rust-nu-command" ,rust-nu-command-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.28) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.28) - ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.28) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.28) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.28) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.28) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.28) - ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.28) - ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.28) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.28) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.28) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.28) - ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.28) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.28) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.28) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.28) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.28) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.28) + ("rust-nu-cli" ,rust-nu-cli-0.29) + ("rust-nu-command" ,rust-nu-command-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) + ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.29) + ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.29) + ("rust-nu-plugin-fetch" ,rust-nu-plugin-fetch-0.29) + ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.29) + ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.29) + ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.29) + ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.29) + ("rust-nu-plugin-post" ,rust-nu-plugin-post-0.29) + ("rust-nu-plugin-ps" ,rust-nu-plugin-ps-0.29) + ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.29) + ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.29) + ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.29) + ("rust-nu-plugin-sys" ,rust-nu-plugin-sys-0.29) + ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.29) + ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.29) + ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.29) + ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.29) + ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.29) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)) #:cargo-development-inputs (("rust-dunce" ,rust-dunce-1) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-hamcrest2" ,rust-hamcrest2-0.3) + ("rust-nu-test-support" ,rust-nu-test-support-0.29) ("rust-serial-test" ,rust-serial-test-0.5)))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1016,17 +1017,17 @@ directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") (license license:expat))) -(define-public rust-nu-ansi-term-0.28 +(define-public rust-nu-ansi-term-0.29 (package (name "rust-nu-ansi-term") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-ansi-term" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0j4ybp1bmlj9lakrp21i180c26x0i9ird08xshsr6607g8nvc73f")))) + (base32 "0zlcma4kg6rsfp5sgfp3yy717bdrn9nq32rdi2nabpwg3qa9mmkb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1040,23 +1041,24 @@ of commands called a ``pipeline''.") underline).") (license license:expat))) -(define-public rust-nu-cli-0.28 +(define-public rust-nu-cli-0.29 (package (name "rust-nu-cli") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0wz3n4b7sz5zynwhs2gn11w1b9cji231f613r23j64a8y26hdzhn")))) + (base32 "0ya95r54k59h0gyz2wgj8y2lhddnk3aw7ww1npzcbfsy1xi1zvi5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arboard" ,rust-arboard-1) - ("rust-async-recursion" ,rust-async-recursion-0.3) + ("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) @@ -1066,11 +1068,13 @@ underline).") ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-csv" ,rust-csv-1) ("rust-ctrlc" ,rust-ctrlc-3) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dtparse" ,rust-dtparse-1) ("rust-dunce" ,rust-dunce-1) @@ -1092,20 +1096,21 @@ underline).") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) ("rust-meval" ,rust-meval-0.2) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-command" ,rust-nu-command-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-json" ,rust-nu-json-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-command" ,rust-nu-command-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-json" ,rust-nu-json-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1113,28 +1118,31 @@ underline).") ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) - ("rust-query-interface" ,rust-query-interface-0.3) - ("rust-quick-xml" ,rust-quick-xml-0.21) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-quick-xml" ,rust-quick-xml-0.21) ("rust-rand" ,rust-rand-0.8) ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-6) + ("rust-rustyline" ,rust-rustyline-8) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-urlencoded" + ,rust-serde-urlencoded-0.7) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-sha2" ,rust-sha2-0.9) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shellexpand" ,rust-shellexpand-2) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) + ("rust-strip-ansi-escapes" + ,rust-strip-ansi-escapes-0.1) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) @@ -1145,7 +1153,8 @@ underline).") ("rust-toml" ,rust-toml-0.5) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-segmentation" + ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) @@ -1156,23 +1165,24 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-command-0.28 +(define-public rust-nu-command-0.29 (package (name "rust-nu-command") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n6967w99m4zi52lfb57ycckammcc4im92yl5v2a2r6avnxrby1d")))) + (base32 "0nydc7vyrhfw99bimjs6061zgcqqi8hjjx20sq3qn2njgk1p730l")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arboard" ,rust-arboard-1) - ("rust-async-recursion" ,rust-async-recursion-0.3) + ("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-base64" ,rust-base64-0.13) ("rust-bigdecimal" ,rust-bigdecimal-0.2) @@ -1182,12 +1192,14 @@ underline).") ("rust-chrono" ,rust-chrono-0.4) ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-clap" ,rust-clap-2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-crossterm" ,rust-crossterm-0.19) ("rust-csv" ,rust-csv-1) ("rust-ctrlc" ,rust-ctrlc-3) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dtparse" ,rust-dtparse-1) ("rust-dunce" ,rust-dunce-1) @@ -1208,21 +1220,23 @@ underline).") ("rust-itertools" ,rust-itertools-0.10) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) + ("rust-md5" ,rust-md5-0.7) ("rust-meval" ,rust-meval-0.2) ("rust-minus" ,rust-minus-3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-engine" ,rust-nu-engine-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-json" ,rust-nu-json-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-engine" ,rust-nu-engine-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-json" ,rust-nu-json-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) @@ -1230,7 +1244,8 @@ underline).") ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-ptree" ,rust-ptree-0.3) - ("rust-query-interface" ,rust-query-interface-0.3) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-quick-xml" ,rust-quick-xml-0.21) ("rust-rand" ,rust-rand-0.7) ("rust-rayon" ,rust-rayon-1) @@ -1238,17 +1253,19 @@ underline).") ("rust-roxmltree" ,rust-roxmltree-0.14) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-7) + ("rust-rustyline" ,rust-rustyline-8) ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-ini" ,rust-serde-ini-0.2) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-urlencoded" + ,rust-serde-urlencoded-0.7) ("rust-serde-yaml" ,rust-serde-yaml-0.8) ("rust-sha2" ,rust-sha2-0.9) ("rust-shadow-rs" ,rust-shadow-rs-0.5) ("rust-shellexpand" ,rust-shellexpand-2) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) + ("rust-strip-ansi-escapes" + ,rust-strip-ansi-escapes-0.1) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4) ("rust-tempfile" ,rust-tempfile-3) @@ -1259,7 +1276,8 @@ underline).") ("rust-toml" ,rust-toml-0.5) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-segmentation" + ,rust-unicode-segmentation-1) ("rust-url" ,rust-url-2) ("rust-users" ,rust-users-0.11) ("rust-uuid" ,rust-uuid-0.8) @@ -1270,17 +1288,17 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-data-0.28 +(define-public rust-nu-data-0.29 (package (name "rust-nu-data") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gq0izbpaw4lp92ia3d3i14x649r1s6jscabm6xdi2qcxfb420kz")))) + (base32 "1niljv9vm42py1hmf8na03xbxb4vvypmrxk765ih9m2jg2zq9386")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1289,22 +1307,25 @@ underline).") ("rust-byte-unit" ,rust-byte-unit-4) ("rust-chrono" ,rust-chrono-0.4) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) + ("rust-directories-next" + ,rust-directories-next-2) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-table" ,rust-nu-table-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-table" ,rust-nu-table-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-format" ,rust-num-format-0.4) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-query-interface" ,rust-query-interface-0.3) + ("rust-query-interface" + ,rust-query-interface-0.3) ("rust-serde" ,rust-serde-1) ("rust-toml" ,rust-toml-0.5) ("rust-users" ,rust-users-0.11)))) @@ -1313,24 +1334,27 @@ underline).") (description "CLI for nushell") (license license:expat))) -(define-public rust-nu-engine-0.28 +(define-public rust-nu-engine-0.29 (package (name "rust-nu-engine") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "135bwcqvb8vhg417yzz90bj396f9hwpbqrdi9kw8fvmfz573z32s")))) + (base32 "1wz033zamlakpca5k2bgal2ykd5ia76g5fw3r5xzb6jb63q7xqhf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-async-recursion" ,rust-async-recursion-0.3) + (("rust-async-recursion" + ,rust-async-recursion-0.3) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-bytes" ,rust-bytes-0.5) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-dirs-next" ,rust-dirs-next-2) ("rust-dunce" ,rust-dunce-1) @@ -1345,15 +1369,15 @@ underline).") ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-parser" ,rust-nu-parser-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-stream" ,rust-nu-stream-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-parser" ,rust-nu-parser-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-stream" ,rust-nu-stream-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-parking-lot" ,rust-parking-lot-0.11) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) @@ -1363,34 +1387,36 @@ underline).") ("rust-termcolor" ,rust-termcolor-1) ("rust-trash" ,rust-trash-1) ("rust-umask" ,rust-umask-1) - ("rust-users" ,rust-users-0.11)))) + ("rust-users" ,rust-users-0.11) + ("rust-which" ,rust-which-4)))) (home-page "https://www.nushell.sh") (synopsis "Core commands for nushell") (description "Core commands for nushell") (license license:expat))) -(define-public rust-nu-errors-0.28 +(define-public rust-nu-errors-0.29 (package (name "rust-nu-errors") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-errors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1zb5mmhzjh5cd27ry4z0vgw99ic9k3badxy3ywjk72nzpr5ra303")))) + (base32 "1xxdirdd57x20irn1z1p2987cyyi8l6k6shlblikjjf97d8kjk0n")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1402,23 +1428,24 @@ underline).") (description "Core error subsystem for Nushell") (license license:expat))) -(define-public rust-nu-json-0.28 +(define-public rust-nu-json-0.29 (package (name "rust-nu-json") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02w1lp7mp1fg7rf5zpdzllvsmd0jlgmig50xxag6a901ic85ddr7")))) + (base32 "1c1xj96gmyznqys3mxgnir4jf88npg4jkcwh9xa420agb03n9gzh")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-linked-hash-map" + ,rust-linked-hash-map-0.5) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-regex" ,rust-regex-1) ("rust-serde" ,rust-serde-1)))) @@ -1427,33 +1454,36 @@ underline).") (description "This package is a fork of @code{serde-hjson}.") (license license:expat))) -(define-public rust-nu-parser-0.28 +(define-public rust-nu-parser-0.29 (package (name "rust-nu-parser") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sixgfj7nsg66gmsqchydkqbhf3dzg5igvcri7dz6qdadi578wb5")))) + (base32 "1cmqx4gw7xg6ag58y7pq94prwkagc40wcrxbk2vzqj206h97xvmi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) + ("rust-codespan-reporting" + ,rust-codespan-reporting-0.11) ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-derive-is-enum-variant" ,rust-derive-is-enum-variant-0.1) + ("rust-derive-is-enum-variant" + ,rust-derive-is-enum-variant-0.1) ("rust-dunce" ,rust-dunce-1) ("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-test-support" ,rust-nu-test-support-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-test-support" + ,rust-nu-test-support-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde" ,rust-serde-1) @@ -1464,10 +1494,10 @@ underline).") (description "Nushell parser") (license license:expat))) -(define-public rust-nu-plugin-0.28 +(define-public rust-nu-plugin-0.29 (package (name "rust-nu-plugin") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -1475,19 +1505,19 @@ underline).") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bkxkffcywaam8r55v8ciq42mgimgxzl4x8vb5qzx49a5gjb1831")))) + (base32 "03qqvh4jhpzwb1mh4f8pz2m88sa825giz5g7lr2l96nb0qfya19j")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-nu-test-support" - ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1)))) @@ -1496,17 +1526,17 @@ underline).") (description "Nushell Plugin") (license license:expat))) -(define-public rust-nu-plugin-binaryview-0.28 +(define-public rust-nu-plugin-binaryview-0.29 (package (name "rust-nu-plugin-binaryview") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_binaryview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "055pc3idf1jsrks0hpx55vazaivxdjfncvbqjjsp89dk1011a3yp")))) + (base32 "0x7g9lncglbpdjxk1r47k49ha9yir03znis6zs7i25qwsb2sgynz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1514,11 +1544,11 @@ underline).") (("rust-crossterm" ,rust-crossterm-0.19) ("rust-image" ,rust-image-0.22) ("rust-neso" ,rust-neso-0.5) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-pretty-hex" ,rust-pretty-hex-0.2) ("rust-rawkey" ,rust-rawkey-0.1)))) (home-page "https://www.nushell.sh") @@ -1527,29 +1557,29 @@ underline).") "This package provides a binary viewer plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.28 +(define-public rust-nu-plugin-chart-0.29 (package (name "rust-nu-plugin-chart") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_chart" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "114kg6vspympi2fr14sgvwnlinwa7s2vwv8f9a9p1kwqg4qa281s")))) + (base32 "1b4zqnm788728jzqxcipik4x3lgj8yf0cjpxznbb10bgyfdp0jxk")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-cli" ,rust-nu-cli-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-cli" ,rust-nu-cli-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-tui" ,rust-tui-0.14)))) (home-page "https://www.nushell.sh") (synopsis "Plugin to display charts") @@ -1557,17 +1587,17 @@ underline).") "This package provides a plugin to display charts in Nushell.") (license license:expat))) -(define-public rust-nu-plugin-fetch-0.28 +(define-public rust-nu-plugin-fetch-0.29 (package (name "rust-nu-plugin-fetch") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_fetch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v7pc58m8gi5zscvyviy8j5zbn30hxqlb37c0grgda7635vqhq31")))) + (base32 "086z2a2fmi4v95kg6bgzp1ylilbbflxnf242vnkmw6ys5gs8g4dy")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -1575,10 +1605,10 @@ underline).") (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) ("rust-mime" ,rust-mime-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-surf" ,rust-surf-2) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1586,28 +1616,28 @@ underline).") (description "This package provides a URL fetch plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.28 +(define-public rust-nu-plugin-from-bson-0.29 (package (name "rust-nu-plugin-from-bson") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13k11dh2pc48181qcbqwwgwwqh5d2g99p0rq4ly75l5jwyyazi73")))) + (base32 "02932wzrqrg4777cm1lpncig9cxn7s80fmlrkavrkw9dh2lnbbms")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1616,27 +1646,27 @@ underline).") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.28 +(define-public rust-nu-plugin-from-sqlite-0.29 (package (name "rust-nu-plugin-from-sqlite") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_from_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mpaz3vn7zf1ijccfd9rgrzl0fr3fci6j16w7a81x6dh7pqavxgn")))) + (base32 "1mnavx7pa5isic2rnrxd8462axh826rimscjpjxq4nk77wkzp5s8")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1647,28 +1677,28 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.28 +(define-public rust-nu-plugin-inc-0.29 (package (name "rust-nu-plugin-inc") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_inc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dbayv8gcjpz46xgvh9b1pka2ygyhyalk1xzh43cvaccqn4qafrb")))) + (base32 "0w0dmqa6rv12whpmsvli5nb7pnazrhdp08x2fzrabz60rq1qsfx9")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + (("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-nu-test-support" - ,rust-nu-test-support-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ,rust-nu-test-support-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-semver" ,rust-semver-0.11)))) (home-page "https://www.nushell.sh") (synopsis "Version incrementer plugin for Nushell") @@ -1677,25 +1707,25 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-match-0.28 +(define-public rust-nu-plugin-match-0.29 (package (name "rust-nu-plugin-match") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_match" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1d19hwrrmbwxx3nn7gjs2wvzf6wfhdai9jsq35n7bgjx2qyip0ma")))) + (base32 "0hmxhd3z7p88xg5g75kljl0g6rp5k22ff0k9f2a6j9j7y3rrdlmb")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + (("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-regex" ,rust-regex-1)))) (home-page "https://www.nushell.sh") (synopsis "Regex match plugin for Nushell") @@ -1703,27 +1733,27 @@ Nushell.") "This package provides a regex match plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-post-0.28 +(define-public rust-nu-plugin-post-0.29 (package (name "rust-nu-plugin-post") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_post" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jha85gl422p9knr0m4xdx353nmm00zrj5yh9w2gdyzs6hbzf80q")))) + (base32 "1d2198ks2cw6phg1hdsz75rqh5l49whcsl5hl21g86y2j5sl0hpd")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-base64" ,rust-base64-0.13) ("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-serde-json" ,rust-serde-json-1) ("rust-surf" ,rust-surf-1) @@ -1733,27 +1763,27 @@ Nushell.") (description "This package is an HTTP POST plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-ps-0.28 +(define-public rust-nu-plugin-ps-0.29 (package (name "rust-nu-plugin-ps") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_ps" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0akgz7wi85ny2cfkcs9bn4hc97d4wdh9ayrzd6zasmird5kl1lv8")))) + (base32 "00dy60fnii1iifv0rh1xm77jn37l068np46fp3izbsbq642vzf7m")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-timer" ,rust-futures-timer-3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1762,80 +1792,80 @@ Nushell.") "This package provides a process list plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-s3-0.28 +(define-public rust-nu-plugin-s3-0.29 (package (name "rust-nu-plugin-s3") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_s3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02b71ljsi7z2nbpm9djaxvdg7ql6xn0mqibpnzql0d39wfb0bxc2")))) + (base32 "00856l98gmmnv5bfg1vd6mqyk0zpkdrd1xgxqfi2c9nmsy2b1qfa")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-s3handler" ,rust-s3handler-0.6)))) (home-page "https://www.nushell.sh") (synopsis "S3 plugin for Nushell") (description "This package is an S3 plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.28 +(define-public rust-nu-plugin-selector-0.29 (package (name "rust-nu-plugin-selector") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_selector" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g1sjlvylclhhp41h6xx6vaa10478albjgh3n7kg3p0s6i8db5a7")))) + (base32 "14hn8plcax4kljq5kw96881pngs7w2gy11k3hs1pmaxhr0bi6c8h")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-nipper" ,rust-nipper-0.1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28)))) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29)))) (home-page "https://www.nushell.sh") (synopsis "Web scraping using CSS selector") (description "This package provides web scraping using CSS selector.") (license license:expat))) -(define-public rust-nu-plugin-start-0.28 +(define-public rust-nu-plugin-start-0.29 (package (name "rust-nu-plugin-start") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_start" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gqn6b1jpxcfx81c5c4yfs52gzxp9viyqj7hjs7fqvf5czi0bmz7")))) + (base32 "002cjbdh4zn81zhc5a0gklfxdjslqbcbp1wcx5ijzpch40c5dyzj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-open" ,rust-open-1) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1845,10 +1875,10 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-sys-0.28 +(define-public rust-nu-plugin-sys-0.29 (package (name "rust-nu-plugin-sys") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -1856,17 +1886,17 @@ Nushell.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16igj4z9f7kfy3x71ki3vaqdx6064l3k718vqfpabffjkz9qpfp5")))) + (base32 "0s2jyaff4lngm1c5446618r5761d8dcbpsrs7p7vzp6g2dic1w69")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-sysinfo" ,rust-sysinfo-0.16)))) (home-page "https://www.nushell.sh") @@ -1874,28 +1904,28 @@ Nushell.") (description "This package provides a system info plugin for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-textview-0.28 +(define-public rust-nu-plugin-textview-0.29 (package (name "rust-nu-plugin-textview") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_textview" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07m3x9bkq1qliicnshgs6yi6q5fbl6d6gxcd60kqcavkvdknnf8m")))) + (base32 "19kwh6rn0xk340yk0w1r3dfm328s9jqln8hgfqw5m3lld1hh1a4v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bat" ,rust-bat-0.17) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) - ("rust-nu-data" ,rust-nu-data-0.28) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) + ("rust-nu-data" ,rust-nu-data-0.29) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-term-size" ,rust-term-size-0.3) ("rust-url" ,rust-url-2)))) (home-page "https://www.nushell.sh") @@ -1904,27 +1934,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.28 +(define-public rust-nu-plugin-to-bson-0.29 (package (name "rust-nu-plugin-to-bson") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_bson" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rq2kwzrby8rh57gq4s4ljj4fgfgblrhjncjycpmkw2jzn7sa6xi")))) + (base32 "1j019frp663s511b7z9sz5vh77pvz0nn3w2asrk50xlyj5hfig55")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bson" ,rust-bson-0.14) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "Converter plugin to the bson format for Nushell") @@ -1933,27 +1963,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.28 +(define-public rust-nu-plugin-to-sqlite-0.29 (package (name "rust-nu-plugin-to-sqlite") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_to_sqlite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0q07fv4i4rkzjna54mkcri5bfngqkkmpfj3vmiyzib0x84pvzfjf")))) + (base32 "0p86iyag0ci15i1nqyb74kp1lax9mgm73w5g3qkp2v97lihv12pf")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rusqlite" ,rust-rusqlite-0.24) ("rust-tempfile" ,rust-tempfile-3)))) @@ -1964,26 +1994,26 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-tree-0.28 +(define-public rust-nu-plugin-tree-0.29 (package (name "rust-nu-plugin-tree") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_tree" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xifcyg0z025n6w0cqjnmrjcbynv437dkxpsxgbvm4iybj558590")))) + (base32 "096l86ci540v0aj9xrvwd4ccgg388kabz4rbg88nrpw0rlacrbc3")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-ptree" ,rust-ptree-0.3)))) (home-page "https://www.nushell.sh") (synopsis "Tree viewer plugin for Nushell") @@ -1991,27 +2021,27 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.28 +(define-public rust-nu-plugin-xpath-0.29 (package (name "rust-nu-plugin-xpath") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu_plugin_xpath" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0mwajr07489kgv2yhxsk0laydf8m8p736npvkcbsjxaxydnv5a5a")))) + (base32 "0459awkffb2sydd2l5gbcx1kz466qkigb1bxn5ka208y9k5qz54v")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.2) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-plugin" ,rust-nu-plugin-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-plugin" ,rust-nu-plugin-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-sxd-document" ,rust-sxd-document-0.3) ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) (home-page "https://www.nushell.sh") @@ -2019,17 +2049,17 @@ Nushell.") (description "Traverses XML") (license license:expat))) -(define-public rust-nu-protocol-0.28 +(define-public rust-nu-protocol-0.29 (package (name "rust-nu-protocol") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0khpg2dnapyyimyq4ys1nfs1xzysxq2nb1ka2lmjfgdxrbwzrqnj")))) + (base32 "1iii3r37dcl7sf870qrzfkdc1iylbbkcycp1k5ifjvd5yxlkfpxx")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2041,8 +2071,8 @@ Nushell.") ("rust-getset" ,rust-getset-0.1) ("rust-indexmap" ,rust-indexmap-1) ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-num-integer" ,rust-num-integer-0.1) ("rust-num-traits" ,rust-num-traits-0.2) @@ -2056,17 +2086,17 @@ Nushell.") (description "Core values and protocols for Nushell") (license license:expat))) -(define-public rust-nu-source-0.28 +(define-public rust-nu-source-0.29 (package (name "rust-nu-source") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-source" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13a590iff8bg6p38xs1hh5krmii6qz2w5k7ak57dyh3r3vbhvmmd")))) + (base32 "1m8phdw9iwawsq0ip4zn2w8ggjjr45z1ny2sgdb3h1y1awpnvdbq")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2083,46 +2113,46 @@ Nushell.") Nushell.") (license license:expat))) -(define-public rust-nu-stream-0.28 +(define-public rust-nu-stream-0.29 (package (name "rust-nu-stream") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-stream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02dl4d9gzl2jhg71hfc04x9j4p29iwwcyvm6m9pihwfpwb3q2bhj")))) + (base32 "15zx16s4wb23316ih4wqnnpajh1qz5vckpzk3k41qqkmar1w4sah")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28)))) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29)))) (home-page "https://www.nushell.sh") (synopsis "Nushell stream") (description "This package provides Nushell stream.") (license license:expat))) -(define-public rust-nu-table-0.28 +(define-public rust-nu-table-0.29 (package (name "rust-nu-table") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15yd0wrl0y0rmjdvq2gmk97nxppdy5r424vy8v85gk876g82gi1s")))) + (base32 "1ihrr2406v5yjdfm699q6alx5bh49q8d04x1dzvn6qydgmf6r8z6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.28) + (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.29) ("rust-regex" ,rust-regex-1) ("rust-unicode-width" ,rust-unicode-width-0.1)))) (home-page "https://www.nushell.sh") @@ -2130,17 +2160,17 @@ Nushell.") (description "Nushell table printing") (license license:expat))) -(define-public rust-nu-test-support-0.28 +(define-public rust-nu-test-support-0.29 (package (name "rust-nu-test-support") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qphsvr1wpn26ak5g4bj106csm8bia12srpv1dwy4zif42if57gm")))) + (base32 "0dlmhrskpdp82a6064srx1c4bqvfz66madx2i6cgxg56d7x38km6")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2150,11 +2180,12 @@ Nushell.") ("rust-dunce" ,rust-dunce-1) ("rust-getset" ,rust-getset-0.1) ("rust-glob" ,rust-glob-0.3) + ("rust-hamcrest2" ,rust-hamcrest2-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) + ("rust-nu-value-ext" ,rust-nu-value-ext-0.29) ("rust-num-bigint" ,rust-num-bigint-0.3) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://www.nushell.sh") @@ -2163,10 +2194,10 @@ Nushell.") tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.28 +(define-public rust-nu-value-ext-0.29 (package (name "rust-nu-value-ext") - (version "0.28.0") + (version "0.29.0") (source (origin (method url-fetch) @@ -2174,16 +2205,16 @@ tests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kwx2s4gyss8gmj72kl0y2yzq5injwv9g9n53bal339b81dd7v90")))) + (base32 "1riq3xg6cqwrfb55bwva13m5dn4d7d71g2825dn7z2i96f6vylwi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1) ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.28) - ("rust-nu-protocol" ,rust-nu-protocol-0.28) - ("rust-nu-source" ,rust-nu-source-0.28) + ("rust-nu-errors" ,rust-nu-errors-0.29) + ("rust-nu-protocol" ,rust-nu-protocol-0.29) + ("rust-nu-source" ,rust-nu-source-0.29) ("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://www.nushell.sh") (synopsis "@code{Extension} traits for values in Nushell") -- cgit 1.4.1 From 83ecb38148b0edd7f678b078373255f746a4090b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 2 Apr 2021 21:46:37 +0100 Subject: gnu: Add cl-opengl. * gnu/packages/lisp-xyz.scm: (sbcl-cl-opengl, cl-opengl, ecl-cl-opengl): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 53 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e1a5a9a7a6..9eb937314e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages file) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages imagemagick) @@ -15564,3 +15565,55 @@ immediately loaded.") (define-public cl-conspack (sbcl-package->cl-source-package sbcl-cl-conspack)) + +(define-public sbcl-cl-opengl + (let ((commit "e2d83e0977b7e7ac3f3d348d8ccc7ccd04e74d59") + (revision "1")) + (package + (name "sbcl-cl-opengl") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/3b/cl-opengl") + (commit commit))) + (file-name (git-file-name "cl-opengl" version)) + (sha256 + (base32 "0mhqmll09f079pnd6mgswz9nvr6h5n27d4q7zpmm2igf1v460id7")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:asd-systems '("cl-opengl" "cl-glu" "cl-glut") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-lib-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "gl/library.lisp" + (("libGL.so" all) + (string-append (assoc-ref inputs "mesa") "/lib/" all))) + (substitute* "glu/library.lisp" + (("libGLU.so" all) + (string-append (assoc-ref inputs "glu") "/lib/" all))) + (substitute* "glut/library.lisp" + (("libglut.so" all) + (string-append (assoc-ref inputs "freeglut") "/lib/" all))) + #t))))) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("cffi" ,sbcl-cffi) + ("float-features" ,sbcl-float-features) + ("freeglut" ,freeglut) + ("glu" ,glu) + ("mesa" ,mesa))) + (home-page "https://github.com/3b/cl-opengl") + (synopsis "Common Lisp bindings to OpenGL, GLU and GLUT APIs") + (description + "This package provides a set of bindings and utilities for accessing the +OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.") + (license license:bsd-3)))) + +(define-public ecl-cl-opengl + (sbcl-package->ecl-package sbcl-cl-opengl)) + +(define-public cl-opengl + (sbcl-package->cl-source-package sbcl-cl-opengl)) -- cgit 1.4.1 From 35351dfd97056974922e59c273fda583a2250ddb Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 3 Apr 2021 11:12:27 +0200 Subject: gnu: saga: Update to 7.9.0. * gnu/packages/geo.scm (saga): Update to 7.9.0. [inputs]: Replace proj.4 with proj. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index be05fbe711..37783b7ccd 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2013,7 +2013,7 @@ visualization.") (define-public saga (package (name "saga") - (version "7.6.2") + (version "7.9.0") (source (origin (method url-fetch) @@ -2021,7 +2021,7 @@ visualization.") (version-major version) "/SAGA%20-%20" version "/saga-" version ".tar.gz")) (sha256 - (base32 "09j5magmayq2y620kqa490mfd1kpdp3lng2ifcgbrmssc079ybm0")))) + (base32 "1n051yxxkylly0k9rlkx2ih3j2lf9d4csg00sm7161r7nhjvggd1")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -2036,7 +2036,7 @@ visualization.") ("libtiff" ,libtiff) ("opencv" ,opencv) ("postgresql" ,postgresql) - ("proj.4" ,proj.4) + ("proj" ,proj) ("python" ,python) ("qhull" ,qhull) ("unixodbc" ,unixodbc) -- cgit 1.4.1 From f4b78c22a1975ef8637c560c6def190abbcc4254 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Sat, 3 Apr 2021 11:56:20 +0200 Subject: gnu: tippecanoe: Update to 1.36.0. * gnu/packages/geo.scm (tippecanoe): Update to 1.36.0. [arguments]: Use cc-for-target instead of hard-coding gcc. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 37783b7ccd..bc5e6820f3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1102,7 +1102,7 @@ map, geocoding with Nominatim, or general analysis.") (define-public tippecanoe (package (name "tippecanoe") - (version "1.31.5") + (version "1.36.0") (source (origin (method git-fetch) @@ -1111,14 +1111,14 @@ map, geocoding with Nominatim, or general analysis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m0x931a945sr7axyhcvpwh798m58hx1zxh6ikgf9gsgqhdhmszz")))) + (base32 "0lbmhly4ivnqc6qk1k3sdqvsg6x3nfd8gnjx846bhqj4wag3f88m")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure)) #:test-target "test" #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs `(("perl" ,perl) -- cgit 1.4.1 From a6c6079babdc894f82626f2f64bd3515082eabe5 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 3 Apr 2021 17:52:31 +0200 Subject: gnu: rust-rand-core: Update to 0.6.2. Version 0.6.1 was yanked. * gnu/packages/crates-io.scm(rust-rand-core): Update to 0.6.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 32440e2fe5..a20073ae9d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31368,14 +31368,14 @@ useful types and distributions, and some randomness-related algorithms.") (define-public rust-rand-core-0.6 (package (name "rust-rand-core") - (version "0.6.1") + (version "0.6.2") (source (origin (method url-fetch) (uri (crate-uri "rand_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rfjrcyaj7blz2nawv2pypm5kqc59p80n6f5pg691399iggxf9n0")))) + (base32 "1rvas1afjvd2827b8mf2ilg78h3ksl9npkrdds3wbw9x33mndkrl")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 29d2c9064c8670d652de1af63dd6d10111f810a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 01:10:59 +0200 Subject: gnu: diffoscope: Update to 172. * gnu/packages/diffoscope.scm (diffoscope): Update to 172. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 0b2779d288..d5f782e68d 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -72,7 +72,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "171") + (version "172") (source (origin (method git-fetch) (uri (git-reference @@ -81,7 +81,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1niz481s8i86ql56kfmnyzh0nwinhpzhprfkljwdprqi6hc63v0c")))) + "1lglxn9h8s7kvmfd2rsyhrcv3y8a4bppbxr9nf2sgnlbdln1vwqq")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit 1.4.1 From e7c0011d2a1b3d95d99c3dce09bcddb72cac498e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 01:11:08 +0200 Subject: gnu: vim: Update to 8.2.2689. * gnu/packages/vim.scm (vim): Update to 8.2.2689. --- 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 92ce1213c4..231fae9298 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -71,7 +71,7 @@ (define-public vim (package (name "vim") - (version "8.2.2677") + (version "8.2.2689") (source (origin (method git-fetch) (uri (git-reference @@ -80,7 +80,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "13y58h0nnd5jpqk8nhpcdhg6m2drfnrfbiv4cjh9qmkjw47i0qir")))) + "0l0hkr8cw7fdsfc5zzcxx3q1wmv9k3hrgalvffq0l69lviqdgh0p")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 4f3813f324cfb14bf77416836bb17dd557d721df Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:00 +0200 Subject: gnu: perl-crypt-rijndael: Update to 1.16. * gnu/packages/perl.scm (perl-crypt-rijndael): Update to 1.16. --- 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 bf6dabf611..f0df5e6d04 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -2213,7 +2213,7 @@ Password Generator\".") (define-public perl-crypt-rijndael (package (name "perl-crypt-rijndael") - (version "1.15") + (version "1.16") (source (origin (method url-fetch) @@ -2221,7 +2221,7 @@ Password Generator\".") "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-" version ".tar.gz")) (sha256 - (base32 "0qs1b6ma4sj0ip5d8544fzgc1bbankc4qlmznp8hay8dk5arp650")))) + (base32 "0h2dr1bd15y0sipxsdh1k4hx5bccywn15haj0xpjmf0471g0hh35")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Crypt-Rijndael") (synopsis "Crypt::CBC compliant Rijndael encryption module") -- cgit 1.4.1 From aa4373c177d2e5e0bde3276eb283a07bf8f0a4e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:08 +0200 Subject: gnu: perl-digest-hmac: Update to 1.04. * gnu/packages/perl.scm (perl-digest-hmac): Update to 1.04. --- gnu/packages/perl.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f0df5e6d04..a061c715f9 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3771,15 +3771,14 @@ for CRC-CCITT, CRC-16 and CRC-32.") (define-public perl-digest-hmac (package (name "perl-digest-hmac") - (version "1.03") + (version "1.04") (source (origin (method url-fetch) - (uri (string-append "mirror://cpan/authors/id/G/GA/GAAS/" + (uri (string-append "mirror://cpan/authors/id/A/AR/ARODLAND/" "Digest-HMAC-" version ".tar.gz")) (sha256 - (base32 - "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv")))) + (base32 "1m4fn0w3hb4vn7k5kja508a5hjmcrm28zhdpjkbl8p17m9b83g6n")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Digest-HMAC") (synopsis "Keyed-Hashing for Message Authentication") -- cgit 1.4.1 From 2a28f0d634e1e894393c73d8023207b384f26781 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:21 +0200 Subject: gnu: perl-scalar-list-utils: Update to 1.56. * gnu/packages/perl.scm (perl-scalar-list-utils): Update to 1.56. --- 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 a061c715f9..fba8d28011 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -11152,14 +11152,14 @@ files, using JSON::PP and/or CPAN::Meta::YAML.") (define-public perl-scalar-list-utils (package (name "perl-scalar-list-utils") - (version "1.53") + (version "1.56") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/P/PE/PEVANS/" "Scalar-List-Utils-" version ".tar.gz")) (sha256 - (base32 "16dfpnrcf5846j998rdd6gra16m9030rnz9fpsh1hfzvcsq8ch5x")))) + (base32 "0nxb29x7i2w6kjxq188n131b56bsqj1ykrxjcjp6sgpv81ym7f0m")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/Scalar-List-Utils") (synopsis "Common Scalar and List utility subroutines") -- cgit 1.4.1 From b805d4c4199f3605c0f4a8730861e63bab9ba686 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:07:29 +0200 Subject: gnu: mousepad: Update to 0.5.4. * gnu/packages/xfce.scm (mousepad): Update to 0.5.4. --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e0ace027fb..38240d7b9f 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1206,7 +1206,7 @@ of data to either CD/DVD/BD.") (define-public mousepad (package (name "mousepad") - (version "0.5.3") + (version "0.5.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/mousepad/" @@ -1214,7 +1214,7 @@ of data to either CD/DVD/BD.") version ".tar.bz2")) (sha256 (base32 - "1a6a3x4h6aisjm59i0afx1w50035s76zjr4a6p9ja5bax6wqn877")))) + "189aljqgkrspqk9498izgvssw08pgkyvf7hc7ddmzfhcblp4j3yr")))) (build-system gnu-build-system) (arguments '(#:configure-flags '(;; Use the GSettings keyfile backend rather than -- cgit 1.4.1 From 77038ad4f105c9ecee74fdd5c597f727a1956afd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 20:40:28 +0200 Subject: gnu: terminator: Update to 2.1.1. * gnu/packages/gnome.scm (terminator): Update to 2.1.1. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed6d433cf9..34f5078581 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10895,7 +10895,7 @@ advanced image management tool") (define-public terminator (package (name "terminator") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) @@ -10903,8 +10903,7 @@ advanced image management tool") "releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 - (base32 - "1vap4li2i24l1iz2q4b8wvhj8flamarf18xcmzq5ik2vzcrisbjy")))) + (base32 "0xdgmam7ghnxw6g38a4gjw3kk3rhga8c66lns18k928jlr9fmddw")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit 1.4.1 From b495254efbe79d8240bec844c83baede897b5707 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 22:06:17 +0200 Subject: gnu: knot-resolver: Update to 5.3.1. * gnu/packages/dns.scm (knot-resolver): Update to 5.3.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 6d146e6264..afdf2867a7 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -943,14 +943,14 @@ synthesis, and on-the-fly re-configuration.") (define-public knot-resolver (package (name "knot-resolver") - (version "5.3.0") + (version "5.3.1") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-resolver/" "knot-resolver-" version ".tar.xz")) (sha256 (base32 - "0gp3ivv3zccz4b6s1wxbsvvlrc837lw2g089l3cbvzsg7z0b4v7v")))) + "1j99sz6r1hdvvd8rffx1917r9cyb7z46ivp5934sq57irmxnnkcx")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit 1.4.1 From 58beda01217c48da52e67ac5461f33b6532b5ede Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 3 Apr 2021 20:37:11 +0200 Subject: services: guix-publish: Add zstd compression by default. That way, the default config with (advertises? #t) and without a cache will offer zstd-compressed substitutes, which should lead to much higher throughput than gzip. * gnu/services/base.scm (default-compression): When 'guix-publish-configuration-cache' returns true, use higher level compression ratios. Add "zstd". * doc/guix.texi (Base Services): Mention zstd. --- doc/guix.texi | 2 +- gnu/services/base.scm | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index da18b45cf9..bada446357 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15646,7 +15646,7 @@ This allows neighboring Guix devices with discovery on (see @code{guix-configuration} above) to discover this @command{guix publish} instance and to automatically download substitutes from it. -@item @code{compression} (default: @code{'(("gzip" 3))}) +@item @code{compression} (default: @code{'(("gzip" 3) ("zstd" 3))}) This is a list of compression method/level tuple used when compressing substitutes. For example, to compress all substitutes with @emph{both} lzip at level 7 and gzip at level 9, write: diff --git a/gnu/services/base.scm b/gnu/services/base.scm index a8214ae96f..24b3ea785b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -1816,7 +1816,11 @@ proxy of 'guix-daemon'...~%") raise a deprecation warning if the 'compression-level' field was used." (match (%guix-publish-configuration-compression-level config) (#f - '(("gzip" 3))) + ;; Default to low compression levels when there's no cache so that users + ;; get good bandwidth by default. + (if (guix-publish-configuration-cache config) + '(("gzip" 5) ("zstd" 19)) + '(("gzip" 3) ("zstd" 3)))) ;zstd compresses faster (level (warn-about-deprecation 'compression-level properties #:replacement 'compression) -- cgit 1.4.1 From 2161820ebbbab62a5ce76c9101ebaec54dc61586 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Tue, 30 Mar 2021 22:36:14 +0200 Subject: activation: Do not dereference symlinks during home directory creation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/build/activation.scm (copy-account-skeletons): Do not chown the home directory; leave this to 'activate-user-home'. (activate-user-home): Only chown the home directory after the account skeletons have been copied. Co-authored-by: Ludovic Courtès . --- gnu/build/activation.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index 6cb6f8819b..2af1d44b5f 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -107,7 +107,8 @@ Warning: this is currently suspect to a TOCTTOU race!" (directory %skeleton-directory) uid gid) "Copy the account skeletons from DIRECTORY to HOME. When UID is an integer, -make it the owner of all the files created; likewise for GID." +make it the owner of all the files created except the home directory; likewise +for GID." (define (set-owner file) (when (or uid gid) (chown file (or uid -1) (or gid -1)))) @@ -115,7 +116,6 @@ make it the owner of all the files created; likewise for GID." (let ((files (scandir directory (negate dot-or-dot-dot?) string Date: Fri, 2 Apr 2021 23:50:31 +0200 Subject: gnu: zabbix-agentd: Update to 5.2.6 [fixes CVE-2021-27927]. * gnu/packages/monitoring.scm (zabbix-agentd): Update to 5.2.6. --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 46e1903704..22b02a561b 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -160,7 +160,7 @@ etc. via a Web interface. Features include: (define-public zabbix-agentd (package (name "zabbix-agentd") - (version "5.2.5") + (version "5.2.6") (source (origin (method url-fetch) @@ -168,7 +168,7 @@ etc. via a Web interface. Features include: "https://cdn.zabbix.com/zabbix/sources/stable/" (version-major+minor version) "/zabbix-" version ".tar.gz")) (sha256 - (base32 "1iaby7rablakx91hajnkmjcc4zkvrq7xsvlhss3lw5drm12rf3ff")))) + (base32 "100n1rv7r4pqagxxifzpcza5bhrr2fklzx7gndxwiyq4597p1jvn")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 9dc92bc679cf33e1aa0b9b0ae9de1d009df8e47a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 3 Apr 2021 23:53:47 +0200 Subject: gnu: perl-moose: Update to 2.2015. * gnu/packages/perl.scm (perl-moose): Update to 2.2015. --- 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 fba8d28011..af025593cd 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -6699,14 +6699,14 @@ Moose and is optimised for rapid startup.") (define-public perl-moose (package (name "perl-moose") - (version "2.2012") + (version "2.2015") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/ET/ETHER/" "Moose-" version ".tar.gz")) (sha256 (base32 - "0s9m2pskc8h1k94pbvx0lvf0xgv9xca349isbcsrqdqnkmxf9fs6")))) + "05gma3q3l15igqrqi8ax8v5cmmvy7s939q3xzs45l1rc7sfx6yd6")))) (build-system perl-build-system) (native-inputs `(("perl-cpan-meta-check" ,perl-cpan-meta-check) -- cgit 1.4.1 From 719dd9b45f26a0b987f10665f45cdc8af3b2e7f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 00:24:44 +0200 Subject: gnu: perl-pdf-api2: Update to 2.039. * gnu/packages/perl.scm (perl-pdf-api2): Update to 2.039. --- 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 af025593cd..f1bc21986e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8309,7 +8309,7 @@ with file paths.") (define-public perl-pdf-api2 (package (name "perl-pdf-api2") - (version "2.038") + (version "2.039") (source (origin (method url-fetch) (uri (string-append @@ -8317,7 +8317,7 @@ with file paths.") version ".tar.gz")) (sha256 (base32 - "02dxz798sx0ncdphjrfvfl2a3c1lkplyriyk4psq99q2kdsc8ivl")))) + "08x1anlvmxwym081flkrz7wr9q89y9wbq8ajqk72xsbzhhc479rn")))) (build-system perl-build-system) (native-inputs `(("perl-test-exception" ,perl-test-exception) -- cgit 1.4.1 From b692a1bb45fc32bb88e4d897ce342015251943e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 13:11:40 +0200 Subject: gnu: corkscrew: Update to 2.0-0.268b71e. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ssh.scm (corkscrew)[source]: Fetch from elsewhere. [arguments]: Add #:configure-flags of ‘--enable-ssl’. Add a new 'update-metadata phase. Remove the custom 'configure phase. [native-inputs]: Add autoconf, automake, and pkg-config. [inputs]: Add openssl. [description]: Update accordingly. --- gnu/packages/ssh.scm | 93 ++++++++++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 42 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 68590e2fe5..fae10d0e16 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -403,48 +403,57 @@ libssh library.") (deprecated-package "guile3.0-ssh" guile-ssh)) (define-public corkscrew - (package - (name "corkscrew") - (version "2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/patpadgett/corkscrew") - (commit (string-append "v" version)))) - (sha256 - (base32 "0g4pkczrc1zqpnxyyjwcjmyzdj5qqcpzwf1bm3965zdwp94bpppf")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; Replace configure phase as the ./configure script does not like - ;; CONFIG_SHELL and SHELL passed as parameters. - (lambda* (#:key outputs build target #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bash (which "bash")) - ;; Set --build and --host flags as the provided config.guess - ;; is not able to detect them. - (flags `(,(string-append "--prefix=" out) - ,(string-append "--build=" build) - ,(string-append "--host=" (or target build))))) - (setenv "CONFIG_SHELL" bash) - (apply invoke bash "./configure" flags)))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "README.markdown" doc) - #t)))))) - (home-page "https://github.com/patpadgett/corkscrew") - (synopsis "SSH tunneling through HTTP(S) proxies") - (description - "Corkscrew tunnels SSH connections through most HTTP and HTTPS proxies. -Proxy authentication is only supported through the plain-text HTTP basic -authentication scheme.") - (license license:gpl2+))) + ;; The last 2.0 release hails from 2009. Use a fork (submitted upstream as + ;; ) that adds now-essential + ;; IPv6 and TLS support. + (let ((revision "0") + (commit "268b71e88ee51fddceab96d665b327394f1feb12")) + (package + (name "corkscrew") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rtgill82/corkscrew") + (commit commit))) + (sha256 + (base32 "1rylbimlfig3ii4bqr4r058lkc43pqkxnxqpqdpm31blh3xs0dcw")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--enable-ssl") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'update-metadata + (lambda _ + (substitute* "configure.ac" + ;; Our version differs significantly. + (("2.0") (string-append ,version " (Guix)"))) + (substitute* "corkscrew.c" + ;; This domain's since been squat. + (("\\(agroman@agroman\\.net\\)") + (format #f "<~a>" ,(package-home-page this-package)))))) + (add-after 'install 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" ,version))) + (install-file "README.md" doc) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("openssl" ,openssl))) + (home-page "https://github.com/patpadgett/corkscrew") + (synopsis "SSH tunneling through HTTP(S) proxies") + (description + "Corkscrew tunnels SSH connections through most HTTP and HTTPS proxies. +It supports proxy authentication through the HTTP basic authentication scheme +with optional @acronym{TLS, Transport-Level Security} to protect credentials.") + (license license:gpl2+)))) (define-public mosh (package -- cgit 1.4.1 From aaec5de3a7bcef35421bc801e0f747daa8dbfb5c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 13:24:04 +0200 Subject: gnu: ugrep: Update to 3.1.11. * gnu/packages/search.scm (ugrep): Update to 3.1.11. --- gnu/packages/search.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index d458747872..0d603ad360 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -420,14 +420,14 @@ bibliographic data and simple document and bibtex retrieval.") (define-public ugrep (package (name "ugrep") - (version "3.1.4") + (version "3.1.11") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Genivia/ugrep") (commit (string-append "v" version)))) (sha256 - (base32 "1ydnpdhn1mp2pnbqzvwabrp573626k89kbv97fax6y1bz2pamrg4")) + (base32 "1g3sxnrcaz1jxwa8nwrxpr63g4y0ha5zcf10053ciy9wjh6wqs1w")) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet @@ -446,13 +446,13 @@ bibliographic data and simple document and bibtex retrieval.") ("pcre2" ,pcre2) ("zlib" ,zlib))) (arguments - `(#:tests? #f ;; No script for re-building the binary test input-files + `(#:tests? #f ; no way to rebuild the binary input files #:test-target "test" #:phases (modify-phases %standard-phases (add-before 'check 'check-setup (lambda _ - ;; unpatch shepengs in tests + ;; Unpatch shebangs in tests. (substitute* '("tests/Hello.bat" "tests/Hello.sh") (("#!/gnu/store/.*/bin/sh") "#!/bin/sh"))))))) -- cgit 1.4.1 From c23136bfadf14c608e00614031bfaf41756d7849 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 14:18:11 +0200 Subject: gnu: drumstick: Remove unused ‘-DLIB_SUFFIX=’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (drumstick)[arguments]: Remove #:configure-flags. --- gnu/packages/music.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 41e9372c6f..206241a13b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2650,7 +2650,6 @@ browser.") (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target - #:configure-flags '("-DLIB_SUFFIX=") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-docbook -- cgit 1.4.1 From 494d5f79e7cb6db41267b39398b808f408355899 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 14:58:06 +0200 Subject: gnu: drumstick: Update to 2.1.1. * gnu/packages/music.scm (drumstick): Update to 2.1.1. --- 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 206241a13b..4bad86e1a2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2639,14 +2639,14 @@ browser.") (define-public drumstick (package (name "drumstick") - (version "2.0.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/drumstick/" version "/drumstick-" version ".tar.bz2")) (sha256 (base32 - "088j0w3kr9i4lh78y0js0q8adlfzkr89xq2dxc8y3bafsgihax1x")))) + "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit 1.4.1 From f047efce430aa997cc2e6c918bdb5aeb1de6fe3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:11:46 +0200 Subject: gnu: vmpk: Update to 0.8.2. * gnu/packages/music.scm (vmpk): Update to 0.8.2. --- 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 4bad86e1a2..41e2043c6b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2686,14 +2686,14 @@ backends, including ALSA, OSS, Network and FluidSynth.") (define-public vmpk (package (name "vmpk") - (version "0.8.0") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/vmpk/vmpk/" version "/vmpk-" version ".tar.bz2")) (sha256 (base32 - "0wn45c4sbvan7schq93zmsgg5fcf144mbbawxn5kq699vrbc3473")))) + "1kv256j13adk4ib7r464gsl4vjhih820bq37ddhqfyfd07wh53a2")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target -- cgit 1.4.1 From 51c03ff26552775b8b6f2ce1ba1edf37df0ed8a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:16:35 +0200 Subject: gnu: perl-path-tiny: Update to 0.118. * gnu/packages/perl.scm (perl-path-tiny): Update to 0.118. --- 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 f1bc21986e..4d54912a56 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8284,14 +8284,14 @@ file names.") (define-public perl-path-tiny (package (name "perl-path-tiny") - (version "0.108") + (version "0.118") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/D/DA/DAGOLDEN/" "Path-Tiny-" version ".tar.gz")) (sha256 (base32 - "1x9zf8r3cynf4vqlycyyspsr70v4zw6bk9bkgvfpvsxkw8mlhj9w")))) + "1zdhc3azw6wn21db3yyygs57vlqkx72ipyd8sa21m72c1y6qs4rj")))) (build-system perl-build-system) (arguments `(#:tests? #f)) ; Tests require additional test modules to be packaged -- cgit 1.4.1 From b5d7ea6f37186905931374a7cbbca23af6e8eec8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 4 Apr 2021 15:19:17 +0200 Subject: gnu: drumstick: Use new HTTPS home page. * gnu/packages/music.scm (drumstick)[home-page]: Update & use HTTPS. --- 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 41e2043c6b..89a8a56965 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2672,7 +2672,7 @@ browser.") ("docbook-xsl" ,docbook-xsl) ("doxygen" ,doxygen) ("graphviz" ,graphviz))) ; for dot - (home-page "http://drumstick.sourceforge.net/") + (home-page "https://drumstick.sourceforge.io/") (synopsis "C++ MIDI library") (description "Drumstick is a set of MIDI libraries using C++/Qt5 idioms and style. It -- cgit 1.4.1 From b7aca04856ffcbacb4179b3c485c20403bd19787 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 4 Apr 2021 16:05:33 +0300 Subject: gnu: go-github-com-sirupsen-logrus: Update to 1.8.1. * gnu/packages/golang.scm (go-github-com-sirupsen-logrus): Update to 1.8.1. [propagated-inputs]: Add go-github-com-davecgh-go-spew, go-github-com-pmezard-go-difflib. Sort alphabetically. [arguments]: Enable test suite. --- gnu/packages/golang.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d9988cd7ad..904f16539e 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, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019 Ludovic Courtès @@ -2099,7 +2099,7 @@ application's http.Handlers.") (define-public go-github-com-sirupsen-logrus (package (name "go-github-com-sirupsen-logrus") - (version "1.0.5") + (version "1.8.1") (source (origin (method git-fetch) @@ -2109,17 +2109,16 @@ application's http.Handlers.") (file-name (git-file-name name version)) (sha256 (base32 - "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz")))) + "0rvqzic2zz7fpxyizmqxwmhv1m52ii9bgxnqa6km8wsa0l08wh42")))) (build-system go-build-system) (propagated-inputs - `(("go-golang-org-x-crypto" - ,go-golang-org-x-crypto) - ("go-github-com-stretchr-testify" - ,go-github-com-stretchr-testify) + `(("go-github-com-davecgh-go-spew" ,go-github-com-davecgh-go-spew) + ("go-github-com-pmezard-go-difflib" ,go-github-com-pmezard-go-difflib) + ("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys))) (arguments - '(#:tests? #f ;FIXME missing dependencies - #:import-path "github.com/sirupsen/logrus")) + '(#:import-path "github.com/sirupsen/logrus")) (home-page "https://github.com/sirupsen/logrus") (synopsis "Structured, pluggable logging for Go") (description "Logrus is a structured logger for Go, completely API -- cgit 1.4.1 From a4bf1b1a4d83a273c729184b2bcb2cd0525fe8c5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Apr 2021 15:42:41 +0200 Subject: gnu: ncftp: Add 'release-monitoring-url' property. * gnu/packages/ftp.scm (ncftp)[properties]: New field. --- gnu/packages/ftp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 9715c3e770..961ce3a464 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2018, 2021, 2021 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016–2021 Tobias Geerinckx-Rice @@ -118,6 +118,8 @@ reliability in mind.") (("a freeware program") "free software")) #t)))) + (properties + `((release-monitoring-url . "https://www.ncftp.com/download/"))) (build-system gnu-build-system) (arguments '(#:phases -- cgit 1.4.1 From 51fa1b6ea5255b3b9112d0c9c86814019955a2a7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 4 Apr 2021 15:46:47 +0200 Subject: gnu: file: Add 'release-monitoring-url' property. * gnu/packages/file.scm (file)[properties]: New field. --- gnu/packages/file.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/file.scm b/gnu/packages/file.scm index bac951f9c5..3f1145b520 100644 --- a/gnu/packages/file.scm +++ b/gnu/packages/file.scm @@ -46,6 +46,8 @@ `(("self" ,this-package)) '())) + (properties + `((release-monitoring-url . "http://ftp.astron.com/pub/file/"))) (synopsis "File type guesser") (description "The file command is a file type guesser, a command-line tool that tells -- cgit 1.4.1 From 4a6271d95b62fe99327dcfa2dc30d6cc87db6a3e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:32:23 +0200 Subject: gnu: mpg321: Update source URL. * gnu/packages/mp3.scm (mpg321)[source]: Update URL to match what's on SourceForge. Add 'file-name'. --- gnu/packages/mp3.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index dadaccdd88..ff67d9e9e5 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge -;;; Copyright © 2014, 2015, 2017, 2020 Ludovic Courtès +;;; Copyright © 2014, 2015, 2017, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert @@ -405,7 +405,8 @@ command-line tool as well as a C library, libmpg123.") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/mpg321/mpg321/" - version "/mpg321-" version ".tar.gz")) + version "/mpg321_" version ".orig.tar.gz")) + (file-name (string-append "mpg321-" version ".tar.gz")) (sha256 (base32 "0ki8mh76bbmdh77qsiw682dvi8y468yhbdabqwg05igmwc1wqvq5")) -- cgit 1.4.1 From b6e5eb4d23d80d749462d3affde46f29e83c2a52 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:34:37 +0200 Subject: gnu: libffi: Add 'release-monitoring-url'. * gnu/packages/libffi.scm (libffi)[home-page]: Change to sourceware.org. [properties]: New field. --- gnu/packages/libffi.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm index 6c434bbe90..d62a1588c1 100644 --- a/gnu/packages/libffi.scm +++ b/gnu/packages/libffi.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Federico Beffa ;;; Copyright © 2015, 2019 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2020 Efraim Flashner @@ -103,7 +103,8 @@ to call code written in another language. The libffi library really only provides the lowest, machine dependent layer of a fully featured foreign function interface. A layer must exist above libffi that handles type conversions for values passed between the two languages.") - (home-page "http://sources.redhat.com/libffi/") + (home-page "http://www.sourceware.org/libffi/") + (properties `((release-monitoring-url . ,home-page))) ;; See . (license expat))) -- cgit 1.4.1 From dda0ada3849719f183ee158871d382b2f57f7a59 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 5 Apr 2021 11:37:32 +0200 Subject: gnu: sloccount: Update source URL. * gnu/packages/code.scm (sloccount)[source, home-page]: Update. --- 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 4e30dacdf4..a79d8b4a2b 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2015, 2018, 2020 Ludovic Courtès +;;; Copyright © 2013, 2015, 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2018 Ricardo Wurmus ;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner @@ -180,7 +180,7 @@ around in a large, deeply nested project.") (version "2.26") (source (origin (method url-fetch) - (uri (string-append "http://www.dwheeler.com/sloccount/sloccount-" + (uri (string-append "https://dwheeler.com/sloccount/sloccount-" version ".tar.gz")) (sha256 (base32 @@ -221,7 +221,7 @@ around in a large, deeply nested project.") #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (inputs `(("perl" ,perl))) - (home-page "http://www.dwheeler.com/sloccount/") + (home-page "https://dwheeler.com/sloccount/") (synopsis "Count physical source lines of code (SLOC)") (description "SLOCCount is a set of the programs for counting source lines of -- cgit 1.4.1 From f10634f15d109a54c39b56827bbf4618387c1e18 Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Sun, 4 Apr 2021 06:09:26 -0700 Subject: gnu: Fix copyright symbol. * gnu/packages/crates-io.scm: Fix copyright line for Zheng Junjie. Signed-off-by: Mathieu Othacehe --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a20073ae9d..5d2ccc0731 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Antoine Côté ;;; Copyright © 2021 aecepoglu -;;; Copyright @ 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. -- cgit 1.4.1 From b54fc8f54ed77341dd64d983cbcb66cc642acbc2 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 21:39:56 +0100 Subject: gnu: sbcl-golden-utils: Update to 0.0.0-2.62a5cb9. * gnu/packages/lisp-xyz.scm (sbcl-golden-utils): Update to 0.0.0-2.62a5cb9. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9eb937314e..f206eec456 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -161,8 +161,8 @@ collection.") (sbcl-package->cl-source-package sbcl-bodge-utilities)) (define-public sbcl-golden-utils - (let ((commit "9424419d867d5c2f819196ee41667a818a5058e7") - (revision "1")) + (let ((commit "62a5cb948a011eb26e7a89f56d5839a3334b4100") + (revision "2")) (package (name "sbcl-golden-utils") (version (git-version "0.0.0" revision commit)) @@ -172,9 +172,9 @@ collection.") (uri (git-reference (url "https://git.mfiano.net/mfiano/golden-utils") (commit commit))) - (file-name (git-file-name name version)) + (file-name (git-file-name "golden-utils" version)) (sha256 - (base32 "15x0phm6820yj3h37ibi06gjyh6z45sd2nz2n8lcbfflwm086q0h")))) + (base32 "13mvxqwd1nmpq8h5hb1s60wyqdj7ji4haxrqr0sy3csyqa8aq2j8")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria))) -- cgit 1.4.1 From 17c11ae958e5d444549aa4c7589565c092d2ea82 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 22:22:29 +0100 Subject: gnu: Add cl-cpus. * gnu/packages/lisp-xyz.scm (sbcl-cl-cpus, cl-cpus, ecl-cl-cpus): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f206eec456..718d7c429f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15335,6 +15335,35 @@ line tool @code{df} and get disk space information using @code{statvfs}.") (define-public cl-diskspace (sbcl-package->cl-source-package sbcl-cl-diskspace)) +(define-public sbcl-cl-cpus + (package + (name "sbcl-cl-cpus") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muyinliu/cl-cpus") + (commit (string-append "v" version)))) + (file-name (git-file-name "cl-cpus" version)) + (sha256 + (base32 "0sdaff9hpsx7bpkkkqavmxmrrlc2d61gmqjjgn8xchncng4a0rf8")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi))) + (home-page "https://github.com/muyinliu/cl-cpus") + (synopsis "Common Lisp feature to get number of CPUs") + (description + "This package provides a Common Lisp system which has only one function to +return the CPU count of the current system.") + (license license:isc))) + +(define-public ecl-cl-cpus + (sbcl-package->ecl-package sbcl-cl-cpus)) + +(define-public cl-cpus + (sbcl-package->cl-source-package sbcl-cl-cpus)) + (define-public sbcl-fof (package (name "sbcl-fof") -- cgit 1.4.1 From acaf97abae63f664d20c38e88d46ae529b249e8f Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 21:57:54 +0100 Subject: gnu: Add cl-shadow. * gnu/packages/lisp-xyz.scm (sbcl-shadow, cl-shadow, ecl-shadow): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 718d7c429f..ae6f1b204d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15646,3 +15646,42 @@ OpenGL (Mesa), GLU and GLUT (FreeGLUT) APIs using CFFI.") (define-public cl-opengl (sbcl-package->cl-source-package sbcl-cl-opengl)) + +(define-public sbcl-shadow + (let ((commit "b2031adbfba3579b48c9d39ad997e19b79b6852f") + (revision "1")) + (package + (name "sbcl-shadow") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/shadow") + (commit commit))) + (file-name (git-file-name "shadow" version)) + (sha256 + (base32 "0w1i734gkdkziin74ql2nhx7jdjxx02ylssaa6qdrvnj4br1124a")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cffi" ,sbcl-cffi) + ("cl-opengl" ,sbcl-cl-opengl) + ("glsl-packing" ,sbcl-glsl-packing) + ("golden-utils" ,sbcl-golden-utils) + ("static-vectors" ,sbcl-static-vectors) + ("varjo" ,sbcl-varjo))) + (home-page "https://git.mfiano.net/mfiano/shadow") + (synopsis "Management system for OpenGL shader programs") + (description + "This package provides a Common Lisp library for defining OpenGL shader +programs. There are also functions for referencing shader programs by name, +querying for basic information about them, modifying uniform variables +throughout the lifecycle of an OpenGL application, and managing certain OpenGL +buffer object types (UBO, SSBO currently).") + (license license:expat)))) + +(define-public ecl-shadow + (sbcl-package->ecl-package sbcl-shadow)) + +(define-public cl-shadow + (sbcl-package->cl-source-package sbcl-shadow)) -- cgit 1.4.1 From 49d40b9e3d219052a05b8e6c4a5dca6317c61b4d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 3 Apr 2021 22:09:41 +0100 Subject: gnu: Add cl-umbra. * gnu/packages/lisp-xyz.scm (sbcl-umbra, cl-umbra, ecl-umbra): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ae6f1b204d..fe86cc8b18 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -15685,3 +15685,36 @@ buffer object types (UBO, SSBO currently).") (define-public cl-shadow (sbcl-package->cl-source-package sbcl-shadow)) + +(define-public sbcl-umbra + (let ((commit "d6ef2f6cbfa26180929061129eaf325bf17f73d8") + (revision "1")) + (package + (name "sbcl-umbra") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.mfiano.net/mfiano/umbra") + (commit commit))) + (file-name (git-file-name "umbra" version)) + (sha256 + (base32 "04vyh2j00zdpb8ryxr8g81wjcmqlz9wrn55r3cypcj4qg970r5wi")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("golden-utils" ,sbcl-golden-utils) + ("shadow" ,sbcl-shadow) + ("varjo" ,sbcl-varjo))) + (home-page "https://git.mfiano.net/mfiano/umbra") + (synopsis "Common Lisp library of reusable GPU shader functions") + (description + "This is a Common Lisp library consisting of a collection of useful GPU +shader functions, written with @code{Shadow}.") + (license license:expat)))) + +(define-public ecl-umbra + (sbcl-package->ecl-package sbcl-umbra)) + +(define-public cl-umbra + (sbcl-package->cl-source-package sbcl-umbra)) -- cgit 1.4.1 From bab809cef0600a1c5d0c7d3fc5d434435b4c5688 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Thu, 1 Apr 2021 23:07:18 +0200 Subject: gnu: suitesparse: Update to 5.9.0. * gnu/packages/maths.scm (suitesparse): Update to 5.9.0. [arguments]: Use cc-for-target instead of hard-coding gcc. Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2e072e7d82..5cd11ec435 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Felix Gruber +;;; Copyright © 2020, 2021 Felix Gruber ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020 Nicolò Balzarotti @@ -3910,7 +3910,7 @@ Fresnel integrals, and similar related functions as well.") (define-public suitesparse (package (name "suitesparse") - (version "5.8.1") + (version "5.9.0") (source (origin (method git-fetch) @@ -3920,7 +3920,7 @@ Fresnel integrals, and similar related functions as well.") (file-name (git-file-name name version)) (sha256 (base32 - "0qjlyfxs8s48rs63c2fzspisgq1kk4bwkgnhmh125hgkdhrq2w1c")) + "1zhkix58afw92s7p291prljdm3yi0pjg1kbi3lczdb8rb14jkz5n")) (patches (search-patches "suitesparse-mongoose-cmake.patch")) (modules '((guix build utils))) (snippet @@ -3930,9 +3930,9 @@ Fresnel integrals, and similar related functions as well.") #t)))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;no "check" target + `(#:tests? #f ;no "check" target #:make-flags - (list "CC=gcc" + (list (string-append "CC=" ,(cc-for-target)) "TBB=-ltbb" "MY_METIS_LIB=-lmetis" ;; Flags for cmake (required to build GraphBLAS and Mongoose) -- cgit 1.4.1 From b6acaa1c2e0726f3e3f525fd5bffcb1c9753b38b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 5 Apr 2021 15:09:54 +0300 Subject: gnu: go-github-com-puerkitobio-goquery: Adjust inputs. * gnu/packages/golang.scm (go-github-com-puerkitobio-goquery) [native-inputs]: Move all inputs ... [propagated-inputs]: ... to here. --- 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 904f16539e..278a2efa00 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -5504,7 +5504,7 @@ the parse trees produced by the html package.") (build-system go-build-system) (arguments `(#:import-path "github.com/PuerkitoBio/goquery")) - (native-inputs + (propagated-inputs `(("go-github-com-andybalholm-cascadia" ,go-github-com-andybalholm-cascadia) ("go-golang-org-x-net" ,go-golang-org-x-net))) (home-page "https://github.com/PuerkitoBio/goquery") -- cgit 1.4.1 From fffa137e6e46e073e23bc24542cca1e68a90e9a3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Apr 2021 15:47:54 +0200 Subject: gnu: perl-net-cidr-lite: Update to 0.22 [security fixes]. * gnu/packages/networking.scm (perl-net-cidr-lite): Update to 0.22. --- gnu/packages/networking.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7cbf1de9bf..133f525cb9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2098,22 +2098,19 @@ It is intended primarily for use in testing.") (define-public perl-net-cidr-lite (package (name "perl-net-cidr-lite") - (version "0.21") + (version "0.22") (source (origin (method url-fetch) (uri (string-append - "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-" + "mirror://cpan/authors/id/S/ST/STIGTSP/Net-CIDR-Lite-" version ".tar.gz")) (sha256 - (base32 - "14shj73zbqmfjbp0qz1fs9j4p2dpvz5hfkm4qfdjbydflbl2b8fg")))) + (base32 "05w57db2lx4djb4vixzdr6qgrzyzkk047nl812g7nq8s6k5xh5s3")))) (build-system perl-build-system) - (home-page - "https://metacpan.org/release/Net-CIDR-Lite") - (synopsis - "Perl extension for merging IPv4 or IPv6 CIDR addresses") + (home-page "https://metacpan.org/release/Net-CIDR-Lite") + (synopsis "Perl extension for merging IPv4 or IPv6 CIDR addresses") (description "Net::CIDR::Lite merges IPv4 or IPv6 CIDR addresses.") (license license:gpl1+))) -- cgit 1.4.1 From d8e6486877643d7d948557badc614c2b844a6d85 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:49 -0400 Subject: gnu: chez-scheme: Update nanopass to 1.9.2. * gnu/packages/chez.scm (nanopass): Update nanopass to 1.9.2. Signed-off-by: Leo Prikler --- gnu/packages/chez.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index eac556c4d0..3918e7741d 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Brendan Tildesley +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -43,13 +44,13 @@ #:use-module (srfi srfi-1)) (define nanopass - (let ((version "1.9.1")) + (let ((version "1.9.2")) (origin (method git-fetch) (uri (git-reference (url "https://github.com/nanopass/nanopass-framework-scheme") (commit (string-append "v" version)))) - (sha256 (base32 "1synadgaycca39jfx525975ss9y0lkl516sdrc62wrrllamm8n21")) + (sha256 (base32 "16vjsik9rrzbabbhbxbaha51ppi3f9n8rk59pc6zdyffs0vziy4i")) (file-name (git-file-name "nanopass" version))))) (define stex -- cgit 1.4.1 From 6f71fd4a5e9f2ccd0ae8b78cdb59d53e9cde9544 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:50 -0400 Subject: gnu: chez-scheme: Update stex. Get a patch from upstream that will help us simplify the build process for the Chez Scheme documentation. * gnu/packages/chez.scm (chez-stex): Update to commit 5405149. Signed-off-by: Leo Prikler --- gnu/packages/chez.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 3918e7741d..b0b9abfd05 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -54,13 +54,17 @@ (file-name (git-file-name "nanopass" version))))) (define stex - (let ((version "1.2.2")) + ;; This commit includes a fix, which we would otherwise want to use as + ;; patch. Let's revert to tagged releases as soon as one becomes available. + (let* ((commit "54051494434a197772bf6ca5b4e6cf6be55f39a5") + (version "1.2.2") + (version (git-version version "1" commit))) (origin (method git-fetch) (uri (git-reference (url "https://github.com/dybvig/stex") - (commit (string-append "v" version)))) - (sha256 (base32 "1q5i8pf4cdfjsj6r2k1rih7ljbfggyxdng2p2fvsgarzihpsin2i")) + (commit commit))) + (sha256 (base32 "01jnvw8qw33gnpzwrakwhsr05h6b609lm180jnspcrb7lds2p23d")) (file-name (git-file-name "stex" version))))) (define-public chez-scheme -- cgit 1.4.1 From e29b1fff1d8147623ab149fca7b0cc42a376bf62 Mon Sep 17 00:00:00 2001 From: Philip McGrath Date: Fri, 19 Mar 2021 14:24:51 -0400 Subject: gnu: chez-scheme: simplify packaging Take advantage of patches that have been accepted upstream. These changes lay a foundation for reusing more of Chez's build process for Racket. * gnu/packages/patches/chez-scheme-build-util-paths-backport.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/chez.scm (chez-scheme)[source](patches): Use it. [source](snippet): Remove bundled libraries here, not in configure phase. [inputs]: Organize. Move "nanopass", "stex", and "xorg-rgb" to ... [native-inputs]: ... this field. [arguments]: Add (ice-9 ftw) to #:modules. Remove unneeded 'patch-processor-detection' phase. Add 'unpack-nanopass+stex' phase (refactored from 'configure'). Simplify 'configure' phase by removing patches that have been upstreamed. Add "--nogzip-man-pages" flag so we can remove 'make-manpages-writable' phase. Stop ignoring #:configure-flags, move "--threads" there, and remove unneeded workaround. Add 'prepare-stex' phase (refactored from 'install-doc'). Use it to streamline 'install-doc' phase, installing all of the right files into the right places. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/chez.scm | 246 ++++--- .../chez-scheme-build-util-paths-backport.patch | 780 +++++++++++++++++++++ 3 files changed, 923 insertions(+), 104 deletions(-) create mode 100644 gnu/packages/patches/chez-scheme-build-util-paths-backport.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a1a08fa911..1d7133667d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -887,6 +887,7 @@ dist_patch_DATA = \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ + %D%/packages/patches/chez-scheme-build-util-paths-backport.patch \ %D%/packages/patches/chmlib-inttypes.patch \ %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index b0b9abfd05..1cd2cde71b 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -30,6 +30,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system gnu) #:use-module (gnu packages compression) #:use-module (gnu packages ncurses) @@ -79,21 +80,41 @@ (commit (string-append "v" version)))) (sha256 (base32 "0prgn2z9l888j93ydxaf04ph424g0fi3a8w7f8m0b2r7fr1v7388")) - (file-name (git-file-name name version)))) + (file-name (git-file-name name version)) + (patches + (search-patches + ;; backported from upstream: remove on next release + "chez-scheme-build-util-paths-backport.patch")) + (snippet + ;; remove bundled libraries + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (for-each (lambda (dir) + (when (directory-exists? dir) + (delete-file-recursively dir))) + '("stex" + "nanopass" + "lz4" + "zlib"))))))) (build-system gnu-build-system) (inputs - `(("ncurses" ,ncurses) - ("libuuid" ,util-linux "lib") - ("libx11" ,libx11) - ("lz4" ,lz4) - ("lz4:static" ,lz4 "static") - ("xorg-rgb" ,xorg-rgb) - ("nanopass" ,nanopass) + `(("libuuid" ,util-linux "lib") ("zlib" ,zlib) ("zlib:static" ,zlib "static") - ("stex" ,stex))) + ("lz4" ,lz4) + ("lz4:static" ,lz4 "static") + ;; for expeditor: + ("ncurses" ,ncurses) + ;; for X11 clipboard support in expeditor: + ;; https://github.com/cisco/ChezScheme/issues/9#issuecomment-222057232 + ("libx11" ,libx11))) (native-inputs - `(("texlive" ,(texlive-union (list texlive-latex-oberdiek + `(("nanopass" ,nanopass) ; source only + ;; for docs + ("stex" ,stex) + ("xorg-rgb" ,xorg-rgb) + ("texlive" ,(texlive-union (list texlive-latex-oberdiek texlive-generic-epsf))) ("ghostscript" ,ghostscript) ("netpbm" ,netpbm))) @@ -103,96 +124,54 @@ (files (list (string-append "lib/csv" version "-site")))))) (outputs '("out" "doc")) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 match)) + `(#:modules + ((guix build gnu-build-system) + (guix build utils) + (ice-9 ftw) + (ice-9 match)) #:test-target "test" #:configure-flags - (list ,(match (or (%current-target-system) (%current-system)) - ("x86_64-linux" '(list "--machine=ta6le")) - ("i686-linux" '(list "--machine=ti3le")) - ;; Let autodetection have its attempt on other architectures. - (_ - '()))) + '("--threads") ;; TODO when we fix armhf, it doesn't support --threads #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-processor-detection - (lambda _ (substitute* "configure" - (("uname -a") "uname -m")) - #t)) - ;; Adapt the custom 'configure' script. + ;; put these where configure expects them to be + (add-after 'unpack 'unpack-nanopass+stex + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (dep) + (define src + (assoc-ref (or native-inputs inputs) dep)) + (copy-recursively src dep + #:keep-mtime? #t)) + '("nanopass" "stex")) + #t)) + ;; NOTE: the custom Chez 'configure' script doesn't allow + ;; unrecognized flags, such as those automatically added + ;; by `gnu-build-system`. (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (nanopass (assoc-ref inputs "nanopass")) - (stex (assoc-ref inputs "stex")) - (lz4-static (assoc-ref inputs "lz4:static")) - (zlib-static (assoc-ref inputs "zlib:static")) - (unpack (assoc-ref %standard-phases 'unpack)) - (patch-source-shebangs - (assoc-ref %standard-phases 'patch-source-shebangs))) - (map (match-lambda - ((src orig-name new-name) - (with-directory-excursion "." - (apply unpack (list #:source src)) - (apply patch-source-shebangs (list #:source src))) - (delete-file-recursively new-name) - (invoke "mv" orig-name new-name))) - `((,nanopass "source" "nanopass") - (,stex "source" "stex"))) - ;; The configure step wants to CURL all submodules as it - ;; detects a checkout without submodules. Disable curling, - ;; and manually patch the needed modules for compilation. - (substitute* "configure" - (("! -f '") "-d '")) ; working around CURL. - (substitute* (find-files "mats" "Mf-.*") - (("^[[:space:]]+(cc ) *") "\tgcc ")) - (substitute* - (find-files "." (string-append - "(" - "Mf-[a-zA-Z0-9.]+" - "|Makefile[a-zA-Z0-9.]*" - "|checkin" - "|stex\\.stex" - "|newrelease" - "|workarea" - "|unix\\.ms" - "|^6\\.ms" - ;;"|[a-zA-Z0-9.]+\\.ms" ; guile can't read - ")")) - (("/bin/rm") (which "rm")) - (("/bin/ln") (which "ln")) - (("/bin/cp") (which "cp")) - (("/bin/echo") (which "echo"))) - (substitute* "makefiles/installsh" - (("/bin/true") (which "true"))) - (substitute* "stex/Makefile" - (("PREFIX=/usr") (string-append "PREFIX=" out))) - (invoke "./configure" "--threads" - (string-append "ZLIB=" zlib-static "/lib/libz.a") - (string-append "LZ4=" lz4-static "/lib/liblz4.a") - (string-append "--installprefix=" out))))) - ;; Installation of the documentation requires a running "chez". - (add-after 'install 'install-doc - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version))) - (invoke "make" "docs") - (with-directory-excursion "csug" - (substitute* "Makefile" - ;; The ‘installdir=’ can't be overruled on the command line. - (("/tmp/csug9") doc) - ;; $m is the ‘machine type’, e.g. ‘ta6le’ on x86_64, but is - ;; set incorrectly for some reason, e.g. to ‘a6le’ on x86_64. - ;; Avoid the whole mess by running the (machine-independent) - ;; ‘installsh’ script at its original location. - (("\\$m/installsh") "makefiles/installsh")) - (invoke "make" "install") - (install-file "csug.pdf" doc)) - (with-directory-excursion "release_notes" - (install-file "release_notes.pdf" doc)) + (lambda* (#:key inputs outputs + (configure-flags '()) + #:allow-other-keys) + (let* ((zlib-static (assoc-ref inputs "zlib:static")) + (lz4-static (assoc-ref inputs "lz4:static")) + (out (assoc-ref outputs "out")) + ;; add flags which are always required: + (flags (cons* + (string-append "--installprefix=" out) + (string-append "ZLIB=" zlib-static "/lib/libz.a") + (string-append "LZ4=" lz4-static "/lib/liblz4.a") + ;; Guix will do compress man pages, + ;; and letting Chez try causes an error + "--nogzip-man-pages" + configure-flags))) + (format #t "configure flags: ~s~%" flags) + ;; Some makefiles (for tests) don't seem to propagate CC + ;; properly, so we take it out of their hands: + (setenv "CC" ,(cc-for-target)) + (apply invoke + "./configure" + flags) #t))) - ;; The binary file name is called "scheme" as the one from MIT/GNU + ;; The binary file name is called "scheme" as is the one from MIT/GNU ;; Scheme. We add a symlink to use in case both are installed. (add-after 'install 'install-symlink (lambda* (#:key outputs #:allow-other-keys) @@ -207,16 +186,75 @@ "/" name ".boot"))) (find-files lib "scheme.boot")) #t))) - (add-before 'reset-gzip-timestamps 'make-manpages-writable - (lambda* (#:key outputs #:allow-other-keys) - (map (lambda (file) - (make-file-writable file)) - (find-files (string-append (assoc-ref outputs "out") - "/share/man") - ".*\\.gz$")) - #t))))) - ;; According to the documentation MIPS is not supported. - ;; Cross-compiling for the Raspberry Pi is supported, but not native ARM. + ;; Building explicitly lets us avoid using substitute* + ;; to re-write makefiles. + (add-after 'install-symlink 'prepare-stex + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((stex+version + (strip-store-file-name + (assoc-ref (or native-inputs inputs) "stex"))) + ;; Eventually we want to install stex as a real + ;; package so it's reusable. For now: + (stex-output "/tmp") + (doc-dir (string-append stex-output + "/share/doc/" + stex+version))) + (with-directory-excursion "stex" + (invoke "make" + "install" + (string-append "LIB=" + stex-output + "/lib/" + stex+version) + (string-append "Scheme=" + (assoc-ref outputs "out") + "/bin/scheme")) + (for-each (lambda (pth) + (install-file pth doc-dir)) + '("ReadMe" ; includes the license + "doc/stex.html" + "doc/stex.css" + "doc/stex.pdf")) + #t)))) + ;; Building the documentation requires stex and a running scheme. + ;; FIXME: this is probably wrong for cross-compilation + (add-after 'prepare-stex 'install-doc + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) + (let* ((chez+version (strip-store-file-name + (assoc-ref outputs "out"))) + (stex+version + (strip-store-file-name + (assoc-ref (or native-inputs inputs) "stex"))) + (scheme (string-append (assoc-ref outputs "out") + "/bin/scheme")) + ;; see note on stex-output in phase build-stex, above: + (stexlib (string-append "/tmp" + "/lib/" + stex+version)) + (doc-dir (string-append (assoc-ref outputs "doc") + "/share/doc/" + chez+version))) + (define* (stex-make #:optional (suffix "")) + (invoke "make" + "install" + (string-append "Scheme=" scheme) + (string-append "STEXLIB=" stexlib) + (string-append "installdir=" doc-dir suffix))) + (with-directory-excursion "csug" + (stex-make "/csug")) + (with-directory-excursion "release_notes" + (stex-make "/release_notes")) + (with-directory-excursion doc-dir + (symlink "release_notes/release_notes.pdf" + "release_notes.pdf") + (symlink "csug/csug9_5.pdf" + "csug.pdf")) + #t)))))) + ;; Chez Scheme does not have a MIPS backend. + ;; FIXME: Debian backports patches to get armhf working. + ;; We should too. It is the Chez machine type arm32le + ;; (no threaded version upstream yet, though there is in + ;; Racket's fork), more specifically (per the release notes) ARMv6. (supported-systems (fold delete %supported-systems '("mips64el-linux" "armhf-linux"))) (home-page "https://cisco.github.io/ChezScheme/") diff --git a/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch b/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch new file mode 100644 index 0000000000..aad2d99996 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-build-util-paths-backport.patch @@ -0,0 +1,780 @@ +From 2447e047b750c3371778beb487f881641a582e66 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Thu, 11 Mar 2021 18:17:47 -0500 +Subject: [PATCH] avoid hard-coded paths for utilities in build scripts + +Backported from +https://github.com/cisco/ChezScheme/commit/8f4633ce24ac6425b2ab13cc78026b1c9bb5361e + +Specific changes: + - `cc` -> `$(CC)` + - `/bin/rm` -> `rm` + - `/bin/ln` -> `ln` + - `/bin/cp` -> `cp` + - `/bin/echo` -> `echo` + - in `makefiles/installsh`, add a case to find `true` + at an unusual path or as a shell builtin + +Co-authored-by: Andy Keep +--- + LOG | 12 ++++++++++++ + csug/gifs/Makefile | 8 ++++---- + csug/math/Makefile | 4 ++-- + examples/Makefile | 2 +- + makefiles/Makefile-csug.in | 6 +++--- + makefiles/Makefile-release_notes.in | 2 +- + makefiles/Mf-install.in | 4 ++-- + makefiles/installsh | 3 ++- + mats/6.ms | 2 +- + mats/Mf-a6fb | 4 ++-- + mats/Mf-a6le | 4 ++-- + mats/Mf-a6nb | 4 ++-- + mats/Mf-a6ob | 4 ++-- + mats/Mf-a6osx | 4 ++-- + mats/Mf-arm32le | 4 ++-- + mats/Mf-i3fb | 4 ++-- + mats/Mf-i3le | 4 ++-- + mats/Mf-i3nb | 4 ++-- + mats/Mf-i3ob | 4 ++-- + mats/Mf-i3osx | 4 ++-- + mats/Mf-i3qnx | 4 ++-- + mats/Mf-ppc32le | 4 ++-- + mats/Mf-ta6fb | 4 ++-- + mats/Mf-ta6le | 4 ++-- + mats/Mf-ta6nb | 4 ++-- + mats/Mf-ta6ob | 4 ++-- + mats/Mf-ta6osx | 4 ++-- + mats/Mf-ti3fb | 4 ++-- + mats/Mf-ti3le | 4 ++-- + mats/Mf-ti3nb | 4 ++-- + mats/Mf-ti3ob | 4 ++-- + mats/Mf-ti3osx | 4 ++-- + mats/Mf-tppc32le | 4 ++-- + mats/unix.ms | 4 ++-- + newrelease | 22 +++++++++++----------- + pkg/Makefile | 2 +- + release_notes/gifs/Makefile | 6 +++--- + release_notes/math/Makefile | 4 ++-- + s/Mf-base | 2 +- + workarea | 10 +++++----- + 40 files changed, 101 insertions(+), 88 deletions(-) + +diff --git a/LOG b/LOG +index e1631df..399104d 100644 +--- a/LOG ++++ b/LOG +@@ -2119,3 +2119,15 @@ + bintar/Makefile rpm/Makefile pkg/Makefile wininstall/Makefile + wininstall/a6nt.wxs wininstall/i3nt.wxs wininstall/ta6nt.wxs + wininstall/ti3nt.wxs ++9.5.5 changes: ++- avoid hard-coded paths for utilities in build scripts ++ checkin csug/gifs/Makefile csug/math/Makefile examples/Makefile ++ makefiles/Makefile-csug.in makefiles/Makefile-release_notes.in ++ makefiles/Mf-install.in makefiles/installsh mats/6.ms mats/Mf-a6fb ++ mats/Mf-a6le mats/Mf-a6nb mats/Mf-a6ob mats/Mf-a6osx mats/Mf-arm32le ++ mats/Mf-i3fb mats/Mf-i3le mats/Mf-i3nb mats/Mf-i3ob mats/Mf-i3osx ++ mats/Mf-i3qnx mats/Mf-ppc32le mats/Mf-ta6fb mats/Mf-ta6le mats/Mf-ta6nb ++ mats/Mf-ta6ob mats/Mf-ta6osx mats/Mf-ti3fb mats/Mf-ti3le mats/Mf-ti3nb ++ mats/Mf-ti3ob mats/Mf-ti3osx mats/Mf-tppc32le mats/unix.ms newrelease ++ pkg/Makefile release_notes/gifs/Makefile release_notes/math/Makefile ++ s/Mf-base workarea +diff --git a/csug/gifs/Makefile b/csug/gifs/Makefile +index 8676e4c..4253ffd 100644 +--- a/csug/gifs/Makefile ++++ b/csug/gifs/Makefile +@@ -18,7 +18,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + # translate ps file to gif w/o transparent white background +@@ -28,7 +28,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} +@@ -57,7 +57,7 @@ ghostRightarrow.gif: Rightarrow.tex + giftrans -g '#000000=#ffffff' |\ + giftopnm |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux ++ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + test -f $*.gif && chmod 644 $*.gif + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/csug/math/Makefile b/csug/math/Makefile +index 3385fdb..3392ea8 100644 +--- a/csug/math/Makefile ++++ b/csug/math/Makefile +@@ -15,11 +15,11 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log $*.aux ++ rm -f $*.dvi $*.log $*.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} + + ${gifs}: mathmacros + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/examples/Makefile b/examples/Makefile +index b1b4e1d..3edfdd0 100644 +--- a/examples/Makefile ++++ b/examples/Makefile +@@ -25,4 +25,4 @@ needed: ${obj} + + all: ; echo "(time (for-each compile-file (map symbol->string '(${src}))))" | ${Scheme} + +-clean: ; /bin/rm -f $(obj) expr.md ++clean: ; rm -f $(obj) expr.md +diff --git a/makefiles/Makefile-csug.in b/makefiles/Makefile-csug.in +index df24092..6f8a8d9 100644 +--- a/makefiles/Makefile-csug.in ++++ b/makefiles/Makefile-csug.in +@@ -29,7 +29,7 @@ install: target + # thrice is not enough when starting from scratch + logcheck1: $(x).thirdrun + @if [ -n "`grep 'Warning: Label(s) may have changed' $(x).log`" ] ; then\ +- /bin/rm -f $(x).thirdrun ;\ ++ rm -f $(x).thirdrun ;\ + $(MAKE) $(x).thirdrun;\ + fi + +@@ -55,7 +55,7 @@ stexsrc = csug.stex title.stex copyright.stex contents.stex\ + texsrc = ${stexsrc:%.stex=%.tex} + + title.tex contents.tex bibliography.tex: +- /bin/rm -f $*.tex ++ rm -f $*.tex + echo "%%% DO NOT EDIT THIS FILE" > $*.tex + echo "%%% Edit the .stex version instead" >> $*.tex + echo "" >> $*.tex +@@ -147,7 +147,7 @@ code: $(stexsrc) + echo '(load "code" pretty-print)' | $(Scheme) -q + + $(x).clean: +- -/bin/rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ ++ -rm -f $(x).rfm $(x).sfm $(x).prefirstrun $(x).presecondrun\ + $(x).prethirdrun $(x).ans\ + $(x).hprefirstrun $(x).hpresecondrun $(x).hprethirdrun\ + tspl.aux tspl.haux tspl.rfm tspl.idx in.hidx\ +diff --git a/makefiles/Makefile-release_notes.in b/makefiles/Makefile-release_notes.in +index 4435b6f..64348a4 100644 +--- a/makefiles/Makefile-release_notes.in ++++ b/makefiles/Makefile-release_notes.in +@@ -38,7 +38,7 @@ install: $x.pdf $x.html + $(INSTALL) -m 2755 -d $(installdir)/gifs + $(INSTALL) -m 0644 --ifdiff gifs/*.gif $(installdir)/gifs + $(INSTALL) -m 2755 -d $(installdir)/math +- -/bin/rm -rf $(installdir)/$(mathdir) ++ -rm -rf $(installdir)/$(mathdir) + $(INSTALL) -m 2755 -d $(installdir)/$(mathdir) + if [ -e $(mathdir)/0.gif ] ; then $(INSTALL) -m 0644 $(mathdir)/*.gif $(installdir)/$(mathdir) ; fi + +diff --git a/makefiles/Mf-install.in b/makefiles/Mf-install.in +index a702c34..c09043d 100644 +--- a/makefiles/Mf-install.in ++++ b/makefiles/Mf-install.in +@@ -114,12 +114,12 @@ bininstall: ${Bin} + libbininstall: ${LibBin} + $I -m 444 ${PetiteBoot} ${LibBin}/petite.boot + if [ "${InstallPetiteName}" != "petite" ]; then\ +- /bin/rm -f ${LibBin}/${InstallPetiteName}.boot;\ ++ rm -f ${LibBin}/${InstallPetiteName}.boot;\ + ln -f ${LibBin}/petite.boot ${LibBin}/${InstallPetiteName}.boot;\ + fi + $I -m 444 ${SchemeBoot} ${LibBin}/scheme.boot;\ + if [ "${InstallSchemeName}" != "scheme" ]; then\ +- /bin/rm -f ${LibBin}/${InstallSchemeName}.boot;\ ++ rm -f ${LibBin}/${InstallSchemeName}.boot;\ + ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallSchemeName}.boot;\ + fi + ln -f ${LibBin}/scheme.boot ${LibBin}/${InstallScriptName}.boot; +diff --git a/makefiles/installsh b/makefiles/installsh +index 48f1e46..95d85fb 100755 +--- a/makefiles/installsh ++++ b/makefiles/installsh +@@ -1,7 +1,8 @@ + #! /bin/sh + if [ -x /bin/true ]; then TRUE=/bin/true; + elif [ -x /usr/bin/true ]; then TRUE=/usr/bin/true; +-else echo "Can't find /bin/true or /usr/bin/true" ; exit 1; ++elif command -v true &> /dev/null; then TRUE=true; ++else echo "Can't find /bin/true or /usr/bin/true and no true command" ; exit 1; + fi + + while ${TRUE} ; do +diff --git a/mats/6.ms b/mats/6.ms +index 102f84b..e504230 100644 +--- a/mats/6.ms ++++ b/mats/6.ms +@@ -2685,7 +2685,7 @@ + (begin + (system "ln -s ../examples .") + (load "examples/fatfib.ss" compile) +- (system "/bin/rm examples") ++ (system "rm -f examples") + #t)) + (or (windows?) (embedded?) + (equal? +diff --git a/mats/Mf-a6fb b/mats/Mf-a6fb +index b16d1b6..ff9e687 100644 +--- a/mats/Mf-a6fb ++++ b/mats/Mf-a6fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6le b/mats/Mf-a6le +index d6fee09..a3bda76 100644 +--- a/mats/Mf-a6le ++++ b/mats/Mf-a6le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6nb b/mats/Mf-a6nb +index 48187ef..0f7ac17 100644 +--- a/mats/Mf-a6nb ++++ b/mats/Mf-a6nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6ob b/mats/Mf-a6ob +index 12758f3..0ffcccc 100644 +--- a/mats/Mf-a6ob ++++ b/mats/Mf-a6ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-a6osx b/mats/Mf-a6osx +index f1dbf85..57bac22 100644 +--- a/mats/Mf-a6osx ++++ b/mats/Mf-a6osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-arm32le b/mats/Mf-arm32le +index f33a665..83896eb 100644 +--- a/mats/Mf-arm32le ++++ b/mats/Mf-arm32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -fomit-frame-pointer -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3fb b/mats/Mf-i3fb +index 150cedb..1e4e8fc 100644 +--- a/mats/Mf-i3fb ++++ b/mats/Mf-i3fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3le b/mats/Mf-i3le +index 8f521c8..b248620 100644 +--- a/mats/Mf-i3le ++++ b/mats/Mf-i3le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3nb b/mats/Mf-i3nb +index e81f6ff..8afeb5c 100644 +--- a/mats/Mf-i3nb ++++ b/mats/Mf-i3nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3ob b/mats/Mf-i3ob +index 4e3ee1b..fcd4dee 100644 +--- a/mats/Mf-i3ob ++++ b/mats/Mf-i3ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3osx b/mats/Mf-i3osx +index 53c7d4a..a55f6ee 100644 +--- a/mats/Mf-i3osx ++++ b/mats/Mf-i3osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-i3qnx b/mats/Mf-i3qnx +index 724f2db..3e1437a 100644 +--- a/mats/Mf-i3qnx ++++ b/mats/Mf-i3qnx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ppc32le b/mats/Mf-ppc32le +index 28151a8..547ca00 100644 +--- a/mats/Mf-ppc32le ++++ b/mats/Mf-ppc32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6fb b/mats/Mf-ta6fb +index 921d609..5ed233e 100644 +--- a/mats/Mf-ta6fb ++++ b/mats/Mf-ta6fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6le b/mats/Mf-ta6le +index cd014ec..21c686a 100644 +--- a/mats/Mf-ta6le ++++ b/mats/Mf-ta6le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6nb b/mats/Mf-ta6nb +index 6b1929d..9b9b898 100644 +--- a/mats/Mf-ta6nb ++++ b/mats/Mf-ta6nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6ob b/mats/Mf-ta6ob +index a7aee91..8f25aed 100644 +--- a/mats/Mf-ta6ob ++++ b/mats/Mf-ta6ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ta6osx b/mats/Mf-ta6osx +index 42da5d7..0dd386f 100644 +--- a/mats/Mf-ta6osx ++++ b/mats/Mf-ta6osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m64 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3fb b/mats/Mf-ti3fb +index c891145..56bf7d3 100644 +--- a/mats/Mf-ti3fb ++++ b/mats/Mf-ti3fb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3le b/mats/Mf-ti3le +index 12e77b8..22b4148 100644 +--- a/mats/Mf-ti3le ++++ b/mats/Mf-ti3le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3nb b/mats/Mf-ti3nb +index 028c652..573946e 100644 +--- a/mats/Mf-ti3nb ++++ b/mats/Mf-ti3nb +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3ob b/mats/Mf-ti3ob +index 8a4741c..4472b60 100644 +--- a/mats/Mf-ti3ob ++++ b/mats/Mf-ti3ob +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-ti3osx b/mats/Mf-ti3osx +index 6913c34..9273b44 100644 +--- a/mats/Mf-ti3osx ++++ b/mats/Mf-ti3osx +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -dynamiclib -undefined dynamic_lookup -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/Mf-tppc32le b/mats/Mf-tppc32le +index a12b515..8b9d9f0 100644 +--- a/mats/Mf-tppc32le ++++ b/mats/Mf-tppc32le +@@ -21,7 +21,7 @@ fobj = foreign1.so + include Mf-base + + foreign1.so: ${fsrc} ../boot/$m/scheme.h +- cc -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} ++ $(CC) -m32 -pthread -fPIC -shared -I${Include} -o foreign1.so ${fsrc} + + cat_flush: cat_flush.c +- cc -o cat_flush cat_flush.c ++ $(CC) -o cat_flush cat_flush.c +diff --git a/mats/unix.ms b/mats/unix.ms +index cfba3e7..db7f6f9 100644 +--- a/mats/unix.ms ++++ b/mats/unix.ms +@@ -72,8 +72,8 @@ + (mat system + (eqv? (with-output-to-file "testfile.ss" void '(replace)) (void)) + (begin +- (system (format "~:[~;/pkg~]/bin/rm testfile.ss" (embedded?))) +- (system (format "~:[~;/pkg~]/bin/echo hello > testfile.ss" (embedded?))) ++ (system "rm -f testfile.ss") ++ (system "echo hello > testfile.ss") + (let ([p (open-input-file "testfile.ss")]) + (and (eq? (read p) 'hello) + (begin (close-input-port p) #t)))) +diff --git a/newrelease b/newrelease +index e903956..2d06740 100755 +--- a/newrelease ++++ b/newrelease +@@ -75,13 +75,13 @@ if ($status != 0) exit 1 + + cd $W + +-/bin/rm -f BUILDING ++rm -f BUILDING + sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ + -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ + ../BUILDING > BUILDING + set updatedfiles = ($updatedfiles BUILDING) + +-/bin/rm -f NOTICE ++rm -f NOTICE + sed -e "s/Chez Scheme Version [^ ]*/Chez Scheme Version $R/" \ + -e "s/Copyright 1984-.... /Copyright 1984-`date +%Y` /" \ + ../NOTICE > NOTICE +@@ -92,19 +92,19 @@ sed -e "s/csv[0-9]\.[0-9]\(\.[0-9]\)*/csv$R/" ../makefiles/Mf-install.in > makef + sed -e "s/csug[0-9]\.[0-9]/csug$MR.$mR/" -e "s/csug[0-9]_[0-9]/csug$MR""_$mR/" ../makefiles/Makefile-csug.in > makefiles/Makefile-csug.in + set updatedfiles = ($updatedfiles makefiles/Mf-install.in makefiles/Makefile-csug.in) + +-/bin/rm scheme.1.in ++rm -f scheme.1.in + sed -e "s/Chez Scheme Version [0-9]\.[0-9]\(\.[0-9]\)* .* [0-9][0-9]*/Chez Scheme Version $R `date +'%B %Y'`/" \ + -e "s/Copyright .* Cisco Systems, Inc./Copyright `date +%Y` Cisco Systems, Inc./" \ + ../scheme.1.in > scheme.1.in + set updatedfiles = ($updatedfiles scheme.1.in) + +-/bin/rm -f c/Makefile.{,t}{i3,a6}nt ++rm -f c/Makefile.{,t}{i3,a6}nt + foreach fn (c/Makefile.{,t}{a6,i3}nt) + set updatedfiles = ($updatedfiles $fn) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn + end + +-/bin/rm -f mats/Mf-{,t}{i3,a6}nt ++rm -f mats/Mf-{,t}{i3,a6}nt + foreach fn (mats/Mf-{,t}{a6,i3}nt) + set updatedfiles = ($updatedfiles $fn) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" ../$fn > $fn +@@ -123,11 +123,11 @@ sed -e "s/FILEVERSION .*/FILEVERSION $RCVERSION/"\ + -e "s/Copyright 1984-..../Copyright 1984-`date +%Y`/g" ../c/scheme.rc > c/scheme.rc + set updatedfiles = ($updatedfiles c/scheme.rc) + +-/bin/rm -f s/7.ss ++rm -f s/7.ss + sed -e "s/nCopyright 1984-..../nCopyright 1984-`date +%Y`/g" ../s/7.ss > s/7.ss + set updatedfiles = ($updatedfiles s/7.ss) + +-/bin/rm -f s/cmacros.ss ++rm -f s/cmacros.ss + set VNUM = `printf "%04x%02x%02x" $MR $mR $bR` + sed -e "s/scheme-version #x......../scheme-version #x$VNUM/" ../s/cmacros.ss > s/cmacros.ss + set updatedfiles = ($updatedfiles s/cmacros.ss) +@@ -146,17 +146,17 @@ sed -e "s/Revised\(.*\)for Chez Scheme Version [^ ]*
    /Revised\1for Chez Schem + ../csug/csug.stex > csug/csug.stex + set updatedfiles = ($updatedfiles csug/copyright.stex csug/csug.stex) + +-/bin/rm bintar/Makefile ++rm -f bintar/Makefile + sed -e "s/^version = .*/version = $R/" \ + -e "s/csv[0-9][0-9][0-9]*/csv$ZR/g" \ + ../bintar/Makefile > bintar/Makefile + set updatedfiles = ($updatedfiles bintar/Makefile) + +-/bin/rm rpm/Makefile ++rm -f rpm/Makefile + sed -e "s/^version = .*/version = $R/" ../rpm/Makefile > rpm/Makefile + set updatedfiles = ($updatedfiles rpm/Makefile) + +-/bin/rm pkg/Makefile ++rm -f pkg/Makefile + sed -e "s/^version = .*/version = $R/" \ + -e "s/© .* Cisco Systems/\© `date +%Y` Cisco Systems/" \ + ../pkg/Makefile > pkg/Makefile +@@ -170,7 +170,7 @@ foreach fn (wininstall/{,t}{a6,i3}nt.wxs) + sed -e "s/csv[0-9][0-9][0-9]*/csv$ZR/" ../$fn > $fn + end + +-/bin/rm LOG ++rm -f LOG + cat ../LOG > LOG + echo "" >> LOG + echo "$R changes:" >> LOG +diff --git a/pkg/Makefile b/pkg/Makefile +index e0eef67..a3fe83f 100644 +--- a/pkg/Makefile ++++ b/pkg/Makefile +@@ -39,7 +39,7 @@ $(PKG): $(BUILDROOT)/$(PKG) + --package-path $(BUILDROOT)\ + $(PKG) + sudo chown $(DOTUSER):$(DOTGROUP) $(PKG) +- sudo /bin/rm -rf $(RELEASE) $(BUILDROOT) ++ sudo rm -rf $(RELEASE) $(BUILDROOT) + + $(BUILDROOT)/$(PKG): $(PKGCONTENT) + sudo /usr/bin/pkgbuild\ +diff --git a/release_notes/gifs/Makefile b/release_notes/gifs/Makefile +index 9572965..701d53a 100644 +--- a/release_notes/gifs/Makefile ++++ b/release_notes/gifs/Makefile +@@ -15,7 +15,7 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log *.aux ++ rm -f $*.dvi $*.log *.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} +@@ -44,7 +44,7 @@ ghostRightarrow.gif: Rightarrow.tex + giftrans -g '#000000=#ffffff' |\ + giftopnm |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux ++ rm -f Rightarrow.dvi Rightarrow.log Rightarrow.aux + test -f $*.gif && chmod 644 $*.gif + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/release_notes/math/Makefile b/release_notes/math/Makefile +index b3ffae3..9eca430 100644 +--- a/release_notes/math/Makefile ++++ b/release_notes/math/Makefile +@@ -16,11 +16,11 @@ density=-r90x90 + ${density} - |\ + pnmcrop |\ + ppmtogif -transparent white > $*.gif +- /bin/rm -f $*.dvi $*.log $*.aux ++ rm -f $*.dvi $*.log $*.aux + test -f $*.gif && chmod 644 $*.gif + + all: ${gifs} + + ${gifs}: mathmacros + +-clean: ; /bin/rm -f *.gif Make.out ++clean: ; rm -f *.gif Make.out +diff --git a/s/Mf-base b/s/Mf-base +index c709608..40d816c 100644 +--- a/s/Mf-base ++++ b/s/Mf-base +@@ -206,7 +206,7 @@ profiled: + $(MAKE) all loadspd=t bp=t PetiteBoot=../boot/$m/xpetite.boot SchemeBoot=../boot/$m/xscheme.boot + $(MAKE) prettyclean + $(MAKE) io.$m loadspd=t dumpbpd=t Scheme="../bin/$m/scheme -b ../boot/$m/xpetite.boot -b ../boot/$m/xscheme.boot" +- /bin/rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot ++ rm -f ../boot/$m/xpetite.boot ../boot/$m/xscheme.boot + $(MAKE) prettyclean + $(MAKE) all loadspd=t loadbpd=t + +diff --git a/workarea b/workarea +index bacc712..0461919 100755 +--- a/workarea ++++ b/workarea +@@ -70,9 +70,9 @@ esac + + if [ "$OS" = "Windows_NT" ] + then +- ln="/bin/cp -R" ++ ln="cp -R" + else +- ln="/bin/ln -s" ++ ln="ln -s" + fi + + # This shell script creates a workarea for local modifications to the +@@ -102,7 +102,7 @@ workln() + forceworkln() + { + if [ ! -e $2 ] ; then +- /bin/ln -s $1 $2 2> /dev/null ++ ln -s $1 $2 2> /dev/null + fi + } + +@@ -168,13 +168,13 @@ done + # deep copy submodules where builds occur so changes don't propagate through symlinks + for dir in `echo zlib` ; do + if [ ! -e $W/$dir ] ; then +- /bin/cp -R $dir $W/$dir ++ cp -R $dir $W/$dir + fi + done + + for dir in `echo lz4` ; do + if [ ! -e $W/$dir ] ; then +- /bin/cp -R $dir $W/$dir ++ cp -R $dir $W/$dir + fi + done + +-- +2.21.1 (Apple Git-122.3) + -- cgit 1.4.1 From 8b578c217f57ce009dbbc9df1036a06b6b822754 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Mon, 29 Mar 2021 17:59:47 +0200 Subject: gnu: crypto++: Update to 8.5.0. * gnu/packages/crypto.scm (crypto++): Update to 8.5.0. [origin]: Use git-fetch and git-reference. --- gnu/packages/crypto.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 94f9cbeebf..57d417de80 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -773,15 +773,18 @@ data on your platform, so the seed itself will be as random as possible. (define-public crypto++ (package (name "crypto++") - (version "8.4.0") + (version "8.5.0") (source (origin - (method url-fetch/zipbomb) - (uri (string-append "https://cryptopp.com/cryptopp" - (string-join (string-split version #\.) "") - ".zip")) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/weidai11/cryptopp") + (commit + (string-append "CRYPTOPP_" + (string-replace-substring version "." "_"))))) (sha256 (base32 - "16kvfm11xv7j9a3yykzysjgw38a9b7lnc5n5x5h82g395k6ybxf0")))) + "0in7rlazq91vfi519g9wr7bh87hii47cimxv7fmj0f88vhjaidq3")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit 1.4.1 From 81f65a3a2c5f4d1a5e8d74a4525181d8ae7d5408 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Fri, 2 Apr 2021 11:11:10 +0100 Subject: tests: libvirt: Catch issues with incorrect /var and /etc in package. * gnu/tests/virtualization.scm (run-libvirt-test): Chdir to "/tmp" before running test. Add "connect" test. --- gnu/tests/virtualization.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index e95787ee19..9f9d3a5e26 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2020 Ludovic Courtès ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,10 +93,20 @@ 0 (marionette-eval `(begin + (chdir "/tmp") (system* ,(string-append #$libvirt "/bin/virsh") "-c" "qemu:///system" "version")) marionette)) + (test-eq "connect" + 0 + (marionette-eval + `(begin + (chdir "/tmp") + (system* ,(string-append #$libvirt "/bin/virsh") + "-c" "qemu:///system" "connect")) + marionette)) + (test-end) (exit (= (test-runner-fail-count (test-runner-current)) 0))))) -- cgit 1.4.1 From ee5c4f70b6bc85cdb63a05c75683587528e89b2b Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 18 Feb 2021 21:48:09 +0100 Subject: gnu: libvirt: Enable disk and directory storage. * gnu/packages/virtualization.scm (libvirt)[inputs]: Add parted. [arguments]: Add configure flags to support disk and directory storage. --- gnu/packages/virtualization.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b365d722f9..88313d54a2 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1081,6 +1081,8 @@ manage system or application containers.") (list "--with-qemu" "--with-qemu-user=nobody" "--with-qemu-group=kvm" + "--with-storage-disk" + "--with-storage-dir" "--with-polkit" (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) @@ -1142,6 +1144,7 @@ manage system or application containers.") ("dmidecode" ,dmidecode) ("dnsmasq" ,dnsmasq) ("ebtables" ,ebtables) + ("parted" ,parted) ("iproute" ,iproute) ("iptables" ,iptables))) (native-inputs -- cgit 1.4.1 From 0d4ae86bc2e5c5a87e3d343d2b144ed9afd75314 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 2 Apr 2021 11:49:34 +0100 Subject: gnu: libvirt: Update to 7.2.0. * gnu/packages/virtualization.scm (libvirt): Update to 7.2.0. [arguemnts]: Switch to meson, only build system supported by upstream. [inputs]: Add libssh2 and readline. [native-inputs]: Add bash-completion, gettext, python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-add-install-prefix.patch: New file... * gnu/local.mk: ...add it. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete file, merged by upstream. Tested-by: Pierre Langlois --- gnu/local.mk | 4 +- .../patches/libvirt-add-install-prefix.patch | 329 +++++++++++++++++++++ gnu/packages/virtualization.scm | 82 +++-- 3 files changed, 367 insertions(+), 48 deletions(-) create mode 100644 gnu/packages/patches/libvirt-add-install-prefix.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1d7133667d..075504e302 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -34,7 +34,7 @@ # Copyright © 2020, 2021 Felix Gruber # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz -# Copyright © 2020 Brice Waegeneire +# Copyright © 2020, 2021 Brice Waegeneire # Copyright © 2020 Tanguy Le Carrour # Copyright © 2020 Martin Becze # Copyright © 2020 Malte Frank Gerdes @@ -1264,7 +1264,7 @@ dist_patch_DATA = \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-add-install-prefix.patch b/gnu/packages/patches/libvirt-add-install-prefix.patch new file mode 100644 index 0000000000..1331fa9b6f --- /dev/null +++ b/gnu/packages/patches/libvirt-add-install-prefix.patch @@ -0,0 +1,329 @@ +Patch from NixOS: +https://raw.githubusercontent.com/NixOS/nixpkgs/b98031a49c66095dd1eb9185ecdaeeb5e3cd752d/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + +From a896b0be849455edb83a9305dfec9b41447ef3e4 Mon Sep 17 00:00:00 2001 +From: Euan Kemp +Date: Thu, 14 Jan 2021 00:32:00 -0800 +Subject: [PATCH] meson: patch in an install prefix for building on nix + +Used in the nixpkgs version of libvirt so that we can install things in +the nix store, but read them from the root filesystem. +--- + meson.build | 9 +++++++++ + meson_options.txt | 2 ++ + src/libxl/meson.build | 6 +++--- + src/locking/meson.build | 8 ++++---- + src/lxc/meson.build | 6 +++--- + src/meson.build | 18 +++++++++--------- + src/network/meson.build | 12 ++++++------ + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 14 +++++++------- + src/remote/meson.build | 6 +++--- + src/security/apparmor/meson.build | 8 ++++---- + tools/meson.build | 4 ++-- + 12 files changed, 53 insertions(+), 42 deletions(-) + +diff --git a/meson.build b/meson.build +index b5164f6..33719f1 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' + conf.set('WINVER', '0x0600') # Win Vista / Server 2008 + endif + ++# patched in for nix ++install_prefix = get_option('install_prefix') + + # set various paths + +@@ -57,6 +59,13 @@ else + sysconfdir = prefix / get_option('sysconfdir') + endif + ++# nix: don't prefix the localstatedir; some things need to write to it, so it ++# can't be in the nix store, and that's what the prefix is. ++# We'll prefix things ourselves where needed ++localstatedir = get_option('localstatedir') ++# Same for sysconfidr ++sysconfdir = get_option('sysconfdir') ++ + # if --prefix is /usr, don't use /usr/var for localstatedir or /usr/etc for + # sysconfdir as this makes a lot of things break in testing situations + if prefix == '/usr' +diff --git a/meson_options.txt b/meson_options.txt +index e5d79c2..081cd32 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,5 @@ ++option('install_prefix', type: 'string', value: '', description: 'prefix for nix store installation') ++ + option('no_git', type: 'boolean', value: false, description: 'Disable git submodule update') + option('packager', type: 'string', value: '', description: 'Extra packager name') + option('packager_version', type: 'string', value: '', description: 'Extra packager version') +diff --git a/src/libxl/meson.build b/src/libxl/meson.build +index 3bb6cc5..78d7be0 100644 +--- a/src/libxl/meson.build ++++ b/src/libxl/meson.build +@@ -84,8 +84,8 @@ if conf.has('WITH_LIBXL') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'libxl', +- runstatedir / 'libvirt' / 'libxl', +- localstatedir / 'log' / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'libxl', ++ install_prefix + runstatedir / 'libvirt' / 'libxl', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'libxl', + ] + endif +diff --git a/src/locking/meson.build b/src/locking/meson.build +index 8a28310..9da81cc 100644 +--- a/src/locking/meson.build ++++ b/src/locking/meson.build +@@ -243,14 +243,14 @@ if conf.has('WITH_LIBVIRTD') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lockd', +- localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', +- runstatedir / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lockd' / 'files', ++ install_prefix + runstatedir / 'libvirt' / 'lockd', + ] + + if conf.has('WITH_SANLOCK') + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'sanlock', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'sanlock', + ] + endif + endif +diff --git a/src/lxc/meson.build b/src/lxc/meson.build +index f8e2a88..96d6687 100644 +--- a/src/lxc/meson.build ++++ b/src/lxc/meson.build +@@ -182,8 +182,8 @@ if conf.has('WITH_LXC') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'lxc', +- runstatedir / 'libvirt' / 'lxc', +- localstatedir / 'log' / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'lxc', ++ install_prefix + runstatedir / 'libvirt' / 'lxc', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'lxc', + ] + endif +diff --git a/src/meson.build b/src/meson.build +index 7c47821..d33d16a 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -669,7 +669,7 @@ endforeach + + virt_conf_files += 'libvirt.conf' + +-install_data(virt_conf_files, install_dir: confdir) ++install_data(virt_conf_files, install_dir: install_prefix + confdir) + install_data(virt_aug_files, install_dir: virt_aug_dir) + + # augeas_test_data: +@@ -729,7 +729,7 @@ foreach data : virt_daemon_confs + output: '@0@.conf'.format(data['name']), + configuration: daemon_conf, + install: true, +- install_dir: confdir, ++ install_dir: install_prefix + confdir, + ) + + if data.get('with_ip', false) +@@ -853,14 +853,14 @@ if conf.has('WITH_LIBVIRTD') + + install_data( + init_file, +- install_dir: sysconfdir / 'init.d', ++ install_dir: install_prefix + sysconfdir / 'init.d', + rename: [ init['name'] ], + ) + + if init.has_key('confd') + install_data( + init['confd'], +- install_dir: sysconfdir / 'conf.d', ++ install_dir: install_prefix + sysconfdir / 'conf.d', + rename: [ init['name'] ], + ) + endif +@@ -872,7 +872,7 @@ if init_script != 'none' + foreach sysconf : sysconf_files + install_data( + sysconf['file'], +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: [ sysconf['name'] ], + ) + endforeach +@@ -897,10 +897,10 @@ endif + # Install empty directories + + virt_install_dirs += [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', ++ install_prefix + localstatedir / 'cache' / 'libvirt', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'images', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'filesystems', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'boot', + ] + + meson.add_install_script( +diff --git a/src/network/meson.build b/src/network/meson.build +index 3ec598c..b02040b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -79,9 +79,9 @@ if conf.has('WITH_NETWORK') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'network', +- localstatedir / 'lib' / 'libvirt' / 'dnsmasq', +- runstatedir / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'network', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'dnsmasq', ++ install_prefix + runstatedir / 'libvirt' / 'network', + ] + + configure_file( +@@ -89,12 +89,12 @@ if conf.has('WITH_NETWORK') + output: '@BASENAME@', + copy: true, + install: true, +- install_dir: confdir / 'qemu' / 'networks', ++ install_dir: install_prefix + confdir / 'qemu' / 'networks', + ) + + meson.add_install_script( + meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), +- confdir / 'qemu' / 'networks' / 'autostart', ++ install_prefix + confdir / 'qemu' / 'networks' / 'autostart', + '../default.xml', 'default.xml', + ) + +diff --git a/src/nwfilter/xml/meson.build b/src/nwfilter/xml/meson.build +index 0d96c54..66c92a1 100644 +--- a/src/nwfilter/xml/meson.build ++++ b/src/nwfilter/xml/meson.build +@@ -25,4 +25,4 @@ nwfilter_xml_files = [ + 'qemu-announce-self.xml', + ] + +-install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') ++install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') +diff --git a/src/qemu/meson.build b/src/qemu/meson.build +index 90640b0..8802cec 100644 +--- a/src/qemu/meson.build ++++ b/src/qemu/meson.build +@@ -171,12 +171,12 @@ if conf.has('WITH_QEMU') + } + + virt_install_dirs += [ +- localstatedir / 'lib' / 'libvirt' / 'qemu', +- runstatedir / 'libvirt' / 'qemu', +- localstatedir / 'cache' / 'libvirt' / 'qemu', +- localstatedir / 'log' / 'libvirt' / 'qemu', +- localstatedir / 'lib' / 'libvirt' / 'swtpm', +- runstatedir / 'libvirt' / 'qemu' / 'swtpm', +- localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'qemu', ++ install_prefix + runstatedir / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'cache' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'log' / 'libvirt' / 'qemu', ++ install_prefix + localstatedir / 'lib' / 'libvirt' / 'swtpm', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ++ install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + ] + endif +diff --git a/src/remote/meson.build b/src/remote/meson.build +index 9ad2f6a..429a15b 100644 +--- a/src/remote/meson.build ++++ b/src/remote/meson.build +@@ -245,7 +245,7 @@ if conf.has('WITH_REMOTE') + } + + virt_install_dirs += [ +- localstatedir / 'log' / 'libvirt', ++ install_prefix + localstatedir / 'log' / 'libvirt', + ] + + logrotate_conf = configuration_data() +@@ -259,7 +259,7 @@ if conf.has('WITH_REMOTE') + ) + install_data( + log_file, +- install_dir: sysconfdir / 'logrotate.d', ++ install_dir: install_prefix + sysconfdir / 'logrotate.d', + rename: [ name ], + ) + endforeach +@@ -309,7 +309,7 @@ endif + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: install_prefix + sysconfdir / 'sasl2', + rename: [ 'libvirt.conf' ], + ) + endif +diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build +index af43780..e2d6c81 100644 +--- a/src/security/apparmor/meson.build ++++ b/src/security/apparmor/meson.build +@@ -17,22 +17,22 @@ foreach name : apparmor_gen_profiles + output: name, + configuration: apparmor_gen_profiles_conf, + install: true, +- install_dir: apparmor_dir, ++ install_dir: install_prefix + apparmor_dir, + ) + endforeach + + install_data( + [ 'libvirt-qemu', 'libvirt-lxc' ], +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + + install_data( + [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], +- install_dir: apparmor_dir / 'libvirt', ++ install_dir: install_prefix + apparmor_dir / 'libvirt', + ) + + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) +diff --git a/tools/meson.build b/tools/meson.build +index b8c6802..dacd0ff 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -115,7 +115,7 @@ if conf.has('WITH_LOGIN_SHELL') + install_rpath: libvirt_rpath, + ) + +- install_data('virt-login-shell.conf', install_dir: sysconfdir / 'libvirt') ++ install_data('virt-login-shell.conf', install_dir: install_prefix + sysconfdir / 'libvirt') + endif + + if host_machine.system() == 'windows' +@@ -274,7 +274,7 @@ configure_file( + if init_script == 'systemd' + install_data( + 'libvirt-guests.sysconf', +- install_dir: sysconfdir / 'sysconfig', ++ install_dir: install_prefix + sysconfdir / 'sysconfig', + rename: 'libvirt-guests', + ) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 88313d54a2..3c6b61499a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka -;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Mathieu Othacehe ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020, 2021 Maxim Cournoyer @@ -42,6 +42,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages bison) #:use-module (gnu packages build-tools) #:use-module (gnu packages check) @@ -97,6 +98,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) + #:use-module (gnu packages readline) #:use-module (gnu packages selinux) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -1065,66 +1067,48 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.2.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) - (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (base32 "1l6i1rz1v9rnp61sgzlrlbsfh03208dbm3b259i0jl5sqz85kx01")) + (patches (search-patches "libvirt-add-install-prefix.patch")))) + (build-system meson-build-system) (arguments `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=nobody" - "--with-qemu-group=kvm" - "--with-storage-disk" - "--with-storage-dir" - "--with-polkit" - (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" + (list "-Ddriver_qemu=enabled" + "-Dqemu_user=nobody" + "-Dqemu_group=kvm" + "-Dstorage_disk=enabled" + "-Dstorage_dir=enabled" + "-Dpolkit=enabled" + "-Dnls=enabled" ;translations + (string-append "-Ddocdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) + "-Dbash_completion=enabled" + (string-append "-Dinstall_prefix=" (assoc-ref %outputs "out")) "--sysconfdir=/etc" "--localstatedir=/var") + #:meson ,meson-0.55 #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to ‘/bin/sh’, causing test failures. - (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determine where - ;; the RPC headers are located. Tell it to look in the right place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) - #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails - "virnetsockettest" ; tries to network - "virshtest"))) ; fails - (substitute* "tests/Makefile.in" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|"))) + (let ((tests (list "commandtest" ; hangs idly + "qemuxml2argvtest" ; fails + "virnetsockettest"))) ; tries to network + (substitute* "tests/meson.build" + (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) "")) #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=/tmp/etc" - "localstatedir=/tmp/var" - make-flags)))))) + (add-before 'install 'no-polkit-magic + ;; Meson ‘magically’ invokes pkexec, which fails (not setuid). + (lambda _ + (setenv "PKEXEC_UID" "something") + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1133,11 +1117,13 @@ manage system or application containers.") ("dbus" ,dbus) ("libpcap" ,libpcap) ("libnl" ,libnl) + ("libssh2" ,libssh2) ;optional ("libtirpc" ,libtirpc) ;for ("libuuid" ,util-linux "lib") ("lvm2" ,lvm2) ;for libdevmapper ("curl" ,curl) ("openssl" ,openssl) + ("readline" ,readline) ("cyrus-sasl" ,cyrus-sasl) ("libyajl" ,libyajl) ("audit" ,audit) @@ -1148,11 +1134,15 @@ manage system or application containers.") ("iproute" ,iproute) ("iptables" ,iptables))) (native-inputs - `(("xsltproc" ,libxslt) + `(("bash-completion" ,bash-completion) + ("gettext" ,gettext-minimal) + ("xsltproc" ,libxslt) ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for rpcgen (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualization -- cgit 1.4.1 From 28cc447fc5bd0a219ad54836a343826cc34d9bd7 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:23 +0000 Subject: gnu: python-libvirt: Update to 7.2.0. * gnu/packages/virtualization.scm (python-libvirt): Update to 7.2.0. --- gnu/packages/virtualization.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 3c6b61499a..953b09a325 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1196,14 +1197,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.2.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-python-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))) + (base32 "1ryfimhf47s9k4n0gys233bh15l68fccs2bvj8bjwqjm9k2vmhy0")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 29383ecc8ccd8d8df77e5c60e59aba42e5ca0fec Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:24 +0000 Subject: gnu: libvirt-glib: Update to 4.0.0. * gnu/packages/virtualization.scm (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. --- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 953b09a325..13f97a1625 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1155,15 +1155,15 @@ to integrate other virtualization mechanisms if needed.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) -- cgit 1.4.1 From 653faaebd60c407cbd2265c6ee8a72a521f6b116 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Sat, 20 Mar 2021 21:31:25 +0000 Subject: gnu: virt-manager: Update to 3.2.0. * gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0. [arguments]: Remove #:test-target. Remove fix-qemu-img-reference phase. Adapt check phase to use pytest, although they still do not run. [native-inputs]: Add python-docutils. Suggest adding python-pytest to enable tests. --- gnu/packages/virtualization.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 13f97a1625..5fc6ff8e4f 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1236,7 +1236,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sources" @@ -1244,11 +1244,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))) + "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' command - #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wasn't ; met @@ -1266,12 +1265,6 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) - (add-after 'unpack 'fix-qemu-img-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) - #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1302,11 +1295,12 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be enabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "python" "setup.py" "test_ui")) + (invoke "dbus-run-session" "--" "pytest" "--uitests")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas)) @@ -1336,7 +1330,9 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) + ("rst2man" ,python-docutils) ;; The following are required for running the tests + ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) -- cgit 1.4.1 From 92ff287e746ab294427aaafbede74f57678e28e5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 5 Apr 2021 19:20:59 +0200 Subject: gnu: Add dream. * gnu/packages/radio.scm (dream): New variable. --- gnu/packages/radio.scm | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 826693a538..bd26252c64 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -29,6 +29,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -36,6 +37,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) @@ -49,6 +51,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages golang) + #:use-module (gnu packages gps) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages image) @@ -1414,3 +1417,72 @@ Compatible hardware/software: @item Icom IC-9700 @end itemize\n") (license license:expat))) + +(define-public dream + (package + (name "dream") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/drm/dream/" version + "/dream-" version "-svn808.tar.gz")) + (sha256 + (base32 "01dv6gvljz64zrjbr08mybr9aicvpq2c6qskww46lngdjyhk8xs1")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("faad2" ,faad2) + ("fftw" ,fftw) + ("libsndfile" ,libsndfile) + ("libpcap" ,libpcap) + ("opus" ,opus) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qwt" ,qwt) + ("speexdsp" ,speexdsp) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "dream.pro" + (("target\\.path = /usr/bin") + (string-append "target.path = " + (assoc-ref outputs "out") "/bin")) + (("documentation\\.path = /usr/share/man/man1") + (string-append "documentation.path = " + (assoc-ref outputs "out") + "/share/man/man1")) + (("/usr/include/pulse/") + (string-append (assoc-ref inputs "pulseaudio") + "/include/pulse/")) + (("/usr/include/sndfile\\.h") + (string-append (assoc-ref inputs "libsndfile") + "/include/sndfile.h")) + (("/usr/include/opus/") + (string-append (assoc-ref inputs "opus") + "/include/opus/")) + (("/usr/include/speex/") + (string-append (assoc-ref inputs "speexdsp") + "/include/speex/")) + (("/usr/include/qwt/") + (string-append (assoc-ref inputs "qwt") + "/include/qwt/")) + (("\\$\\$OUT_PWD/include/neaacdec\\.h") + (string-append (assoc-ref inputs "faad2") + "/include/neaacdec.h"))))) + (replace 'configure + (lambda _ + (invoke "qmake")))))) + (home-page "https://sourceforge.net/projects/drm/") + (synopsis "Digital Radio Mondiale receiver") + (description + "Dream is a software implementation of a Digital Radio Mondiale (DRM) +receiver.") + (license license:gpl2+))) -- cgit 1.4.1 From 561017f83823253a496b1eb650377c96623c2385 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 5 Apr 2021 20:56:00 +0200 Subject: gnu: Add welle-io. * gnu/packages/radio.scm (welle-io): New variable. --- gnu/packages/radio.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index bd26252c64..afe93081b3 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages maths) + #:use-module (gnu packages mp3) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -1486,3 +1487,43 @@ Compatible hardware/software: "Dream is a software implementation of a Digital Radio Mondiale (DRM) receiver.") (license license:gpl2+))) + +(define-public welle-io + (package + (name "welle-io") + (version "2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/albrechtl/welle.io") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa")))) + (build-system qt-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("faad2" ,faad2) + ("fftwf" ,fftwf) + ("lame" ,lame) + ("libusb" ,libusb) + ("mpg123" ,mpg123) + ("rtl-sdr" ,rtl-sdr) + ("qtbase" ,qtbase) + ("qtcharts" ,qtcharts) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtmultimedia" ,qtmultimedia) + ("qtquickcontrols2" ,qtquickcontrols2))) + (arguments + `(#:configure-flags '("-DRTLSDR=ON") + #:tests? #f)) + (home-page "https://www.welle.io/") + (synopsis "DAB and DAB+ software radio") + (description + "@code{welle.io} is a Digital Audio Broadcasting (DAB and DAB+) software +defined radio with support for rtl-sdr.") + (license license:gpl2+))) -- cgit 1.4.1 From ab0ed26eb70931e04c921ceef313ca67e3c6d61c Mon Sep 17 00:00:00 2001 From: Ron Nazarov via Guix-patches via Date: Sat, 3 Apr 2021 22:19:08 +0100 Subject: gnu: Add node-wrappy. * gnu/packages/node-xyz.scm (node-wrappy): New variable. Signed-off-by: Leo Famulari --- gnu/packages/node-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm index 60cc005ea4..f401380310 100644 --- a/gnu/packages/node-xyz.scm +++ b/gnu/packages/node-xyz.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Efraim Flashner ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Noisytoot ;;; ;;; This file is part of GNU Guix. ;;; @@ -272,3 +273,28 @@ function with browser support.") "@code{node-semver} is a JavaScript implementation of the @uref{https://semver.org/, SemVer.org} specification.") (license license:isc))) + +(define-public node-wrappy + (package + (name "node-wrappy") + (version "1.0.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/npm/wrappy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1ymlc61cja6v5438vwb04gq8wg2b784lj39zf0g4i36fvgcw9783")))) + (build-system node-build-system) + (arguments + '(#:tests? #f ; FIXME: Tests depend on node-tap + #:phases + (modify-phases %standard-phases + ;; The only dependency to check for is tap, which we don't have. + (delete 'configure)))) + (home-page "https://github.com/npm/wrappy") + (synopsis "Callback wrapping utility") + (description "@code{wrappy} is a utility for Node.js to wrap callbacks.") + (license license:isc))) -- cgit 1.4.1 From 14392c77896561c5846c0f3a0588720792d61e95 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Tue, 6 Apr 2021 10:57:19 +0200 Subject: gnu: python-tortoise-orm: Fix dependencies. * gnu/packages/databases.scm (python-tortoise-orm) [propagated-inputs]: Add missing dependency. [arguments]: Relax pytz version requirement, remove iso8601 requirement. --- gnu/packages/databases.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 130e94d535..ce7afa82d0 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2469,7 +2469,10 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") (lambda _ (substitute* "setup.py" (("pypika>=0\\.44\\.0,<0\\.45\\.0") "pypika") - (("aiosqlite>=0.16.0,<0.17.0") "aiosqlite")) + (("aiosqlite>=0.16.0,<0.17.0") "aiosqlite") + (("pytz>=2020\\.4,<2021\\.0") "pytz") + ;; Not required, since ciso8601 is used. + (("'iso8601>=0\\.1\\.13,<0\\.2\\.0',") "")) #t))))) (native-inputs `(("python-asynctest" ,python-asynctest) @@ -2478,6 +2481,7 @@ can autogenerate peewee models using @code{pwiz}, a model generator.") `(("python-aiosqlite" ,python-aiosqlite) ("python-pypika" ,python-pypika) ("python-ciso8601" ,python-ciso8601) + ("python-pytz" ,python-pytz) ("python-typing-extensions" ,python-typing-extensions))) (home-page -- cgit 1.4.1 From a7f12433248a6a2732b81c5302ee81dd37d5f33d Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 12:27:36 +0200 Subject: gnu: libpano13: Update to 2.9.20_rc3 [security fixes]. Fixes at least CVE-2021-20307. * gnu/packages/photo.scm (libpano13): Update to 2.9.20_rc3. --- gnu/packages/photo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 5fd57af4a5..c0c8632d9a 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -355,15 +355,16 @@ and a wide variety of other metadata.") (define-public libpano13 (package (name "libpano13") - (version "2.9.19") + (version "2.9.20_rc3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/panotools/libpano13/" - "libpano13-" version "/" - "libpano13-" version ".tar.gz")) + "libpano13-" (first + (string-split version #\_)) + "/libpano13-" version ".tar.gz")) (sha256 (base32 - "1a4m3plmfcrrplqs9zfzhc5apibn10m5sajpizm1sd3q74w5fwq3")))) + "12cv4886l1czfjwy7k6ipgf3zjksgwhdjzr2s9fdg33vqcv2hlrv")))) (build-system cmake-build-system) (inputs `(("libjpeg" ,libjpeg-turbo) -- cgit 1.4.1 From c6eb6d471da1b7bdf7264defac0cc33fd1d48c81 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 13:55:04 +0200 Subject: gnu: txr: Update to 255. * gnu/packages/lisp.scm (txr): Update to 255. --- gnu/packages/lisp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 3704d226fe..1d8c1ac601 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve -;;; Copyright © 2019, 2020 Guillaume Le Vaillant +;;; Copyright © 2019, 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Zhu Zihao ;;; Copyright © 2021 Sharlatan Hellseher @@ -847,7 +847,7 @@ enough to play the original mainframe Zork all the way through.") (define-public txr (package (name "txr") - (version "246") + (version "255") (source (origin (method git-fetch) @@ -856,7 +856,7 @@ enough to play the original mainframe Zork all the way through.") (commit (string-append "txr-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ynkz0ss7nn1ssiaxagpq80iabknf085nk0pra9hn8y9hx7av0db")))) + (base32 "0fjca44761x29xg5hh60yf4i3k7462z7ysnadbk2wzisp42yxk6j")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 05a5e222e9e9250dbac61a278762dd47f2eb8897 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 6 Apr 2021 14:49:20 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210406. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210406. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index fe86cc8b18..d7fd0a9061 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3418,10 +3418,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "6e8315613d496089ba858c13afabb2c0f6d28740")) + (let ((commit "1f4ae84a10fd81914b1adedc0a7d34392837521e")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "11" commit)) + (version (git-version "2.4" "12" commit)) (source (origin (method git-fetch) @@ -3431,7 +3431,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "121jk3irxaz8jnmhjnpdypb9shwd844rf4b3x94y1ig4dxw7gx6h")))) + "051gvx7jy6yx3272y7vswxqzbjdbwany025g2drcjck5h79w6af5")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From bed31da50d8edfefa7255d9e80ab837c2d88349e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 14:55:45 +0200 Subject: gnu: bitcoin-unlimited: Update to 1.9.1.1. * gnu/packages/finance.scm (bitcoin-unlimited): Update to 1.9.1.1. --- 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 3ccc077b94..08b7a95292 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1404,7 +1404,7 @@ following three utilities are included with the library: (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") - (version "1.9.0.1") + (version "1.9.1.1") (source (origin (method git-fetch) @@ -1413,7 +1413,7 @@ following three utilities are included with the library: (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pan24g3d5csa004d7zvlizj4mv58ly5i579341isp944phl3g5v")))) + (base32 "0vyvfawss40v9jaic9zq0z3cjvxiq04d4wgq4rnkha7ilm9zqyd7")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit 1.4.1 From 535417a6cbabaa0fc6b662f1cbc9078a7954fd0c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 6 Apr 2021 15:20:01 +0200 Subject: gnu: bitcoin-unlimited: Use new source repository. * gnu/packages/finance.scm (bitcoin-unlimited)[source]: Update git repository URL. --- gnu/packages/finance.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 08b7a95292..f18438bc88 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1409,7 +1409,7 @@ following three utilities are included with the library: (origin (method git-fetch) (uri (git-reference - (url "https://github.com/BitcoinUnlimited/BitcoinUnlimited") + (url "https://gitlab.com/bitcoinunlimited/BCHUnlimited.git/") (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 -- cgit 1.4.1 From 26f34f3de4239544cc03a914de137e246ac99abe Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 19:14:53 +0200 Subject: gnu: python-django: Update to 3.1.8 [security fixes]. * gnu/packages/django.scm (python-django): Update to 3.1.8. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 7122ba3071..cba7929b60 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -47,13 +47,13 @@ (define-public python-django (package (name "python-django") - (version "3.1.7") + (version "3.1.8") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "19v5lfijnjx18y9ax962z3gnbxy9k8i3w4j0qfzcp85nx4p7kkij")))) + "1b0ymqv09b523k3c2jnpb2gjy2fsy6irbfyc2g9x5hjyw41k2fgq")))) (build-system python-build-system) (arguments '(#:phases -- cgit 1.4.1 From 1467080de4ddf49d0bf2fbc3ff9e1cf8dccba44a Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 19:15:01 +0200 Subject: gnu: python-django-2.2: Update to 2.2.20 [security fixes]. * gnu/packages/django.scm (python-django-2.2): Update to 2.2.20. --- gnu/packages/django.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index cba7929b60..dfc3d314ad 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -132,13 +132,13 @@ to the @dfn{don't repeat yourself} (DRY) principle.") (define-public python-django-2.2 (package (inherit python-django) - (version "2.2.19") + (version "2.2.20") (source (origin (method url-fetch) (uri (pypi-uri "Django" version)) (sha256 (base32 - "0hysjf8bz4g8xrn2cdx6pmawimpyr6ag2fg3jxsnc1byr3g3bhih")))) + "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95")))) (native-inputs `(;; XXX: In 2.2 and 3.0, selenium is required for the test suite. ("python-selenium" ,python-selenium) -- cgit 1.4.1 From 5fd046cbfd73ac178c02c503f3d8e2104a929e52 Mon Sep 17 00:00:00 2001 From: Franck Pérignon Date: Tue, 6 Apr 2021 11:20:00 +0000 Subject: gnu: Add scotch and pt-scotch with shared libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/maths.scm (scotch-shared, pt-scotch-shared): New variables. Signed-off-by: Leo Famulari --- gnu/packages/maths.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5cd11ec435..ff1b46f095 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -43,6 +43,7 @@ ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Gerd Heber +;;; Copyright © 2021 Franck Pérignon ;;; ;;; This file is part of GNU Guix. ;;; @@ -3246,6 +3247,63 @@ YACC = bison -pscotchyy -y -b y (synopsis "Programs and libraries for graph algorithms (32-bit integers)"))) +(define-public scotch-shared + (package (inherit scotch) + (name "scotch-shared") + (native-inputs + `(("gcc" ,gcc) + ("flex" ,flex) + ("bison" ,bison))) + (arguments + (substitute-keyword-arguments (package-arguments scotch) + ((#:phases scotch-shared-phases) + `(modify-phases ,scotch-shared-phases + (replace + 'configure + (lambda _ + ;; Otherwise, the RUNPATH will lack the final path component. + (setenv "RPATHFLAGS" (string-append "-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib")) + (call-with-output-file "Makefile.inc" + (lambda (port) + (format port " +EXE = +LIB = .so +OBJ = .o +MAKE = make +AR = gcc +ARFLAGS = -shared -o +CAT = cat +CCS = gcc +CCP = mpicc +CCD = gcc +CPPFLAGS =~{ -D~a~} +CFLAGS = -O2 -g -fPIC $(CPPFLAGS) $(RPATHFLAGS) +CLIBFLAGS = -shared -fPIC +LDFLAGS = -lz -lm -lrt -lpthread -Xlinker --no-as-needed +CP = cp +LEX = flex -Pscotchyy -olex.yy.c +LN = ln +MKDIR = mkdir +MV = mv +RANLIB = echo +YACC = bison -pscotchyy -y -b y +" + '("COMMON_FILE_COMPRESS_GZ" + "COMMON_PTHREAD" + "COMMON_RANDOM_FIXED_SEED" + "INTSIZE64" ;use 'int64_t' + ;; Prevents symbolc clashes with libesmumps + "SCOTCH_RENAME" + ;; XXX: Causes invalid frees in superlu-dist tests + ;; "SCOTCH_PTHREAD" + ;; "SCOTCH_PTHREAD_NUMBER=2" + "restrict=__restrict" + ))))#t)) + (delete 'check))))) + (synopsis + "Programs and libraries for graph algorithms (shared libraries version)"))) + (define-public pt-scotch (package (inherit scotch) (name "pt-scotch") @@ -3293,6 +3351,28 @@ YACC = bison -pscotchyy -y -b y (synopsis "Programs and libraries for graph algorithms (with MPI and 32-bit integers)"))) +(define-public pt-scotch-shared + (package (inherit scotch-shared) + (name "pt-scotch-shared") + (propagated-inputs + `(("openmpi" ,openmpi))) ;Headers include MPI headers + (arguments + (substitute-keyword-arguments (package-arguments scotch-shared) + ((#:phases scotch-shared-phases) + `(modify-phases ,scotch-shared-phases + (replace + 'build + (lambda _ + (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))))) + (synopsis "Graph algorithms (shared libraries version, with MPI)"))) + + (define-public metis (package (name "metis") -- cgit 1.4.1 From 87aaccbf5584eaca421e5e238534c79ef5fd4d2a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Apr 2021 13:35:56 -0400 Subject: gnu: emacs-php-mode: Fix installation prefix. * gnu/packages/emacs-xyz.scm (emacs-php-mode) [include]: Remove argument. [phases]{add-lisp-dir-to-emacs-load-path}: Remove phase. {enter-source-directory}: Add phase. --- gnu/packages/emacs-xyz.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 239915fffe..8e80ccbb56 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12486,13 +12486,11 @@ using Imenu, and Compilation mode support for MSBuild, devenv and xbuild.") (base32 "0bs9q62bd7885c39v7x1qz3w1fhpmpdgm72xwsk2yygw0ii425nn")))) (build-system emacs-build-system) (arguments - `(#:include (cons "^lisp/" %default-include) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'add-source-to-load-path 'add-lisp-dir-to-emacs-load-path + (add-after 'unpack 'enter-source-directory (lambda _ - (setenv "EMACSLOADPATH" - (string-append (getcwd) "/lisp:" (getenv "EMACSLOADPATH")))))))) + (chdir "lisp")))))) (propagated-inputs `(("emacs-projectile" ,emacs-projectile))) (home-page "https://github.com/ejmr/php-mode") (synopsis "Major mode for editing PHP code") -- cgit 1.4.1 From 41d0b233bac19a2ce0289bf2279a1e7f831b8aee Mon Sep 17 00:00:00 2001 From: Léo Le Bouter Date: Tue, 6 Apr 2021 21:00:16 +0200 Subject: gnu: umoci: Update to 0.4.7 [fixes CVE-2021-29136]. * gnu/packages/virtualization.scm (umoci): Update to 0.4.7. --- 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 5fc6ff8e4f..64e5c88fd1 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1605,7 +1605,7 @@ Open Container Initiative specification.") (define-public umoci (package (name "umoci") - (version "0.4.6") + (version "0.4.7") (source (origin (method url-fetch) @@ -1614,7 +1614,7 @@ Open Container Initiative specification.") version "/umoci.tar.xz")) (file-name (string-append "umoci-" version ".tar.xz")) (sha256 - (base32 "06q7xfwnqysc013hapx31jhlzmyg8qb467qfkynj673qc7p9bd6h")))) + (base32 "0fvljj9k4f83wbqzd8nbijz0p1zaq633f8yxyvl5sy3wjf03ffk9")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/umoci" -- cgit 1.4.1 From 8515a506ca71ae5e3709930754d6df77614ffb71 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 6 Apr 2021 16:31:16 -0400 Subject: gnu: qemu: Fix the Texinfo manual. The makeinfo command splits the generated info output in multiple files (in 300 KiB chunks) by default; this meant the build system would have had to install the multiple QEMU.info-1, QEMU.info-2, etc. files for the info manual to work as intended. Instead, keep the info manual as one single file by specifying the --no-split option to makeinfo. * gnu/packages/patches/qemu-build-info-manual.patch (sphinxinfo) : Invoke with the --no-split argument. --- gnu/packages/patches/qemu-build-info-manual.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packages/patches/qemu-build-info-manual.patch index c837040d45..f2bee30ab0 100644 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ b/gnu/packages/patches/qemu-build-info-manual.patch @@ -90,7 +90,7 @@ index ebd85d59f9..1243839461 100644 + output: 'QEMU.info', + install: true, + install_dir: get_option('infodir'), -+ command: [makeinfo, '@INPUT0@', '--output=@OUTPUT@']) ++ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) + alias_target('texi', sphinxtexi) + alias_target('info', sphinxinfo) + endif -- cgit 1.4.1 From 66d8dc3d745442efdfe13decdff6bde748fb4c53 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 17 Feb 2021 20:43:30 +0100 Subject: gnu: Add opensmtpd-filter-rspamd. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (opensmtpd-filter-rspamd): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 489053544b..56fae3fcba 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2020 Eric Brown ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Michael Rohleder -;;; Copyright © 2020 Alexey Abramov +;;; Copyright © 2020, 2021 Alexey Abramov ;;; Copyright © 2020 Tim Gesthuizen ;;; Copyright © 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Oleg Pykhalov @@ -159,6 +159,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system go) #:use-module (guix build-system gnu) + #:use-module (guix build-system go) #:use-module (guix build-system guile) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -3169,6 +3170,39 @@ writing OpenSMTPd filters.") messages with @acronym{DKIM, DomainKeys Identified Mail} (RFC 4871).") (license license:expat))) +(define-public opensmtpd-filter-rspamd + (package + (name "opensmtpd-filter-rspamd") + (version "0.1.7") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/poolpOrg/filter-rspamd") + (commit (string-append "v" version)))) + (sha256 + (base32 "1qhrw20q9y44ffgx5k14nvqc9dh47ihywgzza84g0zv9xgif7hd5")) + (file-name (git-file-name name version)))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/poolpOrg/filter-rspamd" + #:phases + (modify-phases %standard-phases + (add-before 'build 'set-bootstrap-variables + (lambda* (#:key outputs inputs #:allow-other-keys) + ;; Tell the build system where to install binaries + (let* ((out (assoc-ref outputs "out")) + (libexec (string-append out "/libexec/opensmtpd"))) + (setenv "GOBIN" libexec))))))) + (native-inputs + `(("opensmtpd" ,opensmtpd))) + (home-page "https://github.com/poolpOrg/filter-rspamd") + (synopsis "OpenSMTPd filter to request an Rspamd analysis") + (description + "The @command{filter-rspamd} OpenSMTPd filter implements the +Rspamd protocol and allows OpenSMTPd to request an Rspamd analysis of +an SMTP transaction before a message is committed to queue.") + (license license:isc))) + (define-public mailman (package (name "mailman") -- cgit 1.4.1 From 5a6e27bfbdf04bb4555b49fd06766266807a3092 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Wed, 17 Feb 2021 20:43:59 +0100 Subject: services: dovecot: Fix serialization of a free-form-args arguments. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/mail.scm (serialize-free-form-args): Change destination and return a string containing the formated text. Signed-off-by: Ludovic Courtès --- gnu/services/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index c0f6371104..81f692e437 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -159,7 +159,7 @@ (define (serialize-free-form-args field-name val) (serialize-field field-name (string-join - (map (match-lambda ((k . v) (format #t "~a=~a" k v))) val) + (map (match-lambda ((k . v) (format #f "~a=~a" k v))) val) " "))) (define-configuration dict-configuration -- cgit 1.4.1 From ee9c44c76752231ea40f2492304426f204f93a0e Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 17 Feb 2021 22:45:08 +0000 Subject: gnu: Add camlidl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/ocaml.scm (camlidl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/ocaml.scm | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 086f3b048a..0948377d08 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2020 divoplade ;;; Copyright © 2020 pukkamustard ;;; Copyright © 2021 aecepoglu +;;; Copyright © 2021 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -466,6 +467,71 @@ depend: $(STDLIB_MLIS) $(STDLIB_DEPS)")) for building OCaml library and programs.") (license license:lgpl2.1+))) +(define-public camlidl + (package + (name "camlidl") + (version "1.09") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xavierleroy/camlidl") + (commit "camlidl109"))) + (sha256 + (base32 "0zrkaq7fk23b2b9vg6jwdjx7l0hdqp4synbbrw1zcg8gjf6n3c80")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;; No test suite + #:make-flags + (list + (string-append + "BINDIR=" (assoc-ref %outputs "out") "/bin") + (string-append + "OCAMLLIB=" (assoc-ref %outputs "out") "/lib/ocaml/site-lib/camlidl")) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'build + (lambda _ + (copy-file "config/Makefile.unix" "config/Makefile") + ;; Note: do not pass '-jN' as this appears to not be + ;; parallel-safe (race condition related to libcamlidl.a). + (invoke "make" "all") + #t)) + (add-before 'install 'create-target-directories + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (string-append (assoc-ref outputs "out")))) + (mkdir-p + (string-append out "/bin")) + (mkdir-p + (string-append out "/lib/ocaml/site-lib/camlidl/stublibs")) + (mkdir-p + (string-append out "/lib/ocaml/site-lib/camlidl/caml"))) + #t)) + (add-after 'install 'install-meta + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (with-output-to-file + (string-append out "/lib/ocaml/site-lib/camlidl/META") + (lambda _ + (display + (string-append + "description = \"Stub code generator for OCaml/C interface\" +version = \"" ,version "\" +directory = \"^\" +archive(byte) = \"com.cma\" +archive(native) = \"com.cmxa\""))))) + #t))))) + (native-inputs + `(("ocaml" ,ocaml))) + (home-page "https://github.com/xavierleroy/camlidl") + (synopsis "Stub code generator for OCaml/C interface") + (description + "Camlidl is a stub code generator for Objective Caml. It generates stub +code for interfacing Caml with C from an IDL description of the C functions.") + (license license:lgpl2.1))) + (define-public ocaml-extlib (package (name "ocaml-extlib") -- cgit 1.4.1 From 8e4d44ad390c2171e8ae212dea0ec93d6af278f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 5 Apr 2021 17:23:16 +0200 Subject: gnu: Add cfm. * gnu/packages/admin.scm (cfm): New public variable. --- gnu/packages/admin.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 2963f3e049..8e43d8fe97 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -329,6 +329,38 @@ interface and is based on GNU Guile.") #t))) ,@(package-arguments shepherd))))) +(define-public cfm + (package + (name "cfm") + (version "0.6.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/WillEccles/cfm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14gapia902f29wa4dlrrj8jcwcff9bfvyhjccw9ddy2gxx2g8wmr")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no test suite + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + ;; Keeping xdg-open optional avoids a size increase of 293%. + (delete 'configure)))) ; no configure script + (home-page "https://eccles.dev/cfm/") + (synopsis + "Simple terminal file manager with @command{vi}-inspired key bindings") + (description + "The Cactus File Manager (@command{cfm}) helps you manage your files +visually from a text terminal. It aims to be simple and fast, with key bindings +inspired by @command{vi}.") + (license license:mpl2.0))) + (define-public cloud-utils (package (name "cloud-utils") -- cgit 1.4.1 From 08512512eae2bd8b71f2e99251ee8dcadcefc1a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:05 +0200 Subject: gnu: stunnel: Update to 5.59. * gnu/packages/web.scm (stunnel): Update to 5.59. --- 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 7bc638ba88..fc4abfdf81 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5888,14 +5888,14 @@ tools like SSH (Secure Shell) to reach the outside world.") (define-public stunnel (package (name "stunnel") - (version "5.58") + (version "5.59") (source (origin (method url-fetch) (uri (string-append "https://www.stunnel.org/downloads/stunnel-" version ".tar.gz")) (sha256 - (base32 "0y9vjzjqi340vy6h321r1cskb7l6a4prr9d2ysixqzjpjv04rhfl")))) + (base32 "17yf2n47j5hw2y9527mrkx3j7q9jk5vvg46m3hgp1wg8dggpcxqk")))) (build-system gnu-build-system) (native-inputs ;; For tests. -- cgit 1.4.1 From d6f0987669ab4a23e04191787dd3171220152bed Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:21 +0200 Subject: gnu: tmux-xpanes: Update to 4.1.2. * gnu/packages/tmux.scm (tmux-xpanes): Update to 4.1.2. --- gnu/packages/tmux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm index 95a31f80fd..8f0ea5223f 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2017 Vasile Dumitrascu ;;; Copyright © 2017 Stefan Reichör -;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Oleg Pykhalov ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020 Edouard Klein -- cgit 1.4.1 From b0a53c526887dc31f0f328b4e3950edfa766902b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:34 +0200 Subject: gnu: mpv: Update to 0.33.1. * gnu/packages/video.scm (mpv): Update to 0.33.1. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4cd36cbd7f..0a6bd3f57a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2016, 2018, 2019, 2020 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu -;;; Copyright © 201–72021 Tobias Geerinckx-Rice +;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Ethan R. Jones @@ -1995,7 +1995,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.33.0") + (version "0.33.1") (source (origin (method git-fetch) (uri (git-reference @@ -2004,7 +2004,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (file-name (git-file-name name version)) (sha256 (base32 - "06cmycd2gb826kf2zv470w6nhzyk9sdhjydsdiinbgb902lzcpfy")))) + "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45")))) (build-system waf-build-system) (native-inputs `(("perl" ,perl) ; for zsh completion file -- cgit 1.4.1 From d3184ee437f1c11b7203676fcd1ffb1a9ae24bd8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 00:54:41 +0200 Subject: gnu: di: Update to 4.50. * gnu/packages/admin.scm (di): Update to 4.50. --- 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 8e43d8fe97..4cb23ddc01 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2957,13 +2957,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.49") + (version "4.50") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz")) (sha256 - (base32 "1y38jhp2bpwbwzdzjlhgfqc7bxxz9cwapxd61799zjf54jkslkf0")))) + (base32 "0aj9ldkvmj8fmrk685vd2gagz0q8lwsn2nfbx6r6mza94mn8pw42")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures -- cgit 1.4.1 From a121f4c54a3534c7191b1dc5d2b932510c477e35 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Apr 2021 11:57:21 +0200 Subject: gnu: cuirass: Update to 1.0.0-6.ec0be96. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-6.ec0be96. --- 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 cdfe725a65..eaf3b304ca 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "eb94e7da6a5985a4b92d92aa22955e4013490e9c") - (revision "5")) + (let ((commit "ec0be96407f039a7a2f7daf4baf1d26e47773753") + (revision "6")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1fyj33bhfl0zl7ik98dxqvb58n24zv3aw037gvri0p0xzyp2fhbx")))) + "1cxwbsf4if7lk1i0fhpp1m7dga35afq4dgpkbj9a9f2z8cxi1w1d")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit 1.4.1 From a060977239690bc6fadf45efc55ec61e34f89cac Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 28 Mar 2021 12:56:53 +0300 Subject: gnu: Add entt. * gnu/packages/cpp.scm (entt): New variable. Signed-off-by: Leo Prikler --- gnu/packages/game-development.scm | 40 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index ea879568f5..3e74de449d 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Giacomo Leidi +;;; Copyright © 2021 Alexandru-Sergiu Marton ;;; ;;; This file is part of GNU Guix. ;;; @@ -55,6 +56,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages compression) + #:use-module (gnu packages check) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) @@ -1761,6 +1763,44 @@ provide high-quality 3D rendering, it contains an animation editor, and can be scripted in a Python-like language.") (license license:expat))) +(define-public entt + (package + (name "entt") + (version "3.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/skypjack/entt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzvnhiw3r6nkmxp749zwxc8kzja09nijyxibdbri3g2i7pysf58")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-DENTT_BUILD_TESTING=ON" + "-DENTT_FIND_GTEST_PACKAGE=ON" + "-DENTT_BUILD_DOCS=ON") + ;; Only tests are compiled, and they need assertions to work correctly. + #:build-type "Debug")) + (native-inputs + `(;; for testing + ("googletest" ,googletest) + ;; for documentation + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (synopsis "Entity component system") + (description "EnTT is a header-only library, containing (among other things) +@itemize +@item an entity component system based on sparse sets, +@item a configuration system using the monostate pattern, +@item a static reflection system, +@item and a cooperative scheduler. +@end itemize") + (home-page "https://github.com/skypjack/entt") + (license (list license:expat ; code + license:cc-by4.0)))) ; documentation + (define-public eureka (package (name "eureka") -- cgit 1.4.1 From 37d8def701839200c44c76cb2fa2abfb27a7b88b Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 7 Apr 2021 15:28:01 +0200 Subject: gnu: cuirass: Update to 1.0.0-7.1b35a77. * gnu/packages/ci.scm (cuirass): Update to 1.0.0-7.1b35a77. --- 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 eaf3b304ca..eaf32d9739 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -48,8 +48,8 @@ #:use-module (guix build-system gnu)) (define-public cuirass - (let ((commit "ec0be96407f039a7a2f7daf4baf1d26e47773753") - (revision "6")) + (let ((commit "1b35a7785627f3e8c5b6d8f37bf11eb4a470b4c4") + (revision "7")) (package (name "cuirass") (version (git-version "1.0.0" revision commit)) @@ -62,7 +62,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1cxwbsf4if7lk1i0fhpp1m7dga35afq4dgpkbj9a9f2z8cxi1w1d")))) + "1hy8inhwpi9i92yg5alvmqgp1vjnrhinckywkv9kgyjlskzshib3")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit 1.4.1 From 8a32b6a542e49ae989a4418c73546e558c547479 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 7 Apr 2021 19:31:57 +0200 Subject: gnu: sbcl-cl-webkit: Update to 20210407. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20210407. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d7fd0a9061..8d527005e9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3418,10 +3418,10 @@ is a library for creating graphical user interfaces.") (sbcl-package->ecl-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "1f4ae84a10fd81914b1adedc0a7d34392837521e")) + (let ((commit "db855639d4a13f6ba296959cf11635b6b67421bf")) (package (name "sbcl-cl-webkit") - (version (git-version "2.4" "12" commit)) + (version (git-version "2.4" "13" commit)) (source (origin (method git-fetch) @@ -3431,7 +3431,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "051gvx7jy6yx3272y7vswxqzbjdbwany025g2drcjck5h79w6af5")))) + "01alj5bfsh2983pwpdy0zpa2rvl4kl0mqzs08ff46is3cb8fqs0g")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From 2d77c270f4196cddd5739cda0156b610607a26a5 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Wed, 7 Apr 2021 18:48:21 +0100 Subject: gnu: Add texlive-fontaxes. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ec21221ea1..c8bac7eea7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7905,3 +7905,26 @@ matching maths fonts are provided by the @code{fourier} and @code{mathdesign} font packages.") (license (license:fsf-free "http://mirrors.ctan.org/fonts/utopia/README")))) + +(define-public texlive-fontaxes + (package + (name "texlive-fontaxes") + (version "1.0e") + (source + (origin + (method svn-fetch) + (uri (texlive-ref "latex" "fontaxes")) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "19mhp9l7cjw0sbq55c9lz0l2pffkyhyir3i63jqynifjmglbgkl7")))) + (build-system texlive-build-system) + (arguments '(#:tex-directory "latex/fontaxes")) + (home-page "http://www.ctan.org/pkg/fontaxes") + (synopsis "Additional font axes for LaTeX") + (description "The @code{fontaxes} package adds several new font +axes on top of LaTeX's New Font Selection Scheme (NFSS). In +particular, it splits the shape axis into a primary and a secondary +shape axis and it adds three new axes to deal with the different +figure versions offered by many professional fonts.") + (license license:lppl1.3+))) -- cgit 1.4.1 From 0bc6ae5843a29320bea971c6a3a0a3b6814fb291 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 19:55:06 +0200 Subject: gnu: tmux-xpanes: Update to 4.1.3. * gnu/packages/tmux.scm (tmux-xpanes): Update to 4.1.3. --- 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 8f0ea5223f..b8355600b3 100644 --- a/gnu/packages/tmux.scm +++ b/gnu/packages/tmux.scm @@ -228,7 +228,7 @@ them, etc., by attaching to the corresponding pane in tmux.") (define-public tmux-xpanes (package (name "tmux-xpanes") - (version "4.1.2") + (version "4.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -237,7 +237,7 @@ them, etc., by attaching to the corresponding pane in tmux.") (file-name (git-file-name name version)) (sha256 (base32 - "0vm5mi6dqdbg0b5qh4r8sr1plpc00jryd8a2qxpp3a72cigjvvf0")))) + "09fmnn1q76r1l4cv7clmfr3j9cjmd053kq238d0qj2i486948ivv")))) (build-system trivial-build-system) (inputs `(("bash" ,bash))) -- cgit 1.4.1 From 6b1b6b0ed06cf7593ad8476cfa28273ed0bdb44d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:22:52 +0200 Subject: gnu: nmrpflash: Update to 0.9.15. * gnu/packages/admin.scm (nmrpflash): Update to 0.9.15. --- 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 4cb23ddc01..06fc6baa46 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -4318,7 +4318,7 @@ entries, providing commands to add, remove, comment, and search.") (define-public nmrpflash (package (name "nmrpflash") - (version "0.9.14") + (version "0.9.15") (source (origin (method git-fetch) @@ -4327,7 +4327,7 @@ entries, providing commands to add, remove, comment, and search.") (url "https://github.com/jclehner/nmrpflash") (commit (string-append "v" version)))) (sha256 - (base32 "1fdjrxhjs96rdclbkld57xarf592slhkp79h46z833npxpn12ck1")) + (base32 "0ssfls1sfh8w748qsnkfgndlpw395100x2yynzbk5jd56scxvp20")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit 1.4.1 From 2b605ef3b145ec136530f08ee7aa27382aa64b46 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:25:58 +0200 Subject: gnu: libupnp: Update to 1.14.5 [fixes CVE-2021-28302]. * gnu/packages/upnp.scm (libupnp): Update to 1.14.5. --- gnu/packages/upnp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 307ea14e96..2743ba456d 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -96,14 +96,14 @@ over IRC, instant messaging, network games, and most server software.") (define-public libupnp (package (name "libupnp") - (version "1.14.4") + (version "1.14.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/pupnp/pupnp/releases/download" "/release-" version "/libupnp-" version".tar.bz2")) (sha256 - (base32 "0qxydxf11dnq5rd33pa35mc5i5li7xdysc7ph23bisbh63srwr6d")))) + (base32 "16hlcpffmqd4rja57m6km1dpx3abgv91vvmb8971vfg6gd0glzr2")))) (native-inputs `(("pkg-config" ,pkg-config))) (build-system gnu-build-system) -- cgit 1.4.1 From 43110e8d4e3b88481b99ffd8a88158d1fc54837e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 21:26:32 +0200 Subject: gnu: youtube-dl: Update to 2021.04.07. * gnu/packages/video.scm (youtube-dl): Update to 2021.04.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 0a6bd3f57a..571dbb70c6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,14 +2179,14 @@ To load this plugin, specify the following option when starting mpv: (define-public youtube-dl (package (name "youtube-dl") - (version "2021.04.01") + (version "2021.04.07") (source (origin (method url-fetch) (uri (string-append "https://youtube-dl.org/downloads/latest/" "youtube-dl-" version ".tar.gz")) (sha256 (base32 - "1vw9l32bv115129v1lfar626y3vivvxkp36bc1phjcrsjfayz67h")) + "02d51l6gdjr3zhhi7ydf5kzv8dv4jzq0ygja7zb2h9k7hnl0l27m")) (snippet '(begin ;; Delete the pre-generated files, except for the man page -- cgit 1.4.1 From 1ccc5cfc387d14fa3ebe864e16c0637994819b0f Mon Sep 17 00:00:00 2001 From: David Thompson Date: Wed, 7 Apr 2021 17:08:21 -0400 Subject: gnu: tiled: Update to 1.5.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 3e74de449d..07a17763f8 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -448,7 +448,7 @@ support.") (define-public tiled (package (name "tiled") - (version "1.4.3") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -457,7 +457,7 @@ support.") (file-name (git-file-name name version)) (sha256 (base32 - "14bx4gywfzr2f07ldqk3la82g5ag1agj21f7ccrxip12ydmpx0xb")))) + "1prajkx1xpp3csa0xpkrn3c2cnzvmwzxgrqb9d3gqszp3sllr2dg")))) (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase) -- cgit 1.4.1 From 096897889f54f1649c2c18f27d62f9f00207334e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:36:02 +0200 Subject: gnu: solarus: Update to 1.6.5. * gnu/packages/games.scm (solarus): Update to 1.6.5. (solarus-quest-editor)[source]: Update hash. [arguments]: Remove obsolete 'fix-qt-build phase. --- gnu/packages/games.scm | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3f909aad4b..048784ab2c 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2325,7 +2325,7 @@ and defeat them with your bubbles!") (name "solarus") ;; XXX: When updating this package, please also update hash in ;; `solarus-quest-editor' below. - (version "1.6.4") + (version "1.6.5") (source (origin (method git-fetch) @@ -2334,7 +2334,7 @@ and defeat them with your bubbles!") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1n6l91yyqjx0pz4w1lp3yybpq0fs2yjswfcm8c1wjfkxwiznbdxi")))) + (base32 "0ny9dgqphjv2l39rff2621hnrzpf8qin8vmnv7jdz20azjk4m8id")))) (build-system cmake-build-system) (arguments `(#:phases @@ -2393,19 +2393,9 @@ in mind.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1qbc2j9kalk7xqk9j27s7wnm5zawiyjs47xqkqphw683idmzmjzn")))) + (base32 "1pvjgd4faxii5sskw1h55lw90hlbazhwni8nxyywzrmkjbq7irm0")))) (arguments - `(#:tests? #false ;no test - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-qt-build - ;; XXX: Fix build with Qt 5.15. It has been applied upstream as - ;; 81d5c7f1 and can be removed at next upgrade. - (lambda _ - (substitute* "src/entities/jumper.cpp" - (("#include " all) - (string-append all "\n" "#include \n"))) - #t))))) + `(#:tests? #false)) ; no test suite (inputs `(("solarus" ,solarus) ,@(package-inputs solarus))) -- cgit 1.4.1 From 887531a231c2beacc8e7345fe382af961d575ea7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:37:53 +0200 Subject: gnu: nsd: Update to 4.3.6. * gnu/packages/dns.scm (nsd): Update to 4.3.6. --- 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 afdf2867a7..c940657ce9 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -539,14 +539,14 @@ asynchronous fashion.") (define-public nsd (package (name "nsd") - (version "4.3.5") + (version "4.3.6") (source (origin (method url-fetch) (uri (string-append "https://www.nlnetlabs.nl/downloads/nsd/nsd-" version ".tar.gz")) (sha256 - (base32 "0wj490rxqs86z8s4lxjwk06ry5pvkdqqyq1cf83z7mxk60zb98kx")))) + (base32 "062zwx4k5rgpg2c0b4721ldj36aj8clrxv79mlfw9b15ap7w1rmy")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 2ffd92abf23e3fb3b3bac3c3efd43630ba616f4b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 7 Apr 2021 23:38:53 +0200 Subject: gnu: libxlsxwriter: Update to 1.0.1. * gnu/packages/xml.scm (libxlsxwriter): Update to 1.0.1. --- gnu/packages/xml.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 130fe45995..1c34fe499a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -221,7 +221,7 @@ project (but it is usable outside of the Gnome platform).") (define-public libxlsxwriter (package (name "libxlsxwriter") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -230,8 +230,7 @@ project (but it is usable outside of the Gnome platform).") (commit (string-append "RELEASE_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "070pfqggia71z4ichr5yrwfndfz903z941ns72vy0lvb1mpp7g05")) + (base32 "0dsqv4qdd582fhwj6m80iz50gkyw4m8n9h4mkd2871csa03sbilf")) (modules '((guix build utils))) (snippet ;; Remove bundled minizip source -- cgit 1.4.1 From 3118fde135da3c661de8d61f73ebb4f633d096ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 7 Apr 2021 21:25:06 +0200 Subject: gnu: r-seurat: Update to 4.0.1. * gnu/packages/cran.scm (r-seurat): Update to 4.0.1. [arguments]: Remove. [propagated-inputs]: Replace r-spatstat with r-spatstat-core and r-spatstat-geom. --- gnu/packages/cran.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 044ad8f5bb..fcde611f5d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26484,27 +26484,15 @@ other R users.") (define-public r-seurat (package (name "r-seurat") - (version "4.0.0") + (version "4.0.1") (source (origin (method url-fetch) (uri (cran-uri "Seurat" version)) (sha256 (base32 - "1mp3py00bmzj4541d8ry5sfzkpfzvnl9dpa8n4qhakd13dl30xdn")))) + "17cmp9mimvykb8ny796dn1zwmvg0pwwjw1zcixyamc5q1lwnxi3p")))) (properties `((upstream-name . "Seurat"))) (build-system r-build-system) - ;; This is needed because r-spatstat has been split up and there has - ;; been no new release of Seurat since then. - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-spatstat-import - (lambda _ - (substitute* "NAMESPACE" - (("importFrom\\(spatstat,markvario\\)") - "importFrom(spatstat.core,markvario)") - (("importFrom\\(spatstat,ppp\\)") - "importFrom(spatstat.geom,ppp)"))))))) (propagated-inputs `(("r-cluster" ,r-cluster) ("r-cowplot" ,r-cowplot) @@ -26545,7 +26533,8 @@ other R users.") ("r-sctransform" ,r-sctransform) ("r-seuratobject" ,r-seuratobject) ("r-shiny" ,r-shiny) - ("r-spatstat" ,r-spatstat) + ("r-spatstat-core" ,r-spatstat-core) + ("r-spatstat-geom" ,r-spatstat-geom) ("r-tibble" ,r-tibble) ("r-uwot" ,r-uwot))) (home-page "http://www.satijalab.org/seurat") -- cgit 1.4.1 From a2b1c149df1626e5a9ac6b3dc9c4d465ba79aedd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:23:56 +0200 Subject: gnu: Add r-workflowsets. * gnu/packages/cran.scm (r-workflowsets): 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 fcde611f5d..f47d35ae42 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25853,6 +25853,45 @@ for finding reasonable values of hyper-parameters in models, pre-processing methods, and post-processing steps.") (license license:expat))) +(define-public r-workflowsets + (package + (name "r-workflowsets") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "workflowsets" version)) + (sha256 + (base32 + "1q41isvj7hhbkx3y8k6kazpiygig92xannsz8dpklh0k3j9l3c2p")))) + (properties `((upstream-name . "workflowsets"))) + (build-system r-build-system) + (propagated-inputs + `(("r-cli" ,r-cli) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-prettyunits" ,r-prettyunits) + ("r-purrr" ,r-purrr) + ("r-rlang" ,r-rlang) + ("r-rsample" ,r-rsample) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr) + ("r-tune" ,r-tune) + ("r-vctrs" ,r-vctrs) + ("r-withr" ,r-withr) + ("r-workflows" ,r-workflows))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/tidymodels/workflowsets") + (synopsis "Create a collection of tidymodels workflows") + (description + "A workflow is a combination of a model and preprocessors (e.g, a +formula, recipe, etc.). In order to try different combinations of these, an +object can be created that contains many workflows. There are functions to +create workflows en masse as well as training them and visualizing the +results.") + (license license:expat))) + (define-public r-tidyposterior (package (name "r-tidyposterior") -- cgit 1.4.1 From 08462c02c2a93ad82444222b3f20f8cb05c18c3a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-diffobj: Update to 0.3.4. * gnu/packages/cran.scm (r-diffobj): Update to 0.3.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 f47d35ae42..597a317f9c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -156,14 +156,14 @@ automatically pruning objects to maintain the constraints.") (define-public r-diffobj (package (name "r-diffobj") - (version "0.3.3") + (version "0.3.4") (source (origin (method url-fetch) (uri (cran-uri "diffobj" version)) (sha256 (base32 - "1x3d5sk8mk0s2d7dq8wxi1zv6krlx33n22ls2jwnb58b8xrmakj1")))) + "1z4yhfasjpi9rxl1lh9bny7yvs947a6hhc768azc1wwad748mk9q")))) (properties `((upstream-name . "diffobj"))) (build-system r-build-system) (propagated-inputs `(("r-crayon" ,r-crayon))) -- cgit 1.4.1 From c55b81d99f3aecc7c91871c84b45064334fc47df Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-ggpmisc: Update to 0.3.9. * gnu/packages/cran.scm (r-ggpmisc): Update to 0.3.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 597a317f9c..21a455a6fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -393,13 +393,13 @@ variables.") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.3.8-1") + (version "0.3.9") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0kcrh73nwha52vl6z35wafmqs5lsdh2p4nqvi2ir70cv1k5y46zf")))) + "0nb0lpwqph9334s9sq77mk3nd22icy9d9hywz4awhf6nvp5rcc2v")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) -- cgit 1.4.1 From 3e30068225f3ea52a3a4a5d7d7e953283c186318 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:48 +0200 Subject: gnu: r-oenb: Update to 0.0.2. * gnu/packages/cran.scm (r-oenb): Update to 0.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 21a455a6fe..0542bb325d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -501,14 +501,14 @@ higher.") (define-public r-oenb (package (name "r-oenb") - (version "0.0.1") + (version "0.0.2") (source (origin (method url-fetch) (uri (cran-uri "oenb" version)) (sha256 (base32 - "1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz")))) + "1jgxw7ycx2lcdzglg9nix8k08fs4r6i5jdsjzrd6w1dg6smsinl5")))) (properties `((upstream-name . "oenb"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 183e3b413c5e24d20f565ef94ec653f90e66419b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-reprex: Update to 2.0.0. * gnu/packages/cran.scm (r-reprex): Update to 2.0.0. [propagated-inputs]: Add r-rstudioapi. --- 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 0542bb325d..f3452c2653 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -927,14 +927,14 @@ package is a port of the Python package @code{cssselect}.") (define-public r-reprex (package (name "r-reprex") - (version "1.0.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "reprex" version)) (sha256 (base32 - "07nzx0fdl48jw95ipx17ql0l13q60yl3rjrkj1m375wrc7h1v5nx")))) + "1lcnxczy28n4g3rvph09va7svcznfyqa7zdggklqb924qvy7flwh")))) (build-system r-build-system) (propagated-inputs `(("r-callr" ,r-callr) @@ -945,6 +945,7 @@ package is a port of the Python package @code{cssselect}.") ("r-knitr" ,r-knitr) ("r-rlang" ,r-rlang) ("r-rmarkdown" ,r-rmarkdown) + ("r-rstudioapi" ,r-rstudioapi) ("r-withr" ,r-withr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From 2eafe4ee97f47707c3d7a5c2777b5a5eccf255f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-callr: Update to 3.6.0. * gnu/packages/cran.scm (r-callr): Update to 3.6.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 f3452c2653..1aa80edbf1 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -984,14 +984,14 @@ same time tries to group instances from the same class together.") (define-public r-callr (package (name "r-callr") - (version "3.5.1") + (version "3.6.0") (source (origin (method url-fetch) (uri (cran-uri "callr" version)) (sha256 (base32 - "15l6ppsxdadlnl4fk0f8bvf327n8izk96px5d08m1ay9iij8qcyf")))) + "050s7l1ipi6snbj6xnk052l6acycnxjyzv84026adw5x8kki0yz6")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit 1.4.1 From 667f719b447b23a860443a9e2531ddd0c0d3b4ff Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-psych: Update to 2.1.3. * gnu/packages/cran.scm (r-psych): Update to 2.1.3. [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 1aa80edbf1..39cb7522a0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4223,19 +4223,21 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.0.12") + (version "2.1.3") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0k5dw5nb7kx7f21b0z01dry99qcpnk7iaicv7xq9d35wv2hx8wca")))) + "1ibh1ivr280wpmk3qjgm715dk79wx0ikjl9jjjcqs03q6vz4wmdx")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice) ("r-mnormt" ,r-mnormt) ("r-nlme" ,r-nlme))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/psych/") (synopsis "Procedures for psychological, psychometric, and personality research") (description -- cgit 1.4.1 From bd005c093a8fb87ca8a8518517aea28596eecf0c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-broom: Update to 0.7.6. * gnu/packages/cran.scm (r-broom): Update to 0.7.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 39cb7522a0..73bcbc1106 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4278,14 +4278,14 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "0.7.5") + (version "0.7.6") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "1qjyl5b100bsakm48w1vi3819lkpys7vb86n1sv9h4y2wr1c4jmw")))) + "1ljcl8mh0yqxw3qxzar482qwbxbcaim1x6y1wm82ws12pfdw0j8n")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit 1.4.1 From c6976608be1a91a15e2f7c9837bbd40aa5cf7cc2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:49 +0200 Subject: gnu: r-vioplot: Update to 0.3.6. * gnu/packages/cran.scm (r-vioplot): Update to 0.3.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 73bcbc1106..3d060a6f9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4768,14 +4768,14 @@ structure.") (define-public r-vioplot (package (name "r-vioplot") - (version "0.3.5") + (version "0.3.6") (source (origin (method url-fetch) (uri (cran-uri "vioplot" version)) (sha256 (base32 - "0aiy615kn9lpr2cs757g3pklg81n01yhqh0wrwv111fn3cy86r0v")))) + "15vmrm9gwdhfg8mnq8rsg7m59kzc9h53cv96am4ds1dkm56w4n6p")))) (build-system r-build-system) (propagated-inputs `(("r-sm" ,r-sm) -- cgit 1.4.1 From db62940b1339cdca8f0f8c746faefec8343f7f56 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-cli: Update to 2.4.0. * gnu/packages/cran.scm (r-cli): Update to 2.4.0. [propagated-inputs]: Remove r-assertthat. --- 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 3d060a6f9b..dbcda18133 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5051,18 +5051,17 @@ plots in @code{ggplot2}.") (define-public r-cli (package (name "r-cli") - (version "2.3.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "1jh64ixn6mg2ap1sx4azrxkjnlsyjbfxyc9zjkx8m9dlakgf4v2i")))) + "0l1s9yv23bc7mm0hfdlamgz4wjfrisv8aylr65ihjs98jsynrkg3")))) (build-system r-build-system) (propagated-inputs - `(("r-assertthat" ,r-assertthat) - ("r-glue" ,r-glue))) + `(("r-glue" ,r-glue))) (home-page "https://github.com/r-lib/cli#readme") (synopsis "Helpers for developing command line interfaces") (description "This package provides a suite of tools designed to build -- cgit 1.4.1 From ab9531e3b7ff50f4bb0f2af051ad697b814bf6f4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-processx: Update to 3.5.1. * gnu/packages/cran.scm (r-processx): Update to 3.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 dbcda18133..45de6ae91b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5113,13 +5113,13 @@ constants, and control debugging of packages via environment variables.") (define-public r-processx (package (name "r-processx") - (version "3.4.5") + (version "3.5.1") (source (origin (method url-fetch) (uri (cran-uri "processx" version)) (sha256 - (base32 "055v2gdrgqsfy8s672wsq79bqr44b4jjmcbqivx4p2d6lqx10s73")))) + (base32 "1z7zag7g041xlhzhkdfl33y2phc877h1pwj9k69p69b967qi6p6k")))) (build-system r-build-system) (propagated-inputs `(("r-ps" ,r-ps) -- cgit 1.4.1 From 69c18192d7bcee2b97a6a13d89f620190d045d15 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-vctrs: Update to 0.3.7. * gnu/packages/cran.scm (r-vctrs): Update to 0.3.7. [propagated-inputs]: Remove r-digest. --- 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 45de6ae91b..e9b5091982 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5325,18 +5325,17 @@ to variables on the left-hand side of the assignment.") (define-public r-vctrs (package (name "r-vctrs") - (version "0.3.6") + (version "0.3.7") (source (origin (method url-fetch) (uri (cran-uri "vctrs" version)) (sha256 (base32 - "09ddxgzyah7lw42hn6n8fynsixf43s10jamsf94d2aidky63czfz")))) + "03hyxk3x635xfdn2x707gygdb2xk0cayl1nl44zib9bwqyyb7nas")))) (build-system r-build-system) (propagated-inputs - `(("r-digest" ,r-digest) - ("r-ellipsis" ,r-ellipsis) + `(("r-ellipsis" ,r-ellipsis) ("r-glue" ,r-glue) ("r-rlang" ,r-rlang))) (native-inputs -- cgit 1.4.1 From 5666f9919958e1da5c25cf2eac0b280686f04485 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:50 +0200 Subject: gnu: r-tinytex: Update to 0.31. * gnu/packages/cran.scm (r-tinytex): Update to 0.31. --- 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 e9b5091982..3b5a53b51c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5413,14 +5413,14 @@ terminals.") (define-public r-tinytex (package (name "r-tinytex") - (version "0.30") + (version "0.31") (source (origin (method url-fetch) (uri (cran-uri "tinytex" version)) (sha256 (base32 - "0dk6mpszwh1m65b0wfwjlcvpzywmasf6p31niqiq53wnd92my0gw")))) + "04a3ncaxix30n9m73slpsn1idxv7j1f7fy3nhxpvkk514x9rgg0p")))) (build-system r-build-system) (propagated-inputs `(("r-xfun" ,r-xfun))) -- cgit 1.4.1 From f802ddb2422355d9870513a400633d9226db29d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-sapa: Update to 2.0-3. * gnu/packages/cran.scm (r-sapa): Update to 2.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 3b5a53b51c..d9e50162b2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5728,14 +5728,14 @@ sapa R packages.") (define-public r-sapa (package (name "r-sapa") - (version "2.0-2") + (version "2.0-3") (source (origin (method url-fetch) (uri (cran-uri "sapa" version)) (sha256 (base32 - "056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds")))) + "0kj681rd4c2lvqr926lb6f4qwp281x5274dg6vbk8pf5y7s0qlpc")))) (build-system r-build-system) (propagated-inputs `(("r-ifultools" ,r-ifultools) -- cgit 1.4.1 From 07958074342bd54a472e2d73cb3147fbaa5b834a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-arules: Update to 1.6-7. * gnu/packages/cran.scm (r-arules): Update to 1.6-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 d9e50162b2..84b77463aa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6707,14 +6707,14 @@ evaluated by the @dfn{Akaike Information Criterion} (AIC).") (define-public r-arules (package (name "r-arules") - (version "1.6-6") + (version "1.6-7") (source (origin (method url-fetch) (uri (cran-uri "arules" version)) (sha256 (base32 - "1pk3jjizn2m5rwi7qkdkbq9f07acgpy0qdzzqmx0agg47cwahlkm")))) + "0m80kndfbannw8h53nqdd5wl8h33q2z259aa1cp1nwadaxf9fc1q")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit 1.4.1 From 3d7e85a832a2f60f732ce79ff1a07a1756c19b06 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:51 +0200 Subject: gnu: r-rastervis: Update to 0.50.1. * gnu/packages/cran.scm (r-rastervis): Update to 0.50.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 84b77463aa..7b6158c8bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7232,14 +7232,14 @@ Python's @url{https://github.com/ActiveState/appdirs,Appdirs} to R.") (define-public r-rastervis (package (name "r-rastervis") - (version "0.50") + (version "0.50.1") (source (origin (method url-fetch) (uri (cran-uri "rasterVis" version)) (sha256 (base32 - "0m7fjd53apxim0d0rjnyzc28vmfcg4spcrn0zbnk8llillxji1hi")))) + "1fkmyllydnmk3j2cmgf86r91wyxf2kh573x8bkck7wgkfniw4h7w")))) (properties `((upstream-name . "rasterVis"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 74554d52695c5a4256bec25d6c5654f2698e23b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-renv: Update to 0.13.2. * gnu/packages/cran.scm (r-renv): Update to 0.13.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 7b6158c8bd..d4b15f42c6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7291,14 +7291,14 @@ those searches and pull data into their R sessions.") (define-public r-renv (package (name "r-renv") - (version "0.13.0") + (version "0.13.2") (source (origin (method url-fetch) (uri (cran-uri "renv" version)) (sha256 (base32 - "16n2dz9jibc03f7q1wrzxss6l5jmaks7m2lnli9dz9anvcmxbdia")))) + "0jlsf6vfvqhr4i35xy3xf1ixkfillivzy3wbpl6ca9vyjpnhiwj1")))) (properties `((upstream-name . "renv"))) (build-system r-build-system) (native-inputs -- cgit 1.4.1 From d62f9f8de6a094a3b0ca5de3313201a43b80c7c0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-rbibutils: Update to 2.1. * gnu/packages/cran.scm (r-rbibutils): Update to 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 d4b15f42c6..73055c06e4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7862,14 +7862,14 @@ hierarchical models using Markov Chain Monte Carlo (MCMC) simulation.") (define-public r-rbibutils (package (name "r-rbibutils") - (version "2.0") + (version "2.1") (source (origin (method url-fetch) (uri (cran-uri "rbibutils" version)) (sha256 (base32 - "1vfg2188i4dyhrmvnwpsh2la8qkd4wkryz2fpj4cppi1wfz3ml83")))) + "13phw0dk3p3s1z45ff7dbqnn27zws1209mp3d4763zh7xnsdsl44")))) (properties `((upstream-name . "rbibutils"))) (build-system r-build-system) (home-page "https://geobosh.github.io/rbibutils/") -- cgit 1.4.1 From d54765907cff3925966e1aca4b615df642a13e36 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-officer: Update to 0.3.18. * gnu/packages/cran.scm (r-officer): Update to 0.3.18. --- 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 73055c06e4..94b11e9ab0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -7910,14 +7910,14 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.17") + (version "0.3.18") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1apg0dh1zfhrqcbbmm8318l40gyjbqc2l9sdvwxx7qi8mzc1mqvw")))) + "1j3bv4j8x5ijj0j447vpdsk4p8pl3ncwdwnns6n3plfrqgsf3vsg")))) (build-system r-build-system) (propagated-inputs `(("r-r6" ,r-r6) -- cgit 1.4.1 From 60f6aa20e9862dfeba7c3943ccb83ab0f09a80c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:52 +0200 Subject: gnu: r-insight: Update to 0.13.2. * gnu/packages/cran.scm (r-insight): Update to 0.13.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 94b11e9ab0..7c74659481 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8171,14 +8171,14 @@ other add-on packages.") (define-public r-insight (package (name "r-insight") - (version "0.13.1") + (version "0.13.2") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "1la4yxzfl9fnknamnaziil6gvpdzl78z16lfzis9jgzg8r9q0y5l")))) + "03b7kd17h25mi1si40ibcp3jpasyqpj51mr8js0ywywyfw7909j1")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From f1d038bd0e5fae9fd0d4fe05a84357cebb38c58b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-magick: Update to 2.7.1. * gnu/packages/cran.scm (r-magick): Update to 2.7.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 7c74659481..ff368b6a6b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9668,14 +9668,14 @@ samples is large and the number of mixture components is not too large.") (define-public r-magick (package (name "r-magick") - (version "2.7.0") + (version "2.7.1") (source (origin (method url-fetch) (uri (cran-uri "magick" version)) (sha256 (base32 - "0m1kij6pp7dmsrhl80h60iyccjqmbbb3zdnqdc9sgy1kj1x3pscp")))) + "16svy84dq25g69axqgympsrh8dzssa1w3zz08zc8m6nprr3jqwqf")))) (build-system r-build-system) (inputs `(("imagemagick" ,imagemagick) -- cgit 1.4.1 From 8f0c5bd3ebdc083967c105cf20b9dfbff790eebc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-emmeans: Update to 1.5.5-1. * gnu/packages/cran.scm (r-emmeans): Update to 1.5.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 ff368b6a6b..9b400cad2f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10110,14 +10110,14 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-emmeans (package (name "r-emmeans") - (version "1.5.4") + (version "1.5.5-1") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "1rbh3ls23fazrwpsam5llk3kqdzz2zvsms3i4f1cgn34ky3w8361")))) + "0l5dd71ihhs7zy6ygniy07iisgy7a1ai1w41hqf84swb0j3cl6iz")))) (build-system r-build-system) (propagated-inputs `(("r-estimability" ,r-estimability) -- cgit 1.4.1 From 51d9bcf64ba29c5162f72f331383cdf089fd3f00 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-ggeffects: Update to 1.0.2. * gnu/packages/cran.scm (r-ggeffects): 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 9b400cad2f..38703f2b0b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10400,14 +10400,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1c5rvycaqp7zp1j6j17c84v8nlpi0w7bhfxmcha4n37m0snk1kgy")))) + "0qh8x8yi8gkb5x7zfxmb1c689k7bhc1f5947yymny34j7xdsb9s8")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) -- cgit 1.4.1 From 799526f97c9488abc4060f5330636648980ba568 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:53 +0200 Subject: gnu: r-effectsize: Update to 0.4.4-1. * gnu/packages/cran.scm (r-effectsize): Update to 0.4.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 38703f2b0b..97ee2f50d2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10430,14 +10430,14 @@ results using @code{ggplot2}.") (define-public r-effectsize (package (name "r-effectsize") - (version "0.4.4") + (version "0.4.4-1") (source (origin (method url-fetch) (uri (cran-uri "effectsize" version)) (sha256 (base32 - "0mgkq12ym72ncakkjpkzkjglhksyhj3iw8v4a8fjgpf7prvn191g")))) + "02rwf3lxnzgc8yh0wridsc6lqr9s6v0cqzbk4biwnr494rvs46zb")))) (properties `((upstream-name . "effectsize"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 8917f29fba9cb5aa83c8c9e41cb590cc92add3b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-gh: Update to 1.2.1. * gnu/packages/cran.scm (r-gh): 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 97ee2f50d2..45d0ed9327 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10547,14 +10547,14 @@ repositories.") (define-public r-gh (package (name "r-gh") - (version "1.2.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (cran-uri "gh" version)) (sha256 (base32 - "1zvy3ylxvni10lhvmbm9h14mg4wlsbdbzbzviwf28jxss8749219")))) + "16xa1qb1r28f8yc6ybjrxiq2zigxj886dp9k29jpsn5091xbzkq0")))) (build-system r-build-system) (propagated-inputs `(("r-cli" ,r-cli) -- cgit 1.4.1 From 43f88bc36d26a4cc909212b9a23d2a1ce9a96e60 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-gert: Update to 1.3.0. * gnu/packages/cran.scm (r-gert): 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 45d0ed9327..1dbda7d706 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10658,14 +10658,14 @@ user credentials.") (define-public r-gert (package (name "r-gert") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "gert" version)) (sha256 (base32 - "0ag2ia6cfb5drf3517lg5nhik1w0nv09a75wdy5jdciws1qra3d6")))) + "1fh72p92wj83yv1ch77jms6k1gjqfji8cmgw23vpxd0p8l9jj4h7")))) (properties `((upstream-name . "gert"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From c9dbd368569b3ac5157ea95101e2694d9eddcac9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-remotes: Update to 2.3.0. * gnu/packages/cran.scm (r-remotes): Update to 2.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 1dbda7d706..c9b5f780ca 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10758,14 +10758,14 @@ more information about packages, and where they were installed from.") (define-public r-remotes (package (name "r-remotes") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "remotes" version)) (sha256 (base32 - "1f1kdw9j1wald3fs8b3n68x1kljy07j60g3aw1aarx26ikyk9whj")))) + "0f35648bdxhvplcfj80r4hfj5w21f1s01kcz6b29d098c1mnfzb7")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From 77ca025cfe5159067af6d9883a500e81b703531e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:54 +0200 Subject: gnu: r-summarytools: Update to 0.9.9. * gnu/packages/cran.scm (r-summarytools): Update to 0.9.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 c9b5f780ca..6baad1ec19 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10884,14 +10884,14 @@ ways.") (define-public r-summarytools (package (name "r-summarytools") - (version "0.9.8") + (version "0.9.9") (source (origin (method url-fetch) (uri (cran-uri "summarytools" version)) (sha256 (base32 - "0n7rad6bkfn9cb99wbfzbwl5qzch48r0gafhddfcqvyh4fbn2k0j")))) + "0ig7vgjvldbndwhky1bsi38zifr9ji8xvvfqbfffplac08llvrbr")))) (build-system r-build-system) (propagated-inputs `(("r-base64enc" ,r-base64enc) -- cgit 1.4.1 From 3626d0674544d957eaec1a1a912a939738cc3940 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-biocmanager: Update to 1.30.12. * gnu/packages/cran.scm (r-biocmanager): Update to 1.30.12. [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 6baad1ec19..caa1f43226 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11275,15 +11275,17 @@ netCDF files.") (define-public r-biocmanager (package (name "r-biocmanager") - (version "1.30.10") + (version "1.30.12") (source (origin (method url-fetch) (uri (cran-uri "BiocManager" version)) (sha256 - (base32 "03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk")))) + (base32 "0c2anza01pc36manj3cvycbq8p57qpq18dsimk3y3gpks70hhqf3")))) (properties `((upstream-name . "BiocManager"))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/BiocManager/") (synopsis "Access the Bioconductor project package repository") (description -- cgit 1.4.1 From d47d3c9c9f09c8bca07e409cfa313174818c23ed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-tiff: Update to 0.1-8. * gnu/packages/cran.scm (r-tiff): Update to 0.1-8. [native-inputs]: Add pkg-config. --- 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 caa1f43226..c33960b2e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11702,19 +11702,21 @@ redundant complex conjugate when the input is real data.") (define-public r-tiff (package (name "r-tiff") - (version "0.1-7") + (version "0.1-8") (source (origin (method url-fetch) (uri (cran-uri "tiff" version)) (sha256 (base32 - "101n6x70fr1dhcwx53g3s8q1j4wh93y0388v1s1316f8558rxqxh")))) + "18m17g5q3nz4v4wrqxnb129b1j02873g2vknddczkklf1pvq4x2b")))) (build-system r-build-system) (inputs `(("libtiff" ,libtiff) ("libjpeg" ,libjpeg-turbo) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://www.rforge.net/tiff/") (synopsis "Read and write TIFF images") (description -- cgit 1.4.1 From 1efeb891adb2387a26ff7421d28267240c7b078b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-gargle: Update to 1.1.0. * gnu/packages/cran.scm (r-gargle): Update to 1.1.0. [propagated-inputs]: Add r-cli, r-rappdirs, and r-rstudioapi. --- 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 c33960b2e0..c88d56683e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12618,21 +12618,24 @@ and manipulating sets of ontological terms.") (define-public r-gargle (package (name "r-gargle") - (version "1.0.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "gargle" version)) (sha256 (base32 - "0hsqn4hf935wn6vk2pwym7la4sdvy271y4cashp38pg4hkpg9zph")))) + "03y29dzz54bw9px5k8a72vmc000lcyrkc5l0izkqcciyi9ijkr3w")))) (build-system r-build-system) (propagated-inputs - `(("r-fs" ,r-fs) + `(("r-cli" ,r-cli) + ("r-fs" ,r-fs) ("r-glue" ,r-glue) ("r-httr" ,r-httr) ("r-jsonlite" ,r-jsonlite) + ("r-rappdirs" ,r-rappdirs) ("r-rlang" ,r-rlang) + ("r-rstudioapi" ,r-rstudioapi) ("r-withr" ,r-withr))) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From dd3b0dd9b8cfd78506eb860ddceaf21370ebe4a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:55 +0200 Subject: gnu: r-rmpfr: Update to 0.8-3. * gnu/packages/cran.scm (r-rmpfr): Update to 0.8-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 c88d56683e..af057197ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12710,14 +12710,14 @@ limitations\" using the GNU Multiple Precision library.") (define-public r-rmpfr (package (name "r-rmpfr") - (version "0.8-2") + (version "0.8-3") (source (origin (method url-fetch) (uri (cran-uri "Rmpfr" version)) (sha256 (base32 - "007pc7fpzl2mcg3qxa2vfjip6m2dr314qjsnybkj3kdj70bszxkl")))) + "1m9wwwch9wg886147brr2zfih65yfdfs3vmfvim1w6jykycasc9a")))) (properties `((upstream-name . "Rmpfr"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 24e9b0cee963e7000b1e20a4bdcc10504ea4dd54 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-units: Update to 0.7-1. * gnu/packages/cran.scm (r-units): Update to 0.7-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 af057197ab..267f8097fe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15135,14 +15135,14 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.7-0") + (version "0.7-1") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "0kwfcrrbcwl7s50n1wp33vswqzmprh91clvakbd1jpznqpg5m3js")))) + "0wwndzjjgqj795xvx1jwa86nwd8adfiwj0pn15yyzzk9baky2axw")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) -- cgit 1.4.1 From b5b7975fa1169ed117579638ad3174092f165d1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-sf: Update to 0.9-8. * gnu/packages/cran.scm (r-sf): 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 267f8097fe..a4220d11d6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15288,14 +15288,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.9-7") + (version "0.9-8") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "175fmnnw11fjhfgjv9sn9b0jfjcqbybpgwsvv99d5yddigvw5jja")))) + "096gg2hbynn6mv3w8n69x987fklg5rrgd0d4nbqaw7vhg1jhlmqi")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) -- cgit 1.4.1 From ba22116deb1e3349bdfbb00b67955551bf5a2ce3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-spdep: Update to 1.1-7. * gnu/packages/cran.scm (r-spdep): Update to 1.1-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 a4220d11d6..49394ea4bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15325,14 +15325,14 @@ datum transformations.") (define-public r-spdep (package (name "r-spdep") - (version "1.1-5") + (version "1.1-7") (source (origin (method url-fetch) (uri (cran-uri "spdep" version)) (sha256 (base32 - "0pbd7wrg5v44p2yxsjp774lpyzap3madir5mn5p3ix7ibk7ldjs7")))) + "0sg417d95paww625663lgmk6jwhs88djqzc96gbs1hxazlf77qb1")))) (build-system r-build-system) (propagated-inputs `(("r-boot" ,r-boot) -- cgit 1.4.1 From 6b575bfd19238ee656644f828cfcc1f658ad1788 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:56 +0200 Subject: gnu: r-rms: Update to 6.2-0. * gnu/packages/cran.scm (r-rms): Update to 6.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 49394ea4bb..bd911159bd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15528,13 +15528,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.1-1") + (version "6.2-0") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "1zgfd60lzbakcv7x0i5k3lkw3s0xx5bzssjgangna5lq2j17cdli")))) + (base32 "1di4xvsx0rwkr77nfqiysbg4qf699199xqil70i39d4zwfzqrm8h")))) (build-system r-build-system) (propagated-inputs `(("r-cluster" ,r-cluster) -- cgit 1.4.1 From 455f5339db63df56cee074cad8b1e1438dbace5c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-tweenr: Update to 1.0.2. * gnu/packages/cran.scm (r-tweenr): 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 bd911159bd..272ce32e8d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16272,14 +16272,14 @@ packages with Rcpp.") (define-public r-tweenr (package (name "r-tweenr") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (cran-uri "tweenr" version)) (sha256 (base32 - "0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg")))) + "17znizh4yabh2zs9mzyr0sl6p0pw49961i61br7cl1b7v9sza18q")))) (build-system r-build-system) (propagated-inputs `(("r-farver" ,r-farver) -- cgit 1.4.1 From 3cfed8ca6a31544bcb38c03bbf2363bbdea9c043 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-styler: Update to 1.4.1. * gnu/packages/cran.scm (r-styler): Update to 1.4.1. [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 272ce32e8d..1f7e043457 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17186,14 +17186,14 @@ batch correction, and data correction.") (define-public r-styler (package (name "r-styler") - (version "1.3.2") + (version "1.4.1") (source (origin (method url-fetch) (uri (cran-uri "styler" version)) (sha256 (base32 - "1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz")))) + "10fj4cnazicb2z9djbv5pszcmrf7wbzagbjvksffqpdc5vbbbw5x")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) @@ -17207,6 +17207,8 @@ batch correction, and data correction.") ("r-tibble" ,r-tibble) ("r-withr" ,r-withr) ("r-xfun" ,r-xfun))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-lib/styler") (synopsis "Non-invasive pretty printing of R code") (description -- cgit 1.4.1 From ad59fd9e6013cec3732493475b07ef2be0f2964b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:57 +0200 Subject: gnu: r-dae: Update to 3.1-37. * gnu/packages/cran.scm (r-dae): Update to 3.1-37. --- 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 1f7e043457..f88e847a71 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17462,14 +17462,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.1-32") + (version "3.1-37") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "126w1lb9pz8mb2ajl2vz5dj798nbifp0dypnzfgcwixif5g5bpqi")))) + "102fgbdpn7yvm1zj180cv4sr1096sz35d4gndsv7w9kriqyi1c1l")))) (build-system r-build-system) (propagated-inputs `(("r-ggplot2" ,r-ggplot2) -- cgit 1.4.1 From ca88d9c0273811f8b3911a205813e8517012588b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-dalex: Update to 2.2.0. * gnu/packages/cran.scm (r-dalex): Update to 2.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 f88e847a71..86072f0e68 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17501,14 +17501,14 @@ been used in the call to @code{aov}.") (define-public r-dalex (package (name "r-dalex") - (version "2.1.1") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "DALEX" version)) (sha256 (base32 - "1dnqsml94s648w8swsrq8spddnd4mj5pl3q6xxr917w6a1jxgyfz")))) + "1qnjbhilv4jfmwqxfi9xc5ysrh8gr84a2a5imjfci7d1n3zcnryn")))) (properties `((upstream-name . "DALEX"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From bc65d86b946dc5438d70670370e87ccffa509e19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-gamlss-data: Update to 6.0-1. * gnu/packages/cran.scm (r-gamlss-data): Update to 6.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 86072f0e68..1b643d4304 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19581,14 +19581,14 @@ discussed in Reisen et al. (2017) @url{doi:10.1016/j.jspi.2017.02.008}.") (define-public r-gamlss-data (package (name "r-gamlss-data") - (version "5.1-4") + (version "6.0-1") (source (origin (method url-fetch) (uri (cran-uri "gamlss.data" version)) (sha256 (base32 - "1dgfspbmps6ipzcmw681wjdp320nm50dwsxafgrcwxndqgc7fdqd")))) + "1cjb2n5i5mnhmb5qbqycdbfg65j7nxb9s74yihqs9kpa39byrzcq")))) (properties `((upstream-name . "gamlss.data"))) (build-system r-build-system) (home-page "http://www.gamlss.org/") -- cgit 1.4.1 From ab5850c7d940ec151371318b2034fbb60126c126 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-gamlss: Update to 5.3-4. * gnu/packages/cran.scm (r-gamlss): Update to 5.3-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 1b643d4304..a0293a2471 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19602,14 +19602,14 @@ models.") (define-public r-gamlss (package (name "r-gamlss") - (version "5.3-1") + (version "5.3-4") (source (origin (method url-fetch) (uri (cran-uri "gamlss" version)) (sha256 (base32 - "1ngf6g4zixwm6ni5r0fs0f6132xd2f2a6mlski9hlqnvvwb46iwr")))) + "06mh00jjxnqwknbv777hawjk0zm81ixrp35fg59mrlqz8y3p2w3j")))) (properties `((upstream-name . "gamlss"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From c3ebc726cd71cd20fd039e84eea63817ee930806 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-actuar: Update to 3.1-2. * gnu/packages/cran.scm (r-actuar): Update to 3.1-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 a0293a2471..818edbf3b5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20813,14 +20813,14 @@ API; see the package vignette for details.") (define-public r-actuar (package (name "r-actuar") - (version "3.1-1") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "actuar" version)) (sha256 (base32 - "0sxn1mskh7x164f1vbrqnadgxnq7y2p3a9mlmqc0sp6cqkw9lhp9")))) + "0gaqm8bkjly2b1jkr1nqnxlp5vqvfpj0a4jd70jv4f9ndlif676y")))) (properties `((upstream-name . "actuar"))) (build-system r-build-system) (propagated-inputs `(("r-expint" ,r-expint))) -- cgit 1.4.1 From b615567e4f229c8b33ab6ccffe9791d93f16a8a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:58 +0200 Subject: gnu: r-imager: Update to 0.42.8. * gnu/packages/cran.scm (r-imager): Update to 0.42.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 818edbf3b5..a02620a09c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20890,14 +20890,14 @@ number embedded in the file rather than the file extension.") (define-public r-imager (package (name "r-imager") - (version "0.42.7") + (version "0.42.8") (source (origin (method url-fetch) (uri (cran-uri "imager" version)) (sha256 (base32 - "1dq0rblnrmnk689bcdmml179gk9lff8x92s2npkjllgjq5q2vfpd")))) + "1kzl93l6k9i4528bbycbqxdn28mj7hnx0fbxisva859xl1wys5c5")))) (properties `((upstream-name . "imager"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 83f2c1479046837fd8151037c9c33ea7f7861cb5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-univoutl: Update to 0.3. * gnu/packages/cran.scm (r-univoutl): 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 a02620a09c..67cdb3f35a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21039,14 +21039,14 @@ functions.") (define-public r-univoutl (package (name "r-univoutl") - (version "0.2") + (version "0.3") (source (origin (method url-fetch) (uri (cran-uri "univOutl" version)) (sha256 (base32 - "0rlc3w7cx2hfxacpjs9kmjzv5p8v9wxnlpxi3rh276wiy5zdr91v")))) + "1hhpxrpmp2wbrynx9xjndnp2sccirgky2x6ksd6yk6phmk0rbzjp")))) (properties `((upstream-name . "univOutl"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From f3785d8a1fdefbf02d99ab616b8a9b993137215d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-shapes: Update to 1.2.6. * gnu/packages/cran.scm (r-shapes): Update to 1.2.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 67cdb3f35a..109ecdd5cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21254,14 +21254,14 @@ different conceptual parts of the algorithm.") (define-public r-shapes (package (name "r-shapes") - (version "1.2.5") + (version "1.2.6") (source (origin (method url-fetch) (uri (cran-uri "shapes" version)) (sha256 (base32 - "0gfpdydfysp5mwg7qmkn73s67gvh2szb40mzqrx97h41ijgcgd8s")))) + "1p9fr95zk3q2v277c5ksb0nh26mcpzwjzjb2lmag51z6hck8cb66")))) (properties `((upstream-name . "shapes"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 13aca4c035d36e44d871fc84d15c6a393a6cda70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-quanteda: Update to 3.0.0. * gnu/packages/cran.scm (r-quanteda): Update to 3.0.0. [propagated-inputs]: Remove r-data-table, r-digest, r-extrafont, r-ggplot2, r-ggrepel, r-jsonlite, r-network, r-proxyc, and r-sna. --- gnu/packages/cran.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 109ecdd5cf..b208ba6f07 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22054,32 +22054,23 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (define-public r-quanteda (package (name "r-quanteda") - (version "2.1.2") + (version "3.0.0") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "13rjwgmg5v1dbryrs9ifyy76s5ib6wrbrm2y5af44vhf1h6p9cvy")))) + "0b1jfkdhpsg5jhjz4p0nf4cmi9p8w40wv3i2f17jf2x1n1y2hjj8")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs - `(("r-data-table" ,r-data-table) - ("r-digest" ,r-digest) - ("r-extrafont" ,r-extrafont) - ("r-fastmatch" ,r-fastmatch) - ("r-ggplot2" ,r-ggplot2) - ("r-ggrepel" ,r-ggrepel) - ("r-jsonlite" ,r-jsonlite) + `(("r-fastmatch" ,r-fastmatch) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) - ("r-network" ,r-network) - ("r-proxyc" ,r-proxyc) ("r-rcpp" ,r-rcpp) ("r-rcpparmadillo" ,r-rcpparmadillo) ("r-rcppparallel" ,r-rcppparallel) - ("r-sna" ,r-sna) ("r-snowballc" ,r-snowballc) ("r-stopwords" ,r-stopwords) ("r-stringi" ,r-stringi) -- cgit 1.4.1 From 3a849bf973d69d34e59e40bcb51030676ee392a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:25:59 +0200 Subject: gnu: r-packrat: Update to 0.6.0. * gnu/packages/cran.scm (r-packrat): Update to 0.6.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 b208ba6f07..e9235568bb 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22839,14 +22839,14 @@ interesting features. iheatmapr uses the plotly library for interactivity.") (define-public r-packrat (package (name "r-packrat") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "packrat" version)) (sha256 (base32 - "1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n")))) + "01cn2vf95nc8bh0hh8imkn030yra3hx64q1fb8jwsr52p9s397fr")))) (properties `((upstream-name . "packrat"))) (build-system r-build-system) (home-page "https://github.com/rstudio/packrat/") -- cgit 1.4.1 From 13747f581489b121f40382acd398a44eafadf280 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-latex2exp: Update to 0.5.0. * gnu/packages/cran.scm (r-latex2exp): Update to 0.5.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 e9235568bb..372ef17740 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -23515,17 +23515,19 @@ appropriate dog and cat images for many status codes.") (define-public r-latex2exp (package (name "r-latex2exp") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (cran-uri "latex2exp" version)) (sha256 (base32 - "12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw")))) + "0qknpw7zwwbzsbry94j8fn48mq7kq5rc5448g9hybbisain3wfvg")))) (build-system r-build-system) (propagated-inputs `(("r-stringr" ,r-stringr) ("r-magrittr" ,r-magrittr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/stefano-meschiari/latex2exp/") (synopsis "Use LaTeX expressions in plots") (description "@code{latex2exp} parses and converts LaTeX math formulas to -- cgit 1.4.1 From e138e27410db5678054b317ded3774ac9deaf543 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-lightgbm: Update to 3.2.0. * gnu/packages/cran.scm (r-lightgbm): Update to 3.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 372ef17740..aafdfdd524 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24387,14 +24387,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "3.1.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "1pwsh6j9ksahh58b15j5ij56bsc6syy3z4k4a5zhy5n7829rz555")))) + "0aw1zcrg7nhddfaif9544hn8g8qcylv6vzpkf8d3kl07nzvgxkvj")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 213d7e76492cf19ebbdd41a740086a15e371102e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-shapforxgboost: Update to 0.1.1. * gnu/packages/cran.scm (r-shapforxgboost): Update to 0.1.1. [propagated-inputs]: Remove r-lightgbm. [native-inputs]: Add r-knitr. --- 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 aafdfdd524..e94f44707d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24423,14 +24423,14 @@ designed to be distributed and efficient with the following goals: (define-public r-shapforxgboost (package (name "r-shapforxgboost") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (cran-uri "SHAPforxgboost" version)) (sha256 (base32 - "0jgyss9bawl7sf4dwa75sn7ld3mvrrr0z2074lbkq3f5qb9gwsly")))) + "106nsf02b1w3yshb55lwnyw1rl1a60162v2wk8znjz3b4ln3mqj5")))) (properties `((upstream-name . "SHAPforxgboost"))) (build-system r-build-system) @@ -24441,9 +24441,10 @@ designed to be distributed and efficient with the following goals: ("r-ggforce" ,r-ggforce) ("r-ggplot2" ,r-ggplot2) ("r-ggpubr" ,r-ggpubr) - ("r-lightgbm" ,r-lightgbm) ("r-rcolorbrewer" ,r-rcolorbrewer) ("r-xgboost" ,r-xgboost))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/liuyanguu/SHAPforxgboost") (synopsis "SHAP Plots for XGBoost") (description -- cgit 1.4.1 From 35654c72850558e8f40369ec227c689b084be09e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:00 +0200 Subject: gnu: r-spatstat-utils: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat-utils): Update to 2.1-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 e94f44707d..f00fd6c025 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24776,14 +24776,14 @@ diagonals. This package allows you to compute the tensor product of arrays.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "2.0-0") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "1li0vksxpkvgyx3j2wi40kj5687vwakkfdix6icm6g01a0lb2m5d")))) + "18gqsc1a85pk69aifi10wprv1c0lci3zxp4wqjb27dlmlbz6jdgd")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) -- cgit 1.4.1 From 1134bab6d099d16a8c0bfeea39c9f450e6ce91f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-sparse: Update to 2.0-0. * gnu/packages/cran.scm (r-spatstat-sparse): Update to 2.0-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 f00fd6c025..4434e16380 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24797,14 +24797,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-sparse (package (name "r-spatstat-sparse") - (version "1.2-1") + (version "2.0-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.sparse" version)) (sha256 (base32 - "1w312q7gxzchigxxzk9akscdsz66j5085lgjryamschjgp4f8yk2")))) + "1iqrpazb88s4w208adf2qgm4ajwz3kwqck65k9g5l28zw9jcxyr7")))) (properties `((upstream-name . "spatstat.sparse"))) (build-system r-build-system) -- cgit 1.4.1 From 8561ce6a8ca3be11c015cf049a728e38b588a744 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-data: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat-data): Update to 2.1-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 4434e16380..c4ed0b392d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24824,14 +24824,14 @@ matrix calculations that are common in statistics, such as quadratic forms.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "2.0-0") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "1z1jb1yzb7qhfg55dhzcrdvn5x8hpg9xif0hpnapddbmhxd1hbb7")))) + "0csmz5vjaxnznkbsfah8qd3v8p0y56jvis01ialxzvf71snl160v")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From b6aa3ada62c7a16a52606f549c9bb6768ab11297 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-geom: Update to 2.0-1. * gnu/packages/cran.scm (r-spatstat-geom): Update to 2.0-1. [propagated-inputs]: Remove r-spatstat-sparse. --- 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 c4ed0b392d..4c11f7614b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24847,21 +24847,20 @@ package.") (define-public r-spatstat-geom (package (name "r-spatstat-geom") - (version "1.65-5") + (version "2.0-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.geom" version)) (sha256 (base32 - "0g0m5b3nbzpyblbp77n56k6aiw3fn23jkk72h9fhqlg1ydn2fzpk")))) + "1r7nlgh62apchidg28fxq1a22iv1b29y5xmsg1kjwfvkbq8zxsvh")))) (properties `((upstream-name . "spatstat.geom"))) (build-system r-build-system) (propagated-inputs `(("r-deldir" ,r-deldir) ("r-polyclip" ,r-polyclip) ("r-spatstat-data" ,r-spatstat-data) - ("r-spatstat-sparse" ,r-spatstat-sparse) ("r-spatstat-utils" ,r-spatstat-utils))) (home-page "http://spatstat.org/") (synopsis "Geometrical functionality of the spatstat package") -- cgit 1.4.1 From 2ef03976f35034d273b747b230b71c29496adc32 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-core: Update to 2.0-0. * gnu/packages/cran.scm (r-spatstat-core): Update to 2.0-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 4c11f7614b..355889fb4e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24873,14 +24873,14 @@ for the geometry of linear networks.") (define-public r-spatstat-core (package (name "r-spatstat-core") - (version "1.65-5") + (version "2.0-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.core" version)) (sha256 (base32 - "0wq61sd53hwyk3fzjdc2prrr66n67zbwb5i3ii7kvyhfwx0xikm3")))) + "19wv27nfx48xkqa1amys4jf93k0d8xns20p84n5kqyibscdsksgx")))) (properties `((upstream-name . "spatstat.core"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 3069514325d601b70391f4044fab9b39ea1194c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:01 +0200 Subject: gnu: r-spatstat-linnet: Update to 2.1-1. * gnu/packages/cran.scm (r-spatstat-linnet): Update to 2.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 355889fb4e..dad72e2cd8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24905,14 +24905,14 @@ user-level code from spatstat, except for the code for linear networks.") (define-public r-spatstat-linnet (package (name "r-spatstat-linnet") - (version "1.65-3") + (version "2.1-1") (source (origin (method url-fetch) (uri (cran-uri "spatstat.linnet" version)) (sha256 (base32 - "1y088r26h5yv006ydgcb4iwpvnc7ql857gky0hbi7xqqciqr8wdv")))) + "1ia0qgggddiwhhyd3q516f3p6by0p4xnq26wqz7410n2ja60bbb4")))) (properties `((upstream-name . "spatstat.linnet"))) (build-system r-build-system) -- cgit 1.4.1 From a387de2fa7dd75dcf61f12919f4e9c6291f4618d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-spatstat: Update to 2.1-0. * gnu/packages/cran.scm (r-spatstat): Update to 2.1-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 dad72e2cd8..2d9b8cfd9b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24932,14 +24932,14 @@ for spatial data on a linear network.") (define-public r-spatstat (package (name "r-spatstat") - (version "2.0-1") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat" version)) (sha256 (base32 - "1xq11ijc0d0lbixxb3wnvyr4gplfj2d2i64ynsa089xd525zzzbw")))) + "0vr5md53247v6crvjvg9m82vc6h914zzvkzfkga8x79hv35ii4as")))) (properties `((upstream-name . "spatstat"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 397490236205fb02194a9b003c8b7b76699a7772 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-cpp11: Update to 0.2.7. * gnu/packages/cran.scm (r-cpp11): Update to 0.2.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 2d9b8cfd9b..0031fdb0f2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24993,14 +24993,14 @@ for linear mixed models (AIREML).") (define-public r-cpp11 (package (name "r-cpp11") - (version "0.2.6") + (version "0.2.7") (source (origin (method url-fetch) (uri (cran-uri "cpp11" version)) (sha256 (base32 - "118i8s7978vl9xyhnb47wcbd6rcc6b958mq2w8s3rdsd4pxv62gz")))) + "1m31yq3kn5wqvm0ahj08kb4bszbbhfybx3l2x975cjzgv3058h8x")))) (properties `((upstream-name . "cpp11"))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit 1.4.1 From f5c72b2cd74b6160528a1641e3dc475f417bc623 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-muhaz: Update to 1.2.6.3. * gnu/packages/cran.scm (r-muhaz): Update to 1.2.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 0031fdb0f2..b1781c7560 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25178,14 +25178,14 @@ to speed up repeated queries of the same set of target points.") (define-public r-muhaz (package (name "r-muhaz") - (version "1.2.6.1") + (version "1.2.6.3") (source (origin (method url-fetch) (uri (cran-uri "muhaz" version)) (sha256 (base32 - "08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk")))) + "1lzc8arbpcxgfap3dfsgq8crpp1cxd9qlbrhvyvl79zgpxjqx4q2")))) (properties `((upstream-name . "muhaz"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 47d8e0c1ad6227ed00743b7bd631300c66c86589 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:02 +0200 Subject: gnu: r-yardstick: Update to 0.0.8. * gnu/packages/cran.scm (r-yardstick): Update to 0.0.8. [propagated-inputs]: Add r-vctrs. --- 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 b1781c7560..25838dd46f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25650,14 +25650,14 @@ workflow. The advantages are: (define-public r-yardstick (package (name "r-yardstick") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) (uri (cran-uri "yardstick" version)) (sha256 (base32 - "1yrvlhn4gxyn9f20z5yv3xam0j0a8z362jwa32r33r0g0jk5z2fq")))) + "13b0lyj2k0r568mwlyz9yvp9156rzlj4jqnjazaffh9vwqh4whir")))) (properties `((upstream-name . "yardstick"))) (build-system r-build-system) (propagated-inputs @@ -25665,7 +25665,8 @@ workflow. The advantages are: ("r-generics" ,r-generics) ("r-proc" ,r-proc) ("r-rlang" ,r-rlang) - ("r-tidyselect" ,r-tidyselect))) + ("r-tidyselect" ,r-tidyselect) + ("r-vctrs" ,r-vctrs))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://github.com/tidymodels/yardstick") -- cgit 1.4.1 From 7ac3cefc64299896ebca5efef16d2be870942168 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:26:03 +0200 Subject: gnu: r-slider: Update to 0.2.1. * gnu/packages/cran.scm (r-slider): Update to 0.2.1. [propagated-inputs]: Add r-ellipsis. --- 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 25838dd46f..8e7ce2c78d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25705,18 +25705,19 @@ observations.") (define-public r-slider (package (name "r-slider") - (version "0.1.5") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "slider" version)) (sha256 (base32 - "1x4jwfxam4czfkb1s5qds5krfw1h2p5a4rh6f5z4yvhsv0d81xck")))) + "1jijh8f3qcn8fa677sqvgl2fb4r5vca1cw4l2vbcqscxb2hr4bqw")))) (properties `((upstream-name . "slider"))) (build-system r-build-system) (propagated-inputs - `(("r-glue" ,r-glue) + `(("r-ellipsis" ,r-ellipsis) + ("r-glue" ,r-glue) ("r-rlang" ,r-rlang) ("r-vctrs" ,r-vctrs) ("r-warp" ,r-warp))) -- cgit 1.4.1 From ed5f5f0274fa8140e5fff853edfbf0007862a36b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-tidyposterior: Update to 0.1.0. * gnu/packages/cran.scm (r-tidyposterior): Update to 0.1.0. [propagated-inputs]: Remove r-lifecycle; add r-tune and r-workflowsets. --- gnu/packages/cran.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 8e7ce2c78d..cacd2fa459 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -25900,28 +25900,29 @@ results.") (define-public r-tidyposterior (package (name "r-tidyposterior") - (version "0.0.3") + (version "0.1.0") (source (origin (method url-fetch) (uri (cran-uri "tidyposterior" version)) (sha256 (base32 - "0wsv800w056ziqbnwal7ncmdy4li8cn5yrdx07w35b7j8kl4mwhg")))) + "1h1664sjrg6akph6nrk8ynn2kjiswv6gshy35gamam1h4axf6wah")))) (properties `((upstream-name . "tidyposterior"))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) ("r-generics" ,r-generics) ("r-ggplot2" ,r-ggplot2) - ("r-lifecycle" ,r-lifecycle) ("r-purrr" ,r-purrr) ("r-rlang" ,r-rlang) ("r-rsample" ,r-rsample) ("r-rstanarm" ,r-rstanarm) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) - ("r-vctrs" ,r-vctrs))) + ("r-tune" ,r-tune) + ("r-vctrs" ,r-vctrs) + ("r-workflowsets" ,r-workflowsets))) (native-inputs `(("r-knitr" ,r-knitr))) (home-page "https://tidyposterior.tidymodels.org") -- cgit 1.4.1 From 3ba3fb71fb04ddc94e360bffd0c806d178f19d59 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-altmeta: Update to 3.3. * gnu/packages/cran.scm (r-altmeta): Update to 3.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 cacd2fa459..fe60620eab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26318,14 +26318,14 @@ phylogenetic relatedness) can also be conducted.") (define-public r-altmeta (package (name "r-altmeta") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (cran-uri "altmeta" version)) (sha256 (base32 - "0z252lbsknqp33i0b0xf5r7spr535iq47bv40vgip6nsqhgrl7b0")))) + "1xq12hnzxh7kgv2i36xprg4lkvqfmxwz3sq4a1jlq2d5g3narvcm")))) (properties `((upstream-name . "altmeta"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 6e93ab06666e624d04648fdafcb0e7c2d8c66e8d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-qtl: Update to 1.48-1. * gnu/packages/cran.scm (r-qtl): Update to 1.48-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 fe60620eab..0907233000 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26380,14 +26380,14 @@ covariate (usually group indicator) and the scores.") (define-public r-qtl (package (name "r-qtl") - (version "1.47-9") + (version "1.48-1") (source (origin (method url-fetch) (uri (cran-uri "qtl" version)) (sha256 (base32 - "0hffirsvw9j82cdx6l7vhqn3a7ab52claqjlinv3lswl1nsfg93b")))) + "098mgmfj8ndi8yipr9b3f6gbbh78cgp9j7y561nlnhrnyc8bsih9")))) (build-system r-build-system) (home-page "https://rqtl.org/") (synopsis "R package for analyzing QTL experiments in genetics") -- cgit 1.4.1 From b83b2a3a4b1a5c39f55614d9f1d496dc220b172f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:48 +0200 Subject: gnu: r-phangorn: Update to 2.6.3. * gnu/packages/cran.scm (r-phangorn): Update to 2.6.3. [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 0907233000..d3239ec33d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26596,14 +26596,14 @@ discovery of differentially expressed genes and markers.") (define-public r-phangorn (package (name "r-phangorn") - (version "2.5.5") + (version "2.6.3") (source (origin (method url-fetch) (uri (cran-uri "phangorn" version)) (sha256 (base32 - "0ihkaykqjmf80d8wrk3saphxvnv58zma6pd13633bd3cwanc33f5")))) + "08yqz8qlw960x4b52wzrm22f242xnpc8695pjkhy7bi1nzm303ga")))) (build-system r-build-system) (propagated-inputs `(("r-ape" ,r-ape) @@ -26613,6 +26613,8 @@ discovery of differentially expressed genes and markers.") ("r-matrix" ,r-matrix) ("r-quadprog" ,r-quadprog) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/KlausVigo/phangorn") (synopsis "Phylogenetic analysis in R") (description -- cgit 1.4.1 From ae3df456bb513c0f1b56fab407b7e0836dc590ab Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-mlr3misc: Update to 0.8.0. * gnu/packages/cran.scm (r-mlr3misc): Update to 0.8.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 d3239ec33d..a151d9651a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26874,13 +26874,13 @@ are.") (define-public r-mlr3misc (package (name "r-mlr3misc") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3misc" version)) (sha256 (base32 - "19k3l2d6wnqvdng0m7p54rrlvwl5457lcy7bg82m2bbpqxi8qch3")))) + "0mzicqs8rhzppyd7v3ljqs35k8pp7p2jg5cs7hx21mxr831bwsys")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) -- cgit 1.4.1 From 6ec08e19b3a0b39ee8744c1b099b713df9c266f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-mlr3learners: Update to 0.4.5. * gnu/packages/cran.scm (r-mlr3learners): Update to 0.4.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 a151d9651a..04d827b86c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26960,13 +26960,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.4.3") + (version "0.4.5") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "1wxlpzz3hpkn77n4ag1v868dmp140j1pmrhynsv5xfgk9fg0w7ri")))) + "02v4y32yn1m0akkqzhfg65ib21rgy9iz8db4kdcrvi949clkxnfk")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit 1.4.1 From 2224e027790d2ab44c7e3d5f3f23f2a261458cb2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-bbotk: Update to 0.3.2. * gnu/packages/cran.scm (r-bbotk): 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 04d827b86c..234f8d55ce 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -26986,14 +26986,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "1f29wxnxr73c4yp5afk05jqggpm7k1z8wiak8xsyw68h7xflq550")))) + "0bd9nxfgsj4ixpgky1mj6knb8l8nivvxpqpyw8vgpkj0za7gp4gr")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From ded15998293bd1ea43dd92c2fadfab8f733d6619 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:49 +0200 Subject: gnu: r-textshaping: Update to 0.3.3. * gnu/packages/cran.scm (r-textshaping): Update to 0.3.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 234f8d55ce..315e7127ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27315,14 +27315,14 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "0fqh4z505b2qriqcj70g2hhdgiawd3w2rs9rqxdwizz5vk8jjygx")))) + "0yl3cv6r8k27h4lzbrsikjydhz94skdjmxx4zqzihvb7h3jfnlpn")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 5a2602032f62898c830299c3541bd28edee0b68f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-ragg: Update to 1.1.2. * gnu/packages/cran.scm (r-ragg): Update to 1.1.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 315e7127ab..1310f1aa04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27348,14 +27348,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.1.1") + (version "1.1.2") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "0nh1xxrxgdbq9anzkc6k3n519czp9hqyiizakm3m2gl4l4w0vp0q")))) + "0q28bwjdxpxm1wlkd8sxdf1m1q8wp4mmzp83d3m09nyy90ydkd8w")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs -- cgit 1.4.1 From 0ec1b08a525b765282f83b5d9a098084aa2fe771 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-lwgeom: Update to 0.2-6. * gnu/packages/cran.scm (r-lwgeom): Update to 0.2-6. [inputs]: Add zlib. --- gnu/packages/cran.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1310f1aa04..114ea7ab16 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28016,28 +28016,30 @@ and formatted text files with additional meta-data, such including @code{.csv}, (define-public r-lwgeom (package (name "r-lwgeom") - (version "0.2-5") + (version "0.2-6") (source - (origin - (method url-fetch) - (uri (cran-uri "lwgeom" version)) - (sha256 - (base32 - "0byhjqa2acns8mznl1ngnfygxxxyszvnq66qfg0smhhhdkwr67aa")))) + (origin + (method url-fetch) + (uri (cran-uri "lwgeom" version)) + (sha256 + (base32 + "1733iwinn426bcmgjxp4j0scvbz35rvqkanmw7g7f47l6j7w14vn")))) (properties `((upstream-name . "lwgeom"))) (build-system r-build-system) - (inputs `(("geos" ,geos) ("proj" ,proj) ("sqlite" ,sqlite))) + (inputs + `(("geos" ,geos) + ("proj" ,proj) + ("sqlite" ,sqlite) + ("zlib" ,zlib))) (propagated-inputs - `(("r-rcpp" ,r-rcpp) - ("r-sf" ,r-sf) - ("r-units" ,r-units))) + `(("r-rcpp" ,r-rcpp) + ("r-sf" ,r-sf) + ("r-units" ,r-units))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page - "https://github.com/r-spatial/lwgeom/") - (synopsis - "Bindings to Selected 'liblwgeom' Functions for Simple Features") + (home-page "https://github.com/r-spatial/lwgeom/") + (synopsis "Bindings to Selected 'liblwgeom' Functions for Simple Features") (description - "Access to selected functions found in + "Access to selected functions found in @url{https://github.com/postgis/postgis/tree/master/liblwgeom,liblwgeom}, the light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (license license:gpl2))) -- cgit 1.4.1 From 971a997f75fac23dd804f26c94e3c16b127dc571 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-stars: Update to 0.5-2. * gnu/packages/cran.scm (r-stars): Update to 0.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 114ea7ab16..61de48e08e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28047,14 +28047,14 @@ light-weight geometry library used by @url{http://postgis.net/,PostGIS}.") (define-public r-stars (package (name "r-stars") - (version "0.5-1") + (version "0.5-2") (source (origin (method url-fetch) (uri (cran-uri "stars" version)) (sha256 (base32 - "0ybk899rc0rpf2cv5kwk78fvis5xnr255hfcy5khdxsxdqgl0m9j")))) + "0w2svw02ywvclq0nsnjns1n0rfr54q7x30y64y14n7zfr969ly1n")))) (properties `((upstream-name . "stars"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 55378aa21d24599d8f9e1a9454c8608eb290268c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-survival: Update to 3.2-10. * gnu/packages/statistics.scm (r-survival): Update to 3.2-10. --- 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 27f3bfa8ef..f63f66ac10 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -710,14 +710,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.2-9") + (version "3.2-10") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1dkpdci2lvx141193wd69445y65w8k2pa89lc3l83i5jaj56svdn")))) + "19fg7mrrr6chbixq10kwwl5clry2y57v6zl24jlmxx2ylis0vjzd")))) (build-system r-build-system) (propagated-inputs `(("r-matrix" ,r-matrix))) -- cgit 1.4.1 From 63c5888c43258a638184c74f337ce6d16aa5da52 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-dbplyr: Update to 2.1.1. * gnu/packages/statistics.scm (r-dbplyr): Update to 2.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 f63f66ac10..a7c2111530 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1733,14 +1733,14 @@ database.") (define-public r-dbplyr (package (name "r-dbplyr") - (version "2.1.0") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "dbplyr" version)) (sha256 (base32 - "1sm0fixfr3bkq18p804mfbfz9z5z801dhzkrpq0spr25jkhpf26l")))) + "025wqpmxdhzblb0pf58m3qh5h6bf5x8qvkf47vyl1cjsp13wz95b")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit 1.4.1 From e2851d10db3731088b5cb3a627efd2c424454edc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-catools: Update to 1.18.2. * gnu/packages/statistics.scm (r-catools): Update to 1.18.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 a7c2111530..06ebeca597 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2681,13 +2681,13 @@ vectors.") (define-public r-catools (package (name "r-catools") - (version "1.18.1") + (version "1.18.2") (source (origin (method url-fetch) (uri (cran-uri "caTools" version)) (sha256 (base32 - "1yf98x2gaf84y9m32xrg84g384zlfwsdw7wvywdljpgdpvzs9szz")))) + "14q2ry8gaszjl0m97qg62dxv5bpj6k02qwyi7q2lnxgcmwai3mkm")))) (properties `((upstream-name . "caTools"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From d6fd6908c269c1c97d7cb740443fcb52148e4b3f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:50 +0200 Subject: gnu: r-rsqlite: Update to 2.2.5. * gnu/packages/statistics.scm (r-rsqlite): Update to 2.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 06ebeca597..ee0d873d1c 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2842,13 +2842,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.2.4") + (version "2.2.5") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "050s7gv42v43d15yqj2sdrh82iikfpm32idfnw4nbjjjnlcg7wxf")))) + "14cxqh8j5v2rqs6yiargy1miycvx7xj47lppvpnnchi5plimlvyy")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From d98cecdd07464a31091778d7313e91c4feb1853b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-xml: Update to 3.99-0.6. * gnu/packages/statistics.scm (r-xml): Update to 3.99-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 ee0d873d1c..a127a336e1 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2916,13 +2916,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.5") + (version "3.99-0.6") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "19jkpnbjx2ij0h7rxi13sqnjnwsap6wywmd4gnhfnqpic1rrnlk0")))) + "0qibvacbfm7gl41ylway3vdyi1qbpa211d48rg3k5i30d48rbf58")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) -- cgit 1.4.1 From 9493b3e9a717ad559a4b067e93f7f07316668219 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-e1071: Update to 1.7-6. * gnu/packages/statistics.scm (r-e1071): Update to 1.7-6. [propagated-inputs]: Add r-proxy. --- 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 a127a336e1..06a5566452 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3402,17 +3402,18 @@ Stochastic Neighbor Embedding using a Barnes-Hut implementation.") (define-public r-e1071 (package (name "r-e1071") - (version "1.7-4") + (version "1.7-6") (source (origin (method url-fetch) (uri (cran-uri "e1071" version)) (sha256 (base32 - "02935xcscjhb0jmnvh44hxlpjcgladrcr0gpz1jxq07m0qdqgaz6")))) + "0blfnv3m5k5xm9bfx1v5awvagqlhqaqpabrvzplf4244c3j259qa")))) (build-system r-build-system) (propagated-inputs - `(("r-class" ,r-class))) + `(("r-class" ,r-class) + ("r-proxy" ,r-proxy))) (home-page "https://cran.r-project.org/web/packages/e1071") (synopsis "Miscellaneous functions for probability theory") (description -- cgit 1.4.1 From 2e36f4a1c45ce8041ead5549b8a6313c686b21fd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-sfsmisc: Update to 1.1-10. * gnu/packages/statistics.scm (r-sfsmisc): Update to 1.1-10. --- 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 06a5566452..cc6e3233c3 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4143,14 +4143,14 @@ existing packages provide.") (define-public r-sfsmisc (package (name "r-sfsmisc") - (version "1.1-8") + (version "1.1-10") (source (origin (method url-fetch) (uri (cran-uri "sfsmisc" version)) (sha256 (base32 - "198zpkz1gvw954ym8669svrk81yb49j6fyk5i6a7dw07z3snlmdn")))) + "1skxahq5jgqdsllpsavzrcpz8l0yj3mfzcf70as8d33jxbiaa4s4")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/sfsmisc") (synopsis "Utilities from \"Seminar fuer Statistik\" ETH Zurich") -- cgit 1.4.1 From e1a38cbad89c79a7bc324b96c74752f6785efedd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 02:53:51 +0200 Subject: gnu: r-sn: Update to 2.0.0. * gnu/packages/statistics.scm (r-sn): Update to 2.0.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 cc6e3233c3..fb14526f98 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5378,14 +5378,14 @@ first and second order derivatives.") (define-public r-sn (package (name "r-sn") - (version "1.6-2") + (version "2.0.0") (source (origin (method url-fetch) (uri (cran-uri "sn" version)) (sha256 (base32 - "179xb7yb8br99aa5awm2yxsy0v5w1kdhv6a7ifaliz2y64677m1g")))) + "0sl8qzy9isy5fq8qxh1fg5285jzgy895nbgz8gdq5d0r6zdwrmmb")))) (build-system r-build-system) (propagated-inputs `(("r-mnormt" ,r-mnormt) -- cgit 1.4.1 From 5c9954490c81ad824900909c679900ca8ce188af Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 7 Apr 2021 15:09:46 -0400 Subject: gnu: gcc-arm-none-eabi: Fix C++ header location. Previously the C++ headers where installed in the include folder, overwriting some C headers. * gnu/packages/embedded.scm (gcc-arm-none-eabi-4.9) [native-search-paths]: Add C++ header locations. (gcc-arm-none-eabi-7-2018-q2-update)[native-search-paths]: Add C++ header locations. (make-libstdc++-arm-none-eabi)[arguments]: Change C++ header install location to include/c++. Signed-off-by: Efraim Flashner --- gnu/packages/embedded.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 413760ab72..a3f1d85580 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -147,7 +147,9 @@ (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" + "arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -317,7 +319,9 @@ usable on embedded products.") (files '("arm-none-eabi/include"))) (search-path-specification (variable "CROSS_CPLUS_INCLUDE_PATH") - (files '("arm-none-eabi/include"))) + (files '("arm-none-eabi/include" + "arm-none-eabi/include/c++" + "arm-none-eabi/include/c++/arm-none-eabi"))) (search-path-specification (variable "CROSS_LIBRARY_PATH") (files '("arm-none-eabi/lib")))))))) @@ -380,7 +384,7 @@ usable on embedded products.") "--with-newlib" ,(string-append "--with-gxx-include-dir=" (assoc-ref %outputs "out") - "/arm-none-eabi/include"))))) + "/arm-none-eabi/include/c++"))))) (native-inputs `(("newlib" ,newlib) ("xgcc" ,xgcc) -- cgit 1.4.1 From bb4f47a7f614eea78a8c8a0d3e5fc55bf4e52646 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Wed, 7 Apr 2021 14:14:56 -0400 Subject: gnu: axoloti-runtime: Simplify build. * gnu/packages/axoloti.scm (axoloti-runtime)[arguments]: Remove unnecessary environment variable assignments in custom 'build phase. Signed-off-by: Efraim Flashner --- gnu/packages/axoloti.scm | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 3049051486..0b12e4fe29 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -147,18 +147,7 @@ (delete 'configure) (replace 'build ;; Build Axoloti firmware with cross-compiler - (lambda* (#:key inputs #:allow-other-keys) - (let* ((toolchain (assoc-ref inputs "cross-toolchain")) - (headers (string-append - toolchain - "/arm-none-eabi/include:" - toolchain - "/arm-none-eabi/include/arm-none-eabi/armv7e-m"))) - (setenv "CROSS_CPATH" headers) - (setenv "CROSS_CPLUS_INCLUDE_PATH" headers) - (setenv "CROSS_LIBRARY_PATH" - (string-append toolchain - "/arm-none-eabi/lib"))) + (lambda _ (with-directory-excursion "platform_linux" (invoke "sh" "compile_firmware.sh")))) (replace 'install -- cgit 1.4.1 From 71ca8fd40b05cd0da14fad2e4b67f8d480abe600 Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Thu, 8 Apr 2021 11:13:11 +0100 Subject: gnu: Add texlive-mweights. * gnu/packages/tex.scm: New variable. --- gnu/packages/tex.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index c8bac7eea7..df84cbd571 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -7928,3 +7928,23 @@ particular, it splits the shape axis into a primary and a secondary shape axis and it adds three new axes to deal with the different figure versions offered by many professional fonts.") (license license:lppl1.3+))) + +(define-public texlive-mweights + (package + (inherit (simple-texlive-package + "texlive-mweights" + (list "/doc/latex/mweights/" + "/tex/latex/mweights/") + (base32 + "1k2xclk54q3xgn48hji23q52nivkzgwf0s30bmm6k83f7v57qv8h") + #:trivial? #t)) + (home-page "https://www.ctan.org/pkg/mweights") + (synopsis "Support for multiple-weight font packages") + (description "Many font families available for use with LaTeX are +available at multiple weights. Many Type 1-oriented support packages +for such fonts re-define the standard @code{\\mddefault} or +@code{\\bfdefault} macros. This can create difficulties if the weight +desired for one font family is not available for another font family, +or if it differs from the weight desired for another font family. The +@code{mweights} package provides a solution to these difficulties.") + (license license:lppl))) -- cgit 1.4.1 From fb73d7d10d95246b2cca3cf3fa75d4e37b8b8157 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:56 +0200 Subject: gnu: r-delayedarray: Update to 0.16.3. * gnu/packages/bioconductor.scm (r-delayedarray): Update to 0.16.3. --- 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 ccf468e420..69a9c936bd 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1236,13 +1236,13 @@ used visualizations.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.16.2") + (version "0.16.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "09lpj951v1afxkrnjvnhzp4qgklq23ykdwlny7k1lyfcdy9q6wm0")))) + "0w1wppy6m2iv41852dscg3y19sq84ahdx3m7c2p2pxjcznmv6hys")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) -- cgit 1.4.1 From 9d2ca982132524fc0177663b2bb36e8192624db2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:59 +0200 Subject: gnu: r-genomeinfodb: Update to 1.26.6. * gnu/packages/bioconductor.scm (r-genomeinfodb): Update to 1.26.6. --- 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 69a9c936bd..4a2a796f27 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2022,13 +2022,13 @@ high-throughput sequencing experiments.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.26.4") + (version "1.26.6") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "1sbhdpgabqbi749ixih8nlmq5id7sg8y6kkfj46r00642rc293ys")))) + "1wy4dwiv0pgim975var802z565py4a0nakx6zdvbhry4c0dfczd1")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) -- cgit 1.4.1 From 55185f9b3f25ac87d09a7afd6aefddb53707c8a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:27:59 +0200 Subject: gnu: r-diffbind: Update to 3.0.15. * gnu/packages/bioconductor.scm (r-diffbind): Update to 3.0.15. --- 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 4a2a796f27..e3418e5a21 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2705,14 +2705,14 @@ signal in the input, that lead to spurious peaks during peak calling.") (define-public r-diffbind (package (name "r-diffbind") - (version "3.0.14") + (version "3.0.15") (source (origin (method url-fetch) (uri (bioconductor-uri "DiffBind" version)) (sha256 (base32 - "1siabhjd0w7bb6v2gfhsm9j7c7c86z8m6lfsyl8p84h0zhjs2vrw")))) + "06f613s8d9z51njyf839g22gwybx9zs5n6xghwr5j1ad2n4m6qwi")))) (properties `((upstream-name . "DiffBind"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 215b0ced02c766095d11a9e8a401f2a1b312fda5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-chippeakanno: Update to 3.24.2. * gnu/packages/bioconductor.scm (r-chippeakanno): Update to 3.24.2. [propagated-inputs]: Add r-dplyr. --- gnu/packages/bioconductor.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index e3418e5a21..7bc5fa2a89 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2919,14 +2919,14 @@ determining dependencies between variables, code improvement suggestions.") (define-public r-chippeakanno (package (name "r-chippeakanno") - (version "3.24.1") + (version "3.24.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ChIPpeakAnno" version)) (sha256 (base32 - "0qdkwjv8s46d1kmgg2chijv7yzy9sv49kiks18w8x2z89prn15gj")))) + "0l417aygs89wf1j9fjpfjhahzskbpbgcrm8xpx3qm4s0307vfzkw")))) (properties `((upstream-name . "ChIPpeakAnno"))) (build-system r-build-system) (propagated-inputs @@ -2935,6 +2935,7 @@ determining dependencies between variables, code improvement suggestions.") ("r-biomart" ,r-biomart) ("r-biostrings" ,r-biostrings) ("r-dbi" ,r-dbi) + ("r-dplyr" ,r-dplyr) ("r-ensembldb" ,r-ensembldb) ("r-genomeinfodb" ,r-genomeinfodb) ("r-genomicalignments" ,r-genomicalignments) -- cgit 1.4.1 From 8a7933f37e1491534656968483358a02881570d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-rsubread: Update to 2.4.3. * gnu/packages/bioconductor.scm (r-rsubread): Update to 2.4.3. --- 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 7bc5fa2a89..aab46afc82 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6909,14 +6909,14 @@ annotations.") (define-public r-rsubread (package (name "r-rsubread") - (version "2.4.2") + (version "2.4.3") (source (origin (method url-fetch) (uri (bioconductor-uri "Rsubread" version)) (sha256 (base32 - "1wczrw5jb69x45hd3rdqqs9vkysdqwlxn9h3kjzn57r4x5q7jrra")))) + "0c4akc89p5467n5rzq9bi7h0h15rbpqpvh7fw42qcj7g2vc41wba")))) (properties `((upstream-name . "Rsubread"))) (build-system r-build-system) (inputs `(("zlib" ,zlib))) -- cgit 1.4.1 From 14a4c30828172c47c2a0dd348577b7fceabb101e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-universalmotif: Update to 1.8.4. * gnu/packages/bioconductor.scm (r-universalmotif): Update to 1.8.4. --- 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 aab46afc82..85d24fcea5 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -8375,14 +8375,14 @@ data.") (define-public r-universalmotif (package (name "r-universalmotif") - (version "1.8.3") + (version "1.8.4") (source (origin (method url-fetch) (uri (bioconductor-uri "universalmotif" version)) (sha256 (base32 - "1ys2kbayc1rzv8nzi60208yfslm4kzynndfg7vw2n0c30dvzycrc")))) + "0pmi5mp5v0srr482vlkfmkp28bywq969fvv9g5kjl5rxki963zmr")))) (properties `((upstream-name . "universalmotif"))) (build-system r-build-system) -- cgit 1.4.1 From e0147aa46fde621f4567d690268aaabef0986932 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-gviz: Update to 1.34.1. * gnu/packages/bioconductor.scm (r-gviz): Update to 1.34.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 85d24fcea5..88dca552e0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -10803,14 +10803,14 @@ family of feature/genome hypotheses.") (define-public r-gviz (package (name "r-gviz") - (version "1.34.0") + (version "1.34.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Gviz" version)) (sha256 (base32 - "0v7bz46b91dnrr55ah42ljj1i2xs3090s4w0lw8098pag00p4vh2")))) + "0bmlfz9ri1gkwyl605a2hqi5b8jdpvynrxwghwmrsd657ip6c7n1")))) (properties `((upstream-name . "Gviz"))) (build-system r-build-system) (propagated-inputs -- cgit 1.4.1 From 5f0c3535aa8394a675edcba11a8aff330cd49a61 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 8 Apr 2021 13:28:00 +0200 Subject: gnu: r-genomicfeatures: Update to 1.42.3. * gnu/packages/bioinformatics.scm (r-genomicfeatures): Update to 1.42.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 9e7423637c..908916ebf3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7811,13 +7811,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.42.2") + (version "1.42.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicFeatures" version)) (sha256 (base32 - "17ns5hvx5q8mrmkgb6linspwml62mi34i6al5bxlib5xi9d9f04s")))) + "168cf261vmcqffbzassavkjyz9a2af0l6zbv9cagkx6b1qrk3siz")))) (properties `((upstream-name . "GenomicFeatures"))) (build-system r-build-system) -- cgit 1.4.1 From 14ada96451812d1ccb7d42e3f0ec2a9248273f0e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 8 Apr 2021 14:03:50 +0200 Subject: ci: Remove the job period argument. Cuirass now deals with periodicity directly on specifications. * gnu/ci.scm (derivation->job): Remove the period argument. (image-jobs, system-test-jobs, tarball-jobs): Adapt them. --- gnu/ci.scm | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 32b7a611fb..4095d4e513 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -79,12 +79,9 @@ (define* (derivation->job name drv #:key - period (max-silent-time 3600) (timeout 3600)) - "Return a Cuirass job called NAME and describing DRV. PERIOD is the minimal -duration that must separate two evaluations of the same job. If PERIOD is -false, then the job will be evaluated as soon as possible. + "Return a Cuirass job called NAME and describing DRV. MAX-SILENT-TIME and TIMEOUT are build options passed to the daemon when building the derivation." @@ -98,7 +95,6 @@ building the derivation." (derivation->output-paths drv))) (#:nix-name . ,(derivation-name drv)) (#:system . ,(derivation-system drv)) - (#:period . ,period) (#:max-silent-time . ,max-silent-time) (#:timeout . ,timeout))) @@ -237,14 +233,11 @@ SYSTEM." (* 3600 hours)) (define (image-jobs store system) - "Return a list of jobs that build images for SYSTEM. Those jobs are -expensive in storage and I/O operations, hence their periodicity is limited by -passing the PERIOD argument." + "Return a list of jobs that build images for SYSTEM." (define (->job name drv) (let ((name (string-append name "." system))) (parameterize ((%graft? #f)) - (derivation->job name drv - #:period (hours 48))))) + (derivation->job name drv)))) (define (build-image image) (run-with-store store @@ -335,11 +328,7 @@ passing the PERIOD argument." (set-guile-for-build (default-guile)) (system-test-value test))))) - ;; Those tests are extremely expensive in I/O operations and storage - ;; size, use the "period" attribute to run them with a period of at - ;; least 48 hours. - (derivation->job name drv - #:period (hours 24))))) + (derivation->job name drv)))) (if (member system %guix-system-supported-systems) ;; Override the value of 'current-guix' used by system tests. Using a @@ -354,8 +343,7 @@ passing the PERIOD argument." (define (->job name drv) (let ((name (string-append name "." system))) (parameterize ((%graft? #f)) - (derivation->job name drv - #:period (hours 24))))) + (derivation->job name drv)))) ;; XXX: Add a job for the stable Guix? (list -- cgit 1.4.1 From 2afc79b51d0956e5834e81a70692a35cd83e4e87 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 8 Apr 2021 14:08:54 +0200 Subject: ci: Introduce new subsets. Introduce 'images, 'system-tests and 'tarball subsets. * gnu/ci.scm (cuirass-jobs): Break the 'all subset into smaller subsets. --- gnu/ci.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/ci.scm b/gnu/ci.scm index 4095d4e513..ff76ffde57 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -483,11 +483,6 @@ valid." (package->job store package system)))) (append (filter-map job all) - (image-jobs store system) - (system-test-jobs store system - #:source source - #:commit commit) - (tarball-jobs store system) (cross-jobs store system)))) ('core ;; Build core packages only. @@ -507,6 +502,17 @@ valid." (let ((hello (specification->package "hello"))) (list (package-job store (job-name hello) hello system)))) + ('images + ;; Build Guix System images only. + (image-jobs store system)) + ('system-tests + ;; Build Guix System tests only. + (system-test-jobs store system + #:source source + #:commit commit)) + ('tarball + ;; Build Guix tarball only. + (tarball-jobs store system)) (('channels . channels) ;; Build only the packages from CHANNELS. (let ((all (all-packages))) -- cgit 1.4.1