From 2ec46078630a09b326822a7565fc7764fd9957a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 02:16:38 +0100 Subject: services: nginx: Fix broken default configuration. * gnu/services/web.scm (nginx-configuration): Emit an empty events{} block by default. * doc/guix.texi (Web Services): Document it. --- gnu/services/web.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index 3edc751ea2..ac247ec39a 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2019 Florian Pelz ;;; Copyright © 2020 Ricardo Wurmus +;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -529,7 +530,8 @@ (server-names-hash-bucket-max-size nginx-configuration-server-names-hash-bucket-max-size (default #f)) (modules nginx-configuration-modules (default '())) - (global-directives nginx-configuration-global-directives (default '())) + (global-directives nginx-configuration-global-directives + (default '((events . ())))) (extra-content nginx-configuration-extra-content (default "")) (file nginx-configuration-file ;#f | string | file-like -- cgit v1.2.3 From 85f0958693588191852b3f3c04c413fc089b0c81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 16 Mar 2020 09:58:56 +0100 Subject: services/web: Export nginx-configuration-global-directives. This is a follow-up to commit b420e6deb96e0760f12e3d941b76e690c4235e47. * gnu/services/web.scm (nginx-configuration-global-directives): Export procedure. --- gnu/services/web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/services/web.scm b/gnu/services/web.scm index ac247ec39a..fa5c34d5af 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -100,6 +100,7 @@ nginx-configuration-server-names-hash-bucket-size nginx-configuration-server-names-hash-bucket-max-size nginx-configuration-modules + nginx-configuration-global-directives nginx-configuration-extra-content nginx-configuration-file -- cgit v1.2.3 From bc6bf142d333f05cfb214295db0756d7e3ad0d67 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 16 Mar 2020 13:59:20 +0100 Subject: gnu: star: Update to 2.7.3a. * gnu/packages/bioinformatics.scm (star): Update to 2.7.3a. --- 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 4dedee6223..9044ebca8d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -6322,16 +6322,16 @@ application of SortMeRNA is filtering rRNA from metatranscriptomic data.") (define-public star (package (name "star") - (version "2.7.1a") + (version "2.7.3a") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/alexdobin/STAR.git") (commit version))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0n6g4s4hgw7qygs1z97j7a2dgz8gfaa4cv5pjvvvmarvk0x07hyg")) + "1hgiqw5qhs0pc1xazzihcfd92na02xyq2kb469z04y1v51kpvvjq")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 4df02ab675b262bc2d43f83ad33785eb434ea6cb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 10:33:29 +0100 Subject: tests: rsync: Set PATH. This is a followup to 8b9cad01e9619f53dc5a65892ca6a09ca5de3447, which would leave PATH unset. * gnu/tests/rsync.scm (run-rsync-test)[test]("service running"): Add call to 'setenv' for PATH. --- gnu/tests/rsync.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/tests/rsync.scm b/gnu/tests/rsync.scm index 096580022f..24e60d9d9d 100644 --- a/gnu/tests/rsync.scm +++ b/gnu/tests/rsync.scm @@ -64,6 +64,10 @@ PORT." (marionette-eval '(begin (use-modules (gnu services herd)) + + ;; Make sure the 'rsync' command is found. + (setenv "PATH" "/run/current-system/profile/bin") + (start-service 'rsync)) marionette)) -- cgit v1.2.3 From ef0f5ff2a74e5e4dc49dfdd0ba6509a91281ddd5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 11:17:15 +0100 Subject: tests: dhcpd: Adjust network interface name. This is a followup to 8e53fe2b91d2776bc1529e7b34967c8f1d9edc32. * gnu/tests/networking.scm (dhcpd-v4-configuration) (%dhcpd-os): Use "ens3" instead of "eth0". --- gnu/tests/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index d1234442bb..e90b247883 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -270,11 +270,11 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (dhcpd-configuration (config-file minimal-dhcpd-v4-config-file) (version "4") - (interfaces '("eth0")))) + (interfaces '("ens3")))) (define %dhcpd-os (simple-operating-system - (static-networking-service "eth0" "192.168.1.4" + (static-networking-service "ens3" "192.168.1.4" #:netmask "255.255.255.0" #:gateway "192.168.1.1" #:name-servers '("192.168.1.2" "192.168.1.3")) -- cgit v1.2.3 From 0f13dd2b7f7675310e4a9bbfd37ee946b9f0dea3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 11:25:57 +0100 Subject: services: dhcpd: Use 'invoke/quiet' when validating the config file. This avoids the lengthy copyright/config message from dhcpd. * gnu/services/networking.scm (dhcpd-activation): Use 'invoke/quiet' instead of 'invoke'. --- gnu/services/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 59b895d60b..618dd95969 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2015 Mark H Weaver ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016 John Darrington @@ -313,7 +313,7 @@ Protocol (DHCP) client, on all the non-loopback network interfaces." (with-output-to-file #$lease-file (lambda _ (display "")))) ;; Validate the config. - (invoke + (invoke/quiet #$(file-append package "/sbin/dhcpd") "-t" "-cf" #$config-file)))))) -- cgit v1.2.3 From c215d9ec1ce108844b14c0c2952199a0da5f4176 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 12:18:59 +0100 Subject: tests: opensmtpd: Gracefully handle test failure. Previously the 'wait' loop would run for ~1024 seconds, at which point we'd reach the file descriptor limit due to the leak in 'queue-empty?'. * gnu/tests/mail.scm (run-opensmtpd-test)[test]("mail arrived"): In 'queue-empty?', close PIPE to avoid file descriptor leak. In 'wait' loop, arrange to run at most 20 times. --- gnu/tests/mail.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index 298918b3a7..58172cd1d6 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -140,16 +140,21 @@ match from any for local action inbound (ice-9 rdelim)) (define (queue-empty?) - (eof-object? - (read-line - (open-input-pipe - (string-append #$(file-append opensmtpd "/sbin/smtpctl") - " show queue"))))) - - (let wait () - (if (queue-empty?) - (file-exists? "/var/mail/root") - (begin (sleep 1) (wait))))) + (let* ((pipe (open-pipe* OPEN_READ + #$(file-append opensmtpd + "/sbin/smtpctl") + "show" "queue")) + (line (read-line pipe))) + (close-pipe pipe) + (eof-object? line))) + + (let wait ((n 20)) + (cond ((queue-empty?) + (file-exists? "/var/mail/root")) + ((zero? n) + (error "root mailbox didn't show up")) + (else + (sleep 1) (wait (- n 1)))))) marionette)) (test-end) -- cgit v1.2.3 From a37e03d60e18dfcf119d0b92d9008e54fc350bf1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 12:21:05 +0100 Subject: tests: opensmtpd: Check /var/spool/mail instead of /var/mail. The test had been failing since the upgrade to 6.6.3p1 in commit 2dbfd8eec43b602d23cee3fdd2842cc333e36c24. * gnu/services/mail.scm (opensmtpd-activation): Create /var/spool/mail. * gnu/tests/mail.scm (run-opensmtpd-test): Check /var/spool/mail instead of /var/mail. --- gnu/services/mail.scm | 4 +++- gnu/tests/mail.scm | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index d97316512f..7791780dfc 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1670,7 +1670,9 @@ match from local for any action outbound ;; Create mbox and spool directories. (mkdir-p "/var/mail") (mkdir-p "/var/spool/smtpd") - (chmod "/var/spool/smtpd" #o711)))))) + (chmod "/var/spool/smtpd" #o711) + (mkdir-p "/var/spool/mail") + (chmod "/var/spool/mail" #o711)))))) (define %opensmtpd-pam-services (list (unix-pam-service "smtpd"))) diff --git a/gnu/tests/mail.scm b/gnu/tests/mail.scm index 58172cd1d6..a50fb1dbca 100644 --- a/gnu/tests/mail.scm +++ b/gnu/tests/mail.scm @@ -99,8 +99,8 @@ match from any for local action inbound (test-assert "mbox is empty" (marionette-eval - '(and (file-exists? "/var/mail") - (not (file-exists? "/var/mail/root"))) + '(and (file-exists? "/var/spool/mail") + (not (file-exists? "/var/spool/mail/root"))) marionette)) (test-eq "accept an email" @@ -150,7 +150,7 @@ match from any for local action inbound (let wait ((n 20)) (cond ((queue-empty?) - (file-exists? "/var/mail/root")) + (file-exists? "/var/spool/mail/root")) ((zero? n) (error "root mailbox didn't show up")) (else -- cgit v1.2.3 From e8cec7cc120fc95b2e869a1834a01e257e0f63c8 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 12:34:13 +0100 Subject: tests: nfs: Ensure 'rpcinfo' can be found. The test was failing since 8b9cad01e9619f53dc5a65892ca6a09ca5de3447. * gnu/tests/nfs.scm (run-nfs-test)[test]("RPC service running"): Add 'setenv' call for PATH. --- gnu/tests/nfs.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 014d049ab5..635c4a7322 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ludovic Courtès +;;; Copyright © 2016, 2017, 2020 Ludovic Courtès ;;; Copyright © 2016 John Darrington ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2017 Tobias Geerinckx-Rice @@ -101,6 +101,10 @@ (marionette-eval '(begin (use-modules (gnu services herd)) + + ;; Ensure 'rpcinfo' can be found below. + (setenv "PATH" "/run/current-system/profile/bin") + (start-service 'rpcbind-daemon)) marionette)) -- cgit v1.2.3 From 76d2b9a2e8893dc566d954c3e5be457fbfab5e17 Mon Sep 17 00:00:00 2001 From: Joseph LaFreniere Date: Wed, 11 Mar 2020 21:48:59 -0500 Subject: gnu: Add libgccjit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gcc.scm (libgccjit): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gcc.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1f10ae5119..08afd80358 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Carlos Sánchez de La Lama ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2020 Joseph LaFreniere ;;; ;;; This file is part of GNU Guix. ;;; @@ -690,6 +691,34 @@ as the 'native-search-paths' field." ;; report two gfortran@5 that are in fact identical. gfortran-7) +(define-public libgccjit + (package + (inherit gcc-9) + (name "libgccjit") + (outputs (delete "lib" (package-outputs gcc))) + (properties (alist-delete 'hidden? (package-properties gcc))) + (arguments + (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26)) + ,@(package-arguments gcc)) + ((#:configure-flags flags) + `(append `("--enable-host-shared" + ,(string-append "--enable-languages=jit")) + (remove (cut string-match "--enable-languages.*" <>) + ,flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")) + #t)))))))) + + (define-public gccgo-4.9 (custom-gcc gcc-4.9 "gccgo" '("go") %generic-search-paths -- cgit v1.2.3 From a1dc5898fbae4c97a37364e91ae49a55d5641f16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:14:19 +0100 Subject: gnu: python-stem: Update to 1.8.0. * gnu/packages/python-xyz.scm (python-stem): Update to 1.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 2718e9b236..f673b5ec15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11516,14 +11516,14 @@ etc.") (define-public python-stem (package (name "python-stem") - (version "1.7.1") + (version "1.8.0") (source (origin (method url-fetch) (uri (pypi-uri "stem" version)) (sha256 (base32 - "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9")))) + "1hk8alc0r4m669ggngdfvryndd0fbx0w62sclcmg55af4ak8xd50")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From 44b885656aa1eb1d2dff9ecda35149c71d51b1fe Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:10:51 +0100 Subject: gnu: python-werkzeug: Update to 1.0.0. * gnu/packages/python-web.scm (python-werkzeug): Update to 1.0.0. [source](uri): Capitalize PyPI project name. [native-inputs]: Add PYTHON-PYTEST-TIMEOUT. --- gnu/packages/python-web.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 07c1ceb2db..d1e09fc727 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2783,14 +2783,14 @@ List. Forked from and using the same API as the publicsuffix package.") (define-public python-werkzeug (package (name "python-werkzeug") - (version "0.14.1") + (version "1.0.0") (source (origin (method url-fetch) - (uri (pypi-uri "werkzeug" version)) + (uri (pypi-uri "Werkzeug" version)) (sha256 (base32 - "0z2m4snn1vc9518r2vzgdj1nc90kcgi60wijvd29yvcp85ypmzf3")))) + "15kh0z61klp62mrc1prka13xsshxn0rsp1j1s2964iw86yisi6qn")))) (build-system python-build-system) (arguments '(#:phases @@ -2803,7 +2803,8 @@ List. Forked from and using the same API as the publicsuffix package.") (propagated-inputs `(("python-requests" ,python-requests))) (native-inputs - `(("python-pytest" ,python-pytest))) + `(("python-pytest" ,python-pytest) + ("python-pytest-timeout" ,python-pytest-timeout))) (home-page "https://www.palletsprojects.org/p/werkzeug/") (synopsis "Utilities for WSGI applications") (description "One of the most advanced WSGI utility modules. It includes a -- cgit v1.2.3 From 15af040cc35895e779397ab42f53561666d9301a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:27:50 +0100 Subject: gnu: python-flask: Update to 1.1.1. * gnu/packages/python-web.scm (python-flask): Update to 1.1.1. --- gnu/packages/python-web.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d1e09fc727..985d03f8d1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1728,20 +1728,22 @@ minimum of WSGI.") (define-public python-flask (package (name "python-flask") - (version "1.0.3") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "Flask" version)) (sha256 (base32 - "1wxnhjlxwwjhjxmghykjhllpahv5pkdc5hln4ab6nab43s26sz5d")))) + "0ljdjgyjn7vh8ic1n1dc2l1cl421i6pr3kx5sz2w5irhyfbg3y8k")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check (lambda _ - (invoke "python" "-m" "pytest")))))) + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv" "tests")))))) (native-inputs `(("python-pytest" ,python-pytest))) (propagated-inputs -- cgit v1.2.3 From 4393dafd320ad5d10d8c87d4ae46ce21fdd4ffb6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:33:57 +0100 Subject: gnu: python-flask-login: Update to 0.5.0. * gnu/packages/python-web.scm (python-flask-login): Update to 0.5.0. [arguments]: Remove. [native-inputs]: Remove PYTHON-NOSE and PYTHON-PEP8. Add PYTHON-COVERAGE, PYTHON-PYCODESTYLE. and PYTHON-PYTEST. --- gnu/packages/python-web.scm | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 985d03f8d1..b17de9953f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2394,7 +2394,7 @@ on the command line.") (define-public python-flask-login (package (name "python-flask-login") - (version "0.4.1") + (version "0.5.0") (source (origin (method git-fetch) @@ -2403,25 +2403,18 @@ on the command line.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'avoid-yanc - ;; Work around '.nosetests-real: error: no such option: --with-yanc'. - (lambda _ - (setenv "NOCOLOR" "set") - #t))))) + (base32 "11ac924w0y4m0kf3mxnxdlidy88jfa7njw5yyrq16dvnx4iwd8gg")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask))) (native-inputs ;; For tests. `(("python-blinker" ,python-blinker) + ("python-coverage" ,python-coverage) ("python-mock" ,python-mock) - ("python-nose" ,python-nose) - ("python-pep8" ,python-pep8) + ("python-pycodestyle" ,python-pycodestyle) ("python-pyflakes" ,python-pyflakes) + ("python-pytest" ,python-pytest) ("python-semantic-version" ,python-semantic-version) ("python-werkzeug" ,python-werkzeug))) (home-page "https://github.com/maxcountryman/flask-login") -- cgit v1.2.3 From 33901ed8c0a85e9b0badbc7ea042d310bdfac970 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:41:51 +0100 Subject: gnu: python-flask-babel: Update to 1.0.0. * gnu/packages/python-web.scm (python-flask-babel): Update to 1.0.0. [arguments]: New field. --- gnu/packages/python-web.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b17de9953f..b87764b907 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -440,15 +440,21 @@ between a web browser and web server.") (define-public python-flask-babel (package (name "python-flask-babel") - (version "0.11.2") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "Flask-Babel" version)) (sha256 (base32 - "0ff9n165vhf1nhv6807ckhpp224jw7k7sd7jz5kfh3sbpl85gmy0")))) + "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (with-directory-excursion "tests" + (invoke "python" "tests.py"))))))) (propagated-inputs `(("python-flask" ,python-flask) ("python-babel" ,python-babel) -- cgit v1.2.3 From 8f29817ed523dd4e5dbd459ecb94dbd1cab6a4fc Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:43:25 +0100 Subject: gnu: python-flask-wtf: Update to 0.14.3. * gnu/packages/python-web.scm (python-flask-wtf): Update to 0.14.3. [arguments]: Remove obsolete phase. Override check phase. [native-inputs]: Remove PYTHON-NOSE. Add PYTHON-PYTEST. --- gnu/packages/python-web.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b87764b907..6d4204bad0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1770,31 +1770,29 @@ presume or force a developer to use a particular tool or library.") (define-public python-flask-wtf (package (name "python-flask-wtf") - (version "0.13.1") + (version "0.14.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-WTF" version)) (sha256 (base32 - "04l5743j2dici46038sqlzvf0xzpg8rf7s9ld2x24xv7f4idg990")))) + "086pvg2x69n0nczcq7frknfjd8am1zdy8qqpva1sanwb02hf65yl")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'check 'drop-failing-test + (replace 'check (lambda _ - ;; FIXME: This file tries resolving an external server, which - ;; fails. Try to patch out the offending section instead of - ;; deleting the whole thing. - (delete-file "tests/test_recaptcha.py") - #t))))) + (setenv "PYTHONPATH" (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) (propagated-inputs `(("python-flask-babel" ,python-flask-babel) ("python-babel" ,python-babel) ("python-wtforms" ,python-wtforms))) (native-inputs - `(("python-nose" ,python-nose))) + `(("python-pytest" ,python-pytest))) (home-page "https://github.com/lepture/flask-wtf") (synopsis "Simple integration of Flask and WTForms") (description "Flask-WTF integrates Flask and WTForms, including CSRF, file -- cgit v1.2.3 From 0a044f75b54d92417debf600fe7c4c4f86af344d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 03:55:16 +0100 Subject: gnu: python-flask-restful: Update to 0.3.8. * gnu/packages/patches/python-flask-restful-werkzeug-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-web.scm (python-flask-restful): Update to 0.3.8. [source](patches): New field. [native-inputs]: Remove PYTHON-SPHINX. --- gnu/local.mk | 1 + .../python-flask-restful-werkzeug-compat.patch | 36 ++++++++++++++++++++++ gnu/packages/python-web.scm | 8 ++--- 3 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 gnu/packages/patches/python-flask-restful-werkzeug-compat.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3be54b2627..1dd7e0a6a8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ %D%/packages/patches/python-faker-fix-build-32bit.patch \ + %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ diff --git a/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch new file mode 100644 index 0000000000..0e928ef455 --- /dev/null +++ b/gnu/packages/patches/python-flask-restful-werkzeug-compat.patch @@ -0,0 +1,36 @@ +We need one patch on top of 0.3.8 for compatibility with Werkzeug 1.0. + +Taken from upstream: +https://github.com/flask-restful/flask-restful/commit/73376a488907af3042b52678ac4c23f8a8911e5b + +diff --git a/tests/test_api.py b/tests/test_api.py +index f7f8e661..6795d362 100644 +--- a/tests/test_api.py ++++ b/tests/test_api.py +@@ -445,7 +445,9 @@ def test_handle_non_api_error(self): + + resp = app.get("/foo") + self.assertEquals(resp.status_code, 404) +- self.assertEquals('text/html', resp.headers['Content-Type']) ++ # in newer versions of werkzeug this is `text/html; charset=utf8` ++ content_type, _, _ = resp.headers['Content-Type'].partition(';') ++ self.assertEquals('text/html', content_type) + + def test_non_api_error_404_catchall(self): + app = Flask(__name__) +diff --git a/tests/test_reqparse.py b/tests/test_reqparse.py +index 2f1fbedf..9776f17c 100644 +--- a/tests/test_reqparse.py ++++ b/tests/test_reqparse.py +@@ -2,9 +2,9 @@ + import unittest + from mock import Mock, patch + from flask import Flask +-from werkzeug import exceptions, MultiDict ++from werkzeug import exceptions + from werkzeug.wrappers import Request +-from werkzeug.datastructures import FileStorage ++from werkzeug.datastructures import FileStorage, MultiDict + from flask_restful.reqparse import Argument, RequestParser, Namespace + import six + import decimal diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6d4204bad0..ae01f83611 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2173,14 +2173,15 @@ pretty printer and a tree visitor.") (define-public python-flask-restful (package (name "python-flask-restful") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) (uri (pypi-uri "Flask-RESTful" version)) + (patches (search-patches "python-flask-restful-werkzeug-compat.patch")) (sha256 (base32 - "1a9cbwkr6krryyzq4sd3f415nkkc6dyfls5i3pgyibs94g0hw97q")))) + "05b9lzx5yc3wgml2bcq50lq35h66m8zpj6dc9advcb5z3acsbaay")))) (build-system python-build-system) (propagated-inputs `(("python-aniso8601" ,python-aniso8601) @@ -2191,8 +2192,7 @@ pretty printer and a tree visitor.") `(;; Optional dependency of Flask. Tests need it. ("python-blinker" ,python-blinker) ("python-mock" ,python-mock) ; For tests - ("python-nose" ,python-nose) ; For tests - ("python-sphinx" ,python-sphinx))) + ("python-nose" ,python-nose))) ;for tests (home-page "https://www.github.com/flask-restful/flask-restful/") (synopsis -- cgit v1.2.3 From 200acbc34b9fe24f6c204e419d357da3197ea891 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:05:16 +0100 Subject: gnu: python-stdnum: Update to 1.13. * gnu/packages/finance.scm (python-stdnum): Update to 1.13. [arguments]: New field. [native-inputs]: Add PYTHON-NOSE. --- gnu/packages/finance.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 89a7ffe956..0e44802fe1 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -982,15 +982,22 @@ agent.") (define-public python-stdnum (package (name "python-stdnum") - (version "1.8.1") + (version "1.13") (source (origin (method url-fetch) (uri (pypi-uri "python-stdnum" version)) (sha256 (base32 - "0hvr47q32xbyiznpmbg4r8rcvxhnf0lwf33hcpnynyik57djy5np")))) + "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "nosetests")))))) + (native-inputs + `(("python-nose" ,python-nose))) (home-page "https://arthurdejong.org/python-stdnum/") (synopsis -- cgit v1.2.3 From e5b4b8028ae59eab96b12df5e1e615cb63fca8ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:08:26 +0100 Subject: gnu: python-flask-restful-swagger: Update to 0.20.1. * gnu/packages/python-web.scm (python-flask-restful-swagger): Update to 0.20.1. [arguments]: New field. Explicitly disable tests. --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index ae01f83611..19d3255d79 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2309,15 +2309,16 @@ documentation builder.") (define-public python-flask-restful-swagger (package (name "python-flask-restful-swagger") - (version "0.19") + (version "0.20.1") (source (origin (method url-fetch) (uri (pypi-uri "flask-restful-swagger" version)) (sha256 (base32 - "16msl8hd5xjmj833bpy264v98cpl5hkw5bgl5gf5vgndxbv3rm6v")))) + "1p66f98b5zpypnnz56pxpbirchqj6aniw6qyrp8h572l0dn9xlvq")))) (build-system python-build-system) + (arguments '(#:tests? #f)) ;no tests (propagated-inputs `(("python-flask-restful" ,python-flask-restful))) (home-page "https://github.com/rantav/flask-restful-swagger") -- cgit v1.2.3 From b85822eaf9b8c85d0a579e37df813d35c3e5d314 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:14:48 +0100 Subject: gnu: python-flask-migrate: Update to 2.5.3. * gnu/packages/python-web.scm (python-flask-migrate): Update to 2.5.3. --- 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 19d3255d79..1000784d6d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2606,14 +2606,14 @@ itself.") (define-public python-flask-migrate (package (name "python-flask-migrate") - (version "2.0.3") + (version "2.5.3") (source (origin (method url-fetch) (uri (pypi-uri "Flask-Migrate" version)) (sha256 (base32 - "107x78lkqsnbg92dld3dkagg07jvchp3ib3y0sivc4ipz6n1y7rk")))) + "1vip9ww6l18dxffjsggm83k71zkvihxpnhaswpv8klh95s6517d6")))) (build-system python-build-system) (propagated-inputs `(("python-flask" ,python-flask) -- cgit v1.2.3 From f8205d9a7838678f9c633ad5c429029f280f254e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:15:07 +0100 Subject: gnu: python2-flake8: Add missing propagated dependency. * gnu/packages/python-xyz.scm (python2-flake8)[propagated-inputs]: Add PYTHON-FUNCTOOLS32. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f673b5ec15..2aea2be56e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7037,6 +7037,7 @@ complexity of Python source code.") (propagated-inputs `(("python2-configparser" ,python2-configparser) ("python2-enum34" ,python2-enum34) + ("python2-functools32" ,python2-functools32) ("python2-typing" ,python2-typing) ,@(package-propagated-inputs base)))))) -- cgit v1.2.3 From 066c21cda4a9893a0cc8398d1a4d3f9f1ac1dfbb Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:32:31 +0100 Subject: gnu: Remove python2-flask-migrate. Upstream no longer supports Python 2 and there are no dependencies on it in Guix. * gnu/packages/python-web.scm (python2-flask-migrate): Remove variable. --- 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 1000784d6d..e431a072d1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2628,9 +2628,6 @@ Alembic") for Flask programs that are using @code{python-alembic}.") (license license:expat))) -(define-public python2-flask-migrate - (package-with-python2 python-flask-migrate)) - (define-public python-genshi (package (name "python-genshi") -- cgit v1.2.3 From e76cbdcd90e603d98f9d074aa2ee0788c65d97df Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 04:39:17 +0100 Subject: gnu: beets: Fix build with newer Werkzeug. * gnu/packages/patches/beets-werkzeug-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/music.scm (beets)[source](patches): New field. --- gnu/local.mk | 1 + gnu/packages/music.scm | 1 + gnu/packages/patches/beets-werkzeug-compat.patch | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 gnu/packages/patches/beets-werkzeug-compat.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1dd7e0a6a8..5cde920c8c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -756,6 +756,7 @@ dist_patch_DATA = \ %D%/packages/patches/bash-completion-directories.patch \ %D%/packages/patches/bastet-change-source-of-unordered_set.patch \ %D%/packages/patches/bazaar-CVE-2017-14176.patch \ + %D%/packages/patches/beets-werkzeug-compat.patch \ %D%/packages/patches/beignet-correct-file-names.patch \ %D%/packages/patches/benchmark-unbundle-googletest.patch \ %D%/packages/patches/biber-fix-encoding-write.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f6585f60d4..fd9cd6c30f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2941,6 +2941,7 @@ Songs can be searched by artist, name or even by a part of the song text.") (source (origin (method url-fetch) (uri (pypi-uri "beets" version)) + (patches (search-patches "beets-werkzeug-compat.patch")) (sha256 (base32 "0m40rjimvfgy1dv04p8f8d5dvi2855v4ix99a9xr900cmcn476yj")))) diff --git a/gnu/packages/patches/beets-werkzeug-compat.patch b/gnu/packages/patches/beets-werkzeug-compat.patch new file mode 100644 index 0000000000..1a91c3a3f9 --- /dev/null +++ b/gnu/packages/patches/beets-werkzeug-compat.patch @@ -0,0 +1,18 @@ +Be compatible with python-werkzeug 1.0.0. + +Taken from upstream: +https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8 + +diff --git a/beetsplug/web/__init__.py b/beetsplug/web/__init__.py +index f53fb3a954..21ff5d94ed 100644 +--- a/beetsplug/web/__init__.py ++++ b/beetsplug/web/__init__.py +@@ -169,7 +169,7 @@ def to_python(self, value): + return ids + + def to_url(self, value): +- return ','.join(value) ++ return ','.join(str(v) for v in value) + + + class QueryConverter(PathConverter): -- cgit v1.2.3 From 2680a3d83e3115f0337c43e3ac3e0d0996d66210 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 12:59:55 +0100 Subject: gnu: Remove git-annex-remote-hubic. This package does not build and is officially unmaintained since 2017. * gnu/packages/version-control.scm (git-annex-remote-hubic): Remove variable. --- gnu/packages/version-control.scm | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5d0fa267a9..599fb2839e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2069,36 +2069,6 @@ supports a large number of version control systems: Git, Subversion, Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (license license:gpl2+))) -(define-public git-annex-remote-hubic - (package - (name "git-annex-remote-hubic") - (version "0.3.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Schnouki/git-annex-remote-hubic.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "16y9sk67hfi17h9n2kkffyabfccksh5rab40hhk69v6cxmbpn2sx")))) - (build-system python-build-system) - (arguments `(#:python ,python-2)) - (native-inputs - `(;; for the tests - ("python2-six" ,python2-six))) - (propagated-inputs - `(("python2-dateutil" ,python2-dateutil) - ("python2-futures" ,python2-futures) - ("python2-rauth" ,python2-rauth) - ("python2-swiftclient" ,python2-swiftclient))) - (home-page "https://github.com/Schnouki/git-annex-remote-hubic/") - (synopsis "Use hubic as a git-annex remote") - (description - "This package allows you to use your hubic account as a \"special -repository\" with git-annex.") - (license license:gpl3+))) - (define-public git-annex-remote-rclone (package (name "git-annex-remote-rclone") -- cgit v1.2.3 From d440e020943c133b8d6e214b116cfac32c9a1f59 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:03:01 +0100 Subject: gnu: Remove python2-keystoneclient. This package fails to build and has no reverse dependencies. * gnu/packages/openstack.scm (python2-keystoneclient): Remove variable. --- gnu/packages/openstack.scm | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 3b6ec6b44f..c3ab3fe953 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -786,21 +786,6 @@ SQLite for its identity store database, with the option to connect to external LDAP.") (license asl2.0))) -(define-public python2-keystoneclient - (let ((keystoneclient (package-with-python2 python-keystoneclient))) - (package (inherit keystoneclient) - (propagated-inputs - `(("python2-requests" ,python2-requests) - ,@(alist-delete "python-requests" - (package-propagated-inputs keystoneclient)))) - (native-inputs - `(("python2-oauthlib" ,python2-oauthlib) - ("python2-oslosphinx" ,python2-oslosphinx) - ("python2-requests-mock" ,python2-requests-mock) - ("python2-tempest-lib" ,python2-tempest-lib) - ,@(fold alist-delete (package-native-inputs keystoneclient) - '("python-oauthlib" "python-oslosphinx" "python-requests-mock" "python-tempest-lib"))))))) - (define-public python-swiftclient (package (name "python-swiftclient") -- cgit v1.2.3 From 3b9610b559d162c3f894a700a0118186a5e7a483 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:04:23 +0100 Subject: gnu: Remove python2-swiftclient. This package fails to build and has no reverse dependencies. * gnu/packages/openstack.scm (python2-swiftclient): Remove variable. (python-swiftclient)[properties]: Remove. --- gnu/packages/openstack.scm | 9 --------- 1 file changed, 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index c3ab3fe953..07c443b3da 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -825,17 +825,8 @@ data that best fit this type of storage model are virtual machine images, photo storage, email storage and backup archiving. Having no central \"brain\" or master point of control provides greater scalability, redundancy and permanence.") - (properties `((python2-variant . ,(delay python2-swiftclient)))) (license asl2.0))) -(define-public python2-swiftclient - (let ((swiftclient (package-with-python2 - (strip-python2-variant python-swiftclient)))) - (package (inherit swiftclient) - (propagated-inputs - `(("python2-futures" ,python2-futures) - ,@(package-propagated-inputs swiftclient)))))) - (define-public python-git-review (package (name "python-git-review") -- cgit v1.2.3 From dc99be08ef148776f536c04a55cc81bcb76a1b9c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:06:07 +0100 Subject: gnu: Remove python2-tempest-lib. This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-tempest-lib): Remove variable. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 07c443b3da..07c2dbe169 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -376,9 +376,6 @@ extensions.") common features used in Tempest.") (license asl2.0))) -(define-public python2-tempest-lib - (package-with-python2 python-tempest-lib)) - ;; Packages from the Oslo library (define-public python-oslo.config (package -- cgit v1.2.3 From e778c457a5e3f1dd63aa3947dcf9f41c5bb350ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:07:09 +0100 Subject: gnu: Remove python2-oslo.log. This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-oslo.log): Remove variable. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 07c2dbe169..f7e806b218 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -520,9 +520,6 @@ configuration for all OpenStack projects. It also provides custom formatters, handlers and support for context specific logging (like resource id’s etc).") (license asl2.0))) -(define-public python2-oslo.log - (package-with-python2 python-oslo.log)) - (define-public python-oslo.serialization (package (name "python-oslo.serialization") -- cgit v1.2.3 From 710f7b57422bbbd171dac823de91d4c279f6ddef Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:08:01 +0100 Subject: gnu: Remove python2-oslo.serialization. * gnu/packages/openstack.scm (python2-oslo.serialization): Remove variable. (python-oslo.serialization)[properties]: Remove. --- gnu/packages/openstack.scm | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index f7e806b218..cfec338bb1 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -549,18 +549,8 @@ handlers and support for context specific logging (like resource id’s etc).") (description "The oslo.serialization library provides support for representing objects in transmittable and storable formats, such as JSON and MessagePack.") - (properties `((python2-variant . ,(delay python2-oslo.serialization)))) (license asl2.0))) -(define-public python2-oslo.serialization - (let ((base (package-with-python2 (strip-python2-variant - python-oslo.serialization)))) - (package - (inherit base) - (native-inputs - `(("python2-ipaddress" ,python2-ipaddress) - ,@(package-native-inputs base)))))) - (define-public python-reno (package (name "python-reno") -- cgit v1.2.3 From 538f44de9ba74ebce637ab437b245bc546c6318b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:08:48 +0100 Subject: gnu: Remove python2-oslo.utils. This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-oslo.utils): Remove variable. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index cfec338bb1..4593b397a0 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -706,9 +706,6 @@ functions, such as encoding, exception handling, string manipulation, and time handling.") (license asl2.0))) -(define-public python2-oslo.utils - (package-with-python2 python-oslo.utils)) - (define-public python-keystoneclient (package (name "python-keystoneclient") -- cgit v1.2.3 From 9ff7c73ba51e6c577afa88c899827075d1227c39 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:09:33 +0100 Subject: gnu: Remove python2-oslo.config. This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-oslo.config): Remove variable. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 4593b397a0..734af38737 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -416,9 +416,6 @@ common features used in Tempest.") .ini style configuration files.") (license asl2.0))) -(define-public python2-oslo.config - (package-with-python2 python-oslo.config)) - (define-public python-oslo.context (package (name "python-oslo.context") -- cgit v1.2.3 From da44dcb87e713dcb6e75a465ed41eb64f5ffad0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:10:13 +0100 Subject: gnu: Remove python2-bandit. This package fails to build and has no users in Guix. * gnu/packages/openstack.scm (python2-bandit): Remove variable. --- gnu/packages/openstack.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 734af38737..8dd8c1907c 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -87,9 +87,6 @@ appropriate plugins against the AST nodes. Once Bandit has finished scanning all the files it generates a report.") (license asl2.0))) -(define-public python2-bandit - (package-with-python2 python-bandit)) - (define-public python-debtcollector (package (name "python-debtcollector") -- cgit v1.2.3 From 751c1b5960508645d1257eb584ff3d5c1627e6c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:11:01 +0100 Subject: gnu: Remove python2-gitpython. This package fails to build and has no users in Guix. * gnu/packages/version-control.scm (python2-gitpython): Remove variable. --- gnu/packages/version-control.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 599fb2839e..4249d4edcf 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1061,9 +1061,6 @@ either a pure Python implementation, or the faster, but more resource intensive @command{git} command implementation.") (license license:bsd-3))) -(define-public python2-gitpython - (package-with-python2 python-gitpython)) - (define-public shflags (package (name "shflags") -- cgit v1.2.3 From 24464edd31256ac81d02b2d9f0a00a72aee8d8d8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:11:45 +0100 Subject: gnu: Remove python2-gitdb. Upstream no longer supports Python 2 and there are no users in Guix. * gnu/packages/version-control.scm (python2-gitdb): Remove variable. --- gnu/packages/version-control.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 4249d4edcf..bf97f89cd6 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1017,9 +1017,6 @@ with performance and scalability in mind. It operates exclusively on streams, allowing to handle large objects with a small memory footprint.") (license license:bsd-3))) -(define-public python2-gitdb - (package-with-python2 python-gitdb)) - (define-public python-gitpython (package (name "python-gitpython") -- cgit v1.2.3 From aa0e4413b70819beea554b8071694b296642d842 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:24:14 +0100 Subject: gnu: python-kivy: Remove unused input. * gnu/packages/python-xyz.scm (python-kivy)[native-inputs]: Remove GIT. --- 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 2aea2be56e..f467e28064 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11603,8 +11603,7 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") "/include/SDL2")) #t))))) (native-inputs - `(("git" ,git) - ("pkg-config" ,pkg-config) + `(("pkg-config" ,pkg-config) ("python-cython" ,python-cython))) (inputs `(("gstreamer" ,gstreamer) -- cgit v1.2.3 From f11b55563723164886939f5dd01598197ddcc8d6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:33:06 +0100 Subject: gnu: python-gevent: Update to 1.4.0. * gnu/packages/python-xyz.scm (python-gevent): Update to 1.4.0. [arguments]: Adjust unbundling variables. Future-proof the C_INCLUDE_PATH override. Add phases "pretend-to-be-CI" and "adjust-tests". Run the tests with "python -m gevent.tests", and respect PARALLEL-JOB-COUNT. [native-inputs]: Add PYTHON-DNSPYTHON, PYTHON-PSUTIL, PYTHON-ZOPE-EVENT and PYTHON-ZOPE-INTERFACE. (python2-gevent)[native-inputs]: Fix input inheritance. --- gnu/packages/python-xyz.scm | 97 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 24 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f467e28064..be02b03639 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10581,13 +10581,13 @@ graphviz.") (define-public python-gevent (package (name "python-gevent") - (version "1.3.7") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "gevent" version)) (sha256 (base32 - "0b0fr04qdk1p4sniv87fh8z5psac60x01pv054kpgi94520g81iz")) + "1lchr4akw2jkm5v4kz7bdm4wv3knkfhbfn9vkkz4s5yrkcxzmdqy")) (modules '((guix build utils))) (snippet '(begin @@ -10614,10 +10614,7 @@ graphviz.") #t)) (add-before 'build 'do-not-use-bundled-sources (lambda* (#:key inputs #:allow-other-keys) - (setenv "CONFIG_SHELL" (which "bash")) - (setenv "LIBEV_EMBED" "false") - (setenv "CARES_EMBED" "false") - (setenv "EMBED" "false") + (setenv "GEVENTSETUP_EMBED" "0") ;; Prevent building bundled libev. (substitute* "setup.py" @@ -10632,15 +10629,65 @@ graphviz.") (string-prefix? "python" item))) ((python) (setenv "C_INCLUDE_PATH" - (string-append greenlet "/" python))))) + (string-append greenlet "/" python ":" + (or (getenv "C_INCLUDE_PATH") + "")))))) #t)) - (add-before 'check 'skip-timer-test + (add-before 'check 'pretend-to-be-CI (lambda _ - ;; XXX: Skip 'TestTimerResolution', which appears to be - ;; unreliable. - (substitute* "src/greentest/test__core_timer.py" - (("not greentest.RUNNING_ON_CI") "False")) + ;; 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)) + (add-before 'check 'adjust-tests + (lambda _ + (let ((disabled-tests + '(;; These tests rely on networking which is not + ;; available in the build container. + "test_urllib2net.py" + "test__server.py" + "test__server_pywsgi.py" + "test_socket.py" + "test__socket.py" + "test__socket_ssl.py" + "test__socket_dns.py" + "test__socket_dns6.py" + "test___example_servers.py" + "test__getaddrinfo_import.py" + "test__examples.py" + "test_httplib.py" + "test_https.py" + "test_urllib2_localnet.py" + "test_ssl.py" + "test__ssl.py" + ;; XXX: These tests borrow functionality from the + ;; Python builtin 'test' module, but it is not + ;; installed with the Guix Python distribution. + "test_smtpd.py" + "test_wsgiref.py" + "test_urllib2.py" + "test_thread.py" + "test_threading.py" + "test__threading_2.py" + ;; FIXME: test_patch_twice_warning_events fails for + ;; no apparent reason. Needs more investigation! + "test__monkey.py" + ;; These tests rely on KeyboardInterrupts which do not + ;; work inside the build container for some reason + ;; (lack of controlling terminal?). + "test_subprocess.py" + "test__issues461_471.py" + ;; TODO: Patch out the tests that use getprotobyname, etc + ;; instead of disabling all the tests from these files. + "test__all__.py" + "test___config.py" + "test__execmodules.py"))) + (call-with-output-file "skipped_tests.txt" + (lambda (port) + (display (string-join disabled-tests "\n") port))) + #t))) (replace 'check (lambda _ ;; Make sure the build directory is on PYTHONPATH. @@ -10649,21 +10696,23 @@ graphviz.") (getenv "PYTHONPATH") ":" (getcwd) "/build/" (car (scandir "build" (cut string-prefix? "lib." <>))))) - (with-directory-excursion "src/greentest" - ;; XXX: Many tests require network access. Instead we only - ;; run known-good tests. Unfortunately we cannot use - ;; recursion here since this directory also contains - ;; Python-version-specific subfolders. - (apply invoke "python" "testrunner.py" "--config" - "known_failures.py" - (scandir "." (cut regexp-exec - (make-regexp "test_+(subprocess|core)") - <>))))))))) + + ;; Use the build daemons configured number of workers. + (setenv "NWORKERS" (number->string (parallel-job-count))) + + (invoke "python" "-m" "gevent.tests" "--config" + "known_failures.py" "--ignore" "skipped_tests.txt")))))) (propagated-inputs `(("python-greenlet" ,python-greenlet) ("python-objgraph" ,python-objgraph))) (native-inputs - `(("python-six" ,python-six))) + `(("python-six" ,python-six) + + ;; For tests. + ("python-dnspython" ,python-dnspython) + ("python-psutil" ,python-psutil) + ("python-zope.event" ,python-zope-event) + ("python-zope.interface" ,python-zope-interface))) (inputs `(("c-ares" ,c-ares) ("libev" ,libev))) @@ -10680,7 +10729,7 @@ to provide a high-level synchronous API on top of the libev event loop.") (strip-python2-variant python-gevent)))) (package (inherit base) - (native-inputs `(,@(package-native-inputs python-gevent) + (native-inputs `(,@(package-native-inputs base) ("python-mock" ,python2-mock)))))) (define-public python-fastimport -- cgit v1.2.3 From 5af516544856373e07fb8d57f14b7eef369623a8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:34:09 +0100 Subject: gnu: python-zope-interface: Update to 4.7.2. * gnu/packages/python-web.scm (python-zope-interface): Update to 4.7.2. --- 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 e431a072d1..775c87f194 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -992,14 +992,14 @@ dispatching systems can be built.") (define-public python-zope-interface (package (name "python-zope-interface") - (version "4.6.0") + (version "4.7.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.interface" version)) (sha256 (base32 - "1rgh2x3rcl9r0v0499kf78xy86rnmanajf4ywmqb943wpk50sg8v")))) + "0r9kvb1q3lxrdhxabliv9nwhjsdmn1n0vcjv93rlqkyb7yyh24gx")))) (build-system python-build-system) (native-inputs `(("python-zope-event" ,python-zope-event))) -- cgit v1.2.3 From 9a1dfda6fa3f2efcb1125f51e854cf788c936387 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:35:03 +0100 Subject: gnu: python-zope-exceptions: Update to 4.3. * gnu/packages/python-web.scm (python-zope-exceptions): Update to 4.3. --- 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 775c87f194..72377f11e6 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1017,14 +1017,14 @@ conforming to a given API or contract.") (define-public python-zope-exceptions (package (name "python-zope-exceptions") - (version "4.0.8") + (version "4.3") (source (origin (method url-fetch) (uri (pypi-uri "zope.exceptions" version)) (sha256 (base32 - "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl")))) + "04bjskwas17yscl8bs3l44maxspw1gdji0zcmr499fs420y9r9az")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; circular dependency with zope.testrunner -- cgit v1.2.3 From 16839ec340414a7cf7cff6427e8cf1756efaef8e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:36:42 +0100 Subject: gnu: python-zope-testing: Update to 4.7. * gnu/packages/python-web.scm (python-zope-testing): Update to 4.7. [source](modules, snippet): Remove. --- gnu/packages/python-web.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 72377f11e6..51e246f513 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1042,20 +1042,14 @@ that have uses outside of the Zope framework.") (define-public python-zope-testing (package (name "python-zope-testing") - (version "4.6.2") + (version "4.7") (source (origin (method url-fetch) (uri (pypi-uri "zope.testing" version)) (sha256 (base32 - "0iiq54hjhkk2gpvzfjac70vyn4r0kw0ngvicshxbdwrkgf2gjq3g")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove pre-compiled .pyc files backup files from source. - (for-each delete-file (find-files "." "(\\.pyc|~)$")) - #t)))) + "1sh3c3i0m8n8fnhqiry0bk3rr356i56ry7calmn57s1pvv8yhsyn")))) (build-system python-build-system) (home-page "https://pypi.org/project/zope.testing/") (synopsis "Zope testing helpers") -- cgit v1.2.3 From ddacd13d564b38ac2cb3fee7aa6372790d033b2c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:42:45 +0100 Subject: gnu: python-zope-testrunner: Update to 5.1. * gnu/packages/python-web.scm (python-zope-testrunner): Update to 5.1. [source](uri): Download tarball instead of zipball. [native-inputs]: Remove UNZIP. Move PYTHON-ZOPE-INTERFACE and PYTHON-ZOPE-EXCEPTIONS ... [propagated-inputs]: ... here. --- gnu/packages/python-web.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 51e246f513..176e54a6ac 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1063,25 +1063,23 @@ forms, HTTP servers, regular expressions, and more.") (define-public python-zope-testrunner (package (name "python-zope-testrunner") - (version "4.4.9") + (version "5.1") (source (origin (method url-fetch) - (uri (pypi-uri "zope.testrunner" version ".zip")) + (uri (pypi-uri "zope.testrunner" version)) (sha256 (base32 - "1r7iqknhh55y45f64mz5hghgvzx34h1i11k350s0avx6q8gznja1")))) + "0w3q66cy4crpj7c0hw0vvvvwf3g931rnvw7wwa20av7yqvv6ajim")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. (native-inputs + `(("python-zope-testing" ,python-zope-testing))) + (propagated-inputs `(("python-six" ,python-six) - ;("python-zope-interface" ,python-zope-interface) ("python-zope-exceptions" ,python-zope-exceptions) - ("python-zope-testing" ,python-zope-testing) - ("unzip" ,unzip))) - (propagated-inputs - `(("python-zope-interface" ,python-zope-interface))) + ("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.testrunner/") (synopsis "Zope testrunner script") (description "Zope.testrunner provides a script for running Python @@ -1089,13 +1087,7 @@ tests.") (license license:zpl2.1))) (define-public python2-zope-testrunner - (let ((base (package-with-python2 python-zope-testrunner))) - (package - (inherit base) - (native-inputs - (append (package-native-inputs base) - `(("python2-subunit" ,python2-subunit) - ("python2-mimeparse" ,python2-mimeparse))))))) + (package-with-python2 python-zope-testrunner)) (define-public python-zope-i18nmessageid (package -- cgit v1.2.3 From ce4b7a44366b0d40699c082fbfa8d985681187c7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 13:55:29 +0100 Subject: gnu: python-zope-i18nmessageid: Update to 5.0.1. * gnu/packages/python-web.scm (python-zope-i18nmessageid): Update to 5.0.1. [native-inputs]: Add PYTHON-COVERAGE and PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-SIX. --- gnu/packages/python-web.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 176e54a6ac..848d5856b5 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1092,15 +1092,20 @@ tests.") (define-public python-zope-i18nmessageid (package (name "python-zope-i18nmessageid") - (version "4.0.3") + (version "5.0.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.i18nmessageid" version)) (sha256 (base32 - "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml")))) + "0ndhn4w1qgwkfbwf9vm2bgq418z5g0wmfsgl0d9nz62cd0mi8d4m")))) (build-system python-build-system) + (native-inputs + `(("python-coverage" ,python-coverage) + ("python-zope-testrunner" ,python-zope-testrunner))) + (propagated-inputs + `(("python-six" ,python-six))) (home-page "https://pypi.org/project/zope.i18nmessageid/") (synopsis "Message identifiers for internationalization") (description "Zope.i18nmessageid provides facilities for declaring -- cgit v1.2.3 From a1e9c929fa7e0b8b79f86c32830dad8ca3263b85 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:11:59 +0100 Subject: gnu: python-zope-schema: Update to 5.0.1. * gnu/packages/python-web.scm (python-zope-schema): Update to 5.0.1. [propagated-inputs]: Remove PYTHON-ZOPE-EXCEPTIONS. [native-inputs]: Remove PYTHON-NOSE and PYTHON-COVERAGE. Add PYTHON-ZOPE-TESTRUNNER and PYTHON-ZOPE-I18NMESSAGEID. --- gnu/packages/python-web.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 848d5856b5..82185cd81f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1118,25 +1118,24 @@ internationalized messages within program source text.") (define-public python-zope-schema (package (name "python-zope-schema") - (version "4.4.2") + (version "5.0.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.schema" version)) (sha256 (base32 - "1p943jdxb587dh7php4vx04qvn7b2877hr4qs5zyckvp5afhhank")))) + "0q93j0x52a42khw12al90jw2bk0wly3jwghql3a25zpwwxvn24ya")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.event. (propagated-inputs `(("python-zope-event" ,python-zope-event) - ("python-zope-exceptions" ,python-zope-exceptions) ("python-zope-interface" ,python-zope-interface))) (native-inputs - `(("python-zope-testing" ,python-zope-testing) - ("python-coverage" ,python-coverage) - ("python-nose" ,python-nose))) + `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) (home-page "https://pypi.org/project/zope.schema/") (synopsis "Zope data schemas") (description "Zope.scheme provides extensions to zope.interface for -- cgit v1.2.3 From 2585304c6ea7293b71f8db4dd00cd11cb3e07cb5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:15:28 +0100 Subject: gnu: python-zope-configuration: Update to 4.3.1. * gnu/packages/python-web.scm (python-zope-configuration): Update to 4.3.1. [native-inputs]: Add PYTHON-ZOPE-TESTING and PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-ZOPE-INTERFACE. --- gnu/packages/python-web.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 82185cd81f..b1e60bc2a1 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1148,18 +1148,22 @@ defining data schemas.") (define-public python-zope-configuration (package (name "python-zope-configuration") - (version "4.0.3") + (version "4.3.1") (source (origin (method url-fetch) (uri (pypi-uri "zope.configuration" version)) (sha256 (base32 - "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n")))) + "1qb88764fd7nkkmqv7fl9bxd1jirynkg5vbqkpqdiffnkxzp85kf")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testing" ,python-zope-testing) + ("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-interface" ,python-zope-interface) ("python-zope-schema" ,python-zope-schema))) (home-page "https://pypi.org/project/zope.configuration/") (synopsis "Zope Configuration Markup Language") -- cgit v1.2.3 From a3a7a0331282a4d39f0f7c71ab551fc3038e835b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:18:04 +0100 Subject: gnu: python-zope-proxy: Update to 4.3.4. * gnu/packages/python-web.scm (python-zope-proxy): Update to 4.3.4. [native-inputs]: Add PYTHON-ZOPE-TESTRUNNER. --- gnu/packages/python-web.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b1e60bc2a1..43f62883a8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1177,17 +1177,19 @@ Markup Language.") (define-public python-zope-proxy (package (name "python-zope-proxy") - (version "4.1.6") + (version "4.3.4") (source (origin (method url-fetch) (uri (pypi-uri "zope.proxy" version)) (sha256 (base32 - "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4")))) + "1g0rcfnbchpvqhm76aixqlz544dawrgmy8gw9zwmijhk6wfl9f26")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs `(("python-zope-interface" ,python-zope-interface))) (home-page "https://pypi.org/project/zope.proxy/") -- cgit v1.2.3 From 386d2fd130dd557a81620e8409e05e6be7c7507a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:20:16 +0100 Subject: gnu: python-zope-location: Update to 4.2. * gnu/packages/python-web.scm (python-zope-location): Update to 4.2. [native-inputs]: Add PYTHON-ZOPE-TESTRUNNER. [propagated-inputs]: Add PYTHON-ZOPE-INTERFACE. --- gnu/packages/python-web.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 43f62883a8..6ff5482612 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1207,19 +1207,22 @@ brokering, etc.) for which the proxy is responsible.") (define-public python-zope-location (package (name "python-zope-location") - (version "4.0.3") + (version "4.2") (source (origin (method url-fetch) (uri (pypi-uri "zope.location" version)) (sha256 (base32 - "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74")))) + "1b40pzl8v00d583d3gsxv1qjdw2dhghlgkbgxl3m07d5r3izj857")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.interface. + (native-inputs + `(("python-zope-testrunner" ,python-zope-testrunner))) (propagated-inputs - `(("python-zope-proxy" ,python-zope-proxy) + `(("python-zope-interface" ,python-zope-interface) + ("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (home-page "https://pypi.org/project/zope.location/") (synopsis "Zope location library") -- cgit v1.2.3 From e26e084fbb33608379d124030d8f9413fcb00a16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:23:24 +0100 Subject: gnu: python-zope-security: Update to 5.1.0. * gnu/packages/python-web.scm (python-zope-security): Update to 5.1.0. [native-inputs]: Remove PYTHON-SIX. Move PYTHON-ZOPE-COMPONENT and PYTHON-ZOPE-LOCATION ... [propagated-inputs]: ... here. Add PYTHON-ZOPE-INTERFACE. (python2-zope-security)[propagated-inputs]: Remove. --- gnu/packages/python-web.scm | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6ff5482612..b02ffd5f58 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1236,26 +1236,26 @@ Zope3, which are are special objects that have a structural location.") (define-public python-zope-security (package (name "python-zope-security") - (version "4.0.3") + (version "5.1.0") (source (origin (method url-fetch) (uri (pypi-uri "zope.security" version)) (sha256 (base32 - "14zmf684amc0x32kq05yxnhfqd1cmyhafkw05gn81rn90zjv6ssy")))) + "1npfrgnm202v48wavpwn3450dsn7az12lfww95vbhxyjl11f14yb")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; FIXME: Tests can't find zope.testrunner. (propagated-inputs - `(("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + `(("python-zope-component" ,python-zope-component) + ("python-zope-i18nmessageid" ,python-zope-i18nmessageid) + ("python-zope-interface" ,python-zope-interface) + ("python-zope-location" ,python-zope-location) ("python-zope-proxy" ,python-zope-proxy) ("python-zope-schema" ,python-zope-schema))) (native-inputs - `(("python-six" ,python-six) - ("python-zope-component" ,python-zope-component) - ("python-zope-configuration" ,python-zope-configuration) - ("python-zope-location" ,python-zope-location) + `(("python-zope-configuration" ,python-zope-configuration) ("python-zope-testrunner" ,python-zope-testrunner) ("python-zope-testing" ,python-zope-testing))) (home-page "https://pypi.org/project/zope.security/") @@ -1265,13 +1265,7 @@ security policies on Python objects.") (license license:zpl2.1))) (define-public python2-zope-security - (let ((zope-security (package-with-python2 python-zope-security))) - (package (inherit zope-security) - (propagated-inputs - `(("python2-zope-testrunner" ,python2-zope-testrunner) - ,@(alist-delete - "python-zope-testrunner" - (package-propagated-inputs zope-security))))))) + (package-with-python2 python-zope-security)) (define-public python-zope-component (package -- cgit v1.2.3 From 8317c89aa3573f4a597fc0b2eaf08769239c5e37 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 16 Mar 2020 14:51:20 +0100 Subject: gnu: python-tqdm: Update to 4.43.0. * gnu/packages/python-xyz.scm (python-tqdm): Update to 4.43.0. [arguments]: New field. [native-inputs]: Remove PYTHON-FLAKE8 and PYTHON-COVERAGE. [properties]: Remove. (python2-tqdm): Use PACKAGE-WITH-PYTHON2. --- gnu/packages/python-xyz.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index be02b03639..c6d3e2ce19 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14496,34 +14496,35 @@ ignoring formatting changes.") (define-public python-tqdm (package (name "python-tqdm") - (version "4.19.6") + (version "4.43.0") (source (origin (method url-fetch) (uri (pypi-uri "tqdm" version)) (sha256 (base32 - "1pw0ngm0zn9papdmkwipi3yih5c3di6d0w849bdmrraq4d2d9h2y")))) + "093v4c2x5hpigv47zvyxl8wh10y2yd2gvz3l9vchn0zsp8hv2pzk")))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + ;; This invokation is taken from tox.ini. + (invoke "nosetests" "--ignore-files=\"test_perf.py\"" + "-d" "-v" "tqdm/")))))) (native-inputs - `(("python-flake8" ,python-flake8) - ("python-nose" ,python-nose) - ("python-coverage" ,python-coverage))) + `(("python-nose" ,python-nose))) (home-page "https://github.com/tqdm/tqdm") (synopsis "Fast, extensible progress meter") (description "Make loops show a progress bar on the console by just wrapping any iterable with @code{|tqdm(iterable)|}. Offers many options to define design and layout.") - (license (list license:mpl2.0 license:expat)) - (properties `((python2-variant . ,(delay python2-tqdm)))))) + (license (list license:mpl2.0 license:expat)))) (define-public python2-tqdm - (let ((tqdm (package-with-python2 - (strip-python2-variant python-tqdm)))) - (package (inherit tqdm) - (native-inputs `(("python2-functools32" ,python2-functools32) - ,@(package-native-inputs tqdm)))))) + (package-with-python2 python-tqdm)) (define-public python-pkginfo (package -- cgit v1.2.3 From 948200832108311f4f6876b1ab60b098bbcb742d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 15:25:58 +0100 Subject: gnu: wxwidgets: Refer to xdg-open. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . * gnu/packages/wxwidgets.scm (wxwidgets)[inputs]: Add xdg-utils. [arguments]: Add ‘refer-to-inputs’ phase to patch xdg-open calls. --- gnu/packages/wxwidgets.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wxwidgets.scm b/gnu/packages/wxwidgets.scm index 5a2ea1c88e..49b190b9df 100644 --- a/gnu/packages/wxwidgets.scm +++ b/gnu/packages/wxwidgets.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2017 Rene Saavedra ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Arun Isaac ;;; ;;; This file is part of GNU Guix. @@ -35,6 +35,7 @@ #:use-module (gnu packages) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -73,7 +74,8 @@ ("libtiff" ,libtiff) ("mesa" ,mesa) ("webkitgtk" ,webkitgtk) - ("sdl" ,sdl))) + ("sdl" ,sdl) + ("xdg-utils" ,xdg-utils))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments @@ -91,7 +93,15 @@ (list (string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib")) ;; No 'check' target. - #:tests? #f)) + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'refer-to-inputs + (lambda _ + (substitute* "src/unix/utilsx11.cpp" + (("wxExecute\\(xdg_open \\+") + (string-append "wxExecute(\"" (which "xdg-open") "\""))) + #t))))) (home-page "https://www.wxwidgets.org/") (synopsis "Widget toolkit for creating graphical user interfaces") (description -- cgit v1.2.3 From 5adc59e6fe8abb701df8fc97d56a6e60258318a4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:51:12 +0100 Subject: gnu: cook: Use archived home page. * gnu/packages/cook.scm (cook)[home-page]: Use a Web Archived copy. --- gnu/packages/cook.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm index 17e090d725..fb0f9104ec 100644 --- a/gnu/packages/cook.scm +++ b/gnu/packages/cook.scm @@ -73,7 +73,8 @@ ;; This test is therefore just skipped. ;; ("inetutils" ,inetutils) ("ed" ,ed))) - (home-page "http://miller.emu.id.au/pmiller/software/cook") + (home-page "https://web.archive.org/web/20140727122520/" + "http://miller.emu.id.au/pmiller/software/cook/") (synopsis "Tool for constructing files") (description "Cook is a tool for constructing files. It is given a set of files to create, and recipes of how to create them. In any non-trivial program -- cgit v1.2.3 From 0d2753ccc138877aea367512c8e6e3babb0ed474 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:51:22 +0100 Subject: gnu: agda: Use HTTPS home page. * gnu/packages/agda.scm (agda)[home-page]: Use HTTPS. --- gnu/packages/agda.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/agda.scm b/gnu/packages/agda.scm index 60944ddb04..98768c668a 100644 --- a/gnu/packages/agda.scm +++ b/gnu/packages/agda.scm @@ -126,7 +126,7 @@ (for-each (cut invoke agda-compiler <>) (find-files (string-append out "/share") "\\.agda$")) #t)))))) - (home-page "http://wiki.portal.chalmers.se/agda/") + (home-page "https://wiki.portal.chalmers.se/agda/") (synopsis "Dependently typed functional programming language and proof assistant") (description -- cgit v1.2.3 From 89b49245ef1230aba62abac8263b39d04e144fb1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:51:38 +0100 Subject: gnu: cogl: Use HTTPS home page. * gnu/packages/gnome.scm (cogl)[home-page]: Use HTTPS. --- 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 a80bce9332..1a213bebf0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4586,7 +4586,7 @@ throughout GNOME for API documentation).") (assoc-ref inputs "xorg-server"))) (setenv "DISPLAY" ":1") #t))))) - (home-page "http://www.cogl3d.org") + (home-page "https://www.cogl3d.org") (synopsis "Object oriented GL/GLES Abstraction/Utility Layer") (description "Cogl is a small library for using 3D graphics hardware to draw pretty -- cgit v1.2.3 From 1fddf8ef1702f96340d7bede8ecbd90b64c2019f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 16:48:18 +0100 Subject: gnu: cook: Fix. This follows up on commit 5adc59e6fe8abb701df8fc97d56a6e60258318a4. * gnu/packages/cook.scm (cook)[home-page]: Better. Reported-by: Marius Bakke --- gnu/packages/cook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm index fb0f9104ec..16c288cc82 100644 --- a/gnu/packages/cook.scm +++ b/gnu/packages/cook.scm @@ -73,8 +73,8 @@ ;; This test is therefore just skipped. ;; ("inetutils" ,inetutils) ("ed" ,ed))) - (home-page "https://web.archive.org/web/20140727122520/" - "http://miller.emu.id.au/pmiller/software/cook/") + (home-page (string-append "https://web.archive.org/web/20140727122520/" + "http://miller.emu.id.au/pmiller/software/cook/")) (synopsis "Tool for constructing files") (description "Cook is a tool for constructing files. It is given a set of files to create, and recipes of how to create them. In any non-trivial program -- cgit v1.2.3 From 057b34478fd8ec7fa1de8c66b125b197d02b3ee5 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Mon, 16 Mar 2020 13:54:51 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.110. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.110. (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 f1bc5798ab..8dd5061b6c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ 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.109") +(define-public linux-libre-4.19-version "4.19.110") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0kwnlv5336vqdf38dzn077ic17zkb4rl5khxmc47syzd9zm4fhnh"))) + (hash (base32 "15kbgj13vsr74c61vzs96a72k86x205jjq5bz9pbn70698n3s4fa"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From f86dd71cbdc4de5c4a38a7c598c99e630f360757 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:27:51 +0200 Subject: gnu: rust-cargon-0.0: Don't skip build. * gnu/pacakges/crates-io.scm (rust-cargon-0.0)[arguments]: Don't skip build. Move rust-gcc-0.3 from cargo-development-inputs to cargo-inputs. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 87493cff05..57b192c4b3 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1745,8 +1745,7 @@ capabilities") "1cszlab7jk736p0lb50ag4l9nv72m7j41bwrmygl0lr4iz0350w2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-development-inputs + `(#:cargo-inputs (("rust-gcc" ,rust-gcc-0.3)))) (home-page "https://github.com/bryant/argon2rs") (synopsis "Thin wrapper around the Argon2 C library") -- cgit v1.2.3 From 182f2a471d85c4936126de84aaa494896a9d940a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:28:51 +0200 Subject: gnu: rust-argon2rs-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-argon2rs-0.2)[arguments]: Don't skip build. Add phase to find all rust dependencies. --- gnu/packages/crates-io.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57b192c4b3..45b941d189 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -476,12 +476,18 @@ text or blue underlined text, on ANSI terminals.") "14mkgkrjd4b4zy92pflz6yb4j1wn2chbd8jczxknxbkdm2vb0rrz")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-blake2-rfc" ,rust-blake2-rfc-0.2) ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1)) #:cargo-development-inputs - (("rust-cargon" ,rust-cargon-0.0)))) + (("rust-cargon" ,rust-cargon-0.0)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cargo-toml + (lambda _ + (substitute* "Cargo.toml" + (("\\{ path =.*,") "{")) + #t))))) (home-page "https://github.com/bryant/argon2rs") (synopsis "Rust password hashing library that runs on Argon2") (description "This package provides a pure Rust password hashing library -- cgit v1.2.3 From c11eea603e8829daf7397c270b60ea96bfea8a29 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:34:19 +0200 Subject: gnu: rust-rawpointer-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-rawpointer-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 45b941d189..da82ecbeba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13618,7 +13618,6 @@ random number generators.") (base32 "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/bluss/rawpointer/") (synopsis "Extra methods for raw pointers") (description "Extra methods for raw pointers. For example -- cgit v1.2.3 From fde752baa7a71f96c293c3d6ee68348fd35c41f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:36:47 +0200 Subject: gnu: rust-rand-xorshift-0.2: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-xorshift-0.2)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index da82ecbeba..9fbcadf3bc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13474,8 +13474,7 @@ generator based on timing jitter.") "1a6wy76lc5fimm1n9n8fzhp4cfjwfwxh4hx63bg3vlh1d2w1dm3p")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1.0)) #:cargo-development-inputs -- cgit v1.2.3 From 723c5d577212a740acca580dcf90f732f08bee08 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:39:32 +0200 Subject: gnu: rust-rand-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-0.3)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fbcadf3bc..a7c4198d5e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13121,8 +13121,7 @@ useful types and distributions, and some randomness-related algorithms.") (base32 "0v679h38pjjqj5h4md7v2slsvj6686qgcn7p9fbw3h43iwnk1b34")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.4)))))) -- cgit v1.2.3 From 8a65ca6f8c1270e63d3581ca11b6b86e22a5e9e7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 16 Mar 2020 21:41:34 +0200 Subject: gnu: rust-rand-0.4: Don't skip build. * gnu/packages/crates-io.scm (rust-rand-0.4)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a7c4198d5e..1e1e9bf5db 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13099,8 +13099,7 @@ useful types and distributions, and some randomness-related algorithms.") (base32 "14qjfv3gggzhnma20k0sc1jf8y6pplsaq7n1j9ls5c8kf2wl0a2m")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-fuchsia-cprng" ,rust-fuchsia-cprng-0.1) ("rust-rand-core" ,rust-rand-core-0.3) ("rust-rdrand" ,rust-rdrand-0.4) -- cgit v1.2.3 From a55472955d7dbe7385fb25a5c31b26f8ebfa6e93 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 17:39:08 +0100 Subject: tests: nfs-server: Use marionette helper procedures. * gnu/tests/nfs.scm (run-nfs-server-test)[test](wait-for-file): Remove. ("nscd is listening on its socket"): Use 'wait-for-unix-socket'. --- gnu/tests/nfs.scm | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 635c4a7322..00109b752e 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -196,18 +196,6 @@ (define marionette (make-marionette (list #$(virtual-machine os)))) - (define (wait-for-file file) - ;; Wait until FILE exists in the guest - (marionette-eval - `(let loop ((i 10)) - (cond ((file-exists? ,file) - #t) - ((> i 0) - (sleep 1) - (loop (- i 1))) - (else - (error "File didn't show up: " ,file)))) - marionette)) (mkdir #$output) (chdir #$output) @@ -231,22 +219,8 @@ marionette)) (test-assert "nscd is listening on its socket" - (marionette-eval - ;; XXX: Work around a race condition in nscd: nscd creates its - ;; PID file before it is listening on its socket. - '(let ((sock (socket PF_UNIX SOCK_STREAM 0))) - (let try () - (catch 'system-error - (lambda () - (connect sock AF_UNIX "/var/run/nscd/socket") - (close-port sock) - (format #t "nscd is ready~%") - #t) - (lambda args - (format #t "waiting for nscd...~%") - (usleep 500000) - (try))))) - marionette)) + (wait-for-unix-socket "/var/run/nscd/socket" + marionette)) (test-assert "network is up" (marionette-eval -- cgit v1.2.3 From e28770df718b733959a4cae933e9c2e8d32715be Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 17:45:32 +0100 Subject: services: nfs: Move activation snippet out of line. * gnu/services/nfs.scm (%nfs-activation): New variable. (nfs-service-type)[extensions]: Refer to %NFS-ACTIVATION. --- gnu/services/nfs.scm | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 140a11856a..3b7dd78eca 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -360,31 +360,35 @@ #t)) (respawn? #f))))) +(define %nfs-activation + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (system* "mount" "-t" "nfsd" + "nfsd" "/proc/fs/nfsd") + + (mkdir-p "/var/lib/nfs") + ;; directory containing monitor list + (mkdir-p "/var/lib/nfs/sm") + ;; Needed for client recovery tracking + (mkdir-p "/var/lib/nfs/v4recovery") + (let ((user (getpw "nobody"))) + (chown "/var/lib/nfs" + (passwd:uid user) + (passwd:gid user)) + (chown "/var/lib/nfs/v4recovery" + (passwd:uid user) + (passwd:gid user))) + #t))) + (define nfs-service-type (service-type (name 'nfs) (extensions (list (service-extension shepherd-root-service-type nfs-shepherd-services) - (service-extension activation-service-type - (const #~(begin - (use-modules (guix build utils)) - (system* "mount" "-t" "nfsd" - "nfsd" "/proc/fs/nfsd") - - (mkdir-p "/var/lib/nfs") - ;; directory containing monitor list - (mkdir-p "/var/lib/nfs/sm") - ;; Needed for client recovery tracking - (mkdir-p "/var/lib/nfs/v4recovery") - (let ((user (getpw "nobody"))) - (chown "/var/lib/nfs" - (passwd:uid user) - (passwd:gid user)) - (chown "/var/lib/nfs/v4recovery" - (passwd:uid user) - (passwd:gid user))) - #t))) + (service-extension activation-service-type (const %nfs-activation)) (service-extension etc-service-type (lambda (config) `(("exports" -- cgit v1.2.3 From 70526bdbe0221ed9077df31cb24374100685725b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 18:31:09 +0100 Subject: services: nfs: Remove unnecessary "mount" invocation. * gnu/services/nfs.scm (%nfs-activation): Remove unnecessary "mount" invocation (/proc/fs/nfsd is automatically mounted, somehow). Remove unnecessary 'mkdir-p' call. --- gnu/services/nfs.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index 3b7dd78eca..c90984387e 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -365,10 +365,6 @@ #~(begin (use-modules (guix build utils)) - (system* "mount" "-t" "nfsd" - "nfsd" "/proc/fs/nfsd") - - (mkdir-p "/var/lib/nfs") ;; directory containing monitor list (mkdir-p "/var/lib/nfs/sm") ;; Needed for client recovery tracking -- cgit v1.2.3 From d3fecbab82f17ef6736300cf2e18981d04ffc25f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Mar 2020 22:18:15 +0100 Subject: gnu: Add tla. * gnu/packages/version-control.scm (tla): New variable. --- gnu/packages/version-control.scm | 59 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index bf97f89cd6..86b1d58654 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2013 Cyril Roelandt -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -2407,3 +2407,60 @@ interrupted, published, and collaborated on while in progress.") videos, datasets, and graphics with text pointers inside Git, while storing the file contents on a remote server.") (license license:expat))) + +(define-public tla + (package + (name "gnu-arch") + (version "1.3.5") + (source (origin + (method url-fetch) + (uri (string-append "https://ftp.gnu.org/old-gnu/gnu-arch/" + "tla-" version ".tar.gz")) + (sha256 + (base32 + "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0")) + (modules '((guix build utils))) + (snippet + '(begin + ;; In tar 1.32, '--preserve' is ambiguous and leads to an + ;; error, so address that. + (substitute* "src/tla/libarch/archive.c" + (("\"--preserve\"") + "\"--preserve-permissions\"")) + #t)))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (chdir "src") + + (mkdir "=build") + (chdir "=build") + + ;; For libneon's 'configure' script. + ;; XXX: There's a bundled copy of neon. + (setenv "CONFIG_SHELL" (which "sh")) + + (invoke "../configure" "--prefix" out + "--config-shell" (which "sh") + "--with-posix-shell" (which "sh") + "--with-cc" "gcc"))))) + + + ;; There are build failures when building in parallel. + #:parallel-build? #f + #:parallel-tests? #f + + #:test-target "test")) + (native-inputs + `(("which" ,which))) + (synopsis "Historical distributed version-control system") + (description + "GNU Arch, aka. @code{tla}, was one of the first free distributed +version-control systems (DVCS). It saw its last release in 2006. This +package is provided for users who need to recover @code{tla} repositories and +for historians.") + (home-page "https://www.gnu.org/software/gnu-arch/") + (license license:gpl2))) ;version 2 only -- cgit v1.2.3 From 19b7d41d3407d2e3c64edffa37042551e06c4b07 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Mon, 16 Mar 2020 21:12:22 +0100 Subject: gnu: gnome-shell-extension-appindicator: Update to 33. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): Update to 33. Signed-off-by: Ludovic Courtès --- 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 b8cd32db08..aeeced42bd 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -123,7 +123,7 @@ the Obsidian icon theme.") (define-public gnome-shell-extension-appindicator (package (name "gnome-shell-extension-appindicator") - (version "30") + (version "33") (source (origin (method git-fetch) (uri (git-reference @@ -132,7 +132,7 @@ the Obsidian icon theme.") (commit (string-append "v" version)))) (sha256 (base32 - "1fjhx23jqwv3d0smwhnjvc35gqhwk9p5f96ic22pfax653cn5vh8")) + "0qm77s080nbf4gqnfzpwp8a7jf7lliz6fxbsd3lasvrr11pgsk87")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments -- cgit v1.2.3 From 70c910eb98f1abc9a4a9bd31d08c629f2f5e8f0c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 18:45:08 +0100 Subject: gnu: reaver: Update to 1.6.6. * gnu/packages/networking.scm (reaver): Update to 1.6.6. [source]: Hard-code NAME. --- gnu/packages/networking.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 4fa5008149..48b2570d9d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -990,15 +990,15 @@ non-existing entropy of some access points.") (define-public reaver (package (name "reaver") - (version "1.6.5") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "https://github.com/t6x/reaver-wps-fork-t6x/releases/" - "download/v" version "/" name "-" version ".tar.xz")) + "download/v" version "/reaver-" version ".tar.xz")) (sha256 (base32 - "0sva3g0kwgv143n9l3lg4qp5iiqz7nk76nr0hwivsnglbhk9sbil")))) + "00k7mc81ifv0wma7k4v18mj498badbw5yls6c28qin3d1gda0ag3")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -1021,7 +1021,7 @@ non-existing entropy of some access points.") (find-files "." "README.*")) (install-file "reaver.1" man1) #t)))) - #:tests? #f)) ; there are no tests + #:tests? #f)) ; there are no tests (inputs `(("libpcap" ,libpcap))) (propagated-inputs -- cgit v1.2.3 From aa0bcb6c5326c96d0a730bbb27af1e496914a5c9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 16 Mar 2020 20:46:27 +0100 Subject: gnu: doctest: Update to 2.3.7. * gnu/packages/check.scm (doctest): Update to 2.3.7. --- 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 fa14ac1544..1b60b99ce1 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -392,7 +392,7 @@ and it supports a very flexible form of test discovery.") (define-public doctest (package (name "doctest") - (version "2.3.6") + (version "2.3.7") (home-page "https://github.com/onqtam/doctest") (source (origin (method git-fetch) @@ -400,7 +400,7 @@ and it supports a very flexible form of test discovery.") (file-name (git-file-name name version)) (sha256 (base32 - "070gkwffi73i2p0azga9yxj8km32bp8bw4jvkvz1vzlpavyii5kn")))) + "134lx7pjnglrl4wdmyr9dz3rjb6d4ir6rvapg00gp52n44dbhnrq")))) (build-system cmake-build-system) (synopsis "C++ test framework") (description -- cgit v1.2.3 From 5144e314925d6014b496bcc6090f46e97318b5fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 00:19:01 +0100 Subject: gnu: eigen: Update to 3.3.7. * gnu/packages/algebra.scm (eigen): Update to 3.3.7. [source]: Add a patch to fix a test failure. * gnu/packages/patches/eigen-stabilise-sparseqr-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/algebra.scm | 7 +- .../patches/eigen-stabilise-sparseqr-test.patch | 74 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/eigen-stabilise-sparseqr-test.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5cde920c8c..caa73d44d4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -826,6 +826,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ + %D%/packages/patches/eigen-stabilise-sparseqr-test.patch \ %D%/packages/patches/einstein-build.patch \ %D%/packages/patches/elfutils-tests-ptrace.patch \ %D%/packages/patches/elixir-path-length.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 50cb3001cb..8682ecd8d0 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 Efraim Flashner -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2020 Björn Höfling @@ -910,15 +910,16 @@ Sine Transform} (DST) and @dfn{Discrete Hartley Transform} (DHT).") (define-public eigen (package (name "eigen") - (version "3.3.5") + (version "3.3.7") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/eigen/eigen/get/" version ".tar.bz2")) (sha256 (base32 - "1qh3yrwn78ms5yhwbpl5wvblk4gbz02cacdygxylr7i9xbrvylkk")) + "1km3fyfzyqfdvmnl79drps3fjwnz3zbh0c7l34mfbqyvvs8cy4wz")) (file-name (string-append name "-" version ".tar.bz2")) + (patches (search-patches "eigen-stabilise-sparseqr-test.patch")) (modules '((guix build utils))) (snippet ;; There are 3 test failures in the "unsupported" directory, diff --git a/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch b/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch new file mode 100644 index 0000000000..b95b46077a --- /dev/null +++ b/gnu/packages/patches/eigen-stabilise-sparseqr-test.patch @@ -0,0 +1,74 @@ +From: Tobias Geerinckx-Rice +Date: Mon, 16 Mar 2020 22:51:37 +0000 +Subject: gnu: eigen: Stabilise sparseqr test. + +Taken verbatim from this[0] upstream commit. + +[0]: https://gitlab.com/libeigen/eigen/-/commit/3b5deeb546d4017b24846f5b0dc3296a50a039fe + +From 3b5deeb546d4017b24846f5b0dc3296a50a039fe Mon Sep 17 00:00:00 2001 +From: Gael Guennebaud +Date: Tue, 19 Feb 2019 22:57:51 +0100 +Subject: [PATCH] bug #899: make sparseqr unit test more stable by 1) trying + with larger threshold and 2) relax rank computation for rank-deficient + problems. + +--- + test/sparseqr.cpp | 31 ++++++++++++++++++++++++++----- + 1 file changed, 26 insertions(+), 5 deletions(-) + +diff --git a/test/sparseqr.cpp b/test/sparseqr.cpp +index 3ffe62314..3576cc626 100644 +--- a/test/sparseqr.cpp ++++ b/test/sparseqr.cpp +@@ -43,6 +43,7 @@ int generate_sparse_rectangular_problem(MatrixType& A, DenseMat& dA, int maxRows + + template void test_sparseqr_scalar() + { ++ typedef typename NumTraits::Real RealScalar; + typedef SparseMatrix MatrixType; + typedef Matrix DenseMat; + typedef Matrix DenseVector; +@@ -91,14 +92,34 @@ template void test_sparseqr_scalar() + exit(0); + return; + } +- +- VERIFY_IS_APPROX(A * x, b); +- +- //Compare with a dense QR solver ++ ++ // Compare with a dense QR solver + ColPivHouseholderQR dqr(dA); + refX = dqr.solve(b); + +- VERIFY_IS_EQUAL(dqr.rank(), solver.rank()); ++ bool rank_deficient = A.cols()>A.rows() || dqr.rank() we might have to increase the threshold ++ // to get a correct solution. ++ RealScalar th = RealScalar(20)*dA.colwise().norm().maxCoeff()*(A.rows()+A.cols()) * NumTraits::epsilon(); ++ for(Index k=0; (k<16) && !test_isApprox(A*x,b); ++k) ++ { ++ th *= RealScalar(10); ++ solver.setPivotThreshold(th); ++ solver.compute(A); ++ x = solver.solve(b); ++ } ++ } ++ ++ VERIFY_IS_APPROX(A * x, b); ++ ++ // For rank deficient problem, the estimated rank might ++ // be slightly off, so let's only raise a warning in such cases. ++ if(rank_deficient) ++g_test_level; ++ VERIFY_IS_EQUAL(solver.rank(), dqr.rank()); ++ if(rank_deficient) --g_test_level; ++ + if(solver.rank()==A.cols()) // full rank + VERIFY_IS_APPROX(x, refX); + // else +-- +2.24.1 + -- cgit v1.2.3 From bf782bfc3f960a65298af2fffa205b41ab7f71e1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 00:19:30 +0100 Subject: gnu: five-or-more: Update to 3.32.1. * gnu/packages/gnome.scm (five-or-more): Update to 3.32.1. [source]: Hard-code NAME. --- gnu/packages/gnome.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1a213bebf0..77a888b3b9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3872,16 +3872,15 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.") (define-public five-or-more (package (name "five-or-more") - (version "3.32.0") + (version "3.32.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" + (uri (string-append "mirror://gnome/sources/five-or-more/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + "five-or-more-" version ".tar.xz")) (sha256 - (base32 - "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn")))) + (base32 "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 97845067b12764ea8d4d7f207213144f7ccb8881 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 02:31:23 +0100 Subject: gnu: perl-test-simple: Update to 1.302172. * gnu/packages/perl-check.scm (perl-test-simple): Update to 1.302172. --- gnu/packages/perl-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl-check.scm b/gnu/packages/perl-check.scm index 67bdfd81c4..6af240a40a 100644 --- a/gnu/packages/perl-check.scm +++ b/gnu/packages/perl-check.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Christopher Baines ;;; Copyright © 2017 Petter -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Kei Kebreau @@ -1237,14 +1237,14 @@ makes fork(2) safe to use in test cases.") (define-public perl-test-simple (package (name "perl-test-simple") - (version "1.302171") + (version "1.302172") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/E/EX/EXODIST/" "Test-Simple-" version ".tar.gz")) (sha256 (base32 - "12in730hr51h42dwd3c5k7ysyp0xyk17583mfvx6zg56nb990zz2")))) + "1z1l8dgssf0mqbgik33sc5j48iiapppkwmacwah990hj0j7pd23k")))) (build-system perl-build-system) (synopsis "Basic utilities for writing tests") (description -- cgit v1.2.3 From df10a64efc9fd9cd725dfc67347fdbfa1e1075c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:20:45 +0100 Subject: gnu: shogun: Use HTTPS home page. * gnu/packages/machine-learning.scm (shogun)[home-page]: Use HTTPS. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 62ef7b84e4..7deb6ee29a 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -566,7 +566,7 @@ optimizing, and searching weighted finite-state transducers (FSTs).") ;; Non-portable SSE instructions are used so building fails on platforms ;; other than x86_64. (supported-systems '("x86_64-linux")) - (home-page "http://shogun-toolbox.org/") + (home-page "https://shogun-toolbox.org/") (synopsis "Machine learning toolbox") (description "The Shogun Machine learning toolbox provides a wide range of unified and -- cgit v1.2.3 From 831d64cc174ec0607503006b243824df6e086f03 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:23:05 +0100 Subject: gnu: openimageio: Use HTTPS home page. * gnu/packages/graphics.scm (openimageio)[home-page]: Use HTTPS. --- 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 f5ebfaacaa..1a1038eca2 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -420,7 +420,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") related classes, utilities, and applications. There is a particular emphasis on formats and functionality used in professional, large-scale animation and visual effects work for film.") - (home-page "http://www.openimageio.org") + (home-page "https://www.openimageio.org") (license license:bsd-3))) ;; This older version of OpenImageIO is required for Blender 2.79. -- cgit v1.2.3 From fe5ed0bbe3acc58a71954adc836687d3c96cbb68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:46:10 +0100 Subject: gnu: wireless-tools: Use HTTPS home page. * gnu/packages/linux.scm (wireless-tools)[home-page]: Use HTTPS. --- gnu/packages/linux.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8dd5061b6c..3ac7e616c8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3065,7 +3065,7 @@ Linux Wireless Extensions; consider using @code{iw} instead. The Wireless Extension was an interface allowing you to set Wireless LAN specific parameters and get the specific stats. It is deprecated in favor the nl80211 interface.") - (home-page "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html") + (home-page "https://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html") ;; wireless.21.h and wireless.22.h are distributed under lgpl2.1+, the ;; other files are distributed under gpl2. (license (list license:gpl2 license:lgpl2.1+)))) -- cgit v1.2.3 From c9938fa84f17b267e769fa1fbaa80dc9ad821ebe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:50:20 +0100 Subject: gnu: glfw: Use HTTPS home page. * gnu/packages/gl.scm (glfw)[home-page]: Use HTTPS. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c82d33037e..01241cd88e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -733,7 +733,7 @@ OpenGL.") ("libxinerama" ,libxinerama) ("libxcursor" ,libxcursor) ("libxxf86vm" ,libxxf86vm))) - (home-page "http://www.glfw.org") + (home-page "https://www.glfw.org") (synopsis "OpenGL application development library") (description "GLFW is a library for OpenGL, OpenGL ES and Vulkan development for -- cgit v1.2.3 From cfff0b386d1d1b52bedad6977ef7e0ce1546ecb1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:51:06 +0100 Subject: gnu: fritzing: Use HTTPS home page. * gnu/packages/engineering.scm (fritzing)[home-page]: Use HTTPS. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 361d4d54a6..6adb142ffb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -648,7 +648,7 @@ multipole-accelerated algorithm.") (sha256 (base32 "1d2v8k7p176j0lczx4vx9n9gbg3vw09n2c4b6w0wj5wqmifywhc1")))))) - (home-page "http://fritzing.org") + (home-page "https://fritzing.org") (synopsis "Electronic circuit design") (description "The Fritzing application is @dfn{Electronic Design Automation} (EDA) -- cgit v1.2.3 From d74647b04a41e1b84092fb7d461e169e714e2aca Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:01:45 +0100 Subject: gnu: qdbm: Use HTTPS home page. * gnu/packages/databases.scm (qdbm)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index be4db42332..8491f7ac11 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1070,7 +1070,7 @@ Most public APIs are compatible with @command{mysqlclient} and MySQLdb.") (assoc-ref %outputs "out") "/lib")) #:make-flags (list "CFLAGS=-fPIC"))) - (home-page "http://fallabs.com/qdbm") + (home-page "https://fallabs.com/qdbm/") (synopsis "Key-value database") (description "QDBM is a library of routines for managing a database. The database is a simple data file containing key-value -- cgit v1.2.3 From f4766a181018c84327d840f0a7e6c9d4e38c04d4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:15:41 +0100 Subject: gnu: libjaylink: Use HTTPS home page. * gnu/packages/embedded.scm (libjaylink)[home-page]: Use HTTPS. --- gnu/packages/embedded.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 46c7a03104..131a928d80 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -450,7 +450,7 @@ languages are C and C++.") ("pkg-config" ,pkg-config))) (inputs `(("libusb" ,libusb))) - (home-page "http://repo.or.cz/w/libjaylink.git") + (home-page "https://repo.or.cz/w/libjaylink.git") (synopsis "Library to interface Segger J-Link devices") (description "libjaylink is a shared library written in C to access SEGGER J-Link and compatible devices.") -- cgit v1.2.3 From ce91eeacad28153c9517aef4c3eefc428c9ff470 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:16:23 +0100 Subject: gnu: libmng: Use HTTPS home page. * gnu/packages/image.scm (libmng)[home-page]: Use HTTPS. --- gnu/packages/image.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 38a8b2ed42..ad288b87ec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1171,7 +1171,7 @@ channels.") `(("lcms" ,lcms) ("libjpeg" ,libjpeg) ("zlib" ,zlib))) - (home-page "http://www.libmng.com/") + (home-page "https://www.libmng.com/") (synopsis "Library for handling MNG files") (description "Libmng is the MNG (Multiple-image Network Graphics) reference library.") -- cgit v1.2.3 From 10b52f4695b337f399eb936d5fa68131ae3452bf Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:17:00 +0100 Subject: gnu: simplescreenrecorder: Use HTTPS home page. * gnu/packages/video.scm (simplescreenrecorder)[home-page]: Use HTTPS. --- 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 c9d9cd5b91..cc1a011d9a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2546,7 +2546,7 @@ making @dfn{screencasts}.") (list "-DWITH_QT5=TRUE") #:tests? #f)) ; no test suite ;; Using HTTPS causes part of the page to be displayed improperly. - (home-page "http://www.maartenbaert.be/simplescreenrecorder/") + (home-page "https://www.maartenbaert.be/simplescreenrecorder/") (synopsis "Screen recorder") (description "SimpleScreenRecorder is an easy to use screen recorder with a graphical user interface. It supports recording the entire screen, or a -- cgit v1.2.3 From 8fc83d98ddd887dab7e5ddce1e210076776e24cb Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 17 Mar 2020 11:10:45 +0100 Subject: gnu: httrack: Fix Texinfo markup in description. * gnu/packages/web.scm (httrack): Fix Texinfo markup in description. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ac156b2b99..bde8c2bbb5 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7207,7 +7207,7 @@ the Internet to a local directory, building recursively all directories, getting HTML, images, and other files from the server to your computer. HTTrack arranges the original site's relative link-structure. Simply open -a page of the @code{mirrored} website in your browser, and you can browse the +a page of the @emph{mirrored} website in your browser, and you can browse the site from link to link, as if you were viewing it online. HTTrack can also update an existing mirrored site, and resume interrupted downloads. -- cgit v1.2.3 From 0f8ae2ea08a8bb74885a3c9e9c5d714d03a69a0c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 17 Mar 2020 11:20:42 +0100 Subject: gnu: scintilla: Update to 4.3.2. * gnu/packages/text-editors.scm (scintilla): Update to 4.3.2. --- 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 9a35e7edce..b7758f106d 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -661,14 +661,14 @@ and Octave. TeXmacs is completely extensible via Guile.") (define-public scintilla (package (name "scintilla") - (version "4.3.0") + (version "4.3.2") (source (origin (method url-fetch) (uri (let ((v (apply string-append (string-split version #\.)))) (string-append "https://www.scintilla.org/scintilla" v ".tgz"))) (sha256 - (base32 "0c52b2wg0y55kv3w7rnzp0nbd1yn2kksy0w8bjdp3gkl0v28wwx5")))) + (base32 "0d8ssl0d8r6bslbzd507l9c5g8mwn1zriak3fnf85936pdmkhq9h")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "GTK3=1" "CC=gcc" "-Cgtk") -- cgit v1.2.3 From 3c0456c6b556b438d4bfc4753d2fe4bc2b96868a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 17 Mar 2020 13:22:01 +0100 Subject: gnu: Add guile-irc. * gnu/packages/guile-xyz.scm (guile-irc): New variable. --- gnu/packages/guile-xyz.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 8ada9c50e6..124373bf8c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3201,3 +3201,35 @@ models and also supports a rich set of boolean query operators.") @code{.torrent} or metainfo files. Implements a bencode reader and writer according to Bitorrent BEP003.") (license license:gpl3+))) + +(define-public guile-irc + (let ((commit "375d3bde9c6ae7ccc9d7cc65817966b6fda8f26a") + (revision "0")) + (package + (name "guile-irc") + (version (git-version "0.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rekado/guile-irc.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "113lcckcywrz9060w1c3fnvr8d7crdsjgsv4h47hgmr1slgadl4y")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-gnutls=yes"))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo))) + (inputs + `(("gnutls" ,gnutls) + ("guile" ,guile-2.2))) + (home-page "https://github.com/rekado/guile-irc") + (synopsis "IRC library for Guile") + (description "This package provides a Guile library for @dfn{Internet +Relay Chat} (IRC).") + ;; Some file headers incorrectly say LGPLv2+. + (license license:lgpl2.1+)))) -- cgit v1.2.3 From 8ee8eb2698f495cebb6df01ddd56aab883d72915 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 17 Mar 2020 13:27:56 +0100 Subject: gnu: gpsd: Install python modules and scripts. * gnu/packages/gps.scm (gpsd)[native-inputs]: Remove python and add bc. [inputs]: Add python, python-pycairo, python-pygobject, python-pyserial, python-wrapper and qtbase. [arguments]: Update scons-flags, remove fix-paths phase, improve fix-build phase and add wrap-python-scripts phase. --- gnu/packages/gps.scm | 94 +++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 936c3aeda0..cd2e09e966 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -27,7 +27,9 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system scons) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages docbook) @@ -39,6 +41,7 @@ #:use-module (gnu packages ncurses) #: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 sqlite) #:use-module (gnu packages xml)) @@ -227,64 +230,57 @@ such as elevation, speed, heart rate, power, temperature, and gear shifts.") (base32 "0faz2mvk82hi7ispxxih07lhpyz5dazs4gcknym9piiabga29p97")))) (build-system scons-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python))) + `(("bc" ,bc) + ("pkg-config" ,pkg-config))) (inputs `(("bluez" ,bluez) ("dbus" ,dbus) ("libcap" ,libcap) ("libusb" ,libusb) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("python" ,python) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) + ("python-pyserial" ,python-pyserial) + ("python-wrapper" ,python-wrapper) + ("qtbase" ,qtbase))) (arguments - `(#:scons-flags (list (string-append "prefix=" %output) - ;; TODO: Install python bindings. - "python=no") + `(#:scons-flags + (list (string-append "prefix=" %output) + (let ((version ,(version-major+minor (package-version python)))) + (string-append "python_libdir=" %output + "/lib/python" version + "/site-packages")) + "qt_versioned=5") #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((python3 (string-append (assoc-ref inputs "python") - "/bin/python3"))) - (substitute* '("contrib/gpsData.py" - "contrib/ntpshmviz" - "contrib/skyview2svg" - "contrib/webgps.py" - "devtools/ais.py" - "devtools/aivdmtable" - "devtools/cycle_analyzer" - "devtools/flocktest" - "devtools/identify_failing_build_options.py" - "devtools/regress-builder" - "devtools/regressdiff" - "devtools/sizes" - "devtools/striplog" - "devtools/tablegen.py" - "devtools/test_json_validity.py" - "devtools/uninstall_cleanup.py" - "gegps" - "gps/gps.py" - "gpscat" - "gpsfake" - "gpsprof" - "jsongen.py" - "leapsecond.py" - "maskaudit.py" - "test_maidenhead.py" - "test_misc.py" - "test_xgps_deps.py" - "ubxtool" - "valgrind-audit.py" - "xgps" - "xgpsspeed" - "zerk") - (("/usr/bin/python") python3) - (("/usr/bin/env python") python3))) - #t)) - (add-after 'fix-paths 'fix-build - (lambda _ + (add-after 'unpack 'fix-build + (lambda* (#:key outputs #:allow-other-keys) (substitute* "SConstruct" - (("'PATH'") - "'PATH','CPATH','LIBRARY_PATH'")) + (("envs = \\{\\}") + "envs = os.environ")) + #t)) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pycairo (assoc-ref inputs "python-pycairo")) + (pygobject (assoc-ref inputs "python-pygobject")) + (pyserial (assoc-ref inputs "python-pyserial")) + (sitedir (lambda (package) + (string-append package + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (pythonpath (string-join (map sitedir + (list out pycairo pygobject + pyserial)) + ":"))) + (for-each (lambda (script) + (wrap-program (string-append out "/bin/" script) + `("PYTHONPATH" ":" prefix (,pythonpath)))) + '("gegps" "gpscat" "gpsfake" "gpsprof" + "ubxtool" "xgps" "xgpsspeed" "zerk"))) #t))))) (synopsis "GPS service daemon") (description -- cgit v1.2.3 From eecf72433fef8dee6bc3e1c69ea4f3f90410e096 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 17 Mar 2020 16:59:17 +0100 Subject: gnu: agi-bio: Fix unqualified file reference. * gnu/packages/opencog.scm (agi-bio)[arguments]: Add phase 'fix-unqualified-load. --- gnu/packages/opencog.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/opencog.scm b/gnu/packages/opencog.scm index ea6858507e..c3b89d41dc 100644 --- a/gnu/packages/opencog.scm +++ b/gnu/packages/opencog.scm @@ -276,7 +276,17 @@ combination.") "/include/guile/2.2/") (string-append "-DGUILE_SITE_DIR=" (assoc-ref %outputs "out") - "/share/guile/site/2.2/")))) + "/share/guile/site/2.2/")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-unqualified-load + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "bioscience/bioscience.scm" + (("\\(load \"bioscience/types/bioscience_types.scm\"\\)") + (format #f "(load \"~a/bioscience/types/bioscience_types.scm\")" + (string-append (assoc-ref outputs "out") + "/share/guile/site/2.2/opencog")))) + #t))))) (inputs `(("atomspace" ,atomspace) ("cogutil" ,cogutil) -- cgit v1.2.3 From 5331dcd6fc8073ae7147e3c081247722270b490c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:30:12 +0100 Subject: gnu: opensubdiv: Use HTTPS home page. * gnu/packages/graphics.scm (opensubdiv)[home-page]: Use HTTPS. --- 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 1a1038eca2..2d50a5f539 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -979,7 +979,7 @@ requirements.") ("libxi" ,libxi) ("zlib" ,zlib) ("glfw" ,glfw))) - (home-page "http://graphics.pixar.com/opensubdiv/") + (home-page "https://graphics.pixar.com/opensubdiv/") (synopsis "High performance subdivision surface evaluation") (description "OpenSubdiv is a set of libraries that implement high performance subdivision surface (subdiv) evaluation on massively parallel CPU -- cgit v1.2.3 From 096ed4f935168e4e02eb947d016a83397dad13c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:42:12 +0100 Subject: gnu: guitarix: Use HTTPS home page. * gnu/packages/audio.scm (guitarix)[home-page]: Use HTTPS. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b429aeb107..56eac50526 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -1443,7 +1443,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.") (list (search-path-specification (variable "LV2_PATH") (files '("lib/lv2"))))) - (home-page "http://guitarix.org/") + (home-page "https://guitarix.org/") (synopsis "Virtual guitar amplifier") (description "Guitarix is a virtual guitar amplifier running JACK. Guitarix takes the signal from your guitar as a mono-signal from your sound -- cgit v1.2.3 From 359b137cd62bbe9a3854bab692600acd8d487154 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:26:21 +0100 Subject: gnu: liboop: Use HTTPS home page. * gnu/packages/ssh.scm (liboop)[home-page]: Use HTTPS. --- gnu/packages/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index fdb3450e01..e3af517997 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -478,7 +478,7 @@ particularly useful for embedded systems, such as wireless routers.") (base32 "1q0p1l72pq9k3bi7a366j2rishv7dzzkg3i6r2npsfg7cnnidbsn")))) (build-system gnu-build-system) - (home-page "http://www.lysator.liu.se/liboop/") + (home-page "https://www.lysator.liu.se/liboop/") (synopsis "Event loop library") (description "Liboop is a low-level event loop management library for POSIX-based operating systems. It supports the development of modular, -- cgit v1.2.3 From 9bd0f41509ae405ed62f90af28769761fbe58a98 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:36:52 +0100 Subject: gnu: tftp-hpa: Use HTTPS home page. * gnu/packages/networking.scm (tftp-hpa)[home-page]: Use HTTPS. --- gnu/packages/networking.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 48b2570d9d..607416fe41 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1724,7 +1724,7 @@ speedtest.net.") "This is a tftp client derived from OpenBSD tftp with some extra options added and bugs fixed. The source includes readline support but it is not enabled due to license conflicts between the BSD advertising clause and the GPL.") - (home-page "http://git.kernel.org/cgit/network/tftp/tftp-hpa.git/about/") + (home-page "https://git.kernel.org/cgit/network/tftp/tftp-hpa.git/about/") ;; Some source files are distributed under a 3-clause BSD license, and ;; others under a 4-clause BSD license. Refer to the files in the source ;; distribution for clarification. -- cgit v1.2.3 From 6c71d56d7757b5f35bdd0d6fc623ba133c9c3e2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 19:40:55 +0100 Subject: gnu: Add straw-viewer. * gnu/packages/video.scm (straw-viewer): New public variable. --- gnu/packages/video.scm | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cc1a011d9a..62b19e2dfb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -123,6 +123,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages ocr) #:use-module (gnu packages perl) + #:use-module (gnu packages perl-check) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) @@ -511,6 +512,90 @@ H.264 (MPEG-4 AVC) video streams.") (@command{mkvmerge}).") (license license:gpl2))) +(define-public straw-viewer + (package + (name "straw-viewer") + (version "0.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trizen/straw-viewer") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "067j8wdfy29bi5ahky10xzzs8cr3mn95wl4kyqqjvjzri77a25j3")))) + (build-system perl-build-system) + (native-inputs + `(("perl-module-build" ,perl-module-build) + ("perl-test-pod" ,perl-test-pod))) + (inputs + `(("perl-data-dump" ,perl-data-dump) + ("perl-json" ,perl-json) + ("perl-libwww" ,perl-libwww) + ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) + ("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached) + ("perl-mozilla-ca" ,perl-mozilla-ca) + ("perl-term-readline-gnu" ,perl-term-readline-gnu) + ("perl-unicode-linebreak" ,perl-unicode-linebreak) + ("xdg-utils" ,xdg-utils) + + ;; Some videos play without youtube-dl, but others silently fail to. + ("youtube-dl" ,youtube-dl))) + + ;; Required only when building the graphical interface (--gtk). + ;;("perl-file-sharedir" ,perl-file-sharedir) + (arguments + `(#:modules ((guix build perl-build-system) + (guix build utils) + (srfi srfi-26)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'refer-to-inputs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/WWW/StrawViewer.pm" + (("'youtube-dl'") + (format #f "'~a/bin/youtube-dl'" + (assoc-ref inputs "youtube-dl")))) + (substitute* "bin/gtk-straw-viewer" + (("'xdg-open'") + (format #f "'~a/bin/xdg-open'" + (assoc-ref inputs "xdg-utils")))) + #t)) + (add-after 'install 'install-desktop + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (sharedir (string-append out "/share"))) + (install-file "share/gtk-straw-viewer.desktop" + (string-append sharedir "/applications")) + (install-file "share/icons/gtk-straw-viewer.png" + (string-append sharedir "/pixmaps")) + #t))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin-dir (string-append out "/bin/")) + (site-dir (string-append out "/lib/perl5/site_perl/")) + (lib-path (getenv "PERL5LIB"))) + (for-each (cut wrap-program <> + `("PERL5LIB" ":" prefix (,lib-path ,site-dir))) + (find-files bin-dir)) + #t)))))) + (synopsis + "Light-weight application for searching and streaming videos from YouTube") + (description + "Straw-viewer searches for YouTube videos using @uref{https://invidio.us/, +invidio.us} and plays them locally in a native media player like @command{vlc} +or @command{mpv}. + +You can search for videos, playlists, and/or channels. The videos are streamed +directly to the player at the best chosen resolution and with closed captions if +available.") + ;; XXX Add #:module-build-flags '("--gtk") dependencies and this sentence. + ;; Both a command-line and a graphical interface are available. + (home-page "https://github.com/trizen/youtube-viewer") + (license license:perl-license))) + (define-public x265 (package (name "x265") -- cgit v1.2.3 From e496ee679d2c9548f5e3541a2a6486df179194d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:56:38 +0100 Subject: gnu: bridge-utils: Update home page. * gnu/packages/linux.scm (bridge-utils)[home-page]: Follow (HTTPS) redirection. --- gnu/packages/linux.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 3ac7e616c8..6a29565aad 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2099,8 +2099,7 @@ Linux-based operating systems.") #t))) #:tests? #f)) ; no 'check' target - (home-page - "http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge") + (home-page "https://wiki.linuxfoundation.org/networking/bridge") (synopsis "Manipulate Ethernet bridges") (description "Utilities for Linux's Ethernet bridging facilities. A bridge is a way -- cgit v1.2.3 From 720aa97782084d7c70bfae324b14f2f062ac1848 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:44:10 +0100 Subject: gnu: sipcalc: Use HTTPS home page. * gnu/packages/admin.scm (sipcalc)[home-page]: Use HTTPS. --- 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 0862000dd2..9b1844f36d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -709,7 +709,7 @@ IPv6, proxies, and Unix sockets.") (base32 "0mv3wndj4z2bsshh2k8d5sy3j8wxzgf8mzmmkvj1k8gpcz37dm6g")))) (build-system gnu-build-system) - (home-page "http://www.routemeister.net/projects/sipcalc/") + (home-page "https://www.routemeister.net/projects/sipcalc/") (synopsis "Command-line IP subnet calculator") (description "Sipcalc is an advanced command-line IP subnet calculator. It can take -- cgit v1.2.3 From 5a3cbfceb16da07c4b828dfa6add342f1afc1679 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:39:00 +0100 Subject: gnu: redis: Use HTTPS home page. * gnu/packages/databases.scm (redis)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 8491f7ac11..5727905beb 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1892,7 +1892,7 @@ similar to BerkeleyDB, LevelDB, etc.") (description "Redis is an advanced key-value cache and store. Redis supports many data structures including strings, hashes, lists, sets, sorted sets, bitmaps and hyperloglogs.") - (home-page "http://redis.io/") + (home-page "https://redis.io/") (license license:bsd-3))) (define-public kyotocabinet -- cgit v1.2.3 From 57f6ac8d902ca0103dd61cd2526aeb7284b171fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 17 Mar 2020 20:28:33 +0100 Subject: gnu: pigx-scrnaseq: Update to 1.1.4. * gnu/packages/bioinformatics.scm (pigx-scrnaseq): Update to 1.1.4. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 9044ebca8d..6dfc23c1dc 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12815,7 +12815,7 @@ methylation and segmentation.") (define-public pigx-scrnaseq (package (name "pigx-scrnaseq") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/BIMSBbioinfo/pigx_scrnaseq/" @@ -12823,7 +12823,7 @@ methylation and segmentation.") "/pigx_scrnaseq-" version ".tar.gz")) (sha256 (base32 - "0ga2jr4968qzwml6aycky4603q64lny3y7lzw6dmafch5pydl1qi")))) + "1d5l3gywypi67yz9advxq5xkgfhr4733gj0bwnngm723i3hdf5w9")))) (build-system gnu-build-system) (inputs `(("coreutils" ,coreutils) -- cgit v1.2.3 From 98c873181aa0005aa07e23566a37b3ede5523687 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 14:47:20 -0500 Subject: gnu: go-github-com-pkg-errors: Update to 0.9.1. * gnu/packages/golang.scm (go-github-com-pkg-errors): Update to 0.9.1. --- gnu/packages/golang.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 0d92139311..184233b522 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3067,7 +3067,7 @@ network protocol.") (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") - (version "0.9.0") + (version "0.9.1") (source (origin (method git-fetch) (uri (git-reference @@ -3076,7 +3076,7 @@ network protocol.") (file-name (git-file-name name version)) (sha256 (base32 - "1hlivqlcnm9wrj0v7h43gamw7mvg6svz9sm31fx28zn4ll25ablh")))) + "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq")))) (build-system go-build-system) (arguments `(#:import-path "github.com/pkg/errors")) -- cgit v1.2.3 From cb78846c130c74c7c136c7b54584c94e2c672d1b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 15:11:53 -0500 Subject: gnu: go-github-com-spaolacci-murmur3: Update to 1.1.0 * gnu/packages/golang.scm (go-github-com-spaolacci-murmur3): Update to 1.1.0. --- gnu/packages/golang.scm | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 184233b522..bf6209d8ea 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2131,32 +2131,30 @@ increase approaching hashing speeds of 1GB/sec on a single core.") (license license:asl2.0)))) (define-public go-github-com-spaolacci-murmur3 - (let ((commit "f09979ecbc725b9e6d41a297405f65e7e8804acc") - (revision "0")) - (package - (name "go-github-com-spaolacci-murmur3") - (version (git-version "1.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/spaolacci/murmur3.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/spaolacci/murmur3")) - (home-page "https://github.com/spaolacci/murmur3") - (synopsis "Native MurmurHash3 Go implementation") - (description "Native Go implementation of Austin Appleby's third -MurmurHash revision (aka MurmurHash3). + (package + (name "go-github-com-spaolacci-murmur3") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spaolacci/murmur3.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/spaolacci/murmur3")) + (home-page "https://github.com/spaolacci/murmur3") + (synopsis "Native MurmurHash3 Go implementation") + (description "Native Go implementation of Austin Appleby's third MurmurHash +revision (aka MurmurHash3). Reference algorithm has been slightly hacked as to support the streaming mode required by Go's standard Hash interface.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-github-com-multiformats-go-multihash (let ((commit "97cdb562a04c6ef66d8ed40cd62f8fbcddd396d6") -- cgit v1.2.3 From 88841a3ead043f032d60e994bceeb20889d66262 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 15:12:38 -0500 Subject: gnu: Add go-github-com-willf-bitset. * gnu/packages/golang.scm (go-github-com-willf-bitset): 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 bf6209d8ea..b0dd5ffe12 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3394,3 +3394,26 @@ data serialization format.") (description " A glob library that implements descending into other directories. It is optimized for filewalking. ") (license license:expat))) + +(define-public go-github-com-willf-bitset + (package + (name "go-github-com-willf-bitset") + (version "1.1.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/willf/bitset") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wpaxg6va3qwd0hq0b8rpb1hswvzzbfm2h8sjmcsdpbkydjjx9zg")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/willf/bitset")) + (synopsis "Bitsets in Go") + (description "This package provides a Go implementation of bitsets, which +are a mapping between non-negative integers and boolean values focused on +efficient space usage.") + (home-page "https://github.com/willf/bitset") + (license license:bsd-3))) -- cgit v1.2.3 From 79405c030f802df3631a6b3617b4a9ea284b638d Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 15:13:16 -0500 Subject: gnu: Add go-github-com-willf-bloom. * gnu/packages/golang.scm (go-github-com-willf-bloom): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index b0dd5ffe12..f684470419 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3417,3 +3417,28 @@ are a mapping between non-negative integers and boolean values focused on efficient space usage.") (home-page "https://github.com/willf/bitset") (license license:bsd-3))) + +(define-public go-github-com-willf-bloom + (package + (name "go-github-com-willf-bloom") + (version "2.0.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/willf/bloom") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ygan8pgcay7wx3cs3ja8rdqj7nly7v3and97ddcc66020jxchzg")))) + (build-system go-build-system) + (arguments + '(#:import-path "github.com/willf/bloom")) + (propagated-inputs + `(("go-github-com-spaolacci-murmur3" ,go-github-com-spaolacci-murmur3) + ("go-github-com-willf-bitset" ,go-github-com-willf-bitset))) + (synopsis "Bloom filters in Go") + (description "This package provides a Go implementation of bloom filters, +based on murmurhash.") + (home-page "https://github.com/willf/bloom") + (license license:bsd-2))) -- cgit v1.2.3 From 6838611252d027a1ef8324cd6dae049040374067 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 2 Mar 2020 15:13:37 -0500 Subject: gnu: Syncthing: Update to 1.4.0. * gnu/packages/syncthing.scm (syncthing): Update to 1.4.0. [inputs]: Add go-github-com-willf-bloom. --- gnu/packages/syncthing.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index afa32e99b4..77f0aa326d 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -30,7 +30,7 @@ (define-public syncthing (package (name "syncthing") - (version "1.3.4") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/syncthing/syncthing" @@ -38,7 +38,7 @@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "025fhfqzcl5qd38zak8485pd67iqkzsf6frm02cl25s3ggv2f0p4")) + "1p9y943kd09pxmsaahbdml2mn2qlwbx23hvbsm1sqbbm8ma9ai8c")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. (snippet '(begin @@ -95,6 +95,7 @@ ("go-github-com-ccding-go-stun" ,go-github-com-ccding-go-stun) ("go-github-com-audriusbutkevicius-pfilter" ,go-github-com-audriusbutkevicius-pfilter) ("go-github-com-lucas-clemente-quic-go" ,go-github-com-lucas-clemente-quic-go) + ("go-github-com-willf-bloom" ,go-github-com-willf-bloom) ;; For tests ("go-github-com-d4l3k-messagediff" ,go-github-com-d4l3k-messagediff))) -- cgit v1.2.3 From 317b13f30e1e23e8fb2f18fcff50b8ee2e448321 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 23:00:42 +0100 Subject: gnu: american-fuzzy-lop: Fix documentation directory. * gnu/packages/debug.scm (american-fuzzy-lop)[arguments]: Install documentation into its conventional location. --- 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 34cc479589..3e3c308dae 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -230,6 +230,8 @@ tools that process C/C++ code.") #t)))))))))))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) + (string-append "DOC_PATH=$(PREFIX)/share/doc/" + ,name "-" ,version) "CC=gcc") #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 3ba980b188ec52bdbd447e6385e4d1d5e93706aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 23:02:56 +0100 Subject: gnu: american-fuzzy-lop: Update to 2.56b. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/debug.scm (american-fuzzy-lop): Update to 2.56b. [source]: Use GIT-FETCH from the new upstream, and GIT-FILE-NAME. [inputs]: Adjust custom-qemu's ‘apply-afl-patches’ phase to this new reality. Don't apply upstreamed Qemu patches. [arguments]: Make the git check-out writable. --- gnu/packages/debug.scm | 50 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 18 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 3e3c308dae..83c9f6ae03 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -171,15 +171,16 @@ tools that process C/C++ code.") (_ "UNSUPPORTED")))) (package (name "american-fuzzy-lop") - (version "2.52b") ;It seems all releases have the 'b' suffix + (version "2.56b") ;It seems all releases have the 'b' suffix (source (origin - (method url-fetch) - (uri (string-append "http://lcamtuf.coredump.cx/afl/releases/" - "afl-" version ".tgz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/AFL") + (commit (string-append "v" version)))) (sha256 - (base32 - "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3")))) + (base32 "1q1g59gkm48aa4cg9h70jx4i2gapmypgp5rzs156b2avd95vwkn1")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs `(("custom-qemu" @@ -204,24 +205,33 @@ tools that process C/C++ code.") (add-after 'unpack 'apply-afl-patches (lambda* (#:key inputs #:allow-other-keys) - (let* ((afl-dir (string-append "afl-" ,version)) - (patch-dir - (string-append afl-dir - "/qemu_mode/patches"))) - (invoke "tar" "xf" - (assoc-ref inputs "afl-src")) - (install-file (string-append patch-dir - "/afl-qemu-cpu-inl.h") - ".") - (copy-file (string-append afl-dir "/config.h") + (let* ((afl-src (assoc-ref inputs "afl-src")) + (patch-dir "qemu_mode/patches")) + (copy-recursively (string-append afl-src "/" + patch-dir) + patch-dir) + (install-file + (string-append patch-dir + "/afl-qemu-cpu-inl.h") + ".") + (copy-file (string-append afl-src "/config.h") "./afl-config.h") - (install-file (string-append afl-dir "/types.h") + (install-file (string-append afl-src "/types.h") ".") (substitute* "afl-qemu-cpu-inl.h" (("\\.\\./\\.\\./config.h") "afl-config.h")) (substitute* (string-append patch-dir "/cpu-exec.diff") (("\\.\\./patches/") "")) + + ;; These were already applied to qemu-minimal-2.10. + (for-each (lambda (obsolete-patch) + (delete-file (string-append + patch-dir "/" + obsolete-patch))) + (list "configure.diff" + "memfd.diff")) + (for-each (lambda (patch-file) (invoke "patch" "--force" "-p1" "--input" patch-file)) @@ -234,6 +244,10 @@ tools that process C/C++ code.") ,name "-" ,version) "CC=gcc") #:phases (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t)) (delete 'configure) ,@(if (string=? (%current-system) (or "x86_64-linux" "i686-linux")) @@ -258,7 +272,7 @@ tools that process C/C++ code.") (symlink (string-append qemu "/bin/qemu-" ,machine) (string-append out "/bin/afl-qemu-trace")) #t))) - (delete 'check)))) ; Tests are run during 'install phase. + (delete 'check)))) ; tests are run during 'install phase (home-page "http://lcamtuf.coredump.cx/afl") (synopsis "Security-oriented fuzzer") (description -- cgit v1.2.3 From 38e1b9efc8f18e3b2f6c28fc69e636357dc712db Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Mar 2020 23:08:48 +0100 Subject: gnu: american-fuzzy-lop: Use HTTPS home page. * gnu/packages/debug.scm (american-fuzzy-lop)[home-page]: Use HTTPS. --- gnu/packages/debug.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 83c9f6ae03..718a76310d 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -273,7 +273,7 @@ tools that process C/C++ code.") (string-append out "/bin/afl-qemu-trace")) #t))) (delete 'check)))) ; tests are run during 'install phase - (home-page "http://lcamtuf.coredump.cx/afl") + (home-page "https://lcamtuf.coredump.cx/afl/") (synopsis "Security-oriented fuzzer") (description "American fuzzy lop is a security-oriented fuzzer that employs a novel -- cgit v1.2.3 From ac5bd7f0f07ca1ff57db00d4cf54fa3cbf42b2e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:11:23 +0100 Subject: gnu: Use HTTPS for www.rforge.net home pages. * gnu/packages/cran.scm (r-rjava, r-tiff, r-uuid, r-fastmatch, r-jpeg) [home-page]: Use HTTPS. * gnu/packages/statistics.scm (r-base64enc)[home-page]: Likewise --- gnu/packages/cran.scm | 10 +++++----- gnu/packages/statistics.scm | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 406ccc644b..a34f91642e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1351,7 +1351,7 @@ applications. That is, compute distances and related measures for angular "1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x")))) (build-system r-build-system) (inputs `(("libjpeg" ,libjpeg))) - (home-page "http://www.rforge.net/jpeg/") + (home-page "https://www.rforge.net/jpeg/") (synopsis "Read and write JPEG images with R") (description "This package provides a way to read, write and display bitmap images stored in the JPEG format with R. It can read and write both @@ -1979,7 +1979,7 @@ use in R. It also provides a simple way for variable interpolation in R.") (base32 "0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90")))) (build-system r-build-system) - (home-page "http://www.rforge.net/fastmatch") + (home-page "https://www.rforge.net/fastmatch") (synopsis "Fast match function") (description "This package provides a fast @code{match} replacement for cases that @@ -4141,7 +4141,7 @@ terminals.") (base32 "0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q")))) (build-system r-build-system) - (home-page "http://www.rforge.net/uuid") + (home-page "https://www.rforge.net/uuid") (synopsis "Tools for generating and handling of UUIDs") (description "This package provides tools for generating and handling of @@ -9698,7 +9698,7 @@ redundant complex conjugate when the input is real data.") `(("libtiff" ,libtiff) ("libjpeg" ,libjpeg) ("zlib" ,zlib))) - (home-page "http://www.rforge.net/tiff/") + (home-page "https://www.rforge.net/tiff/") (synopsis "Read and write TIFF images") (description "This package provides an easy and simple way to read, write and display @@ -13848,7 +13848,7 @@ the corresponding outputs (tables and graphs).") ("jdk" ,icedtea-8 "jdk") ("pcre" ,pcre) ("zlib" ,zlib))) - (home-page "http://www.rforge.net/rJava/") + (home-page "https://www.rforge.net/rJava/") (synopsis "Low-Level R to Java interface") (description "This package provides a low-level interface to the Java VM very much diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 6616780081..1270b644d5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3179,7 +3179,7 @@ Shiny). The @code{DataTables} library has been included in this R package.") (base32 "13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd")))) (build-system r-build-system) - (home-page "http://www.rforge.net/base64enc") + (home-page "https://www.rforge.net/base64enc") (synopsis "Tools for Base64 encoding") (description "This package provides tools for handling Base64 encoding. It is more -- cgit v1.2.3 From 1c131432bdb6cb10514b80fd3f2e8081f5605774 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:43:10 +0100 Subject: gnu: r-tsa: Use HTTPS home page. * gnu/packages/cran.scm (r-tsa)[home-page]: Use HTTPS. --- 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 a34f91642e..ee447d3dd7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft ;;; Copyright © 2016, 2017, 2018 Roel Janssen -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Raoul Bonnal ;;; Copyright © 2018 Vijayalakshmi Vedantham ;;; Copyright © 2018 Sahithi Yarlagadda @@ -4513,7 +4513,7 @@ University Press, 2000.") `(("r-leaps" ,r-leaps) ("r-locfit" ,r-locfit) ("r-mgcv" ,r-mgcv))) - (home-page "http://www.stat.uiowa.edu/~kchan/TSA.htm") + (home-page "https://homepage.divms.uiowa.edu/~kchan/TSA.htm") (synopsis "Time series analysis") (description "This package contains R functions and datasets detailed in the book -- cgit v1.2.3 From 6068cbe1e12f460ce4ed9be2c14000b75924d656 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:36:06 +0100 Subject: gnu: r-acs: Update home page. * gnu/packages/cran.scm (r-acs)[home-page]: Follow (HTTPS) redirection. --- 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 ee447d3dd7..12ed6ffd41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17768,7 +17768,7 @@ errors.") ("r-rcpp" ,r-rcpp) ("r-stringr" ,r-stringr) ("r-xml" ,r-xml))) - (home-page "http://dusp.mit.edu/faculty/ezra-glenn") + (home-page "https://dusp.mit.edu/faculty/ezra-haber-glenn") (synopsis "Work with data from the US Census") (description "This package provides a general toolkit for downloading, managing, -- cgit v1.2.3 From 3ee2070241448908115d9f951dce3666b23c9f15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:40:10 +0100 Subject: gnu: r-beeswarm: Use HTTPS home page. * gnu/packages/statistics.scm (r-beeswarm)[home-page]: Use HTTPS. --- 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 1270b644d5..758909edd5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4328,7 +4328,7 @@ within a category based on their density using quasirandom noise.") (base32 "0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581")))) (build-system r-build-system) - (home-page "http://www.cbs.dtu.dk/~eklund/beeswarm/") + (home-page "https://www.cbs.dtu.dk/~eklund/beeswarm/") (synopsis "Implementation of bee swarm plots") (description "This package provides an implementation of bee swarm plots. The bee -- cgit v1.2.3 From 486a08004850f30d8d860640c41378b130288f21 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:22:43 +0100 Subject: gnu: r-htqpcr: Update home page. * gnu/packages/bioconductor.scm (r-htqpcr)[home-page]: Use HTTPS link to PDF paper. --- gnu/packages/bioconductor.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 4320bc0bb5..bc7623eac3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6630,7 +6630,8 @@ measures.") ("r-gplots" ,r-gplots) ("r-limma" ,r-limma) ("r-rcolorbrewer" ,r-rcolorbrewer))) - (home-page "http://www.ebi.ac.uk/bertone/software") + (home-page (string-append "https://www.ebi.ac.uk/sites/ebi.ac.uk/files/" + "groups/bertone/software/HTqPCR.pdf")) (synopsis "Automated analysis of high-throughput qPCR data") (description "Analysis of Ct values from high throughput quantitative real-time -- cgit v1.2.3 From f8c3d903e921ceb7e216192579d8f615db2547a9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:35:49 +0100 Subject: gnu: r-hapassoc: Use HTTPS home page. * gnu/packages/cran.scm (r-hapassoc)[home-page]: Use HTTPS. --- 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 12ed6ffd41..659660225e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13752,7 +13752,7 @@ variance components, using the likelihood-ratio statistics G.") (base32 "0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s")))) (build-system r-build-system) - (home-page "http://stat.sfu.ca/statgen/research/hapassoc.html") + (home-page "https://stat.sfu.ca/statgen/research/hapassoc.html") (synopsis "Inference of trait associations with SNP haplotypes") (description "Hapassoc performs likelihood inference of trait associations with -- cgit v1.2.3 From 0e36f3e488f6435a7fec71dfdd84ce4e0fbfc744 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:40:03 +0100 Subject: gnu: r-emplik: Use HTTPS home page. * gnu/packages/cran.scm (r-emplik)[home-page]: Use HTTPS. --- 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 659660225e..bf2719c3a5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19044,7 +19044,7 @@ OpenMP.") (build-system r-build-system) (propagated-inputs `(("r-quantreg" ,r-quantreg))) - (home-page "http://www.ms.uky.edu/~mai/EmpLik.html") + (home-page "https://www.ms.uky.edu/~mai/EmpLik.html") (synopsis "Empirical likelihood ratio for censored/truncated data") (description "This package provides empirical likelihood ratio tests for -- cgit v1.2.3 From 39c57484ea604c7d9d742e4f14e84ae0548fecdc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:42:56 +0100 Subject: gnu: r-rcppparallel: Use HTTPS home page. * gnu/packages/cran.scm (r-rcppparallel)[home-page]: Use HTTPS. --- 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 bf2719c3a5..b727534a03 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9253,7 +9253,7 @@ package provides a minimal R interface by relying on the Rcpp package.") "1mhd6vp47xmfw533h0pkvydv96m57fspvd85g8m7iqb5rcxvhhdb")))) (properties `((upstream-name . "RcppParallel"))) (build-system r-build-system) - (home-page "http://rcppcore.github.io/RcppParallel") + (home-page "https://rcppcore.github.io/RcppParallel/") (synopsis "Parallel programming tools for Rcpp") (description "This package provides high level functions for parallel programming with -- cgit v1.2.3 From 4ce61a90801c9f6efa9869b50cce31dc064c5639 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:54:44 +0100 Subject: gnu: r-forcats: Use HTTPS home page. * gnu/packages/statistics.scm (r-forcats)[home-page]: Use HTTPS. --- 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 758909edd5..17fde68f41 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5499,7 +5499,7 @@ and the corresponding decision threshold.") ("r-magrittr" ,r-magrittr) ("r-tibble" ,r-tibble) ("r-rlang" ,r-rlang))) - (home-page "http://forcats.tidyverse.org") + (home-page "https://forcats.tidyverse.org") (synopsis "Tools for working with factors") (description "This package provides helpers for reordering factor levels (including moving specified levels to front, ordering by first -- cgit v1.2.3 From b8930fd86b199d5df2714be759343eee83fe5f1b Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 17 Mar 2020 17:45:09 -0400 Subject: gnu: libfdk: Update to 2.0.1. * gnu/packages/audio.scm (libfdk): Update to 2.0.1. --- gnu/packages/audio.scm | 51 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 56eac50526..6880e74cce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3699,38 +3699,35 @@ using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.") (license license:expat)))) (define-public libfdk - (let ((commit "2326faaf8f2cdf2c3a9108ccdaf1d7551aec543e") - (revision "0")) - (package - (name "libfdk") - ;; The latest upstream revision, with many bug fixes. - (version (git-version "0.1.6" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mstorsjo/fdk-aac") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yy6ndd9d61bwl283vl1r5kva2a4acc0f4r9g0sza156f2abr9ws")))) - (build-system gnu-build-system) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool))) - (home-page "https://github.com/mstorsjo/fdk-aac") - (synopsis "Fraunhofer FDK AAC library") - (description "FDK is a library for encoding and decoding Advanced Audio + (package + (name "libfdk") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mstorsjo/fdk-aac") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fkrnzs78fmj11n9z3l0w53i2fl16jcfiyavwidck9bzmkmsf486")))) + (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (home-page "https://github.com/mstorsjo/fdk-aac") + (synopsis "Fraunhofer FDK AAC library") + (description "FDK is a library for encoding and decoding Advanced Audio Coding (AAC) format audio, developed by Fraunhofer IIS, and included as part of Android. It supports several Audio Object Types including MPEG-2 and MPEG-4 AAC LC, HE-AAC (AAC LC + SBR), HE-AACv2 (LC + SBR + PS) as well AAC-LD (low delay) and AAC-ELD (enhanced low delay) for real-time communication. The encoding library supports sample rates up to 96 kHz and up to eight channels (7.1 -surround).") - (license (license:fsf-free "https://github.com/mstorsjo/fdk-aac/blob/master/NOTICE" - "https://www.gnu.org/licenses/license-list.html#fdk"))))) + surround).") + (license (license:fsf-free "https://github.com/mstorsjo/fdk-aac/blob/master/NOTICE" + "https://www.gnu.org/licenses/license-list.html#fdk")))) (define-public libopenshot-audio (package -- cgit v1.2.3 From caaefa40072115ef3ba131d0875a87c521a9b3f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 00:36:38 +0100 Subject: gnu: tracker: Update to 2.3.4. * gnu/packages/gnome.scm (tracker): Update to 2.3.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 77a888b3b9..895bf4ffd8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7453,7 +7453,7 @@ easy, safe, and automatic.") (define-public tracker (package (name "tracker") - (version "2.3.2") + (version "2.3.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -7461,7 +7461,7 @@ easy, safe, and automatic.") "tracker-" version ".tar.xz")) (sha256 (base32 - "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54")))) + "0vai0qz9jn3z5dlzysynwhbbmslp84ygdql81f5wfxxr98j54yap")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From de60ac2ff2cadcd000248bc11c458cf6c69ce837 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 00:36:55 +0100 Subject: gnu: tracker-miners: Update to 2.3.3. * gnu/packages/gnome.scm (tracker-miners): Update to 2.3.3. --- 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 895bf4ffd8..0f9241edfc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7523,7 +7523,7 @@ endpoint and it understands SPARQL. ") (define-public tracker-miners (package (name "tracker-miners") - (version "2.3.2") + (version "2.3.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker-miners/" @@ -7531,7 +7531,7 @@ endpoint and it understands SPARQL. ") "/tracker-miners-" version ".tar.xz")) (sha256 (base32 - "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6")))) + "06abxrnrz7xayykrabn135rpsm6z0fqw7gibrb9j09l6swlalwkl")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 2c674796d4dc535186a8f820141229047fb02099 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 01:31:32 +0100 Subject: gnu: tintin++: Update to 2.02.02. * gnu/packages/games.scm (tintin++): Update to 2.02.02. --- gnu/packages/games.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 44f59d7260..30045c9f96 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3916,7 +3916,7 @@ a style similar to the original Super Mario games.") (define-public tintin++ (package (name "tintin++") - (version "2.02.00") + (version "2.02.02") (source (origin (method url-fetch) @@ -3924,8 +3924,7 @@ a style similar to the original Super Mario games.") (string-drop-right version 1) "/tintin-" version ".tar.gz")) (sha256 - (base32 - "02qmbhzhh2sdy5b37v54gihs9k4bxmlz3j96gyx7icvx2grkbg5i")))) + (base32 "11ylbp8ip7dwmh4gzb53z147pcfxkl3lwhyy8ngyn2zc634vdn65")))) (inputs `(("gnutls" ,gnutls) ("pcre" ,pcre) -- cgit v1.2.3 From dbe0e0db40a235ceae4e432d82a22432e70805a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 02:07:16 +0100 Subject: gnu: godot: Update to 3.2.1. * gnu/packages/game-development.scm (godot): Update to 3.2.1. --- gnu/packages/game-development.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index bf3b12ffd3..2a66f4a40c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1536,7 +1536,7 @@ games.") (define-public godot (package (name "godot") - (version "3.2") + (version "3.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -1545,7 +1545,7 @@ games.") (file-name (git-file-name name version)) (sha256 (base32 - "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd")) + "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) -- cgit v1.2.3 From f764111bfb56045385ede43a7bc18969037780a6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:45:19 +0100 Subject: gnu: r-iso: Use HTTPS home page. * gnu/packages/cran.scm (r-iso)[home-page]: Use HTTPS. --- 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 b727534a03..86ef002548 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10440,7 +10440,7 @@ the combination of non-negative and non-positive constraints.") (properties `((upstream-name . "Iso"))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://www.stat.auckland.ac.nz/~rolf/") + (home-page "https://www.stat.auckland.ac.nz/~rolf/") (synopsis "Functions to perform isotonic regression") (description "This package provides support for linear order and unimodal -- cgit v1.2.3 From 1994e638e53ff60e074ad3bfdf59fd908f0965ea Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:48:32 +0100 Subject: gnu: r-elasticnet: Update home page. * gnu/packages/cran.scm (r-elasticnet)[home-page]: Follow (HTTPS) redirection. --- 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 86ef002548..64291d41e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16880,7 +16880,7 @@ data.") (build-system r-build-system) (propagated-inputs `(("r-lars" ,r-lars))) - (home-page "http://www.stat.umn.edu/~hzou") + (home-page "http://users.stat.umn.edu/~zouxx019/") (synopsis "Elastic-Net for sparse estimation and sparse PCA") (description "This package provides functions for fitting the entire solution path of -- cgit v1.2.3 From ddf69c4afeebdeb088214969b9a263fdad50d344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:53:36 +0100 Subject: gnu: r-epi: Use HTTPS home page. * gnu/packages/cran.scm (r-epi)[home-page]: Use HTTPS. --- 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 64291d41e0..c477bc2688 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11492,7 +11492,7 @@ model with finite state space using the Aalen-Johansen estimator.") ("r-plyr" ,r-plyr) ("r-survival" ,r-survival) ("r-zoo" ,r-zoo))) - (home-page "http://BendixCarstensen.com/Epi/") + (home-page "https://BendixCarstensen.com/Epi/") (synopsis "Statistical analysis in epidemiology") (description "This package provides functions for demographic and epidemiological -- cgit v1.2.3 From 72ac69941468b855e2fd0be1931b94ff5f94c0bc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:04:38 +0100 Subject: gnu: r-pls: Use HTTPS home page. * gnu/packages/cran.scm (r-pls)[home-page]: Use HTTPS. --- 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 c477bc2688..b95c981935 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1592,7 +1592,7 @@ error stream.") (sha256 (base32 "121byimd6bg7jbrq5wz5fpi0vxq0vh8g724vkhnjzszbvcv1xsb7")))) (build-system r-build-system) - (home-page "http://mevik.net/work/software/pls.html") + (home-page "https://mevik.net/work/software/pls.html") (synopsis "Partial Least Squares and Principal Component Regression") (description "The pls package implements multivariate regression methods: Partial Least -- cgit v1.2.3 From e661c96f84bf985a50d71d5c3dc5dc80566ff2fd Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:15:27 +0100 Subject: gnu: r-mclust: Use HTTPS home page. * gnu/packages/statistics.scm (r-mclust)[home-page]: Use HTTPS. --- 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 17fde68f41..3855e1c65d 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4698,7 +4698,7 @@ models, generalized linear models and model-based clustering.") (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) - (home-page "http://www.stat.washington.edu/mclust/") + (home-page "https://www.stat.washington.edu/mclust/") (synopsis "Gaussian mixture modelling for model-based clustering etc.") (description "This package provides Gaussian finite mixture models fitted via EM -- cgit v1.2.3 From d07b513a30a6728a4cda65a3ff3cb5164b4550c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:17:56 +0100 Subject: gnu: r-tractor-base: Use HTTPS home page. * gnu/packages/cran.scm (r-tractor-base)[home-page]: Use HTTPS. --- 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 b95c981935..4ed6927d54 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -10317,7 +10317,7 @@ conditional reporting based on the current \"output level\".") ("r-reportr" ,r-reportr) ("r-rnifti" ,r-rnifti) ("r-shades" ,r-shades))) - (home-page "http://www.tractor-mri.org.uk") + (home-page "https://www.tractor-mri.org.uk") (synopsis "Read, manipulate and visualize magnetic resonance images") (description "This package provides functions for working with magnetic resonance -- cgit v1.2.3 From f9d9a7e4a62282d26ea1404f2c09c703bb8d2beb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:13:03 +0100 Subject: gnu: r-lars: Update home page. * gnu/packages/statistics.scm (r-lars)[home-page]: Follow (HTTPS) redirection. --- 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 3855e1c65d..fa2b8d6ed5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4563,7 +4563,7 @@ mixture models.") (build-system r-build-system) (inputs `(("gfortran" ,gfortran))) - (home-page "http://www-stat.stanford.edu/~hastie/Papers/#LARS") + (home-page "https://web.stanford.edu/~hastie/Papers/LARS/") (synopsis "Least angle regression software") (description "Least Angle Regression (\"LAR\") is a model selection algorithm; a -- cgit v1.2.3 From 3c1a10e3417db2dd1c78acf648eb3abe062ac1c1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:23:49 +0100 Subject: gnu: r-gsubfn: Update home page. * gnu/packages/cran.scm (r-gsubfn)[home-page]: Update and use HTTPS. --- 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 4ed6927d54..951904785e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5077,7 +5077,7 @@ It also includes interpolation functions.") "00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9")))) (build-system r-build-system) (propagated-inputs `(("r-proto" ,r-proto))) - (home-page "http://gsubfn.googlecode.com") + (home-page "https://code.google.com/archive/p/gsubfn/") (synopsis "Utilities for strings and function arguments.") (description "This package provides @code{gsubfn} which is like @code{gsub} but can -- cgit v1.2.3 From ce9fc7e8ab821d12977bdf4ca9bff3e20eb16c07 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:27:33 +0100 Subject: gnu: r-imager: Use HTTPS home page. * gnu/packages/cran.scm (r-imager)[home-page]: Use HTTPS. --- 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 951904785e..b9b3367691 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18345,7 +18345,7 @@ number embedded in the file rather than the file extension.") ("r-readbitmap" ,r-readbitmap) ("r-stringr" ,r-stringr))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://dahtah.github.io/imager") + (home-page "https://dahtah.github.io/imager/") (synopsis "Image processing library") (description "This is a package for fast image processing for images in up to 4 -- cgit v1.2.3 From f6b950319cb41822e2b3f1b55357037da433e1df Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 17 Mar 2020 22:10:40 -0400 Subject: gnu: system: Export %sudoers-specification. Exporting this variable allows reusing the default value of the `sudoers-file' field when configuring it. * gnu/system.scm (gnu): Export %sudoers-specification. * doc/guix.texi (Invoking guix deploy): Document an example, to use with 'guix deploy'. --- doc/guix.texi | 24 ++++++++++++++++++++++-- gnu/system.scm | 1 + 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index a0920adc1c..086b1d9751 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26996,8 +26996,28 @@ login over SSH may be forbidden in some cases. To work around this, @command{guix deploy} can log in as an unprivileged user and employ @code{sudo} to escalate privileges. This will only work if @code{sudo} is currently installed on the remote and can be invoked non-interactively as -@code{user}. That is: the line in @code{sudoers} granting @code{user} the -ability to use @code{sudo} must contain the @code{NOPASSWD} tag. +@code{user}. That is, the line in @code{sudoers} granting @code{user} the +ability to use @code{sudo} must contain the @code{NOPASSWD} tag. This can +be accomplished with the following operating system configuration snippet: + +@lisp +(use-modules ... + (gnu system) ;for %sudoers-specification)) + +(define %user "username") + +(operating-system + ... + (sudoers-file + (plain-file "sudoers" + (string-append (plain-file-content %sudoers-specification) + (format #f "~a ALL = NOPASSWD: ALL~%" + %username))))) + +@end lisp + +For more information regarding the format of the @file{sudoers} file, +consult @command{man sudoers}. @deftp {Data Type} machine This is the data type representing a single machine in a heterogeneous Guix diff --git a/gnu/system.scm b/gnu/system.scm index cfc730a41c..06c58c27ba 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -138,6 +138,7 @@ local-host-aliases %root-account %setuid-programs + %sudoers-specification %base-packages %base-firmware)) -- cgit v1.2.3 From aaffde38b54c978e2425fa88eea733dc80f87444 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 19 Feb 2020 15:35:46 -0500 Subject: bootloader: grub: Use the all_video module in graphic mode. * gnu/bootloader/grub.scm (eye-candy): Load the module 'all_video' which automatically loads all the available and relevant video modules. --- gnu/bootloader/grub.scm | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index b99f5fa4f4..36a964e8f5 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -162,21 +163,8 @@ system string---e.g., \"x86_64-linux\"." (string-append "set gfxmode=" (string-join gfxmode ";")) "# Leave 'gfxmode' to 'auto'.")) " - insmod video_bochs - insmod video_cirrus + insmod all_video insmod gfxterm - - if [ \"${grub_platform}\" == efi ]; then - # This is for (U)EFI systems (these modules are unavailable in the - # non-EFI GRUB.) If we don't load them, GRUB boots in \"blind mode\", - # which isn't convenient. - insmod efi_gop - insmod efi_uga - else - # These are specific to non-EFI Intel machines. - insmod vbe - insmod vga - fi ") "")) -- cgit v1.2.3 From 6794653e1b0fce8981eb179b9d4cab4a0c5f926f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 19 Feb 2020 15:59:06 -0500 Subject: bootloader: grub: Refactor eye-candy a bit. * gnu/bootloader/grub.scm (eye-candy)[setup-gfxterm-body]: Define the GFXMODE binding using AND-LET* instead of chained AND=>. Add a comment about supporting graphical mode on other systems than x86. Generate configuration string using FORMAT rather than STRING-APPEND. --- gnu/bootloader/grub.scm | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index 36a964e8f5..28e6cb1f5f 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -36,6 +36,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-2) #:export (grub-image grub-image? grub-image-aspect-ratio @@ -149,24 +150,26 @@ STORE-MOUNT-POINT is its mount point; these are used to determine where the background image and fonts must be searched for. SYSTEM must be the target system string---e.g., \"x86_64-linux\"." (define setup-gfxterm-body - ;; Intel and EFI systems need to be switched into graphics mode, whereas - ;; most other modern architectures have no other mode and therefore don't - ;; need to be switched. - (if (string-match "^(x86_64|i[3-6]86)-" system) - (string-append - " -" - (let ((gfxmode (and=> - (and=> config bootloader-configuration-theme) - grub-gfxmode))) - (if gfxmode - (string-append "set gfxmode=" (string-join gfxmode ";")) - "# Leave 'gfxmode' to 'auto'.")) - " + (let ((gfxmode + (or (and-let* ((theme (bootloader-configuration-theme config)) + (gfxmode (grub-gfxmode theme))) + (string-join gfxmode ";")) + "auto"))) + + ;; Intel and EFI systems need to be switched into graphics mode, whereas + ;; most other modern architectures have no other mode and therefore + ;; don't need to be switched. + + ;; XXX: Do we really need to restrict to x86 systems? We could imitate + ;; what the GRUB default configuration does and decide based on whether + ;; a user provided 'gfxterm' in the terminal-outputs field of their + ;; bootloader-configuration record. + (if (string-match "^(x86_64|i[3-6]86)-" system) + (format #f " + set gfxmode=~a insmod all_video - insmod gfxterm -") - "")) + insmod gfxterm~%" gfxmode) + ""))) (define (setup-gfxterm config font-file) (if (memq 'gfxterm (bootloader-configuration-terminal-outputs config)) -- cgit v1.2.3 From e002332b8a136638c2a4fc1a2f2a26541ce0211d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 18 Mar 2020 10:42:38 +0100 Subject: gnu: mcron: Depend on Guile 2.2.7. Fixes . * gnu/packages/guile-xyz.scm (mcron)[inputs]: Replace GUILE-2.2 with GUILE-2.2.7. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 124373bf8c..dbf3c8ee57 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2174,7 +2174,7 @@ is no support for parsing block and inline level HTML.") #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("tzdata" ,tzdata-for-tests))) - (inputs `(("guile" ,guile-2.2))) + (inputs `(("guile" ,guile-2.2.7))) ;fix (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times") (description -- cgit v1.2.3 From aaa7d17dce91f00b7313ca93795cc84ec216a86a Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 19 Feb 2020 11:18:53 +0100 Subject: gnu: gnunet: Update to 0.12.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnunet.scm (gnunet): Update to 0.12.2. [inputs]: Add libjpeg. [arguments]: Deactivate more tests, set LANG env variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnunet.scm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f9b71a2f3a..1bcff1bf66 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2020 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -249,7 +250,7 @@ supports HTTP, HTTPS and GnuTLS.") (define-public gnunet (package (name "gnunet") - (version "0.11.8") + (version "0.12.2") (source (origin (method url-fetch) @@ -257,7 +258,7 @@ supports HTTP, HTTPS and GnuTLS.") ".tar.gz")) (sha256 (base32 - "1zkmcq75sfr3iyg8rgxp9dbl7fwsvc1a71rc0vgisghcbrx1n7yj")))) + "1mwcy7fj1rpd39w7j7k3jdwlil5s889b2qlhfdggqmhigl28na5c")))) (build-system gnu-build-system) (inputs `(("bluez" ,bluez) @@ -269,6 +270,7 @@ supports HTTP, HTTPS and GnuTLS.") ("libextractor" ,libextractor) ("libidn" ,libidn2) ("libgcrypt" ,libgcrypt) + ("libjpeg" ,libjpeg) ("libltdl" ,libltdl) ("libmicrohttpd" ,libmicrohttpd) ("libogg" ,libogg) @@ -289,11 +291,30 @@ supports HTTP, HTTPS and GnuTLS.") #:phases (modify-phases %standard-phases (add-after 'configure 'remove-failing-tests - ;; These tests fail in Guix's building envrionment. + ;; These tests fail in Guix's building environment. (lambda _ + (substitute* "src/cadet/Makefile" + (("test_cadet_2_reopen\\$\\(EXEEXT\\) \\\\\n") "test_cadet_2_reopen$(EXEEXT)") + (("test_cadet_5_forward\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_signal\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_keepalive\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_ack\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_reliable\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_reliable_backwards\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_speed_backwards\\$\\(EXEEXT\\) \\\\\n") "") + (("test_cadet_5_reopen\\$\\(EXEEXT\\)") "")) (substitute* "src/transport/Makefile" + (("\\$\\(am__EXEEXT_15\\)") "") ; test_transport_api_https + (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "") (("test_transport_api_udp_nat\\$\\(EXEEXT\\) \\\\\n") "") - (("test_transport_api_manipulation_cfg\\$\\(EXEEXT\\) \\\\\n") "")) + (("test_transport_blacklisting_multiple_plugins\\$\\(EXEEXT\\) \\\\\n") "")) + (substitute* "src/testbed/Makefile" + (("test_testbed_api_2peers_1controller\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_test\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_statistics\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_topology\\$\\(EXEEXT\\) \\\\\n") "") + (("test_testbed_api_topology_clique\\$\\(EXEEXT\\) \\\\\n") "")) (substitute* "src/topology/Makefile" (("^check_PROGRAMS.*") "\n") (("test_gnunet_daemon_topology\\$\\(EXEEXT\\)\n") "")) @@ -308,6 +329,9 @@ supports HTTP, HTTPS and GnuTLS.") "src/transport/gnunet-transport-certificate-creation.in") (("gnutls-certtool") "certtool")) #t)) + (add-before 'check 'set-env-var-for-tests + (lambda _ + (setenv "LANG" "en_US.UTF-8"))) ;; Swap 'check and 'install phases and add installed binaries to $PATH. (add-before 'check 'set-path-for-check (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From 370cb2e0a493ca7efcac02a43606d8f69f73c2c7 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Wed, 19 Feb 2020 11:29:32 +0100 Subject: gnu: gnunet-gtk: Update to 0.12.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.12.0. Signed-off-by: Ludovic Courtès --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1bcff1bf66..8ad2576bd2 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -388,14 +388,14 @@ services.") (define-public gnunet-gtk (package (inherit gnunet) (name "gnunet-gtk") - (version "0.11.7") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/gnunet/gnunet-gtk-" version ".tar.gz")) (sha256 (base32 - "061ifhqk6q9kx71z5404fm4d60yj2dihlwwmdqmhkn5nn4bvcwb5")))) + "08a43ayv1rhajdklfcv78w2h76jfaz64kgp5krqgj1w1sq8xm6fb")))) (arguments `(#:configure-flags (list "--with-libunique" -- cgit v1.2.3 From d0f501647587154c4763b6c42e3c17adb83f01d0 Mon Sep 17 00:00:00 2001 From: raingloom Date: Sun, 16 Feb 2020 00:00:35 +0100 Subject: gnu: gspell: --enable-vala for VAPI (for geary) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gspell)[arguments]: Add #:configure-flags. [native-inputs]: Add VALA. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0f9241edfc..8e77b5f76e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8946,7 +8946,8 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") (patches (search-patches "gspell-dash-test.patch")))) (build-system glib-or-gtk-build-system) (arguments - '(#:phases + '(#:configure-flags (list "--enable-vala") + #:phases (modify-phases %standard-phases (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) @@ -8971,6 +8972,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") `(("glib" ,glib "bin") ("gobject-introspection" ,gobject-introspection) ("pkg-config" ,pkg-config) + ("vala" ,vala) ;for VAPI, needed by Geary ("xmllint" ,libxml2) ;; For tests. -- cgit v1.2.3 From 0e26c3cfcf0e7fe74f942c5278a8fe6110a7ab38 Mon Sep 17 00:00:00 2001 From: raingloom Date: Sun, 9 Feb 2020 04:18:04 +0100 Subject: gnu: Add Geary. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (geary): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e77b5f76e..da3241ad6e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2019 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2020 raingloom ;;; ;;; This file is part of GNU Guix. ;;; @@ -118,6 +119,7 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages libcanberra) #:use-module (gnu packages libunistring) + #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages lirc) @@ -9956,3 +9958,93 @@ manage remote and virtual systems.") license:cc-by2.0 ;; For all others. license:lgpl2.0+)))) + +(define-public geary + (package + (name "geary") + (version "3.34.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/geary") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "01cc921kyh3zxz07biqbdzkjgmdcc36kwjyajm4y382a75cl5zg7")))) + (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t + #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "test/meson.build" + (("test\\('client-tests', geary_test_client_bin\\)") + "")) + #t)) + (add-after 'unpack 'disable-postinstall-script + (lambda _ + (substitute* "meson.build" + (("meson.add_install_script\\(\ +join_paths\\('build-aux', 'post_install.py'\\)\\)") + "")) + #t)) + (add-before 'check 'setup-xvfb + (lambda _ + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (inputs + `(("enchant" ,enchant) + ("folks" ,folks) + ("gcr" ,gcr) + ("glib" ,glib) + ("gmime" ,gmime-2.6) + ("gnome-online-accounts:lib" + ,gnome-online-accounts "lib") + ("gspell" ,gspell) + ("gtk+" ,gtk+) + ("iso-codes" ,iso-codes) + ("json-glib" ,json-glib) + ("libcanberra" ,libcanberra) + ("libgee" ,libgee) + ("libhandy" ,libhandy) + ("libpeas" ,libpeas) + ("libsecret" ,libsecret) + ("libunwind" ,libunwind) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk) + ("ytnef" ,ytnef))) + (native-inputs + `(("appstream-glib" ,appstream-glib) + ("cmake-minimal" ,cmake-minimal) + ("desktop-file-utils" ,desktop-file-utils) + ("gettext" ,gnu-gettext) + ("glib:bin" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + ("itstool" ,itstool) + ("libarchive" ,libarchive) + ("libxml2" ,libxml2) + ("pkg-config" ,pkg-config) + ("vala" ,vala) + ("xvfb" ,xorg-server-for-tests))) + (synopsis "GNOME email application built around conversations") + (description + "Geary collects related messages together into conversations, +making it easy to find and follow your discussions. Full-text and keyword +search makes it easy to find the email you are looking for. Geary's +full-featured composer lets you send rich, styled text with images, links, and +lists, but also send lightweight, easy to read text messages. Geary +automatically picks up your existing GNOME Online Accounts, and adding more is +easy. Geary has a clean, fast, modern interface that works like you want it +to.") + (home-page "https://wiki.gnome.org/Apps/Geary") + (license (list + ;; geary + license:lgpl2.1+ + ;; icons + license:cc-by3.0 + license:cc-by-sa3.0 + license:public-domain + ;; snowball + license:bsd-2)))) -- cgit v1.2.3 From 382ba7bad59ec7205cd883bb93b5e6cf33329d66 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Wed, 18 Mar 2020 12:26:28 +0100 Subject: gnu: Add emacs-org-static-blog. * gnu/packages/emacs-xyz.scm (emacs-org-static-blog): New variable. --- gnu/packages/emacs-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a821bc7776..932170f136 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -63,6 +63,7 @@ ;;; Copyright © 2020 Masaya Tojo ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -21762,6 +21763,34 @@ records can be browsed and searched from the Emacs Calendar for convenience. All entries in a specified TODO state will be carried over to the next day.") (license license:bsd-3))) +(define-public emacs-org-static-blog + ;; Use the latest commit as the last release only contains half of the + ;; current total commits. New release requested at + ;; . + (package + (name "emacs-org-static-blog") + (version "20200117") + (home-page "https://github.com/bastibe/org-static-blog") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit "5c19300d7634e94ae813b1b66abc716fbb1e5fc9"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh")))) + (build-system emacs-build-system) + (synopsis + "Simple Org mode based static blog generator") + (description + "@code{emacs-org-static-blog} is one more static blog generator, it +focuses on being simple. All file are simple Org files in a directory. The +only requirement is that every Org file must have a @samp{title} and +a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") + (license license:bsd-3))) + (define-public emacs-ddskk ;; XXX: Upstream adds code names to their release tags, so version and code ;; name below need to be updated together. -- cgit v1.2.3 From 202c674ca794649070a13a5aa87ba034f15566bd Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 17 Mar 2020 19:10:10 +0100 Subject: gnu: emacs-which-key: update to 3.4.0 [[PGP Signed Part:No public key for 7C7AFFBEFEF2CB25 created at 2020-03-17T19:10:10+0100 using RSA]] * gnu/packages/emacs-xyz.scm (emacs-which-key): Update to 3.4.0 From f36fee740bab3d74b526358be421a1527af9b69d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 17 Mar 2020 19:03:45 +0100 Subject: [PATCH] gnu: emacs-which-key: update to 3.4.0 * gnu/packages/emacs-xyz.scm (emacs-which-key): Update to 3.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 932170f136..22f8f149f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10404,7 +10404,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") (define-public emacs-which-key (package (name "emacs-which-key") - (version "3.3.1") + (version "3.4.0") (source (origin (method git-fetch) @@ -10413,7 +10413,7 @@ or @code{treemacs}, but leveraging @code{Dired} to do the job of display.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dh6kr00wmql46whjkvnl953zngiv5j99ypvr1b3cb2174623afb")))) + (base32 "1ahgb7dqdc75farkl0fg0a6hvx2067gdvjq99cd3z2dz56km0p05")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From c1ec7149ed9950e8e285941ecfe96d9bcf980eed Mon Sep 17 00:00:00 2001 From: Dimakakos Dimos Date: Tue, 17 Mar 2020 23:42:04 +0200 Subject: gnu: emacs-lsp-ui: Update to 6.2. * gnu/packages/emacs-xyz.scm (emacs-lsp-ui): Update to 6.2. --- 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 22f8f149f9..723a1b2444 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -42,7 +42,7 @@ ;;; Copyright © 2018 Thorsten Wilms ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018, 2019, 2020 Brett Gilio -;;; Copyright © 2019 Dimakakos Dimos +;;; Copyright © 2019, 2020 Dimakakos Dimos ;;; Copyright © 2019 Brian Leung ;;; Copyright © 2019 mikadoZero ;;; Copyright © 2019 Gabriel Hondet @@ -18175,7 +18175,7 @@ processes for Emacs") (define-public emacs-lsp-ui (package (name "emacs-lsp-ui") - (version "6.0") + (version "6.2") (source (origin (method git-fetch) (uri (git-reference @@ -18184,7 +18184,7 @@ processes for Emacs") (file-name (git-file-name name version)) (sha256 (base32 - "1r4327fd8cvjxfwkddp5c4bdskyncbs4sx9m3z2w4d773y2jrakc")))) + "024753bi0p1jyjhw7wk8k6s16kbwab5ar4cfasvbn8g08acf293b")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From 97dba3876d90c1f988c3c962520a8b368f071bef Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 18 Mar 2020 14:42:10 +0100 Subject: gnu: emacs-org-static-blog: Update to 1.3.0. * gnu/packages/emacs-xyz.scm (emacs-org-static-blog): Update to 1.3.0. --- gnu/packages/emacs-xyz.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 723a1b2444..298cfb23b0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21764,24 +21764,20 @@ All entries in a specified TODO state will be carried over to the next day.") (license license:bsd-3))) (define-public emacs-org-static-blog - ;; Use the latest commit as the last release only contains half of the - ;; current total commits. New release requested at - ;; . (package (name "emacs-org-static-blog") - (version "20200117") - (home-page "https://github.com/bastibe/org-static-blog") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference - (url home-page) - (commit "5c19300d7634e94ae813b1b66abc716fbb1e5fc9"))) + (url "https://github.com/bastibe/org-static-blog") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh")))) + (base32 "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0")))) (build-system emacs-build-system) + (home-page "https://github.com/bastibe/org-static-blog") (synopsis "Simple Org mode based static blog generator") (description -- cgit v1.2.3 From 7b1fb40dff774d04f80f4a6f8d2961c22d21c741 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 18 Mar 2020 14:57:27 +0100 Subject: gnu: Add opencpn. * gnu/packages/geo.scm (opencpn): New variable. --- gnu/packages/geo.scm | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0e5afdae30..590da69934 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -47,15 +47,21 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages astronomy) + #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #: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 datastructures) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) + #:use-module (gnu packages gettext) + #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -66,8 +72,10 @@ #:use-module (gnu packages maths) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) + #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -1549,3 +1557,71 @@ exchanged form one Spatial DBMS and the other.") (license (list license:gpl2+ license:lgpl2.1+ license:mpl1.1)))) + +(define-public opencpn + (package + (name "opencpn") + (version "5.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/OpenCPN/OpenCPN.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xv3h6svw9aay5ixpql231md3pf00qxvhg62z88daraf18hlkfja")))) + (build-system cmake-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("bzip2" ,bzip2) + ("cairo" ,cairo) + ("curl" ,curl) + ("glu" ,glu) + ("gtk+" ,gtk+) + ("libarchive" ,libarchive) + ("libelf" ,libelf) + ("libexif" ,libexif) + ("libsndfile" ,libsndfile) + ("lz4" ,lz4) + ("mesa" ,mesa) + ("pango" ,pango) + ("portaudio" ,portaudio) + ("sqlite" ,sqlite) + ("tinyxml" ,tinyxml) + ("wxsvg" ,wxsvg) + ("wxwidgets" ,wxwidgets) + ("xz" ,xz) + ("zlib" ,zlib))) + (arguments + `(#:configure-flags '("-DENABLE_PORTAUDIO=ON" + "-DENABLE_SNDFILE=ON" + "-DBUNDLE_TCDATA=ON" + "-DBUNDLE_GSHHS=CRUDE") + #:tests? #f ; No tests defined + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ + (substitute* "CMakeLists.txt" + (("set\\(wxWidgets_CONFIG_OPTIONS.*--toolkit=gtk3" all) + (string-append all " --libs all"))) + #t))))) + (synopsis "Chart plotter and marine GPS navigation software") + (description + "OpenCPN is a chart plotter and marine navigation software designed to be +used at the helm station of your boat while underway. Chart a course and +track your position right from your laptop.") + (home-page "https://opencpn.org/") + (license (list license:asl2.0 + license:cc0 + license:bsd-2 + license:bsd-3 + license:expat + license:gpl3+ + license:lgpl2.1+ + license:lgpl3+ + license:sgifreeb2.0 + license:zlib)))) -- cgit v1.2.3 From 083a95b7e0af07beedaac1923ab559425fc294f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:47:33 +0100 Subject: gnu: r-shinyace: Use HTTPS home page. * gnu/packages/cran.scm (r-shinyace)[home-page]: Use HTTPS. --- 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 b9b3367691..5cd7955f1a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4926,7 +4926,7 @@ files.") (propagated-inputs `(("r-shiny" ,r-shiny) ("r-jsonlite" ,r-jsonlite))) - (home-page "http://cran.r-project.org/web/packages/shinyAce") + (home-page "https://cran.r-project.org/web/packages/shinyAce/") (synopsis "Ace editor bindings for Shiny") (description "This package provides Ace editor bindings to enable a rich text editing -- cgit v1.2.3 From b89993fbd44684b86f8756af2abf79f61f082ff9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:55:19 +0100 Subject: gnu: r-ldheatmap: Use HTTPS home page. * gnu/packages/cran.scm (r-ldheatmap)[home-page]: Use HTTPS. --- 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 5cd7955f1a..df177b9e86 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13535,7 +13535,7 @@ inbred lines, F2 intercrosses, and association mapping populations.") `(("r-genetics" ,r-genetics) ("r-rcpp" ,r-rcpp) ("r-snpstats" ,r-snpstats))) - (home-page "http://stat.sfu.ca/statgen/research/ldheatmap.html") + (home-page "https://stat.sfu.ca/statgen/research/ldheatmap.html") (synopsis "Graphical display of pairwise linkage disequilibria between SNPs") (description "This package provides tools to produce a graphical display, as a heat -- cgit v1.2.3 From 917edde5802065e7fe62b3b38a1c00e1c2eda293 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:58:48 +0100 Subject: gnu: r-stepwise: Use HTTPS home page. * gnu/packages/cran.scm (r-stepwise)[home-page]: Use HTTPS. --- 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 df177b9e86..d7f64a5ec5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12929,7 +12929,7 @@ Hubbell's @dfn{Unified Neutral Theory of Biodiversity} (UNTB).") (base32 "1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2")))) (build-system r-build-system) - (home-page "http://stat.sfu.ca/statgen/research/stepwise.html") + (home-page "https://stat.sfu.ca/statgen/research/stepwise.html") (synopsis "Stepwise detection of recombination breakpoints") (description "This package provides a stepwise approach to identifying recombination -- cgit v1.2.3 From 8a02807a127b424419fd4f8c5eb13579a0e46b7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:07:18 +0100 Subject: gnu: r-proc: Update home page. * gnu/packages/cran.scm (r-proc)[home-page]: Follow (HTTPS) redirection. --- 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 d7f64a5ec5..d1d5774a52 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6878,7 +6878,7 @@ containing one or more SNPs that evolved under directional selection.") (propagated-inputs `(("r-plyr" ,r-plyr) ("r-rcpp" ,r-rcpp))) - (home-page "http://expasy.org/tools/pROC/") + (home-page "https://web.expasy.org/pROC/") (synopsis "Display and analyze ROC curves") (description "This package provides tools for visualizing, smoothing and comparing -- cgit v1.2.3 From e309b7206f61274e654588f915e4bcb563274014 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:21:20 +0100 Subject: gnu: r-stabledist: Use HTTPS home page. * gnu/packages/cran.scm (r-stabledist)[home-page]: Use HTTPS. --- 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 d1d5774a52..565fef8628 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9579,7 +9579,7 @@ related functions.") (base32 "0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86")))) (build-system r-build-system) - (home-page "http://www.rmetrics.org") + (home-page "https://www.rmetrics.org") (synopsis "Stable distribution functions") (description "This package provides density, probability and quantile functions, and -- cgit v1.2.3 From 2bc3ec3b44ffb7d2da0b0dabcc3135dcf8f2057d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 05:49:06 +0100 Subject: gnu: dovecot: Support LZ4 compression. * gnu/packages/mail.scm (dovecot)[inputs]: Add lz4. --- gnu/packages/mail.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fb5446107c..f3499b28d2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1393,11 +1393,12 @@ facilities for checking incoming mail.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("openssl" ,openssl) - ("zlib" ,zlib) - ("bzip2" ,bzip2) + `(("bzip2" ,bzip2) + ("linux-pam" ,linux-pam) + ("lz4" ,lz4) + ("openssl" ,openssl) ("sqlite" ,sqlite) - ("linux-pam" ,linux-pam))) + ("zlib" ,zlib))) (arguments `(#:configure-flags '("--sysconfdir=/etc" "--localstatedir=/var") -- cgit v1.2.3 From 61d399c5fb2c50c7a0f34b8000c03ad1f0f44082 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:57:39 +0100 Subject: gnu: pioneer: Use HTTPS home page. * gnu/packages/games.scm (pioneer)[home-page]: Use HTTPS. --- gnu/packages/games.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 30045c9f96..59639a0138 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5662,7 +5662,7 @@ elements to achieve a simple goal in the most complex way possible.") #:configure-flags (list "-DUSE_SYSTEM_LIBLUA:BOOL=YES" (string-append "-DPIONEER_DATA_DIR=" %output "/share/games/pioneer")))) - (home-page "http://pioneerspacesim.net") + (home-page "https://pioneerspacesim.net") (synopsis "Game of lonely space adventure") (description "Pioneer is a space adventure game set in our galaxy at the turn of the -- cgit v1.2.3 From 4de63cf3fc0a831d75cb507456821104f24800c2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 17:48:43 +0100 Subject: gnu: tor: Update to 0.4.2.7. * gnu/packages/tor.scm (tor): Update to 0.4.2.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 d0b8dd6af4..61e52ba22c 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 -;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Eric Bavier ;;; Copyright © 2017 Rutger Helling ;;; Copyright © 2018 Ricardo Wurmus @@ -50,14 +50,14 @@ (define-public tor (package (name "tor") - (version "0.4.2.6") + (version "0.4.2.7") (source (origin (method url-fetch) (uri (string-append "https://dist.torproject.org/tor-" version ".tar.gz")) (sha256 (base32 - "1i766s211nrbjvwvkd2375mjsbbc28yrg46564rbx6w46cj10005")))) + "0v82ngwwmmcb7i9563bgsmrjy6xp83xyhqhaljygd0pkvlsxi886")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 30f9236685860209e0a5cb0a0e4f1459633905c4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Mar 2020 16:45:00 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.111. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.111. (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 6a29565aad..5d5e7e862d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ 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.110") +(define-public linux-libre-4.19-version "4.19.111") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "15kbgj13vsr74c61vzs96a72k86x205jjq5bz9pbn70698n3s4fa"))) + (hash (base32 "0cjjf3wbvbkjy4mss8c74afx8ng31i22km66ydh9f9mz182piyy6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From b3fa8349ab65aaa4797651aabd551077c57c117e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Mar 2020 16:46:06 -0400 Subject: gnu: linux-libre: Update to 5.4.26. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.26. (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 5d5e7e862d..0e649d0fe3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,10 +362,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.25") +(define-public linux-libre-5.4-version "5.4.26") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "09ay0adc3s3m7qk0nj5lkmrp5i0q76a9kax0xix8914d115rgvf0"))) + (hash (base32 "1bqdiw4pjzwm7pxml2dl09bj85ijs82rq788c58681zgmvs796k6"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From db483baa1a23934625b07c01c6a294301d2311b9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 18 Mar 2020 21:50:14 +0100 Subject: gnu: emacs-org-static-blog: Fix typo in description. * gnu/packages/emacs-xyz.scm (emacs-org-static-blog)[description]: Fix typo. --- 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 298cfb23b0..6682403ebc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21782,7 +21782,7 @@ All entries in a specified TODO state will be carried over to the next day.") "Simple Org mode based static blog generator") (description "@code{emacs-org-static-blog} is one more static blog generator, it -focuses on being simple. All file are simple Org files in a directory. The +focuses on being simple. All files are simple Org files in a directory. The only requirement is that every Org file must have a @samp{title} and a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") (license license:bsd-3))) -- cgit v1.2.3 From 48a13b4b82cbb0a6f8234263d578bbf58598f9f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:36:59 +0100 Subject: gnu: Use HTTPS for non.tuxfamily.org home pages. * gnu/packages/music.scm (non-timeline, non-mixer, non-session-manager) (non-sequencer)[home-page]: Use HTTPS. --- gnu/packages/music.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fd9cd6c30f..0f4b75b1b6 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1040,7 +1040,7 @@ Guile.") ("ntk" ,ntk))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://non.tuxfamily.org/wiki/Non%20Sequencer") + (home-page "https://non.tuxfamily.org/wiki/Non%20Sequencer") (synopsis "Pattern-based MIDI sequencer") (description "The Non Sequencer is a powerful, lightweight, real-time, @@ -1064,7 +1064,7 @@ transport is rolling.") ("ntk" ,ntk))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://non.tuxfamily.org/nsm/") + (home-page "https://non.tuxfamily.org/nsm/") (synopsis "Audio session management") (description "The Non Session Manager is an API and an implementation for audio @@ -1088,7 +1088,7 @@ communicate with the session management daemon.") ("ntk" ,ntk))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://non.tuxfamily.org/wiki/Non%20Mixer") + (home-page "https://non.tuxfamily.org/wiki/Non%20Mixer") (synopsis "Modular digital audio mixer") (description "The Non Mixer is a powerful, reliable and fast modular digital audio @@ -1113,7 +1113,7 @@ studio.") ("ntk" ,ntk))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "http://non.tuxfamily.org/wiki/Non%20Timeline") + (home-page "https://non.tuxfamily.org/wiki/Non%20Timeline") (synopsis "Modular digital audio timeline arranger") (description "The Non Timeline is a powerful, reliable and fast modular digital audio -- cgit v1.2.3 From 0e2e942515f18d2880dfdf05bad57f49f85535e6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:18:44 +0100 Subject: gnu: r-snowfall: Use HTTPS home page. * gnu/packages/cran.scm (r-snowfall)[home-page]: Use HTTPS. --- 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 565fef8628..0f346e95d8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5617,7 +5617,7 @@ using the @code{snow} package.") (build-system r-build-system) (propagated-inputs `(("r-snow" ,r-snow))) - (home-page "http://cran.r-project.org/web/packages/snowfall/") + (home-page "https://cran.r-project.org/web/packages/snowfall/") (synopsis "Easier cluster computing") (description "This package is a usability wrapper around snow for easier development of parallel R programs. This package offers e.g. extended error -- cgit v1.2.3 From 51d9c867aacf1ff3585f01181ccb36271fd920c7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:26:30 +0100 Subject: gnu: r-rhpcblasctl: Use HTTPS home page. * gnu/packages/cran.scm (r-rhpcblasctl)[home-page]: Use HTTPS. --- 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 0f346e95d8..4c18275eaa 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15473,7 +15473,7 @@ path of values for the regularization parameter.") "0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp")))) (properties `((upstream-name . "RhpcBLASctl"))) (build-system r-build-system) - (home-page "http://prs.ism.ac.jp/~nakama/Rhpc/") + (home-page "https://prs.ism.ac.jp/~nakama/Rhpc/") (synopsis "Control the number of threads on BLAS") (description "This package allows you to control the number of threads the BLAS -- cgit v1.2.3 From 181d19ab2c069448753e68939bc484b302342e38 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:41:57 +0100 Subject: gnu: extempore: Use HTTPS home page. * gnu/packages/music.scm (extempore)[home-page]: 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 0f4b75b1b6..468be9937f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -754,7 +754,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 "http://digego.github.io/extempore/") + (home-page "https://digego.github.io/extempore/") (synopsis "Programming environment for live coding of multimedia") (description "Extempore is a programming language and runtime environment designed -- cgit v1.2.3 From d6894b95ec541d55447126436340faa1d86d0c5e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 20:17:01 +0100 Subject: gnu: dovecot: Use SQLite. * gnu/packages/mail.scm (dovecot)[arguments]: Add "--with-sqlite" to #:configure-flags. --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f3499b28d2..e7931cc670 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1401,7 +1401,8 @@ facilities for checking incoming mail.") ("zlib" ,zlib))) (arguments `(#:configure-flags '("--sysconfdir=/etc" - "--localstatedir=/var") + "--localstatedir=/var" + "--with-sqlite") ; not auto-detected #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-file-names -- cgit v1.2.3 From 8826b792d81c76571a562cb3d62ed5550e4ae04d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 21:23:48 +0100 Subject: gnu: dovecot: Use libsodium. This adds support for ARGON2I and ARGON2ID password hashing in exchange for a <1% increase in closure size. * gnu/packages/mail.scm (dovecot)[inputs]: Add libsodium. (dovecot-libsodium-plugin)[description]: Note its use. --- 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 e7931cc670..d5eaf67ccb 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1394,6 +1394,7 @@ facilities for checking incoming mail.") `(("pkg-config" ,pkg-config))) (inputs `(("bzip2" ,bzip2) + ("libsodium" ,libsodium) ; extra password algorithms ("linux-pam" ,linux-pam) ("lz4" ,lz4) ("openssl" ,openssl) @@ -1516,8 +1517,8 @@ using libsodium sealed boxes. (home-page "https://github.com/LuckyFellow/dovecot-libsodium-plugin") (synopsis "Libsodium password hashing schemes plugin for Dovecot") (description - "@code{dovecot-libsodium-plugin} provides libsodium password -hashing schemes plugin for @code{Dovecot}.") + "@code{dovecot-libsodium-plugin} provides a libsodium password +hashing scheme (such as scrypt) plug-in for @code{Dovecot}.") (license gpl3+)))) (define-public isync -- cgit v1.2.3 From 1b9e1648f631c2692712f3457e239154955cd371 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 23:23:19 +0100 Subject: gnu: workrave: Update to 1.10.37. * gnu/packages/gnome.scm (workrave): Update to 1.10.37. [arguments]: Disable #:tests?. --- gnu/packages/gnome.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index da3241ad6e..ff82c570d0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9296,7 +9296,7 @@ configurable file renaming. ") (define-public workrave (package (name "workrave") - (version "1.10.34") + (version "1.10.37") (source (origin (method git-fetch) @@ -9307,8 +9307,11 @@ configurable file renaming. ") version))))) (file-name (git-file-name name version)) (sha256 - (base32 "0czwhr7nw523753ajcjjfwrf91mq8pmzr19gp0srqsvb1dsn1zcf")))) + (base32 "01cxy7606hx9wgxl550l4p2xa9hsy0rk7swsp58hyi842z2z0y13")))) (build-system glib-or-gtk-build-system) + (arguments + ;; The only tests are maintainer tests (in po/), which fail. + `(#:tests? #f)) (inputs `(("glib" ,glib) ("gtk+" ,gtk+) ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From f73c1a48ce54e86f46ddea8f4b8cd245bb653853 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 23:29:36 +0100 Subject: gnu: chafa: Update to 1.2.2. * gnu/packages/image-viewers.scm (chafa): Update to 1.2.2. --- gnu/packages/image-viewers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 989deb1707..8f3f61c4b1 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -509,14 +509,14 @@ preloading.") (define-public chafa (package (name "chafa") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "https://hpjansson.org/chafa/releases/chafa-" version ".tar.xz")) (sha256 (base32 - "1hj4vdyczby8h52ff23qxl8ng18p5jy549idngpiddwszf5s4drz")))) + "0aa7119514rhsak5i0kgvwllb9z74lnfzfn7dzfhs27fc8cvx1dg")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 30ae1e8c942b6b7a6efd13eff36e03228fda8e8b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 23:40:09 +0100 Subject: gnu: inxi-minimal: Update to 3.0.38-1. * gnu/packages/admin.scm (inxi-minimal): Update to 3.0.38-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 9b1844f36d..382f631ebd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3234,7 +3234,7 @@ Python loading in HPC environments.") (let ((real-name "inxi")) (package (name "inxi-minimal") - (version "3.0.37-1") + (version "3.0.38-1") (source (origin (method git-fetch) @@ -3243,7 +3243,7 @@ Python loading in HPC environments.") (commit version))) (file-name (git-file-name real-name version)) (sha256 - (base32 "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f")))) + (base32 "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm")))) (build-system trivial-build-system) (inputs `(("bash" ,bash-minimal) -- cgit v1.2.3 From 6d27891aa0856575617561ba22ab256fab879c9e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 00:34:39 +0100 Subject: gnu: bind: Update to 9.16.1. * gnu/packages/dns.scm (isc-bind): Update to 9.16.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 100a71d3bd..cc9dc28391 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -114,7 +114,7 @@ and BOOTP/TFTP for network booting of diskless machines.") (define-public isc-bind (package (name "bind") - (version "9.16.0") + (version "9.16.1") (source (origin (method url-fetch) (uri (string-append @@ -122,7 +122,7 @@ and BOOTP/TFTP for network booting of diskless machines.") "/bind-" version ".tar.xz")) (sha256 (base32 - "0a1f1wrlbnmq79q6s15fny36ip81malg6wlr8acp7amimsyxjjxg")))) + "14ayswxnyaqwb935iqdi1w9ih3zs0a0va59j4cyi5f9mh7kxf4x9")))) (build-system gnu-build-system) (outputs `("out" "utils")) (inputs -- cgit v1.2.3 From a79b7ab5a288ace353415bd73dc714ed0ecabe62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 00:34:59 +0100 Subject: gnu: lablgtk: Update to 2.18.10. * gnu/packages/ocaml.scm (lablgtk): Update to 2.18.10. --- gnu/packages/ocaml.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 35701039ad..74d0bd06f2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -764,16 +764,16 @@ Knuth’s LR(1) parser construction technique.") (define-public lablgtk (package (name "lablgtk") - (version "2.18.8") + (version "2.18.10") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/garrigue/lablgtk") - (commit "lablgtk2188"))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gpww8bkwi5cl68kc006970zvzwvq73h1mwrnd239apmwlxc1l8a")))) + "0w8cdfcv2wc19sd3qzj3qq77qc6rbnbynsz02gzbl15kgrvgrfxi")))) (build-system gnu-build-system) (native-inputs `(("ocaml" ,ocaml) -- cgit v1.2.3 From 0c34b5e6d0f2620ba3cab4d36f8df153dfe8fee2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:13:40 +0100 Subject: gnu: camlzip: Update home page. * gnu/packages/ocaml.scm (camlzip)[home-page]: Update. --- 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 74d0bd06f2..5d32997a69 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1038,7 +1038,7 @@ other XUnit testing frameworks.") (list "all" "allopt" (string-append "INSTALLDIR=" (assoc-ref %outputs "out") "/lib/ocaml")))) - (home-page "http://forge.ocamlcore.org/projects/camlzip") + (home-page "https://github.com/xavierleroy/camlzip") (synopsis "Provides easy access to compressed files") (description "Provides easy access to compressed files in ZIP, GZIP and JAR format. It provides functions for reading from and writing to compressed -- cgit v1.2.3 From 2e7d1c567d2e475807014d8cc0d45e7e54767c02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:05:39 +0100 Subject: gnu: libmygpo-qt: Update home page. * gnu/packages/gpodder.scm (libmygpo-qt)[home-page]: Update. --- gnu/packages/gpodder.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 8e7c961929..8bf69c6551 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -127,7 +127,7 @@ locally for later listening.") ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 ;; is fixed. #:tests? #f)) - (home-page "http://wiki.gpodder.org/wiki/Libmygpo-qt") + (home-page "https://gpodder.github.io") (synopsis "Qt/C++ library wrapping the gpodder web service") (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the @url{https://gpodder.net} APIs. It allows applications to discover, manage -- cgit v1.2.3 From 4a0399e277fd76dea018dfc216c30f9ffc16104c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:19:35 +0100 Subject: gnu: jrnl: Use HTTPS home page. * gnu/packages/jrnl.scm (jrnl)[home-page]: Use HTTPS. --- gnu/packages/jrnl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index e5e2a4ba4f..5b57cc7c9b 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -55,7 +55,7 @@ ("python-six" ,python-six) ("python-dateutil" ,python-dateutil) ("python-parsedatetime" ,python-parsedatetime))) - (home-page "http://maebert.github.io/jrnl/") + (home-page "https://maebert.github.io/jrnl/") (synopsis "Personal journal application") (description "Jrnl is a command line journal application that stores your journal in a -- cgit v1.2.3 From 619ffa02ef4b3c30decf8c65cefc7472609c4f59 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:55:23 +0100 Subject: gnu: camlp5: Update home page. * gnu/packages/ocaml.scm (camlp5)[home-page]: Update. --- 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 5d32997a69..c9a1037902 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -570,7 +570,7 @@ Git-friendly development workflow.") (install-file "etc/META" (string-append (assoc-ref outputs "out") "/lib/ocaml/camlp5/")) #t))))) - (home-page "http://camlp5.gforge.inria.fr/") + (home-page "https://camlp5.github.io/") (synopsis "Pre-processor Pretty Printer for OCaml") (description "Camlp5 is a Pre-Processor-Pretty-Printer for Objective Caml. It offers -- cgit v1.2.3 From 85b9ae93f0e5d8eaa14d149e03484c055b21dc11 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:25:50 +0100 Subject: gnu: Use HTTPS for supported psyc.eu subdomains. * gnu/packages/messaging.scm (libpsyc)[home-page]: Use HTTPS. (perl-net-psyc)[source, description, home-page]: Likewise. --- gnu/packages/messaging.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index f8b743f766..af3d4bb733 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1280,7 +1280,7 @@ into existing applications.") (source (origin (method url-fetch) - (uri (string-append "http://perlpsyc.psyc.eu/" + (uri (string-append "https://perl.psyc.eu/" "perlpsyc-" version ".zip")) (file-name (string-append name "-" version ".zip")) (sha256 @@ -1339,10 +1339,10 @@ into existing applications.") (description "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and Gtk2 event loops. This package includes 12 applications and additional scripts: -psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a control console +psycion (a @uref{https://about.psyc.eu,PSYC} chat client), remotor (a control console for @uref{https://torproject.org,tor} router) and many more.") (synopsis "Perl implementation of PSYC protocol") - (home-page "http://perlpsyc.psyc.eu/") + (home-page "https://perl.psyc.eu") (license (list license:gpl2 license:perl-license ;; contrib/irssi-psyc.pl: @@ -1378,7 +1378,7 @@ for @uref{https://torproject.org,tor} router) and many more.") ;; therefore we do not include them. ;; TODO: Get a cargo build system in Guix. (delete 'configure)))) ; no configure script - (home-page "http://about.psyc.eu/libpsyc") + (home-page "https://about.psyc.eu/libpsyc") (description "@code{libpsyc} is a PSYC library in C which implements core aspects of PSYC, useful for all kinds of clients and servers -- cgit v1.2.3 From f44c555b7d5e631a1200c6ef0e43775e1b82dcc2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 01:38:44 +0100 Subject: gnu: neomutt: Update to 20200313. * gnu/packages/mail.scm (neomutt): Update to 20200313. --- 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 d5eaf67ccb..03383180b0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -427,7 +427,7 @@ operating systems.") (define-public neomutt (package (name "neomutt") - (version "20191207") + (version "20200313") (source (origin (method git-fetch) @@ -436,7 +436,7 @@ operating systems.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "147yjpqnsbfy01fhsflxlixk0985r91a6bjmqq3cwmf7gka3sihm")))) + (base32 "1k4k07l6h5krc3fx928qvdq3ssw9fxn95aj7k885xlckd2i1lnb5")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) -- cgit v1.2.3 From bfa368ed0a14ae0f0273587425d8677ed5682ea7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:07:25 +0100 Subject: gnu: aircrack-ng: Update to 1.6. * gnu/packages/networking.scm (aircrack-ng): Update to 1.6. --- 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 607416fe41..e9abac2991 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -899,15 +899,14 @@ live network and disk I/O bandwidth monitor.") (define-public aircrack-ng (package (name "aircrack-ng") - (version "1.5.2") + (version "1.6") (source (origin (method url-fetch) (uri (string-append "https://download.aircrack-ng.org/aircrack-ng-" version ".tar.gz")) (sha256 - (base32 - "0hc2x17bxk2n00z8jj5jfwq3z41681fd19n018724il0cpkjyncy")))) + (base32 "0ix2k64qg7x3w0bzdsbk1m50kcpq1ws59g3zkwiafvpwdr4gs2sg")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From b8e777efcfca32c5277d03812393c938e9424768 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:11:28 +0100 Subject: gnu: python-glances: Update to 3.1.4. * gnu/packages/python-xyz.scm (python-glances): Update to 3.1.4. --- 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 c6d3e2ce19..b0417192bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11959,13 +11959,13 @@ command @command{natsort} that exposes this functionality in the command line.") (define-public python-glances (package (name "python-glances") - (version "3.1.2") + (version "3.1.4") (source (origin (method url-fetch) (uri (pypi-uri "Glances" version)) (sha256 - (base32 "15384pbvw9wj4sb8zgvd9v1812vrypbyjg0acicjf1hdb3p30fkk")) + (base32 "0dc47gbvp9a3wxppdqihxpglxxaxbj3hcvzgcxxq8zcsciah3plq")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 16b8503f55f2e8869c5670e7cd361e69ac1db165 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:12:20 +0100 Subject: gnu: Remove python2-glances variant. * gnu/packages/python-xyz.scm (python2-glances): Remove variable. --- 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 b0417192bf..a2c3844d65 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11989,9 +11989,6 @@ Glances uses the PsUtil library to get information from your system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") (license license:lgpl3+))) -(define-public python2-glances - (package-with-python2 python-glances)) - (define-public python-graphql-core (package (name "python-graphql-core") -- cgit v1.2.3 From 58d902741240d52d783e77ef3a0540642bd91e4c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:20:40 +0100 Subject: gnu: glances: Deprecate python- prefix. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/package/python-xyz.scm (glances): New public variable renamed from…… (python-glances): …this now-deprecated one. --- gnu/packages/python-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a2c3844d65..86e87ae4dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11956,9 +11956,9 @@ command @command{natsort} that exposes this functionality in the command line.") `(("python2-pathlib" ,python2-pathlib) ,@(package-native-inputs base)))))) -(define-public python-glances +(define-public glances (package - (name "python-glances") + (name "glances") (version "3.1.4") (source (origin @@ -11989,6 +11989,9 @@ Glances uses the PsUtil library to get information from your system. It monitors CPU, load, memory, network bandwidth, disk I/O, disk use, and more.") (license license:lgpl3+))) +(define-public python-glances + (deprecated-package "python-glances" glances)) + (define-public python-graphql-core (package (name "python-graphql-core") -- cgit v1.2.3 From 78cb0f3cf81ea547510691b5fc008153adfac736 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Thu, 19 Mar 2020 07:41:00 +0100 Subject: gnu: sbcl-cl-webkit: Update to 20200319. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 20200319. --- 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 078f88a70f..d9986463a0 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3008,7 +3008,7 @@ is a library for creating graphical user interfaces.") (sbcl-package->cl-source-package sbcl-cl-cffi-gtk)) (define-public sbcl-cl-webkit - (let ((commit "79ad41996a1bd7fc8e53fe8d168e8f2030603b14")) + (let ((commit "4832c99c31e0eb1fcce3779d119343ae8a423952")) (package (name "sbcl-cl-webkit") (version (git-version "2.4" "1" commit)) @@ -3021,7 +3021,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "1gxvmxmss5k79v2ccigx92q46zbydxh9r7plnnqh8na348pffgcs")))) + "0sn7m181wfg1q49q45dlsry8c38x7pziqcs0frnymk6yvgndybxd")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit v1.2.3 From c6d24c091c76f8a82d1cbcb9d0957eec183939ca Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:09:49 +0100 Subject: gnu: OpenSSL: Update replacement to 1.1.1e [fixes CVE-2019-1551]. * gnu/packages/tls.scm (openssl-1.1.1d): Rename to ... (openssl-1.1.1e): ... this. Update to 1.1.1e. (openssl)[replacement]: Adjust accordingly. --- gnu/packages/tls.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index c8eea9c928..bb80d86ba4 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -307,7 +307,7 @@ required structures.") (package (name "openssl") (version "1.1.1c") - (replacement openssl-1.1.1d) + (replacement openssl-1.1.1e) (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -409,10 +409,10 @@ required structures.") (license license:openssl) (home-page "https://www.openssl.org/"))) -(define openssl-1.1.1d +(define openssl-1.1.1e (package (inherit openssl) - (version "1.1.1d") + (version "1.1.1e") (source (origin (method url-fetch) (uri (list (string-append "https://www.openssl.org/source/openssl-" @@ -425,7 +425,7 @@ required structures.") (patches (search-patches "openssl-1.1-c-rehash-in.patch")) (sha256 (base32 - "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy")))))) + "1gnwlri1dphr5wdzmg9vlhkh6aq2yqgpfkpmffzwjlfb26n62kv9")))))) (define-public openssl-1.0 (package -- cgit v1.2.3 From 24b5767dad70ac07c9ced74527699e1d6d6d69e8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:47:30 +0100 Subject: gnu: git: Update to 2.25.2. * gnu/packages/version-control.scm (git): Update to 2.25.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 86b1d58654..e7260c0116 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -150,14 +150,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.25.1") + (version "2.25.2") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2")))) + "08vivrv3my8nlp40pwsf7mcc5k7dwyh34hadjszx7qj8w01p34wv")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -170,7 +170,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "15pfm7j4wq8ryp9n9d81h8v0arl15yq9i6cigw45walnq5r6721h")))) + "06nlw6vaqvavkr4nia9qvanqbhaig4hbg9r5f0i9lbvw1hmykfvq")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) -- cgit v1.2.3 From aa0063a00a2f4ce94e6ed63de4c30d0673303574 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:47:42 +0100 Subject: gnu: libsecret: Update to 0.20.2. * gnu/packages/gnome.scm (libsecret): Update to 0.20.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 ff82c570d0..5f34b5d184 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3826,7 +3826,7 @@ and the GLib main loop, to integrate well with GNOME applications.") (define-public libsecret (package (name "libsecret") - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri (string-append @@ -3835,7 +3835,7 @@ and the GLib main loop, to integrate well with GNOME applications.") "libsecret-" version ".tar.xz")) (sha256 (base32 - "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp")))) + "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1")))) (build-system gnu-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 9a9cd9bc7bdd6e716b76dfb36533f276d2439593 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:48:01 +0100 Subject: gnu: libsoup: Update to 2.70.0. * gnu/packages/gnome.scm (libsoup): Update to 2.70.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 5f34b5d184..0fb474046d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3703,7 +3703,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.68.4") + (version "2.70.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -3711,7 +3711,7 @@ libxml to ease remote use of the RESTful API.") "libsoup-" version ".tar.xz")) (sha256 (base32 - "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d")))) + "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 1912ea50031414e8f053e3c851ec0ec6a0e24c61 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:48:23 +0100 Subject: gnu: dav1d: Update to 0.6.0. * gnu/packages/video.scm (dav1d): Update to 0.6.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 62b19e2dfb..0c245ece6e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3701,7 +3701,7 @@ transitions, and effects and then export your film to many common formats.") (define-public dav1d (package (name "dav1d") - (version "0.5.2") + (version "0.6.0") (source (origin (method url-fetch) @@ -3709,7 +3709,7 @@ transitions, and effects and then export your film to many common formats.") "/dav1d/" version "/dav1d-" version ".tar.xz")) (sha256 (base32 - "02hgarv2x2bqbac15pdj7pbm8f4lyn78ws0dncygvhis9a6ghk7r")))) + "0w5k572jzxp7zwdbsa0jgjzri6hsrkydawzzilrw46nxpcak37q9")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From 63efc495c19fa0ce52254eabd8c15605b42d7d5f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:48:45 +0100 Subject: gnu: libwpe: Update to 1.6.0. * gnu/packages/webkit.scm (libwpe): Update to 1.6.0. --- 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 16e2b009fc..1437952516 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -64,14 +64,14 @@ (define-public libwpe (package (name "libwpe") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/libwpe-" version ".tar.xz")) (sha256 (base32 - "1221vs72zs87anrzhbm6pf8jnii7s6ms7mkzj6nlds9zqd7lklz2")))) + "141w35b488jjhanl3nrm0awrbcy6hb579fk8n9vbpx07m2wcd1rm")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From 76e8818b94ef9c753988664799ac6c0eccb60903 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:49:02 +0100 Subject: gnu: wpebackend-fdo: Update to 1.6.0. * gnu/packages/webkit.scm (wpebackend-fdo): Update to 1.6.0. --- 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 1437952516..2c8697223c 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -93,14 +93,14 @@ backend which implements them.") (define-public wpebackend-fdo (package (name "wpebackend-fdo") - (version "1.4.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://wpewebkit.org/releases/" "wpebackend-fdo-" version ".tar.xz")) (sha256 (base32 - "07wd736d4nhd2vpxnjzv9pb8firvbn11jmdbnhpkhjxbxa1k86pw")))) + "0rzm16m3mw9dh2jis9avk2rhz7bijanrzlywyiaicyzrv2wxfnvz")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ;no tests -- cgit v1.2.3 From 0029e65581e7161b96d2cbd1cae78a116416da5e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:49:22 +0100 Subject: gnu: RocksDB: Update to 6.7.3. * gnu/packages/databases.scm (rocksdb): Update to 6.7.3. --- 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 5727905beb..130aaa2653 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1140,7 +1140,7 @@ including field and record folding."))) (define-public rocksdb (package (name "rocksdb") - (version "6.6.4") + (version "6.7.3") (source (origin (method git-fetch) (uri (git-reference @@ -1149,7 +1149,7 @@ including field and record folding."))) (file-name (git-file-name name version)) (sha256 (base32 - "1h7y31b05w4vv4v509l368j9qlbv5assmdq9hp2788zipqbpywc0")) + "19nacd7fb98i97ir07jjsk3l1vf7zzq04c4nqywizq8wakcx99s9")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From c7f06b2b57bd8133863377d24dba5eaa7048ba68 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:49:40 +0100 Subject: gnu: varnish: Update to 6.4.0. * gnu/packages/web.scm (varnish): Update to 6.4.0. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index bde8c2bbb5..0f5f4d2d69 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5480,13 +5480,13 @@ deployments.") (package (name "varnish") (home-page "https://varnish-cache.org/") - (version "6.3.2") + (version "6.4.0") (source (origin (method url-fetch) (uri (string-append home-page "_downloads/varnish-" version ".tgz")) (sha256 (base32 - "1f5ahzdh3am6fij5jhiybv3knwl11rhc5r3ig1ybzw55ai7788q8")))) + "1hkn98vbxk7rc1sd08367qn6rcv8wkxgwbmm1x46y50vi0nvldpn")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib") -- cgit v1.2.3 From e7a90f28cb2a9c662fa7213b4fefb1196acbbefd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 07:58:08 +0100 Subject: gnu: git: Enable parallel tests. * gnu/packages/version-control.scm (git)[arguments]: Remove #:parallel-testS?. --- gnu/packages/version-control.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e7260c0116..d25df4c63d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -235,9 +235,6 @@ as well as the classic centralized workflow.") #:test-target "test" - ;; Tests fail randomly when parallel: . - #:parallel-tests? #f - ;; The explicit --with-tcltk forces the build system to hardcode the ;; absolute file name to 'wish'. #:configure-flags (list (string-append "--with-tcltk=" -- cgit v1.2.3 From baab9eef27994575e3ce1ba7efb822725600f748 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 08:29:06 +0100 Subject: gnu: python2-cython: Exclude parallel tests on i686 systems. * gnu/packages/python-xyz.scm (python2-cython)[arguments]: When building on i686-linux, override the 'check' phase. --- 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 86e87ae4dc..07199aa7ca 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3685,6 +3685,18 @@ writing C extensions for Python as easy as Python itself.") (substitute-keyword-arguments (package-arguments base) ((#:phases phases) `(modify-phases ,phases + ;; XXX: On i686-linux, running the parallel tests fails on many-core + ;; systems, see . + ;; TODO: Move this logic to the regular check phase in a future + ;; rebuild cycle. + ,@(if (string-prefix? "i686" (%current-system)) + '((replace 'check + (lambda _ + (setenv "CFLAGS" "-O0") + (invoke "python" "runtests.py" "-vv" + "-j" (number->string (parallel-job-count)) + "-x" "run.parallel")))) + '()) (add-before 'check 'adjust-test_embed (lambda _ (substitute* "runtests.py" -- cgit v1.2.3 From 0883f34c5152b249f8aa05ba7deb0400ea150628 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 19 Mar 2020 09:09:47 +0100 Subject: gnu: ungoogled-chromium: Update to 80.0.3987.149-0.516e2d9 [security fixes]. This releases fixes CVE-2020-6422, CVE-2020-6424, CVE-2020-6425, CVE-2020-6426, CVE-2020-6427, CVE-2020-6428, CVE-2020-6429, CVE-2019-20503, and CVE-2020-6449. * gnu/packages/chromium.scm (%chromium-version): Set to 80.0.3987.149. (%ungoogled-revision): Set to 516e2d990a50a4bbeb8c583e56333c2935e2af95. (%chromium-origin, %ungoogled-origin): 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 bb0993a4b4..e90d4e7184 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -247,8 +247,8 @@ from forcing GEXP-PROMISE." #:system system #:guile-for-build guile))) -(define %chromium-version "80.0.3987.132") -(define %ungoogled-revision "7e68f18f1d16a132fe7d913a176daf79897eaa58") +(define %chromium-version "80.0.3987.149") +(define %ungoogled-revision "516e2d990a50a4bbeb8c583e56333c2935e2af95") (define %debian-revision "debian/80.0.3987.116-1") (define package-revision "0") (define %package-version (string-append %chromium-version "-" @@ -263,7 +263,7 @@ from forcing GEXP-PROMISE." %chromium-version ".tar.xz")) (sha256 (base32 - "00f2hpi2d0n15yw29dv3dli566cgi7qh55bfpziag9a6j02i401c")))) + "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh")))) (define %ungoogled-origin (origin @@ -274,7 +274,7 @@ from forcing GEXP-PROMISE." (string-take %ungoogled-revision 7))) (sha256 (base32 - "196rr3nly42pzl2bap22vzw4d8x87yl3zy1wq2fla5z8iy4x8ym1")))) + "0nm55qq4ahw9haf5g7hmzic4mr2xjgpay7lxps7xjp7s1pda4g0q")))) (define %debian-origin (origin -- cgit v1.2.3 From f7100edaf69222bd0c38c51ff84df44348b1bf90 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:58:25 +0100 Subject: gnu: r-biosigner: Update to 1.14.2. * gnu/packages/bioconductor.scm (r-biosigner): Update to 1.14.2. [native-inputs]: Remove r-rmarkdown, pandoc, and pandoc-citeproc. --- gnu/packages/bioconductor.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index bc7623eac3..7470fd4b29 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5316,14 +5316,14 @@ coefficients).") (define-public r-biosigner (package (name "r-biosigner") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "biosigner" version)) (sha256 (base32 - "1kdfhw629qczrfms0jmphqz0ksjzi8js00xj92h1lnv092npfk0j")))) + "184vbbd010yzqv0qn1prxiazibxwiacvlpg9yzcgyhamcx9bvq73")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) @@ -5332,10 +5332,7 @@ coefficients).") ("r-randomforest" ,r-randomforest) ("r-ropls" ,r-ropls))) (native-inputs - `(("r-knitr" ,r-knitr) - ("r-rmarkdown" ,r-rmarkdown) - ("pandoc" ,ghc-pandoc) - ("pandoc-citeproc" ,ghc-pandoc-citeproc))) ; all for vignettes + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/biosigner/") (synopsis "Signature discovery from omics data") (description -- cgit v1.2.3 From 2d6a7bca9e196bea3a13ebf90ed4b18c6e781117 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:59:05 +0100 Subject: gnu: r-biocpkgtools: Update to 1.4.6. * gnu/packages/bioconductor.scm (r-biocpkgtools): Update to 1.4.6. [propagated-inputs]: Add r-biocfilecache, r-rappdirs, r-rlang, and r-tidyselect. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 7470fd4b29..6ec74140e3 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7399,18 +7399,19 @@ gene selection, testing relationships, and so on.") (define-public r-biocpkgtools (package (name "r-biocpkgtools") - (version "1.4.0") + (version "1.4.6") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocPkgTools" version)) (sha256 (base32 - "0gyhb3071pxmvaxla7cxy9k97s3z3ynl62jnqz9jnkd53c7jnd53")))) + "0grwnmncmpqcplbfw3j210m1a8f7mmdizklh4zksg4ic21dpjj1a")))) (properties `((upstream-name . "BiocPkgTools"))) (build-system r-build-system) (propagated-inputs - `(("r-biocmanager" ,r-biocmanager) + `(("r-biocfilecache" ,r-biocfilecache) + ("r-biocmanager" ,r-biocmanager) ("r-biocviews" ,r-biocviews) ("r-dplyr" ,r-dplyr) ("r-dt" ,r-dt) @@ -7422,14 +7423,19 @@ gene selection, testing relationships, and so on.") ("r-igraph" ,r-igraph) ("r-jsonlite" ,r-jsonlite) ("r-magrittr" ,r-magrittr) + ("r-rappdirs" ,r-rappdirs) ("r-rbgl" ,r-rbgl) ("r-readr" ,r-readr) ("r-rex" ,r-rex) + ("r-rlang" ,r-rlang) ("r-rvest" ,r-rvest) ("r-stringr" ,r-stringr) ("r-tibble" ,r-tibble) ("r-tidyr" ,r-tidyr) + ("r-tidyselect" ,r-tidyselect) ("r-xml2" ,r-xml2))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/seandavi/BiocPkgTools") (synopsis "Collection of tools for learning about Bioconductor packages") (description -- cgit v1.2.3 From 30c56e67f7bbad2501fc855b404bd30c5bf68524 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 09:59:45 +0100 Subject: gnu: r-crosstalk: Update to 1.1.0.1. * gnu/packages/cran.scm (r-crosstalk): Update to 1.1.0.1. [propagated-inputs]: Remove r-ggplot2 and r-shiny. --- gnu/packages/cran.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4c18275eaa..f0f6c9e8be 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1157,22 +1157,20 @@ in R and Shiny via the D3 visualization library.") (define-public r-crosstalk (package (name "r-crosstalk") - (version "1.0.0") + (version "1.1.0.1") (source (origin (method url-fetch) (uri (cran-uri "crosstalk" version)) (sha256 (base32 - "0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk")))) + "03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn")))) (build-system r-build-system) (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) - ("r-htmltools" ,r-htmltools) + `(("r-htmltools" ,r-htmltools) ("r-jsonlite" ,r-jsonlite) ("r-lazyeval" ,r-lazyeval) - ("r-r6" ,r-r6) - ("r-shiny" ,r-shiny))) + ("r-r6" ,r-r6))) (home-page "https://rstudio.github.io/crosstalk/") (synopsis "Inter-widget interactivity for HTML widgets") (description -- cgit v1.2.3 From 07764987407d2faf22686e932ae170b34e9554ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:07 +0100 Subject: gnu: r-glue: Update to 1.3.2. * gnu/packages/cran.scm (r-glue): Update to 1.3.2. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f0f6c9e8be..273f47c1b9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1521,14 +1521,14 @@ colors are provided.") (define-public r-glue (package (name "r-glue") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "glue" version)) (sha256 (base32 - "1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag")))) + "0alklqcf68kmccssp4j7a7fv553pyqyy6mkkfslav83inppm4d3g")))) (build-system r-build-system) (home-page "https://github.com/tidyverse/glue") (synopsis "Interpreted string literals") -- cgit v1.2.3 From cabdfeab76e777497f9a1cc4fa6b7e6b58497c86 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:14 +0100 Subject: gnu: r-rcpp: Update to 1.0.4. * gnu/packages/cran.scm (r-rcpp): Update to 1.0.4. [native-inputs]: Remove r-knitr. --- 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 273f47c1b9..ef0d3b875f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -1689,16 +1689,14 @@ you to rapidly iterate while developing a package.") (define-public r-rcpp (package (name "r-rcpp") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "Rcpp" version)) (sha256 - (base32 "03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b")))) + (base32 "1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr")))) (build-system r-build-system) - (native-inputs - `(("r-knitr" ,r-knitr))) ; for vignettes (home-page "http://www.rcpp.org") (synopsis "Seamless R and C++ integration") (description -- cgit v1.2.3 From 1c7a4952ff728177de40d0037e8b75d9e73c412e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:29 +0100 Subject: gnu: r-ffbase: Update to 0.12.8. * gnu/packages/cran.scm (r-ffbase): Update to 0.12.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 ef0d3b875f..6406e167f4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2010,14 +2010,14 @@ in main memory.") (define-public r-ffbase (package (name "r-ffbase") - (version "0.12.7") + (version "0.12.8") (source (origin (method url-fetch) (uri (cran-uri "ffbase" version)) (sha256 (base32 - "04kxx2f3f0743c5nvpb7x1x0pcd220dazpd5ag1pidxbz3xa85nw")))) + "0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq")))) (build-system r-build-system) (propagated-inputs `(("r-bit" ,r-bit) -- cgit v1.2.3 From b8168e894547af5650300457810848ae8f65a357 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:36 +0100 Subject: gnu: r-rmysql: Update to 0.10.20. * gnu/packages/cran.scm (r-rmysql): Update to 0.10.20. --- 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 6406e167f4..350e439b41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2796,14 +2796,14 @@ dimensioned arrays.") (define-public r-rmysql (package (name "r-rmysql") - (version "0.10.19") + (version "0.10.20") (source (origin (method url-fetch) (uri (cran-uri "RMySQL" version)) (sha256 (base32 - "0269pfq791qvax69lrwvvzgllyzm3cy3sdp9sakwxzvw5pxk2vhv")))) + "0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i")))) (properties `((upstream-name . "RMySQL"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 99de0bd1dc3e1d5d7e826a526ae1ce7d97441048 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:00:48 +0100 Subject: gnu: r-recipes: Update to 0.1.10. * gnu/packages/cran.scm (r-recipes): Update to 0.1.10. [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 350e439b41..7893219a0c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -3098,14 +3098,14 @@ provides a one-row summary of model-level statistics.") (define-public r-recipes (package (name "r-recipes") - (version "0.1.9") + (version "0.1.10") (source (origin (method url-fetch) (uri (cran-uri "recipes" version)) (sha256 (base32 - "1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm")))) + "11f96aanrzi2v6cn49fhvf9y4cmhra63wcy6nvpv6hcfaqqmwd2g")))) (build-system r-build-system) (propagated-inputs `(("r-dplyr" ,r-dplyr) @@ -3123,6 +3123,8 @@ provides a one-row summary of model-level statistics.") ("r-tidyselect" ,r-tidyselect) ("r-timedate" ,r-timedate) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/topepo/recipes") (synopsis "Preprocessing tools to create design matrices") (description -- cgit v1.2.3 From e6f4f314ba55b9236689d130e146e64224db8f9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:04 +0100 Subject: gnu: r-officer: Update to 0.3.8. * gnu/packages/cran.scm (r-officer): Update to 0.3.8. [propagated-inputs]: Remove r-digest. [native-inputs]: Add r-knitr. --- 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 7893219a0c..ab47103c04 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6198,22 +6198,23 @@ references and Rd files.") (define-public r-officer (package (name "r-officer") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) (uri (cran-uri "officer" version)) (sha256 (base32 - "1zyrcf0xxm67bskynjac8dhil2as7rb0mmqaq30zp9lrgfwiycpz")))) + "0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw")))) (build-system r-build-system) (propagated-inputs - `(("r-digest" ,r-digest) - ("r-magrittr" ,r-magrittr) + `(("r-magrittr" ,r-magrittr) ("r-r6" ,r-r6) ("r-uuid" ,r-uuid) ("r-xml2" ,r-xml2) ("r-zip" ,r-zip))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://davidgohel.github.io/officer") (synopsis "Manipulation of Word and PowerPoint documents") (description -- cgit v1.2.3 From 5cef0ef018ec113e24b32d85c4f5108e9584e6c1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:29 +0100 Subject: gnu: r-pwr: Update to 1.3-0. * gnu/packages/cran.scm (r-pwr): 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 ab47103c04..cb8e95fa24 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8276,14 +8276,14 @@ comparisons of slopes.") (define-public r-pwr (package (name "r-pwr") - (version "1.2-2") + (version "1.3-0") (source (origin (method url-fetch) (uri (cran-uri "pwr" version)) (sha256 (base32 - "0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm")))) + "1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v")))) (build-system r-build-system) (native-inputs `(("r-knitr" ,r-knitr))) -- cgit v1.2.3 From bd1a2cb2c47adb37c2403a785b975a11563b4158 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:40 +0100 Subject: gnu: r-glmmtmb: Update to 1.0.1. * gnu/packages/cran.scm (r-glmmtmb): 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 cb8e95fa24..449c2adafc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8449,14 +8449,14 @@ models.") (define-public r-glmmtmb (package (name "r-glmmtmb") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "glmmTMB" version)) (sha256 (base32 - "1md4yw4kbng953rz1n9g1v2xffk3cxx1qmp0kvbdayg1s82l1rgx")))) + "0sdx1q7wc7895xh8747r4p0wkij0xjgn5ij62ipi9423zd0sr0mm")))) (properties `((upstream-name . "glmmTMB"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 49b68b64f703aaec04c2a4e89ef65050d890547b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:01:48 +0100 Subject: gnu: r-ggeffects: Update to 0.14.2. * gnu/packages/cran.scm (r-ggeffects): Update to 0.14.2. [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 449c2adafc..6617208351 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8533,19 +8533,21 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "0.14.1") + (version "0.14.2") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "07pvs18vlybp96zz1wjr7cwiwi1cvjwkb9ahxzq0vd6adnd6ya59")))) + "1y3yfb07jrr6vkc8hk6rp52l70dj7042jvqgjzllslzy7hx2jhyw")))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight) ("r-mass" ,r-mass) ("r-sjlabelled" ,r-sjlabelled))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/strengejacke/ggeffects") (synopsis "Create tidy data frames of marginal effects for ggplot") (description -- cgit v1.2.3 From ef1443928eb814a7ea9f96f97ba0295f44f276bf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:05 +0100 Subject: gnu: r-waveslim: Update to 1.8.2. * gnu/packages/cran.scm (r-waveslim): Update to 1.8.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 6617208351..4eac5a02cf 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -9756,14 +9756,14 @@ Processing.") (define-public r-waveslim (package (name "r-waveslim") - (version "1.7.5.2") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "waveslim" version)) (sha256 (base32 - "166ai4q3mlh3v338si952z7fbgph80h0l4ws6bna8ig5jx81rnmz")))) + "0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From dacebbf066a87634c5b771c55fbbb2deca951b81 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:13 +0100 Subject: gnu: r-nonnest2: Update to 0.5-3. * gnu/packages/cran.scm (r-nonnest2): Update to 0.5-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 4eac5a02cf..3c6dc5f597 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -12345,20 +12345,22 @@ latent growth curve models.") (define-public r-nonnest2 (package (name "r-nonnest2") - (version "0.5-2") + (version "0.5-3") (source (origin (method url-fetch) (uri (cran-uri "nonnest2" version)) (sha256 (base32 - "1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6")))) + "1mnv4pa583ir9s03h952hk40lwdywr3g88g76sk1zsa54rcmn82c")))) (build-system r-build-system) (propagated-inputs `(("r-compquadform" ,r-compquadform) ("r-lavaan" ,r-lavaan) ("r-mvtnorm" ,r-mvtnorm) ("r-sandwich" ,r-sandwich))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/nonnest2/") (synopsis "Tests of non-nested models") (description -- cgit v1.2.3 From 999204f7f79fde7ee53ba6f27e1179d00d02d8e5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:29 +0100 Subject: gnu: r-units: Update to 0.6-6. * gnu/packages/cran.scm (r-units): Update to 0.6-6. [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 3c6dc5f597..c621da6fd6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13017,19 +13017,21 @@ utilities for sequence data management under the ACNUC system.") (define-public r-units (package (name "r-units") - (version "0.6-5") + (version "0.6-6") (source (origin (method url-fetch) (uri (cran-uri "units" version)) (sha256 (base32 - "02nls8m0r1r7kljs4x35naz3szq62hyqyd5vracf1xwi1kz5kdsh")))) + "11x6xz1fbml28xmrhgn4sii9vfyj3gyfc1dfxahdg9cszdmcgdnh")))) (build-system r-build-system) (inputs `(("udunits" ,udunits))) (propagated-inputs `(("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/r-quantities/units/") (synopsis "Measurement Units for R Vectors") (description -- cgit v1.2.3 From ac9bdd4c68ce25e618b03b52187a600501514db9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:02:45 +0100 Subject: gnu: r-ggraph: Update to 2.0.2. * gnu/packages/cran.scm (r-ggraph): Update to 2.0.2. [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 c621da6fd6..d9cfc6072b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14284,14 +14284,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.") (define-public r-ggraph (package (name "r-ggraph") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "0q2yqsb981a2arf9j530kqs61vw38ixyxbhb6yvv7skgbck02r6y")))) + "1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0")))) (build-system r-build-system) (propagated-inputs `(("r-digest" ,r-digest) @@ -14308,6 +14308,8 @@ databases, including ENA, PDB or ChEMBL are also accessible.") ("r-scales" ,r-scales) ("r-tidygraph" ,r-tidygraph) ("r-viridis" ,r-viridis))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://cran.r-project.org/web/packages/ggraph/") (synopsis "Implementation of grammar of graphics for graphs and networks") (description -- cgit v1.2.3 From 69e260c54205eb660687779fb17b6a3fb2780956 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:02 +0100 Subject: gnu: r-uwot: Update to 0.1.8. * gnu/packages/cran.scm (r-uwot): Update to 0.1.8. [propagated-inputs]: Remove r-rcppparallel. --- 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 d9cfc6072b..3ac71e26b3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15379,14 +15379,14 @@ in R, including a translation of the original algorithm into R.") (define-public r-uwot (package (name "r-uwot") - (version "0.1.5") + (version "0.1.8") (source (origin (method url-fetch) (uri (cran-uri "uwot" version)) (sha256 (base32 - "0pz9wa89xq4d119q86lskrznf979m0r1db8iaprcz7kxbi6b8lrj")))) + "1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd")))) (build-system r-build-system) (propagated-inputs `(("r-dqrng" ,r-dqrng) @@ -15395,7 +15395,6 @@ in R, including a translation of the original algorithm into R.") ("r-matrix" ,r-matrix) ("r-rcpp" ,r-rcpp) ("r-rcppannoy" ,r-rcppannoy) - ("r-rcppparallel" ,r-rcppparallel) ("r-rcppprogress" ,r-rcppprogress) ("r-rspectra" ,r-rspectra))) (home-page "https://github.com/jlmelville/uwot") -- cgit v1.2.3 From c7eb52e64c935e8c9c3f1dec67613b001a542a69 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:20 +0100 Subject: gnu: r-accept: Update to 0.7.1. * gnu/packages/cran.scm (r-accept): 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 3ac71e26b3..88237f1a06 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16696,14 +16696,14 @@ elicitation options based on Kass and Vaidyanathan (1992) (define-public r-accept (package (name "r-accept") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "accept" version)) (sha256 (base32 - "1r4mhy9g4wjcjgdd0gwdarmr09292il3vdkmx0hz7vh9mffyr9kx")))) + "0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y")))) (properties `((upstream-name . "accept"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 40e5102449e7c5ea1b6c9a78fd8528e4862c1251 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:27 +0100 Subject: gnu: r-isocodes: Update to 2020.03.16. * gnu/packages/cran.scm (r-isocodes): Update to 2020.03.16. --- 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 88237f1a06..34bc104960 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19390,14 +19390,14 @@ and Euclidean distance is particularly fast.") (define-public r-isocodes (package (name "r-isocodes") - (version "2019.12.22") + (version "2020.03.16") (source (origin (method url-fetch) (uri (cran-uri "ISOcodes" version)) (sha256 (base32 - "1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874")))) + "1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn")))) (properties `((upstream-name . "ISOcodes"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=ISOcodes") -- cgit v1.2.3 From ecf34a91015280f4055f2c23665b6421a828bb7a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:03:43 +0100 Subject: gnu: r-quanteda: Update to 2.0.1. * gnu/packages/cran.scm (r-quanteda): Update to 2.0.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 34bc104960..2fc62edb4b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19479,14 +19479,14 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") (define-public r-quanteda (package (name "r-quanteda") - (version "2.0.0") + (version "2.0.1") (source (origin (method url-fetch) (uri (cran-uri "quanteda" version)) (sha256 (base32 - "0snr610vahbdqkmma0zy5mg5qbb6n1b8sgsclqb2sccn1gg38vyy")))) + "0pym6vdzqbkyj87m3pla229092xvvx4j830x67qflxzzdmc9dzhz")))) (properties `((upstream-name . "quanteda"))) (build-system r-build-system) (propagated-inputs @@ -19509,6 +19509,8 @@ Norwegian, Portuguese, Romanian, Russian, Spanish, Swedish and Turkish.") ("r-stringi" ,r-stringi) ("r-xml2" ,r-xml2) ("r-yaml" ,r-yaml))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://quanteda.io") (synopsis "Quantitative analysis of textual data") (description -- cgit v1.2.3 From f3a64b9960a64e10eca20483857eaa2021018a1a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:04:01 +0100 Subject: gnu: r-matrixstats: Update to 0.56.0. * gnu/packages/statistics.scm (r-matrixstats): Update to 0.56.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 fa2b8d6ed5..8b21ac31a2 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3573,13 +3573,13 @@ t-probabilities, quantiles, random deviates and densities.") (define-public r-matrixstats (package (name "r-matrixstats") - (version "0.55.0") + (version "0.56.0") (source (origin (method url-fetch) (uri (cran-uri "matrixStats" version)) (sha256 (base32 - "06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn")))) + "09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr")))) (properties `((upstream-name . "matrixStats"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From 2ceb2ed99f4a1b7ee15313c81b0429998ab5d0c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 19 Mar 2020 10:04:11 +0100 Subject: gnu: r-modelmetrics: Update to 1.2.2.2. * gnu/packages/statistics.scm (r-modelmetrics): Update to 1.2.2.2. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 8b21ac31a2..be6eb9f9ed 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -5029,14 +5029,14 @@ decompositions of such matrices, and solutions of linear systems.") (define-public r-modelmetrics (package (name "r-modelmetrics") - (version "1.2.2.1") + (version "1.2.2.2") (source (origin (method url-fetch) (uri (cran-uri "ModelMetrics" version)) (sha256 (base32 - "17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc")))) + "0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy")))) (properties `((upstream-name . "ModelMetrics"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From ea2a180f68156ac05b435e953cd1231274244b9c Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 19 Mar 2020 10:19:37 +0100 Subject: gnu: gpa: Add phase wrap-program. Fixes * gnu/packages/gnupg.scm (gpa)[arguments]: Add phase wrap-program. Signed-off-by: Marius Bakke --- gnu/packages/gnupg.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c5c3d5263f..9075978719 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -975,6 +975,16 @@ however, pgpdump produces more detailed and easier to understand output.") (base32 "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gnupg (assoc-ref inputs "gnupg"))) + (wrap-program (string-append out "/bin/gpa") + `("PATH" ":" prefix (,(string-append gnupg "/bin")))) + #t)))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 83a4ab4e4213eaf10289f0abd8a43979178701d7 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:47:00 +0100 Subject: gnu: Add libksieve. * gnu/packages/kde-pim.scm (libksieve): New variable. * gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 58 +++++++++++++++++++++ .../libksieve-Fix-missing-link-libraries.patch | 59 ++++++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index caa73d44d4..aa5dcd7c39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1108,6 +1108,7 @@ dist_patch_DATA = \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ + %D%/packages/patches/libksieve-Fix-missing-lInk-libraries.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-length-check.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 07293b6bd1..fbe9bc2e94 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1132,3 +1132,61 @@ various Google services.") KDE using certificate-based crypto.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) + +(define-public libksieve + (package + (name "libksieve") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/libksieve-" version ".tar.xz")) + (sha256 + (base32 "0q6f6lc4yvlq0vsfml10lz844z6zxxf7yivk7l3vglap58ci20x1")) + (patches (search-patches "libksieve-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("cyrus-sasl" ,cyrus-sasl) + ("karchive" ,karchive) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + ;; Disable a failing test + ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` + (substitute* + "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" + (("^\\s*(add_test|ecm_mark_as_test)\\W" line) + (string-append "# " line))) + #t))))) + (home-page "https://cgit.kde.org/libksieve.git") + (synopsis "KDE Sieve library") + (description "Sieve is a language that can be used filter emails. KSieve +is a Sieve parser and interpreter library for KDE.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) diff --git a/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..238c4ec46c --- /dev/null +++ b/gnu/packages/patches/libksieve-Fix-missing-link-libraries.patch @@ -0,0 +1,59 @@ +From 732861dda9c466841a09329a0b2c992f2b78c40a Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:15:23 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + src/ksieveui/autocreatescripts/tests/CMakeLists.txt | 2 ++ + src/ksieveui/scriptsparsing/autotests/CMakeLists.txt | 2 +- + src/ksieveui/scriptsparsing/tests/CMakeLists.txt | 8 ++++++-- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt +index 8a482b4..c43216c 100644 +--- a/src/ksieveui/autocreatescripts/tests/CMakeLists.txt ++++ b/src/ksieveui/autocreatescripts/tests/CMakeLists.txt +@@ -15,6 +16,7 @@ set(parsingscript_gui_SRCS parsingscript_gui.cpp ../../tests/capability.cpp) + add_executable(parsingscript_gui ${parsingscript_gui_SRCS}) + target_link_libraries(parsingscript_gui + KF5::KIOCore ++ KF5::SyntaxHighlighting + KF5::KSieveUi + KF5::KSieve + KF5::PimCommon +diff --git a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt +index e41a74e..31703ef 100644 +--- a/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt ++++ b/src/ksieveui/scriptsparsing/autotests/CMakeLists.txt +@@ -5,7 +5,7 @@ macro(add_sieveeditor_xmlprintingscriptbuilding _source _extrasource) + ecm_add_test(${_test} + TEST_NAME ${_name} + NAME_PREFIX "sieveeditor-xmlprintingscriptbuilding-" +- LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi ++ LINK_LIBRARIES Qt5::Test KF5::I18n KF5::KSieveUi KF5::SyntaxHighlighting + ) + endmacro() + add_sieveeditor_xmlprintingscriptbuilding(xmlprintingscriptbuildertest.cpp "" "") +diff --git a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt +index a252039..99a1aaa 100644 +--- a/src/ksieveui/scriptsparsing/tests/CMakeLists.txt ++++ b/src/ksieveui/scriptsparsing/tests/CMakeLists.txt +@@ -9,5 +9,9 @@ set(xmlsieveparsing_SRCS + ) + + add_executable(xmlsieveparsing ${xmlsieveparsing_SRCS} ) +-target_link_libraries(xmlsieveparsing KF5::KSieveUi KF5::KSieve KF5::I18n) +- ++target_link_libraries(xmlsieveparsing ++ KF5::KSieveUi ++ KF5::SyntaxHighlighting ++ KF5::KSieve ++ KF5::I18n ++) +-- +2.21.1 + -- cgit v1.2.3 From a146c18ca43f4f4aea79ab67eb8863014d23afa9 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 18 Jan 2020 21:47:53 +0100 Subject: gnu: Add kmessagelib. * gnu/packages/kde-pim.scm (kmessagelib): New variable. --- gnu/packages/kde-pim.scm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index fbe9bc2e94..8d18ea5b2e 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages gnupg) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) + #:use-module (gnu packages kde-internet) #:use-module (gnu packages openldap) #:use-module (gnu packages qt) #:use-module (gnu packages search) @@ -769,6 +770,84 @@ mail transport.") using a Qt/KMime C++ API.") (license license:lgpl2.0+ ))) +(define-public kmessagelib + (package + (name "kmessagelib") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/messagelib-" version ".tar.xz")) + (sha256 + (base32 "0a378aqkdjzyzlxxha2qxa6vzrj92l1fplzb6fajz4l7ipj4hbnv")))) + (properties `((upstream-name . "messagelib"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("gnupg" ,gnupg) + ("libxml2" ,libxml2))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("karchive" ,karchive) + ("kcalendarcore" ,kcalendarcore) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmbox" ,kmbox) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgravatar" ,libgravatar) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtwebkit" ,qtwebkit) + ("sonnet" ,sonnet))) + (arguments + `(#:tests? #f)) ;; TODO many test fail for quite different reasons + (home-page "https://cgit.kde.org/messagelib.git") + (synopsis "KDE PIM messaging libraries") + (description "This packages provides several libraries for messages, +e.g. a message list, a mime tree parse, a template parser and the +kwebengineviewer.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmime (package (name "kmime") -- cgit v1.2.3 From d3b543a1fd46870ce102071d683c0698fb61b124 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 16:52:12 +0100 Subject: gnu: Add kmailcommon. * gnu/packages/kde-pim.scm (kmailcommon): New variable. --- gnu/packages/kde-pim.scm | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 8d18ea5b2e..42a02f2e63 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -665,6 +665,73 @@ and retrieving certificates from LDAP servers.") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public kmailcommon + (package + (name "kmailcommon") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/mailcommon-" version ".tar.xz")) + (sha256 + (base32 "1gsj89kgq4457mnfjlys4wiixpzwlbwhj4zpd7r4fdhbyihz3k2m")))) + (properties `((upstream-name . "mailcommon"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("gnupg" ,gnupg) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("karchive" ,karchive) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdesignerplugin" ,kdesignerplugin) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kldap" ,kldap) + ("kmailimporter" ,kmailimporter) + ("kmailtransport" ,kmailtransport) + ("kmessagelib" ,kmessagelib) + ("kmime" ,kmime) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("libxslt" ,libxslt) + ("phonon" ,phonon) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f)) ;; TODO: 4/56 tests fail, even with "offscreen" and dbus + (home-page "https://cgit.kde.org/mailcommon.git") + (synopsis "KDE email utility library") + (description "The mail common library provides utility functions for +dealing with email.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kmailimporter (package (name "kmailimporter") -- cgit v1.2.3 From 7a0bb02db42585c8670170bb1a73f6efda155f66 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 17:13:30 +0100 Subject: gnu: Add kblog. * gnu/packages/kde-pim.scm (kblog): New variable. --- gnu/packages/kde-pim.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 42a02f2e63..1fb281e1ea 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -376,6 +376,40 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") calendar data.") (license license:lgpl2.0+))) +(define-public kblog + (package + (name "kblog") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kblog-" version ".tar.xz")) + (sha256 + (base32 "0r3ik3df444kzg2mnzckkh4kk6v08zil1f26dwmxsslsqw9hl0vv")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcalendarcore" ,kcalendarcore) + ("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("kxmlrpcclient" ,kxmlrpcclient) + ("qtbase" ,qtbase) + ("syndication" ,syndication))) + ;; Note: Some tests take up to 90 sec. + (home-page "https://cgit.kde.org/kblog.git") + (synopsis "Client-side support library for web application remote blogging +APIs") + (description "KBlog is a library for calling functions on Blogger 1.0, +MetaWeblog, MovableType and GData compatible blogs. It calls the APIs using +KXmlRpcClient and Syndication. It supports asynchronous sending and fetching +of posts and, if supported on the server, multimedia files. Almost every +modern blogging web application that provides an XML data interface supports +one of the APIs mentioned above.") + (license license:lgpl2.0+))) + (define-public kcalutils (package (name "kcalutils") -- cgit v1.2.3 From 49e247efccb46a9808a2662489857ec9f0fb6664 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 18:07:27 +0100 Subject: gnu: Add kdav. This is in kde-pim.scm since it explicitly offers the "KPimKDAV". * gnu/package/kde-pim.scm (kdav): New variable. --- gnu/packages/kde-pim.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 1fb281e1ea..755cf316c5 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -449,6 +449,34 @@ data") functions for accessing calendar data using the kcalcore API.") (license license:lgpl2.0+))) +(define-public kdav + (package + (name "kdav") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdav-" version ".tar.xz")) + (sha256 + (base32 "1w59n17lridglphnm4mnmmzq1ijpbp269qxfmz01vk6wry6hlnp8")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("kcoreaddons" ,kcoreaddons) + ("ki18n" ,ki18n) + ("kio" ,kio) + ("qtbase" ,qtbase) + ("qtxmlpatterns" ,qtxmlpatterns))) + (home-page "https://cgit.kde.org/kdav.git") + (synopsis "DAV protocol implementation with KJobs") + (description "This is a DAV protocol implemention with KJobs. Calendars +and todos are supported, using either GroupDAV or CalDAV, and contacts are +supported using GroupDAV or CardDAV.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kdepim-apps-libs (package (name "kdepim-apps-libs") -- cgit v1.2.3 From de6b78220475e604fa105ccf98aabb92e86658f3 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 17:39:09 +0100 Subject: gnu: Add kdepim-runtime. * gnu/packages/kde-pim.scm (kdepim-runtime): New variable. * gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 79 ++++++++++++++++++++++ ...kdepim-runtime-Fix-missing-link-libraries.patch | 42 ++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index aa5dcd7c39..56f1903f0c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,6 +1052,7 @@ dist_patch_DATA = \ %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/kdepim-runtime-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 755cf316c5..0956deece3 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -523,6 +523,85 @@ for KDE PIM.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kdepim-runtime + (package + (name "kdepim-runtime") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kdepim-runtime-" version ".tar.xz")) + (sha256 + (base32 "1skid9v6viw379mwhmb4xjh6bylv8wg7cy56kkbcpsmpars9cwr6")) + (patches (search-patches + "kdepim-runtime-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("kdoctools" ,kdoctools) + ("libxslt" ,libxslt) + ("shared-mime-info" ,shared-mime-info))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("boost" ,boost) + ("cyrus-sasl" ,cyrus-sasl) + ("kalarmcal" ,kalarmcal) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdav" ,kdav) + ("kdbusaddons" ,kdbusaddons) + ("kholidays" ,kholidays) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmailtransport" ,kmailtransport) + ("kmbox" ,kmbox) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kross" ,kross) + ("ktextwidgets" ,ktextwidgets) + ("kwallet" ,kwallet) + ("kwindowsystem" ,kwindowsystem) + ("libkgapi" ,libkgapi) + ;; TODO: libkolab + ("qca" ,qca) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtnetworkauth" ,qtnetworkauth) + ("qtspeech" ,qtspeech) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("qtxmlpatterns" ,qtxmlpatterns))) + (arguments + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus + `(#:tests? #f)) + (home-page "https://cgit.kde.org/kdepim-runtime.git") + (synopsis "Runtime components for Akonadi KDE") + (description "This package contains Akonadi agents written using KDE +Development Platform libraries. Any package that uses Akonadi should probably +pull this in as a dependency. The kres-bridges is also parts of this +package.") + (license ;; Files vary a lot regarding the license. GPL2+ and LGPL2.1+ + ;; have been used in those I checked. But the archive also includes + ;; license texts for GPL3 and AGPL3. + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") diff --git a/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..13345c0038 --- /dev/null +++ b/gnu/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch @@ -0,0 +1,42 @@ +From b84c4ba97cecf7304e99cafdd8a9c5866ce27050 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:33:50 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + resources/ews/test/CMakeLists.txt | 1 + + resources/facebook/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/resources/ews/test/CMakeLists.txt b/resources/ews/test/CMakeLists.txt +index b20eddcb8..6355eb994 100644 +--- a/resources/ews/test/CMakeLists.txt ++++ b/resources/ews/test/CMakeLists.txt +@@ -35,6 +35,7 @@ qt5_add_resources(isolatestestcommon_RSRCS isolatedtestcommon.qrc) + add_library(isolatedtestcommon STATIC ${isolatestestcommon_SRCS}) + target_link_libraries(isolatedtestcommon + KF5::AkonadiCore ++ KF5::AkonadiMime + Qt5::Core + Qt5::Network + Qt5::Test +diff --git a/resources/facebook/CMakeLists.txt b/resources/facebook/CMakeLists.txt +index bdd5eeaa7..27a9c83c1 100644 +--- a/resources/facebook/CMakeLists.txt ++++ b/resources/facebook/CMakeLists.txt +@@ -21,7 +21,8 @@ add_library(facebookresourcelib STATIC ${fbresource_SRCS}) + + target_link_libraries(facebookresourcelib + KF5::KIOWidgets ++ KF5::AkonadiCore + KF5::IconThemes + KF5::I18n + KF5::ConfigGui + KF5::CalendarCore +-- +2.21.1 + -- cgit v1.2.3 From 86633b2218ea8a1eb3573cea5b76b49f71667eba Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 19 Jan 2020 23:58:11 +0100 Subject: gnu: Add kaddressbook. * gnu/packages/kde-pim.scm (kaddressbook): New variable. --- gnu/packages/kde-pim.scm | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 0956deece3..661962bb46 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -335,6 +335,63 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kaddressbook + (package + (name "kaddressbook") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kaddressbook-" version ".tar.xz")) + (sha256 + (base32 "1bpl9cqjv7s6pnsaa266jqmny2s6ldkylxviri162jxg51v1hhz3")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("kcalendarcore" ,kcalendarcore) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kcontacts" ,kcontacts) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kdoctools" ,kdoctools) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("prison" ,prison) + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase))) + (home-page "https://kontact.kde.org/components/kaddressbook.html") + (synopsis "Address Book application to manage your contacts") + (description "KAddressBook stores all the personal details of your family, +friends and other contacts. It supports large variety of services, including +NextCloud, Kolab, Google Contacts, Microsoft Exchange (EWS) or any standard +CalDAV server.") + (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kalarmcal (package (name "kalarmcal") -- cgit v1.2.3 From dd80d13bea8239dc77518204cfaa8aee8c8ac097 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 00:38:11 +0100 Subject: gnu: Add knotes. * gnu/packages/kde-pim.scm (knotes): NEw variable. --- gnu/packages/kde-pim.scm | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 661962bb46..137176e481 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1151,6 +1151,80 @@ US-ASCII, non-text attachments, multi-part message bodies, and header information in non-ASCII character sets.") (license license:lgpl2.0+))) +(define-public knotes + (package + (name "knotes") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/knotes-" version ".tar.xz")) + (sha256 + (base32 "128qpfqjn5zwl5550srmbjyxns242q6a3b0jy70jjx2yixy3rb87")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("libxslt" ,libxslt))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("grantlee" ,grantlee) + ("grantleetheme" ,grantleetheme) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdnssd" ,kdnssd) + ("kdoctools" ,kdoctools) + ("kglobalaccel" ,kglobalaccel) + ("kiconthemes" ,kiconthemes) + ("kimap" ,kimap) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kmime" ,kmime) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras))) + (home-page "https://kontact.kde.org/components/knotes.html") + (synopsis "Note-taking utility") + (description "KNotes lets you write the computer equivalent of sticky +notes. The notes are saved automatically when you exit the program, and they +display when you open the program. + +Features: +@itemize +@item Write notes in your choice of font and background color +@item Use drag and drop to email your notes +@item Can be dragged into Calendar to book a time-slot +@item Notes can be printed +@end itemize") + (license (list license:gpl2+ license:lgpl2.0+)))) + (define-public kontactinterface (package (name "kontactinterface") -- cgit v1.2.3 From 639b6ead0c96916ac47eefd03861c023a3026148 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 00:48:32 +0100 Subject: gnu: Add kmail. * gnu/packages/kde-pim.scm (kmail): New variable. * gnu/packages/patches/kmail-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde-pim.scm | 94 ++++++++++++++++++++++ .../patches/kmail-Fix-missing-link-libraries.patch | 41 ++++++++++ 3 files changed, 136 insertions(+) create mode 100644 gnu/packages/patches/kmail-Fix-missing-link-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 56f1903f0c..f3bc77d1de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1060,6 +1060,7 @@ dist_patch_DATA = \ %D%/packages/patches/kinit-kdeinit-extra_libs.patch \ %D%/packages/patches/kinit-kdeinit-libpath.patch \ %D%/packages/patches/kio-search-smbd-on-PATH.patch \ + %D%/packages/patches/kmail-Fix-missing-link-libraries.patch \ %D%/packages/patches/kmod-module-directory.patch \ %D%/packages/patches/kmscon-runtime-keymap-switch.patch \ %D%/packages/patches/kpackage-allow-external-paths.patch \ diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 137176e481..a9ceac591f 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -863,6 +863,100 @@ and retrieving certificates from LDAP servers.") (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public kmail + (package + (name "kmail") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/kmail-" version ".tar.xz")) + (sha256 + (base32 "0gsdpv9pf4h031zcawc4qv78a5kl9hxp2amd0spjhs7wc7nl17fk")) + (patches (search-patches "kmail-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("gpgme" ,gpgme) + ("kbookmarks" ,kbookmarks) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kguiaddons" ,kguiaddons) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailcommon" ,kmailcommon) + ("kmailtransport" ,kmailtransport) + ("kmessagelib" ,kmessagelib) + ("kmime" ,kmime) + ("kmime" ,kmime) + ("knotifications" ,knotifications) + ("knotifyconfig" ,knotifyconfig) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ksyntaxhighlighting" ,ksyntaxhighlighting) + ("ktextwidgets" ,ktextwidgets) + ("ktnef" ,ktnef) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libgravatar" ,libgravatar) + ("libkdepim" ,libkdepim) + ("libkleo" ,libkleo) + ("libksieve" ,libksieve) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("qgpgme" ,qgpgme) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtwebchannel" ,qtwebchannel) + ("qtwebengine" ,qtwebengine) + ("sonnet" ,sonnet))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".") + #t))))) + (home-page "https://kontact.kde.org/components/kmail.html") + (synopsis "Full featured graphical email client") + (description "KMail supports multiple accounts, mail filtering and email +encryption. The program let you configure your workflow and it has good +integration into KDE (Plasma Desktop) but is also useable with other Desktop +Envionments. + +KMail is the email component of Kontact, the integrated personal information +manager from KDE.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kmailcommon (package (name "kmailcommon") diff --git a/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch b/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..fc784d63dd --- /dev/null +++ b/gnu/packages/patches/kmail-Fix-missing-link-libraries.patch @@ -0,0 +1,41 @@ +From 6b0a3a60870499b20ce9ae2ea07cbc5ee53cbdd2 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Tue, 21 Jan 2020 23:23:38 +0100 +Subject: [PATCH] Fix missing link libraries. + +See + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + agents/archivemailagent/CMakeLists.txt | 1 + + agents/followupreminderagent/CMakeLists.txt | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt +index 95c6249de..d0ddcd475 100644 +--- a/agents/archivemailagent/CMakeLists.txt ++++ b/agents/archivemailagent/CMakeLists.txt +@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) + add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) + target_link_libraries(archivemailagent + KF5::MailCommon ++ KF5::Libkdepim + KF5::I18n + KF5::Notifications + KF5::KIOWidgets +diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt +index 9ae7eaa29..527044807 100644 +--- a/agents/followupreminderagent/CMakeLists.txt ++++ b/agents/followupreminderagent/CMakeLists.txt +@@ -27,6 +27,7 @@ target_link_libraries(followupreminderagent + KF5::AkonadiMime + KF5::AkonadiAgentBase + KF5::DBusAddons ++ KF5::FollowupReminder + KF5::XmlGui + KF5::KIOWidgets + KF5::Notifications +-- +2.21.1 + -- cgit v1.2.3 From 9d95d8bd120072cb3b983da86baa645c5b2ecd89 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:45:38 +0100 Subject: gnu: Add kdiagram. * gnu/packages/kde.scm (kdiagram): New variable. * packages/patches/kdiagram-Fix-missing-link-libraries.patch: New file. * gnu/local.mk: Add it. --- gnu/local.mk | 1 + gnu/packages/kde.scm | 31 ++++++++++++++++++++++ .../kdiagram-Fix-missing-link-libraries.patch | 23 ++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f3bc77d1de..ddd89ba018 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1053,6 +1053,7 @@ dist_patch_DATA = \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdepim-runtime-Fix-missing-link-libraries.patch \ + %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ %D%/packages/patches/kiki-level-selection-crash.patch \ %D%/packages/patches/kiki-makefile.patch \ %D%/packages/patches/kiki-missing-includes.patch \ diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 8a612bfe5b..c4576c8ba7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -325,6 +325,37 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") ;; kdevplatform was merged into kdevelop as of 5.2.x (define-deprecated kdevplatform kdevelop) +(define-public kdiagram + (package + (name "kdiagram") + (version "2.6.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/kdiagram/" version + "/kdiagram-" version ".tar.xz")) + (sha256 + (base32 "1c6dbp9gssjrx59z8yxzq1ay56pnw7h28symjrv0gcvhxyjirrxx")) + (patches (search-patches + "kdiagram-Fix-missing-link-libraries.patch")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("qtbase" ,qtbase) + ("qtsvg" ,qtsvg))) + (home-page "https://cgit.kde.org/kdiagram.git/") + (synopsis "Libraries for creating business diagrams") + (description "This package provides libraries for integrating business +diagrams in Qt-based applications. + +@code{KCharts} provides an implementation of the ODF Chart specification. It +supports stock charts, box charts, and whisker charts. @code{KGantt} provides +a module for implementing ODF Gantt charts, which are bar charts that +illustrate project schedules.") + (license license:gpl2+))) + (define-public krita (package (name "krita") diff --git a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch new file mode 100644 index 0000000000..cdfb608d9b --- /dev/null +++ b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch @@ -0,0 +1,23 @@ +From c59acf1f54a2cd760e55082a01593a31a690d786 Mon Sep 17 00:00:00 2001 +From: Hartmut Goebel +Date: Wed, 22 Jan 2020 00:56:27 +0100 +Subject: [PATCH] Fix missing link libraries. + +These are only actually missing if the libraries reside in different +prefixes, as it is the case in Guix or Nix. +--- + examples/Bars/Simple/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/Bars/Simple/CMakeLists.txt b/examples/Bars/Simple/CMakeLists.txt +index be2a6fc..b13befb 100644 +--- a/examples/Bars/Simple/CMakeLists.txt ++++ b/examples/Bars/Simple/CMakeLists.txt +@@ -1,3 +1,3 @@ + add_executable(BarsSimple main.cpp) + +-target_link_libraries(BarsSimple KChart Qt5::Widgets) ++target_link_libraries(BarsSimple KChart Qt5::Widgets Qt5::Svg) +-- +2.21.1 + -- cgit v1.2.3 From d9491d5053ea856fe4fadc84d73d6979e9463a96 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sun, 2 Feb 2020 15:34:14 +0100 Subject: gnu: Add kcalendarsupport. * gnu/packages/kde-pim.scm (kcalendarsupport): New variable. --- gnu/packages/kde-pim.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a9ceac591f..27ec2825ae 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -467,6 +467,52 @@ modern blogging web application that provides an XML data interface supports one of the APIs mentioned above.") (license license:lgpl2.0+))) +(define-public kcalendarsupport + (package + (name "kcalendarsupport") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/calendarsupport-" version ".tar.xz")) + (sha256 + (base32 "1hwfh5njq4614ypwdilna33hdcn11kshpwg6n27cag1qhwrxs1i4")))) + (properties `((upstream-name . "calendarsupport"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalutils", kcalutils) + ("kcompletion" ,kcompletion) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kguiaddons" ,kguiaddons) + ("kholidays" ,kholidays) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("qtbase" ,qtbase))) + (home-page "https://api.kde.org/stable/calendarsupport/") + (synopsis "Calendar Support library for KDE PIM") + (description "The Calendar Support library provides helper utilities for +calendaring applications.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kcalutils (package (name "kcalutils") -- cgit v1.2.3 From b3359b85985bf64061ace2154e2414fb482443bf Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Wed, 22 Jan 2020 13:03:13 +0100 Subject: gnu: Add keventviews. * gnu/package/kde-pim.scm (keventviews): New variable. --- gnu/packages/kde-pim.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 27ec2825ae..966cf5fa84 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -705,6 +705,56 @@ package.") ;; license texts for GPL3 and AGPL3. (list license:gpl2+ license:lgpl2.0+)))) +(define-public keventviews + (package + (name "keventviews") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/eventviews-" version ".tar.xz")) + (sha256 + (base32 "190vx074ligzysc9w5pf2b51dfy0i4v9mc53m9jdcw8y02shy49w")))) + (properties `((upstream-name . "eventviews"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("qttools" ,qttools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcodecs", kcodecs) + ("kcompletion" ,kcompletion) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdiagram" ,kdiagram) + ("kguiaddons" ,kguiaddons) + ("kholidays" ,kholidays) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kmime" ,kmime) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("ktextwidgets" ,ktextwidgets) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/eventviews.git") + (synopsis "KDE PIM library for creating events") + (description "This library provides an event creator for KDE PIM.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kgpg (package (name "kgpg") -- cgit v1.2.3 From 992c6d29bbdb3663d9b5fa1ddf3fdd25e2944360 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:28:55 +0100 Subject: gnu: Add kincidenceeditor. * gnu/packages/kde-pim.scm (kincidenceeditor): New variable. --- gnu/packages/kde-pim.scm | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 966cf5fa84..048a465e86 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -335,6 +335,55 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) +(define-public kincidenceeditor + (package + (name "kincidenceeditor") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/incidenceeditor-" version ".tar.xz")) + (sha256 + (base32 "0v962v2ihawndg39ypkfawa449vpbdyg00ib7avb19a153y3wxg6")))) + (properties `((upstream-name . "incidenceeditor"))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcodecs" ,kcodecs) + ("kcontacts" ,kcontacts) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("kdiagram" ,kdiagram) + ("keventviews" ,keventviews) + ("ki18n" ,ki18n) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kio" ,kio) + ("kitemmodels" ,kitemmodels) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("kpimtextedit" ,kpimtextedit) + ("ktextwidgets" ,ktextwidgets) + ("kwallat" ,kwallet) + ("libkdepim" ,libkdepim) + ("qtbase" ,qtbase))) + (home-page "https://cgit.kde.org/incidenceeditor.git") + (synopsis "KDE PIM library for editing incidences") + (description "This library provides an incidence editor for KDE PIM.") + (license ;; GPL for programs, LGPL for libraries + (list license:gpl2+ license:lgpl2.0+)))) + (define-public kaddressbook (package (name "kaddressbook") -- cgit v1.2.3 From d3d8be5281d6a69f67608b051e4ffde8dcfc1301 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Mon, 20 Jan 2020 01:14:36 +0100 Subject: gnu: Add korganizer. * gnu/packages/kde-pim.scm (korganizer): New variable. --- gnu/packages/kde-pim.scm | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 048a465e86..bf962859b9 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1492,6 +1492,93 @@ Features: application \"Parts\" to be embedded as a Kontact component (or plugin).") (license license:lgpl2.0+))) +(define-public korganizer + (package + (name "korganizer") + (version "19.08.3") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/applications/" version + "/src/korganizer-" version ".tar.xz")) + (sha256 + (base32 "1ixdmmczccvwr7a6vvzv0kyjay0mjnbwcwkq6yym32m2lb3vcxdn")))) + (build-system qt-build-system) + (native-inputs + `(("extra-cmake-modules" ,extra-cmake-modules) + ("dbus" ,dbus) + ("qttools" ,qttools) + ("kdoctools" ,kdoctools))) + (inputs + `(("akonadi" ,akonadi) + ("akonadi-calendar" ,akonadi-calendar) + ("akonadi-contacts" ,akonadi-contacts) + ("akonadi-mime" ,akonadi-mime) + ("akonadi-notes" ,akonadi-notes) + ("akonadi-search" ,akonadi-search) + ("boost" ,boost) + ("kcalendarcore" ,kcalendarcore) + ("kcalendarsupport" ,kcalendarsupport) + ("kcalutils" ,kcalutils) + ("kcmutils" ,kcmutils) + ("kcodecs" ,kcodecs) + ("kcompletion" ,kcompletion) + ("kconfig" ,kconfig) + ("kconfigwidgets" ,kconfigwidgets) + ("kcontacts" ,kcontacts) + ("kcoreaddons" ,kcoreaddons) + ("kcrash" ,kcrash) + ("kdbusaddons" ,kdbusaddons) + ("kdepim-apps-libs" ,kdepim-apps-libs) + ("keventviews" ,keventviews) + ("kholidays" ,kholidays) + ("kiconthemes" ,kiconthemes) + ("kidentitymanagement" ,kidentitymanagement) + ("kimap" ,kimap) + ("kincidenceeditor" ,kincidenceeditor) + ("kitemmodels" ,kitemmodels) + ("kitemviews" ,kitemviews) + ("kjobwidgets" ,kjobwidgets) + ("kldap" ,kldap) + ("kmailtransport" ,kmailtransport) + ("kmime" ,kmime) + ("knewstuff" ,knewstuff) + ("knotifications" ,knotifications) + ("kontactinterface" ,kontactinterface) + ("kparts" ,kparts) + ("kpimcommon" ,kpimcommon) + ("kpimtextedit" ,kpimtextedit) + ("kservice" ,kservice) + ("kwallet" ,kwallet) + ("kwidgetsaddons" ,kwidgetsaddons) + ("kwindowsystem" ,kwindowsystem) + ("kxmlgui" ,kxmlgui) + ("libkdepim" ,libkdepim) + ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests + ("phonon" ,phonon) + ("qtbase" ,qtbase))) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "dbus-launch" "ctest" ".") + #t))))) + (home-page "https://kontact.kde.org/components/korganizer.html") + (synopsis "Organizational assistant, providing calendars and other similar +functionality to help you organize your life.") + (description "KOrganizer is the calendar and scheduling component of +Kontact. It provides management of events and tasks, alarm notification, web +export, network transparent handling of data, group scheduling, import and +export of calendar files and more. It is able to work together with a wide +variety of clanedaring services, including NextCloud, Kolab, Google Calendar +and others. KOrganizer is fully customizable to your needs and is an integral +part of the Kontact suite, which aims to be a complete solution for organizing +your personal data. KOrganizer supports the two dominant standards for storing +and exchanging calendar data, vCalendar and iCalendar.") + (license ;; GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kpimcommon (package (name "kpimcommon") -- cgit v1.2.3 From afa3b4d191d08e8ab88d764778f53c6a5d155a3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:52:32 +0200 Subject: gnu: Fix typo. This is a follow-up to 83a4ab4e4213eaf10289f0abd8a43979178701d7. * gnu/local.mk (dist_patch_DATA): Fix typo in patch name. --- gnu/local.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ddd89ba018..93a1b680d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,7 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ %D%/packages/patches/libotr-test-auth-fix.patch \ - %D%/packages/patches/libksieve-Fix-missing-lInk-libraries.patch \ + %D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-length-check.patch \ -- cgit v1.2.3 From ac75bd010260f6a722e1723b35992b04fd79d44c Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Mar 2020 15:54:42 +0100 Subject: gnu: system: Remove guile-wm from skeleton. * gnu/system/shadow.scm (default-skeletons): Remove guile-wm (especially as a dependency). --- gnu/system/shadow.scm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 13b8b14095..46efdfddab 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Alex Griffin +;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. ;;; @@ -32,7 +33,6 @@ #:use-module ((gnu packages admin) #:select (shadow)) #:use-module (gnu packages bash) - #:use-module (gnu packages guile-wm) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -117,12 +117,6 @@ (define (default-skeletons) "Return the default skeleton files for /etc/skel. These files are copied by 'useradd' in the home directory of newly created user accounts." - (define copy-guile-wm - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (copy-file (car (find-files #+guile-wm "wm-init-sample.scm")) - #$output)))) (let ((profile (plain-file "bash_profile" "\ # Honor per-interactive-shell startup file @@ -162,7 +156,6 @@ alias grep='grep --color=auto'\n")) (zprofile (plain-file "zprofile" "\ # Honor system-wide environment variables source /etc/profile\n")) - (guile-wm (computed-file "guile-wm" copy-guile-wm)) (xdefaults (plain-file "Xdefaults" "\ XTerm*utf8: always XTerm*metaSendsEscape: true\n")) @@ -202,7 +195,6 @@ convenient interactive line editing and input history.\\n\\n\"))) (else (display \"Consider installing the 'guile-colorized' package for a colorful Guile experience.\\n\\n\"))))\n")) - (".guile-wm" ,guile-wm) (".gdbinit" ,gdbinit)))) (define (skeleton-directory skeletons) -- cgit v1.2.3 From 1afd98dc93fed7c5fd7824abbd9ba650835877ff Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:50 +1100 Subject: gnu: Add date. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (date): New variable. * gnu/packages/patches/date-output-pkg-config-files.patch: New file. * gnu/local.mk: Add patch. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 + gnu/packages/calendar.scm | 58 +++++++++++++++++++++ .../patches/date-output-pkg-config-files.patch | 60 ++++++++++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 gnu/packages/patches/date-output-pkg-config-files.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 93a1b680d1..ca3f2664aa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -26,6 +26,7 @@ # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio # Copyright © 2019 Amin Bandali +# Copyright © 2020 Brendan Tildesley # # This file is part of GNU Guix. # @@ -805,6 +806,7 @@ dist_patch_DATA = \ %D%/packages/patches/cube-nocheck.patch \ %D%/packages/patches/cursynth-wave-rand.patch \ %D%/packages/patches/cvs-CVE-2017-12836.patch \ + %D%/packages/patches/date-output-pkg-config-files.patch \ %D%/packages/patches/darkice-workaround-fpermissive-error.patch \ %D%/packages/patches/dbus-helper-search-path.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \ diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 060e4d18ad..bd47800d1d 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Stefan Reichoer ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -48,6 +50,62 @@ #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) +(define-public date + ;; We make the same choice as the Arch package maintainer by choosing a + ;; recent commit to fix some bugs. + ;; https://github.com/Alexays/Waybar/issues/565 + (let ((commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082")) + (package + (name "date") + (version (string-append "2.4.1-" (string-take commit 8))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HowardHinnant/date.git") + (commit "9a0ee2542848ab8625984fc8cdbfb9b5414c0082"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxsn0hj22n61bjywysxqgfv7hj5xvsl6isma95fl8xrimpny083")) + (patches + ;; Install pkg-config files + ;; https://github.com/HowardHinnant/date/pull/538 + (search-patches "date-output-pkg-config-files.patch")))) + (inputs `(("tzdata" ,tzdata))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags (list "-DUSE_SYSTEM_TZ_DB=ON" + "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TZ_LIB=ON" + "-DENABLE_DATE_TESTING=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-bin-bash + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "compile_fail.sh" + (("/bin/bash") (which "bash"))) + #t)) + (add-after 'unpack 'patch-zoneinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/tz.cpp" + (("/usr/share/zoneinfo") + (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo"))) + #t)) + (replace 'check + (lambda _ + ;; Disable test that requires checking timezone that + ;; isn't set in the build environment. + (substitute* "CTestTestfile.cmake" + (("add_test.tz_test_pass_zoned_time_deduction_test.*") "") + (("set_tests_properties.tz_test_pass_zoned_time_deduction_test.*") "")) + (invoke "make" "testit")))))) + (synopsis "Date and time library for C++11 and C++14") + (description "Date is a header only C++ library that extends the chrono +date algorithms library for calendar dates and durations. It also provides +the library for handling time zones and leap seconds.") + (home-page "https://howardhinnant.github.io/date/date.html") + (license license:expat)))) + (define-public libical (package (name "libical") diff --git a/gnu/packages/patches/date-output-pkg-config-files.patch b/gnu/packages/patches/date-output-pkg-config-files.patch new file mode 100644 index 0000000000..3fd1d54b36 --- /dev/null +++ b/gnu/packages/patches/date-output-pkg-config-files.patch @@ -0,0 +1,60 @@ +From e56b2dce7e89a92e1b9b35caa13b3e938c4cedea Mon Sep 17 00:00:00 2001 +From: Cole Mickens +Date: Sun, 26 Jan 2020 01:27:08 -0800 +Subject: [PATCH] CMakeLists.txt: output date.pc for pkg-config + +--- + CMakeLists.txt | 15 +++++++++++++++ + date.pc.in | 10 ++++++++++ + 2 files changed, 25 insertions(+) + create mode 100644 date.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f30c473..fe778e8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,6 +128,15 @@ if( BUILD_TZ_LIB ) + endif( ) + endif( ) + ++if ( BUILD_TZ_LIB ) ++ # Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ ++ set( TZ_COMPILE_DEFINITIONS "$,-D$, -D>,>" ) ++ configure_file(date.pc.in date.pc.cf @ONLY) ++ file( GENERATE OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc" ++ INPUT "${CMAKE_CURRENT_BINARY_DIR}/date.pc.cf" ) ++ ++endif( ) ++ + #[===================================================================[ + installation + #]===================================================================] +@@ -171,6 +180,12 @@ install ( + FILES cmake/dateConfig.cmake "${version_config}" + DESTINATION ${CONFIG_LOC}) + ++if ( BUILD_TZ_LIB ) ++ install( ++ FILES ${CMAKE_BINARY_DIR}/date.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) ++endif( ) ++ + #[===================================================================[ + testing + #]===================================================================] +diff --git a/date.pc.in b/date.pc.in +new file mode 100644 +index 0000000..b9c4623 +--- /dev/null ++++ b/date.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=@CMAKE_INSTALL_BINDIR@ ++libdir=@CMAKE_INSTALL_LIB@ ++includedir=@CMAKE_INSTALL_INCLUDE@ ++ ++Name: date ++Description: A date and time library based on the C++11/14/17 header ++Version: @PACKAGE_VERSION@ ++Libs: -L${libdir} -ltz ++Cflags: -I${includedir} @TZ_COMPILE_DEFINITIONS@ -- cgit v1.2.3 From 5ea20584090b950c53502ef92c63d0c1949568d8 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:51 +1100 Subject: gnu: spdlog: Update to 1.5.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/logging.scm (spdlog): Update to 1.5.0 Signed-off-by: Ludovic Courtès --- 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 d75c44aea6..8496b6256d 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -179,7 +179,7 @@ windows in a terminal, colorize, filter and merge.") (define-public spdlog (package (name "spdlog") - (version "1.3.1") + (version "1.5.0") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ windows in a terminal, colorize, filter and merge.") (file-name (git-file-name name version)) (sha256 (base32 - "1rd4zmrlkcdjx0m0wpmjm1g9srj7jak6ai08qkhbn2lsn0niifzd")))) + "0dn44r3xbw1w0bk9yflnxkh3rzdq2bpxkks44skfmqig0rsj1f1x")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit v1.2.3 From d2793ed696094adb7a91d8f542e395d145edf26a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:52 +1100 Subject: gnu: Add gtk-layer-shell. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtk-layer-shell): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/gtk.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d9bd15824b..d52dc41e7e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Meiyo Peng ;;; Copyright © 2019 Giacomo Leidi +;;; Copyright © 2020 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1892,3 +1893,30 @@ displayed on the other side of the bus.") ;; Dual-licensed under either LGPLv2.1 or LGPLv3. (license (list license:lgpl2.1 license:lgpl3)))) + +(define-public gtk-layer-shell + (package + (name "gtk-layer-shell") + (version "0.1.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")) + (sha256 + (base32 "0ncklk3z0fzlz6p76jdcrr1ykyp1f4ykjjch4x2hfp9bwsnl4a3m")))) + (build-system meson-build-system) + (native-inputs `(("pkg-config" ,pkg-config) + ("gobject-introspection" ,gobject-introspection))) + (inputs `(("wayland" ,wayland) + ("gtk+" ,gtk+))) + (home-page "https://github.com/wmww/gtk-layer-shell") + (synopsis "Library to create Wayland desktop components using the Layer +Shell protocol") + (description "Layer Shell is a Wayland protocol for desktop shell +components, such as panels, notifications and wallpapers. It can be used to +anchor windows to a corner or edge of the output, or stretch them across the +entire output. It supports all Layer Shell features including popups and +popovers.") + (license license:expat))) -- cgit v1.2.3 From 5e78a87bb99ca8f0c56ece90b871791abcd79b68 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 16:28:53 +1100 Subject: gnu: waybar: Update to 0.9.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (waybar): Update to 0.9.1. [inputs]: Add date and gtk-layer-shell dependencies. [synopsis]:Remove period. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index f5b9e62afe..7fee167185 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bison) + #:use-module (gnu packages calendar) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages fontutils) @@ -1485,7 +1486,7 @@ modules for building a Wayland compositor.") (define-public waybar (package (name "waybar") - (version "0.8.0") + (version "0.9.1") (source (origin (method git-fetch) @@ -1494,12 +1495,14 @@ modules for building a Wayland compositor.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s8ck7qxka0l91ayma6amp9sc8cidi43byqgzcavi3a6id983r1z")))) + (base32 "0drlv8im5phz39jxp3gxkc40b6f85bb3piff2v3hmnfzh7ib915s")))) (build-system meson-build-system) (arguments `(#:configure-flags (list (string-append "-Dout=" (assoc-ref %outputs "out"))))) - (inputs `(("fmt" ,fmt) + (inputs `(("date" ,date) + ("fmt" ,fmt) + ("gtk-layer-shell" ,gtk-layer-shell) ("gtkmm" ,gtkmm) ("jsoncpp" ,jsoncpp) ("libdbusmenu" ,libdbusmenu) @@ -1513,7 +1516,7 @@ modules for building a Wayland compositor.") ("pkg-config" ,pkg-config) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/Alexays/Waybar") - (synopsis "Wayland bar for Sway and Wlroots based compositors.") + (synopsis "Wayland bar for Sway and Wlroots based compositors") (description "Waybar is a highly customisable Wayland bar for Sway and Wlroots based compositors.") (license license:expat))) ; MIT license -- cgit v1.2.3 From 06ab895e8ccad6ad9e3131b863cba14924fc149a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 09:34:40 -0500 Subject: gnu: emacs-magit-svn: Use the emacs-build-system. * gnu/packages/emacs-xyz.scm (emacs-magit-svn)[build-system]: Use the emacs-build-system. [arguments]: Remove. --- gnu/packages/emacs-xyz.scm | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6682403ebc..cb216f536d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -414,7 +414,7 @@ operations.") (let ((commit "9e33ceee32f665db59909e1c00a667ccdd04178f")) (package (name "emacs-magit-svn") - (version (git-version "2.2.1" "1" commit)) + (version (git-version "2.2.1" "2" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -424,48 +424,11 @@ operations.") (sha256 (base32 "1mlqz8dh6jy5rv72lgkxv253dgh73fmbaidskicypapvbl3lr6xy")))) - (build-system trivial-build-system) - (native-inputs `(("emacs" ,emacs-minimal))) + (build-system emacs-build-system) (propagated-inputs `(("dash" ,emacs-dash) ("with-editor" ,emacs-with-editor) ("magit" ,emacs-magit) ("transient" ,emacs-transient))) - (arguments - `(#:modules ((guix build utils) - (guix build emacs-utils)) - - #:builder - (begin - (use-modules (guix build utils) - (guix build emacs-utils)) - - (let ((emacs (string-append (assoc-ref %build-inputs "emacs") - "/bin/emacs")) - (magit (string-append (assoc-ref %build-inputs "magit") - "/share/emacs/site-lisp")) - (transient (string-append (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - (dash (string-append (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash))) - (with-editor (string-append (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor))) - (source (assoc-ref %build-inputs "source")) - (lisp-dir (string-append %output "/share/emacs/site-lisp"))) - - (install-file (string-append source "/magit-svn.el") - lisp-dir) - - (with-directory-excursion lisp-dir - (parameterize ((%emacs emacs)) - (emacs-generate-autoloads ,name lisp-dir) - (setenv "EMACSLOADPATH" - (string-append ":" magit ":" transient - ":" dash ":" with-editor)) - (emacs-batch-eval '(byte-compile-file "magit-svn.el")))) - #t)))) (home-page "https://github.com/magit/magit-svn") (synopsis "Git-SVN extension to Magit") (description -- cgit v1.2.3 From 93f606b343dab7e1eb1fe0c2f8eb4b11fc7767b6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 09:48:55 -0500 Subject: gnu: emacs-guix: Remove unnecessary configure flags. * gnu/packages/emacs-xyz.scm (emacs-guix)[arguments]: Remove. --- gnu/packages/emacs-xyz.scm | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index cb216f536d..2bba0eb129 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2127,47 +2127,6 @@ type, for example: packages, buffers, files, etc.") (base32 "0yz64c0z4ygi2k4af18k4r1ncgys18jb8icywkp2g5pgmpn5l7ps")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (let ((guix (assoc-ref %build-inputs "guix")) - (gcrypt (assoc-ref %build-inputs "guile-gcrypt")) - (geiser (assoc-ref %build-inputs "geiser")) - (dash (assoc-ref %build-inputs "dash")) - (bui (assoc-ref %build-inputs "bui")) - (magit-popup (assoc-ref %build-inputs "magit-popup")) - (edit-indirect (assoc-ref %build-inputs "edit-indirect")) - (site-lisp "/share/emacs/site-lisp") - (site-scm "/share/guile/site") - (site-go "/lib/guile") - (guile-dir (lambda (dir) - (car (find-files dir - (lambda (file stat) - (string-prefix? - "2." (basename file))) - #:directories? #t))))) - (list (string-append "--with-guix-site-dir=" - (guile-dir (string-append guix site-scm))) - (string-append "--with-guix-site-ccache-dir=" - (guile-dir (string-append guix site-go)) - "/site-ccache") - (string-append "--with-guile-gcrypt-site-dir=" - (guile-dir (string-append gcrypt site-scm))) - (string-append "--with-guile-gcrypt-site-ccache-dir=" - (guile-dir (string-append gcrypt site-go)) - "/site-ccache") - (string-append "--with-geiser-lispdir=" geiser site-lisp) - (string-append "--with-dash-lispdir=" - dash site-lisp "/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "--with-bui-lispdir=" - bui site-lisp "/guix.d/bui-" - ,(package-version emacs-bui)) - (string-append "--with-editindirect-lispdir=" - edit-indirect site-lisp "/guix.d/edit-indirect-" - ,(package-version emacs-edit-indirect)) - (string-append "--with-popup-lispdir=" - magit-popup site-lisp "/guix.d/magit-popup-" - ,(package-version emacs-magit-popup)))))) (native-inputs `(("pkg-config" ,pkg-config) ("emacs" ,emacs-minimal))) -- cgit v1.2.3 From 092cdae90b57ec6a6bd4047f37d8a5d8526bc191 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 29 Feb 2020 12:38:33 -0500 Subject: gnu: emacs-forge: Use the emacs-build-system. This streamlines the package definition nicely and bring benefits, such as having the Elisp files scanned for potential /bin/ programs and patched, compressing the info manual, being able to compile the autoload file, and installing the byte compiled files to the correct location (under site-lisp/). * gnu/packages/emacs-xyz.scm (emacs-forge)[build-system]: Switch from the gnu-build-system to the emacs-build-system. [arguments]: Remove the #:modules and #:imported-modules arguments. Delete all the custom phases except the 'chdir-lisp one, and add a new 'build-info-manual phase. --- gnu/packages/emacs-xyz.scm | 53 +++++++++++----------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2bba0eb129..0e7131faf3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -18303,7 +18303,7 @@ a suffix) we prefer to call it just a \"transient\".") (let ((commit "63cbf81f166fc71861d8e3d246df8e5ccedcb9bb")) (package (name "emacs-forge") - (version (git-version "0.1.0" "2" commit)) + (version (git-version "0.1.0" "3" commit)) (source (origin (method git-fetch) @@ -18314,7 +18314,7 @@ a suffix) we prefer to call it just a \"transient\".") (sha256 (base32 "1yf2xjx3459py6rji740jm8bmh2pv66ghnbjxsvjd4jf9kcdav83")))) - (build-system gnu-build-system) + (build-system emacs-build-system) (native-inputs `(("texinfo" ,texinfo) ("emacs" ,emacs-minimal))) @@ -18329,51 +18329,22 @@ a suffix) we prefer to call it just a \"transient\".") ("emacs-transient" ,emacs-transient))) (arguments `(#:tests? #f ;no tests - #:modules ((srfi srfi-26) - (guix build gnu-build-system) - ((guix build emacs-build-system) #:prefix emacs:) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) #:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'install) - (add-after 'unpack 'delete-doc-targets + (add-after 'unpack 'build-info-manual (lambda _ - (substitute* "./Makefile" - (("lisp docs") "lisp")))) - (add-after 'delete-doc-targets 'chdir-lisp + (invoke "make" "info") + ;; Move the info file to lisp so that it gets installed by the + ;; emacs-build-system. + (rename-file "docs/forge.info" "lisp/forge.info"))) + (add-after 'build-info-manual 'chdir-lisp (lambda _ - (chdir "lisp"))) - (add-after 'chdir-lisp 'emacs-install - (assoc-ref emacs:%standard-phases 'install)) - (add-after 'emacs-install 'emacs-make-autoloads - (assoc-ref emacs:%standard-phases 'make-autoloads)) - (add-after 'build 'install-elc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (el-dir (string-append - out "/share/emacs/site-lisp/guix.d/forge-" - ,version))) - (for-each (cut install-file <> el-dir) - (find-files "." "\\.elc")) - #t))) - (add-after 'install-elc 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (info (string-append out "/share/info"))) - (with-directory-excursion "../docs" - (invoke "makeinfo" "forge.texi") - (install-file "forge.info" info) - #t))))))) + (chdir "lisp") + #t))))) (home-page "https://github.com/magit/forge/") (synopsis "Access Git forges from Magit") - (description - "Work with Git forges, such as Github and Gitlab, from the comfort of -Magit and the rest of Emacs.") + (description "Work with Git forges, such as Github and Gitlab, from the +comfort of Magit and the rest of Emacs.") (license license:gpl3+)))) (define-public emacs-matcha -- cgit v1.2.3 From d53e87cf11b5a5a1d794f6ef15fe7213c5b60546 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 21:52:37 -0500 Subject: gnu: ghc-hindent: Remove guix.d from the Elisp installation directory. * gnu/packages/haskell-xyz.scm (ghc-hindent)[phases]{emacs-install}: Update the installation prefix directory. --- gnu/packages/haskell-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 418eb7cc46..01fecae850 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5286,8 +5286,7 @@ descriptions.") (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (elisp-file "elisp/hindent.el") - (dest (string-append out "/share/emacs/site-lisp" - "/guix.d/hindent-" ,version)) + (dest (string-append out "/share/emacs/site-lisp")) (emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))) (make-file-writable elisp-file) -- cgit v1.2.3 From 0a3ce07784c74ff27b864884499deca41c3d4d0e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 22:11:47 -0500 Subject: gnu: cedille: Remove guix.d from the Elisp installation directory. * gnu/packages/cedille.scm (cedille)[phases]{patch-cedille-path-el}: Update the Elisp installation prefix used. {copy-cedille-mode}: Likewise. --- gnu/packages/cedille.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cedille.scm b/gnu/packages/cedille.scm index d3a6850f9f..d9cf66c501 100644 --- a/gnu/packages/cedille.scm +++ b/gnu/packages/cedille.scm @@ -56,17 +56,12 @@ (let ((out (assoc-ref outputs "out"))) (substitute* "cedille-mode.el" (("/usr/share/emacs/site-lisp/cedille-mode") - (string-append - out "/share/emacs/site-lisp/guix.d/cedille-" - ,version))) + (string-append out "/share/emacs/site-lisp"))) #t))) (add-after 'unpack 'copy-cedille-mode (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp - (string-append - out "/share/emacs/site-lisp/guix.d/cedille-" - ,version "/"))) + (lisp (string-append out "/share/emacs/site-lisp"))) (mkdir-p (string-append lisp "cedille-mode")) (copy-recursively "cedille-mode" -- cgit v1.2.3 From d5195020d2b2909a6199fe2a93a109b2967e6d88 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 1 Mar 2020 22:34:41 -0500 Subject: gnu: emacs-mew: Remove guix.d from the Elisp installation directory. * gnu/packages/mail.scm (emacs-mew)[arguments]: Update the Elisp installation prefix. --- gnu/packages/mail.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 03383180b0..092bb8be0f 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -673,7 +673,7 @@ repository and Maildir/IMAP as LOCAL repository.") ("ruby" ,ruby))) ; to set GEM_PATH so ruby-sqlite3 is found at runtime (build-system gnu-build-system) (arguments - (let ((elisp-dir "/share/emacs/site-lisp/guix.d/mew") + (let ((elisp-dir "/share/emacs/site-lisp") (icon-dir "/share/mew")) `(#:modules ((guix build gnu-build-system) (guix build utils) -- cgit v1.2.3 From cc96c9504d22c0a0a4a146436a74c24d348241ae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 28 Feb 2020 23:42:59 -0500 Subject: gnu: emacs-magit: Remove obsolete make flags. * gnu/packages/emacs-xyz.scm (emacs-magit): Remove make flags that were jadis required to reference external Elisp libraries. These are now made available through EMACSLOADPATH. --- gnu/packages/emacs-xyz.scm | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0e7131faf3..62d1adcf74 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -295,7 +295,7 @@ on stdout instead of using a socket as the Emacsclient does.") (let ((commit "c761d28d49e5238037512b898db0ec9b40d85770")) (package (name "emacs-magit") - (version (git-version "2.90.1" "2" commit)) + (version (git-version "2.90.1" "3" commit)) (source (origin (method git-fetch) (uri (git-reference @@ -335,24 +335,10 @@ on stdout instead of using a socket as the Emacsclient does.") (guix build emacs-utils)) #:test-target "test" #:tests? #f ; tests are not included in the release - #:make-flags (list (string-append "PREFIX=" %output) ;; Don't put .el files in a sub-directory. - (string-append "lispdir=" %output "/share/emacs/site-lisp") - (string-append "DASH_DIR=" - (assoc-ref %build-inputs "dash") - "/share/emacs/site-lisp/guix.d/dash-" - ,(package-version emacs-dash)) - (string-append "WITH_EDITOR_DIR=" - (assoc-ref %build-inputs "with-editor") - "/share/emacs/site-lisp/guix.d/with-editor-" - ,(package-version emacs-with-editor)) - (string-append "TRANSIENT_DIR=" - (assoc-ref %build-inputs "transient") - "/share/emacs/site-lisp/guix.d/transient-" - ,(package-version emacs-transient))) - + (string-append "lispdir=" %output "/share/emacs/site-lisp")) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch -- cgit v1.2.3 From 15c3aa091100160bbe9c81650f9ab7a12bd7964e Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Thu, 19 Mar 2020 19:54:46 +0100 Subject: gnu: docker-compose: Update to 1.25.4. Fixes . * gnu/packages/docker.scm (docker-compose): Update to 1.25.4. Signed-off-by: Danny Milosavljevic --- gnu/packages/docker.scm | 11 +++++------ gnu/packages/python-xyz.scm | 26 -------------------------- 2 files changed, 5 insertions(+), 32 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7524a0dc1b..69dee2b856 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,19 +99,17 @@ pseudo-terminal (PTY) allocated to a Docker container using the Python client.") (license license:asl2.0))) -;; When updating, check whether python-jsonschema-2.6 can be removed from Guix -;; entirely. (define-public docker-compose (package (name "docker-compose") - (version "1.24.1") + (version "1.25.4") (source (origin (method url-fetch) (uri (pypi-uri "docker-compose" version)) (sha256 (base32 - "0lx7bx6jvhydbab8vwry0bclhdf0dfj6jrns1m5y45yp9ybqxmd5")))) + "1ww8ckpj3n5jdg63qvmiqx3gk0fsrnynnnqj17fppymbwjzf5fps")))) (build-system python-build-system) ;; TODO: Tests require running Docker daemon. (arguments '(#:tests? #f)) @@ -120,9 +119,9 @@ client.") ("python-docker-py" ,python-docker-py) ("python-dockerpty" ,python-dockerpty) ("python-docopt" ,python-docopt) - ("python-jsonschema" ,python-jsonschema-2.6) + ("python-jsonschema" ,python-jsonschema) ("python-pyyaml" ,python-pyyaml) - ("python-requests" ,python-requests-2.20) + ("python-requests" ,python-requests) ("python-six" ,python-six) ("python-texttable" ,python-texttable) ("python-websocket-client" ,python-websocket-client))) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07199aa7ca..8271e1ff7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2306,32 +2306,6 @@ compare, diff, and patch JSON and JSON-like structures in Python.") `(("python2-functools32" ,python2-functools32) ,@(package-propagated-inputs jsonschema)))))) -;; This old version is still required by docker-compose as of 1.24.0. -(define-public python-jsonschema-2.6 - (package - (name "python-jsonschema") - (version "2.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "jsonschema" version)) - (sha256 - (base32 - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check (lambda _ (invoke "nosetests")))))) - (native-inputs - `(("python-nose" ,python-nose) - ("python-vcversioner" ,python-vcversioner))) - (home-page "https://github.com/Julian/jsonschema") - (synopsis "Implementation of JSON Schema for Python") - (description - "Jsonschema is an implementation of JSON Schema for Python.") - (license license:expat) - (properties `((python2-variant . ,(delay python2-jsonschema)))))) - (define-public python-schema (package (name "python-schema") -- cgit v1.2.3 From 0b06a0199fe4f028f707cf77fc8ae73a1b367d4b Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Thu, 19 Mar 2020 21:02:34 +0100 Subject: gnu: rust-bindgen: Add missing space to synopsis. * gnu/packages/crates-io.scm (rust-bindgen-0.50)[synopsis]: Add a space between "C++" and "libraries". --- 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 1e1e9bf5db..a164b25570 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -966,7 +966,7 @@ that uses Serde for transforming structs into bytes and vice versa!") (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis - "Automatically generates FFI bindings to C and C++libraries") + "Automatically generates FFI bindings to C and C++ libraries") (description "Automatically generates Rust FFI bindings to C and C++ libraries.") -- cgit v1.2.3 From 355dd7135cdcdcd4c589bbb7f0f6ab5a2f26ca65 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Fri, 20 Mar 2020 01:24:38 +1100 Subject: gnu: grim: Move scdoc to native-inputs. * gnu/packages/image.scm (scdoc)[inputs]: Remove scdoc. [native-inputs]: Add scdoc. Signed-off-by: Danny Milosavljevic --- 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 ad288b87ec..b665740ca2 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1776,10 +1776,10 @@ identical visual appearance.") (sha256 (base32 "0brljl4zfbn5mh9hkfrfkvd27c5y9vdkgap9r1hrfy9r1x20sskn")))) (build-system meson-build-system) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) (inputs `(("cairo" ,cairo) ("libjpeg-turbo" ,libjpeg-turbo) - ("scdoc" ,scdoc) ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols))) (home-page "https://github.com/emersion/grim") -- cgit v1.2.3 From d105cc52f9f6bf6e721ec88f9f60bc906d320853 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:18:20 +0200 Subject: gnu: Add rust-cairo-sys-rs-0.9. * gnu/packages/crates-io.scm (rust-cairo-sys-rs-0.9): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a164b25570..62d4c63349 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) #:use-module (gnu packages jemalloc) #:use-module (gnu packages llvm) #:use-module (gnu packages pcre) @@ -1677,6 +1678,34 @@ exposed as Reader/Writer streams.") "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cairo-sys-rs-0.9 + (package + (name "rust-cairo-sys-rs") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-sys-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qsdy6s57yvscg2rfm7wdqrlhzbn1aq9lhk3dy1vw5f7r81blrgz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-x11" ,rust-x11-2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (inputs + `(("cairo" ,cairo))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libcairo") + (description "This package provides FFI bindings to libcairo.") + (license license:expat))) + (define-public rust-calloop-0.4 (package (name "rust-calloop") -- cgit v1.2.3 From a3ea699eb3fcaa5051872dcb22a6937b6e8be295 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:31:40 +0200 Subject: gnu: Add rust-gtk-pixbuf-sys-0.9. * gnu/packages/crates-io.scm (rust-gdk-pixbuf-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 62d4c63349..61c932751a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6019,6 +6019,38 @@ archive to be linked into Rustcode.") API library @code{gdi32}.") (license license:expat))) +(define-public rust-gdk-pixbuf-sys-0.9 + (package + (name "rust-gdk-pixbuf-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c2andpjb10y7bahh6nxnksh9m3g5qh4mgq9znx634cy1831p6fq")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests not included in release + #:cargo-inputs + (("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf))) + (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))) + (define-public rust-generator-0.6 (package (name "rust-generator") -- cgit v1.2.3 From 1386cad154bcef019468f8a1e45d9b84d18a2e4d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:45:36 +0200 Subject: gnu: Add rust-pango-sys-0.9. * gnu/packages/crates-io.scm (rust-pango-sys-0.9): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 61c932751a..f6c56039ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11422,6 +11422,37 @@ normally prevent moving a type that has been borrowed from.") "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-pango-sys-0.9 + (package + (name "rust-pango-sys") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0zdynikh6jrfa31fpmbrwnz46a57idci73zzkf0z0g3vj223vfc6")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files not included in release. + #:cargo-inputs + (("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("pango" ,pango))) + (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))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From f06961ea356352565c840e77d71b3a0028e45bd0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 21:55:55 +0200 Subject: gnu: Add rust-pangocairo-sys-0.10. * gnu/packages/crates-io.scm (rust-pangocairo-sys-0.10): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f6c56039ef..5a099b0ed0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11453,6 +11453,37 @@ normally prevent moving a type that has been borrowed from.") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pangocairo-sys-0.10 + (package + (name "rust-pangocairo-sys") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1zlyf5vajarnxg5034b8qa5w5zajv96lfvlgiki26svpmcqip4m3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3)) + #:cargo-development-inputs + (("rust-shell-words" ,rust-shell-words-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("gtk+" ,gtk+))) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to libgtk-3.") + (license license:expat))) + (define-public rust-parity-wasm-0.40 (package (name "rust-parity-wasm") -- cgit v1.2.3 From 34d0c1e7dd25acc43385f4cb91b928b437503a9d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:04:22 +0200 Subject: gnu: Add rust-edit-distance-2.1. * gnu/packages/crates-io.scm (rust-edit-distance-2.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 5a099b0ed0..071e2619fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4175,6 +4175,29 @@ floating-point primitives to an @code{io::Write}.") "This package provides lightweight binding to DirectWrite.") (license license:mpl2.0))) +(define-public rust-edit-distance-2.1 + (package + (name "rust-edit-distance") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "edit-distance" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0yq3wlmd7ly22qxhfysi77qp31yvpx2ll9waa75bkpiih7rsmfmv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.9)))) + (home-page "https://github.com/febeling/edit-distance") + (synopsis "Levenshtein edit distance between strings") + (description + "Levenshtein edit distance between strings, a measure for similarity.") + (license license:asl2.0))) + (define-public rust-either-1.5 (package (name "rust-either") -- cgit v1.2.3 From 44b748e4f5dd2b026a861f2b6411c74a64863b28 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:10:56 +0200 Subject: gnu: Add rust-alga-derive-0.9. * gnu/packages/crates-io.scm (rust-alga-derive-0.9): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 071e2619fa..b29b11cb81 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -219,6 +219,33 @@ the Rust programming language.") ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-alga-derive-0.9 + (package + (name "rust-alga-derive") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "alga-derive" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a2594j6blczz18vfg85agr7vsjrbq6900d3xwxw0zzbqj9j2adz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-edit-distance" ,rust-edit-distance-2.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quickcheck" ,rust-quickcheck-0.9) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/rustsim/alga") + (synopsis "Dutomatic deriving of abstract algebra traits") + (description "Derive attribute for implementing algebraic traits from the +@code{alga} crate.") + (license license:asl2.0))) + (define-public rust-andrew-0.2 (package (name "rust-andrew") -- cgit v1.2.3 From 8ae8478a711acb866b03099d2ed8577446c50cfb Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:14:46 +0200 Subject: gnu: Add rust-ord-subset-3. * gnu/packages/crates-io.scm (rust-ord-subset-3): 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 b29b11cb81..70ea6a515d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -11287,6 +11287,27 @@ system for OpenSSL.") "Extra FFI bindings to OpenSSL that require a C shim.") (license license:expat))) +(define-public rust-ord-subset-3 + (package + (name "rust-ord-subset") + (version "3.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ord-subset" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vvb6zmz279nb59dki7kbsvixbk8zpg2gxvgcpsjfnxg9ik19knp")))) + (build-system cargo-build-system) + (home-page "https://github.com/emerentius/ord_subset") + (synopsis "Tools for working with the Ord subset of certain PartialOrd types") + (description + "This package provides tools for working with the Ord subset of certain +PartialOrd types, like floats.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ordered-float-1.0 (package (name "rust-ordered-float") -- cgit v1.2.3 From e036be30c543449b459a3d0e0928d89ab372e8aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:18:05 +0200 Subject: gnu: Add rust-decimal-2.0. * gnu/packages/crates-io.scm (rust-decimal-2.0): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70ea6a515d..1a15222bac 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3651,6 +3651,36 @@ hexadecimal, base32, and base64.") and arithmetic.") (license license:expat))) +(define-public rust-decimal-2.0 + (package + (name "rust-decimal") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "decimal" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vb3i8vg1dxrw3kzbfiag3gg7rdjd73z80mwbwkq60vnphiqfig6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-ord-subset" ,rust-ord-subset-3) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-cc" ,rust-cc-1.0)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/alkis/decimal") + (synopsis "Decimal floating point arithmetic for Rust") + (description + "Decimal floating point arithmetic for Rust.") + (license license:asl2.0))) + (define-public rust-deflate-0.7 (package (name "rust-deflate") -- cgit v1.2.3 From 818794ee2832aa4c8395d758916e7c057cb02cfd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:27:18 +0200 Subject: gnu: Add rust-alga-0.9. * gnu/packages/crates-io.scm (rust-alga-0.9): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a15222bac..aaa3b2be2d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -219,6 +219,40 @@ the Rust programming language.") ("rust-rand" ,rust-rand-0.3) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3)))))) +(define-public rust-alga-0.9 + (package + (name "rust-alga") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "alga" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wl4z8ini9269x04g8wwdz1nn3hmmvaaysq4jwhymikyg81kv0jg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-decimal" ,rust-decimal-2.0) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-alga-derive" ,rust-alga-derive-0.9) + ("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/rustsim/alga") + (synopsis "Abstract algebra for Rust") + (description "Alga aims to provide solid mathematical abstractions to +algebra-focused applications. It defines and organizes through trait +inheritance the basic building blocks of general algebraic structures. +Specific implementations of algebraic structure traits are left to other +crates. Higher-level traits for specialized domains of algebra (like linear +algebra) are also provided and will prove useful for applications that include +code that is generic with regard to the algebraic entity types.") + (license license:asl2.0))) + (define-public rust-alga-derive-0.9 (package (name "rust-alga-derive") -- cgit v1.2.3 From 87a3a185fe433d3497f08083c6ec7e5eb78c5fef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:32:39 +0200 Subject: gnu: Add rust-rustdoc-stripper-0.1. * gnu/packages/crates-io.scm (rust-rustdoc-stripper-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 aaa3b2be2d..59d153dc22 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14750,6 +14750,29 @@ require unstable language features.") rustc compiler.") (license (list license:expat license:asl2.0)))) +(define-public rust-rustdoc-stripper-0.1 + (package + (name "rust-rustdoc-stripper") + (version "0.1.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustdoc-stripper" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "13rf65a0xk1zyb92jd8p12x529rsbfchwk9zvjr0snr9savpxw19")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (home-page "https://github.com/GuillaumeGomez/rustdoc-stripper") + (synopsis "Nanipulate rustdoc comments") + (description + "This package provides a tool to manipulate rustdoc comments.") + (license license:asl2.0))) + (define-public rust-rustfix-0.4 (package (name "rust-rustfix") -- cgit v1.2.3 From 6de81dd2d89289114d3bc6a93e79fac2a8c2a455 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:35:11 +0200 Subject: gnu: Add rust-gtk-rs-lgpl-docs-0.1. * gnu/packages/crates-io.scm (rust-gtk-rs-lgpl-docs-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 59d153dc22..112018d2e5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7166,6 +7166,29 @@ standard printing of search results, similar to grep itself.") "Fast line oriented regex searching as a library.") (license (list license:unlicense license:expat)))) +(define-public rust-gtk-rs-lgpl-docs-0.1 + (package + (name "rust-gtk-rs-lgpl-docs") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "gtk-rs-lgpl-docs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06b1j64zg0xmhwfkyhzh3y0apclg6qihn3f7s1bd7kgjmkia4jlr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustdoc-stripper" ,rust-rustdoc-stripper-0.1)))) + (home-page "https://gtk-rs.org/") + (synopsis "LGPL-licensed docs for Gtk-rs crates") + (description + "LGPL-licensed docs for Gtk-rs crates.") + (license license:lgpl2.0))) + (define-public rust-gzip-header-0.3 (package (name "rust-gzip-header") -- cgit v1.2.3 From 07bf6cbc49adf2aa0835b84793c30463a66178d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:50:02 +0200 Subject: gnu: rust-futures-util-preview-0.3: Don't skip build. * gnu/packages/crates-io.scm (rust-futures-util-preview-0.3)[arguments]: Don't skip build. Skip tests. Replace rust-rand-0.4 with 0.7 in cargo-inputs. Remove rust-rand-core-0.5. --- 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 112018d2e5..187f15dc49 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6031,7 +6031,7 @@ for the futures-rs library.") "0kizm86wgr5qldyavskfi0r1msg6m4x2pkj0d4r04br2ig29i0dg")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs (("rust-futures" ,rust-futures-0.1) ("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) @@ -6044,8 +6044,7 @@ for the futures-rs library.") ("rust-pin-utils" ,rust-pin-utils-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro-nested" ,rust-proc-macro-nested-0.1) - ("rust-rand" ,rust-rand-0.4) - ("rust-rand-core" ,rust-rand-core-0.5) + ("rust-rand" ,rust-rand-0.7) ("rust-slab" ,rust-slab-0.4) ("rust-tokio-io" ,rust-tokio-io-0.1)))) (home-page "https://github.com/rust-lang/futures-rs") -- cgit v1.2.3 From 8f000e87a2276ee89ee6d192d8e61899a9a680ef Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 22:51:54 +0200 Subject: gnu: Add rust-futures-preview-0.3. * gnu/packages/crates-io.scm (rust-futures-preview-0.3): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 187f15dc49..8fd0433c9e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5889,6 +5889,36 @@ for the futures-rs library.") "This package provides the @code{futures-rs} procedural macro implementations.") (license (list license:expat license:asl2.0)))) +(define-public rust-futures-preview-0.3 + (package + (name "rust-futures-preview") + (version "0.3.0-alpha.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-preview" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0rsq8d1ciyg37i5ysd9dynwmklwy4sx466z9a72687wsi8fgj9dz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs + (("rust-futures-channel-preview" ,rust-futures-channel-preview-0.3) + ("rust-futures-core-preview" ,rust-futures-core-preview-0.3) + ("rust-futures-executor-preview" ,rust-futures-executor-preview-0.3) + ("rust-futures-io-preview" ,rust-futures-io-preview-0.3) + ("rust-futures-sink-preview" ,rust-futures-sink-preview-0.3) + ("rust-futures-util-preview" ,rust-futures-util-preview-0.3)))) + (home-page "https://rust-lang-nursery.github.io/futures-rs") + (synopsis "An implementation of futures and streams") + (description + "An implementation of futures and streams featuring zero allocations, +composability, and iterator-like interfaces.") + (license (list license:expat license:asl2.0)))) + (define-public rust-futures-select-macro-preview-0.3 (package (name "rust-futures-select-macro-preview") -- cgit v1.2.3 From 2832731589bf7c9de0f5136b07b0218a34053ad7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:04:24 +0200 Subject: gnu: Add rust-glib-0.9. * gnu/packages/crates-io.scm (rust-glib-0.9): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8fd0433c9e..35aa27f0b2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6595,6 +6595,43 @@ reading and writing git repositories.") "Generated OpenGL bindings and wrapper for Servo.") (license (list license:asl2.0 license:expat)))) +(define-public rust-glib-0.9 + (package + (name "rust-glib") + (version "0.9.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h3100mf7kdfxibjz5na0sqzbd2mcsyd8pzivn3666w414x5gys0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-futures-task" ,rust-futures-task-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("glib" ,glib))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GLib library") + (description + "Rust bindings for the GLib library.") + (license license:expat))) + (define-public rust-glib-sys-0.9 (package (name "rust-glib-sys") -- cgit v1.2.3 From 85cb4da813f25ebaac112d9f3e9c26f4b64dd985 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:16:27 +0200 Subject: gnu: Add rust-cairo-rs-0.8. * gnu/packages/crates-io.scm (rust-cairo-rs-0.8): 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 35aa27f0b2..2a3c424c4a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1739,6 +1739,39 @@ exposed as Reader/Writer streams.") "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cairo-rs-0.8 + (package + (name "rust-cairo-rs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11303v1fv6hsc9n70ak380gknkf0098phpcxqdhkmahqjsx4jw0m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.9) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1) + ("rust-tempfile" ,rust-tempfile-3.1)))) + (inputs + `(("cairo" ,cairo))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Cairo library") + (description + "Rust bindings for the Cairo library.") + (license license:expat))) + (define-public rust-cairo-sys-rs-0.9 (package (name "rust-cairo-sys-rs") -- cgit v1.2.3 From 9acfbaf39d09557848593284fb1bbaf5a55d695c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:30:05 +0200 Subject: gnu: Add rust-num-bigint-0.1. * gnu/packages/crates-io.scm (rust-num-bigint-0.1): 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 2a3c424c4a..1075c14617 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10758,6 +10758,30 @@ including bigint, complex, rational, range iterators, generic integers, and more "Big integer implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-bigint-0.1 + (package + (inherit rust-num-bigint-0.2) + (name "rust-num-bigint") + (version "0.1.44") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-bigint" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1hg80xd7vd5yqzks1h0zk2fcgqnf84m2cdj9q4cffk581nnrjf76")))) + (arguments + `(#:cargo-inputs + (("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.4) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)) + #:cargo-development-inputs + (("rust-rand" ,rust-rand-0.4)))))) + (define-public rust-num-complex-0.2 (package (name "rust-num-complex") -- cgit v1.2.3 From fbe6dbb69e6600972b8d8f95760abf3a2e107cfd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:41:03 +0200 Subject: gnu: Add rust-num-complex-0.1. * gnu/packages/crates-io.scm (rust-num-complex-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 1075c14617..b2be043833 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10810,6 +10810,27 @@ including bigint, complex, rational, range iterators, generic integers, and more "Complex numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-complex-0.1 + (package + (inherit rust-num-complex-0.2) + (name "rust-num-complex") + (version "0.1.43") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-complex" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mln3h018lar511hadjwfkbyq1561s8kdzfg8aagbakqg0fn725j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)))))) + (define-public rust-num-cpus-1.11 (package (name "rust-num-cpus") -- cgit v1.2.3 From 74f44bf74fd2b48ab18b4af2c849798d4eae15ce Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:45:55 +0200 Subject: gnu: Add rust-num-rational-0.1. * gnu/packages/crates-io.scm (rust-num-rational-0.1): 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 b2be043833..6fee45d9aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10981,6 +10981,28 @@ including bigint, complex, rational, range iterators, generic integers, and more "Rational numbers implementation for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-rational-0.1 + (package + (inherit rust-num-rational-0.2) + (name "rust-num-rational") + (version "0.1.42") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-rational" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kkqb8j3b3nis9hs4ww4hkrmb4a6v9sr9al08xmwhgvmpms4qcgf")))) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-0.8)))))) + (define-public rust-num-traits-0.2 (package (name "rust-num-traits") -- cgit v1.2.3 From 6fee63e6d9c58569937e56151d7084ea7ee6e6cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:47:53 +0200 Subject: gnu: Add rust-num-0.1. * gnu/packages/crates-io.scm (rust-num-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 6fee45d9aa..5de673475d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10727,6 +10727,29 @@ combinators library.") including bigint, complex, rational, range iterators, generic integers, and more.") (license (list license:expat license:asl2.0)))) +(define-public rust-num-0.1 + (package + (inherit rust-num-0.2) + (name "rust-num") + (version "0.1.42") + (source + (origin + (method url-fetch) + (uri (crate-uri "num" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0vhmyvfan380f86895z0f8rjscjc6qvwcmyvm15370ik2mjas0s7")))) + (arguments + `(#:cargo-inputs + (("rust-num-bigint" ,rust-num-bigint-0.1) + ("rust-num-complex" ,rust-num-complex-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-iter" ,rust-num-iter-0.1) + ("rust-num-rational" ,rust-num-rational-0.1) + ("rust-num-traits" ,rust-num-traits-0.2)))))) + (define-public rust-num-bigint-0.2 (package (name "rust-num-bigint") -- cgit v1.2.3 From ee7ef9cb8c3f340508fbfa1abab78bd07b0865e8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:49:53 +0200 Subject: gnu: Add rust-float-cmp-0.3. * gnu/packages/crates-io.scm (rust-float-cmp-0.3): 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 5de673475d..258c4ebc62 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5202,6 +5202,28 @@ Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based streams.") (license (list license:expat license:asl2.0)))) +(define-public rust-float-cmp-0.3 + (package + (name "rust-float-cmp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-cmp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))) + (home-page "https://github.com/mikedilger/float-cmp") + (synopsis "Floating point approximate comparison traits") + (description + "Floating point approximate comparison traits in Rust.") + (license license:expat))) + (define-public rust-float-ord-0.2 (package (name "rust-float-ord") -- cgit v1.2.3 From 2d6fa1839993e381b4c9d6d3287f6be98af2847a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 23:59:29 +0200 Subject: gnu: Add rust-dtoa-short-0.3. * gnu/packages/crates-io.scm (rust-dtoa-short-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 258c4ebc62..eb98877725 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4239,6 +4239,31 @@ floating-point primitives to an @code{io::Write}.") (base32 "0g96cap6si1g6wi62hsdk2fnj3sf5vd4i97zj6163j8hhnsl3n0d")))))) +(define-public rust-dtoa-short-0.3 + (package + (name "rust-dtoa-short") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "dtoa-short" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1wkn7ziqffq8hj0a411lgn7674ackzdk734ikp230rmp2f2hn0jr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-dtoa" ,rust-dtoa-0.4)) + #:cargo-development-inputs + (("rust-float-cmp" ,rust-float-cmp-0.3)))) + (home-page "https://github.com/upsuper/dtoa-short") + (synopsis "Serialize float number and truncate to certain precision") + (description + "Serialize float number and truncate to certain precision in Rust.") + (license license:mpl2.0))) + (define-public rust-duct-0.13 (package (name "rust-duct") -- cgit v1.2.3 From f90a306d1f694f15f7b0c165fe7ef102bb3cfa99 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 00:01:59 +0200 Subject: gnu: Add rust-float-cmp-0.5. * gnu/packages/crates-io.scm (rust-float-cmp-0.5): New variable. (rust-float-cmp-0.3): Inherit from rust-float-cmp-0.5. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index eb98877725..b08324b243 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5227,10 +5227,10 @@ Reader/Writer streams. Contains bindings for zlib, deflate, and gzip-based streams.") (license (list license:expat license:asl2.0)))) -(define-public rust-float-cmp-0.3 +(define-public rust-float-cmp-0.5 (package (name "rust-float-cmp") - (version "0.3.0") + (version "0.5.3") (source (origin (method url-fetch) @@ -5239,16 +5239,33 @@ streams.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + "03hmx3n48hjm0x1ig84n1j87kzp75lzr6cj1sgi6a6pykgn4n8km")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))) + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2)))) (home-page "https://github.com/mikedilger/float-cmp") (synopsis "Floating point approximate comparison traits") (description "Floating point approximate comparison traits in Rust.") (license license:expat))) +(define-public rust-float-cmp-0.3 + (package + (inherit rust-float-cmp-0.5) + (name "rust-float-cmp") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-cmp" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1c0hmj46xma5aysz0qb49padhc26aw875whx6q6rglsj5dqpds1b")))) + (arguments + `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))))) + (define-public rust-float-ord-0.2 (package (name "rust-float-ord") -- cgit v1.2.3 From c9d0d4d4ead7098d279823bce883899a14bed910 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 08:32:19 +0200 Subject: gnu: Add rust-procedural-masquerade-0.1. * gnu/packages/crates-io.scm (rust-procedural-masquerade-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 b08324b243..47da68f75b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -13045,6 +13045,27 @@ in terms of the upstream unstable API.") #:cargo-development-inputs (("rust-quote" ,rust-quote-0.6)))))) +(define-public rust-procedural-masquerade-0.1 + (package + (name "rust-procedural-masquerade") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "procedural-masquerade" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1l098px1hwdzqnxl376a9hfxb9q8kmj2n0y0s8k7plrz3jjp85cs")))) + (build-system cargo-build-system) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Macro rules for proc-macro-derive") + (description + "This package provides @code{macro_rules} for making +@code{proc_macro_derive} pretend to be @code{proc_macro}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proptest-0.9 (package (name "rust-proptest") -- cgit v1.2.3 From 55ca8748df4a5d2915f1abf22012d308f856ba34 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 08:43:48 +0200 Subject: gnu: Add rust-glib-0.8. * gnu/packages/crates-io.scm (rust-glib-0.8): 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 47da68f75b..c694863379 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6729,6 +6729,31 @@ reading and writing git repositories.") "Rust bindings for the GLib library.") (license license:expat))) +(define-public rust-glib-0.8 + (package + (inherit rust-glib-0.9) + (name "rust-glib") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "glib" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0ysy87zrwyzhfpf3d8rkyyr3amwj85wky05fsl7kx95s84l269xy")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-glib-sys-0.9 (package (name "rust-glib-sys") -- cgit v1.2.3 From 57beeed7040171667ce35d7012b900c2780293a3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 09:17:59 +0200 Subject: gnu: Add rust-cairo-rs-0.7. * gnu/packages/crates-io.scm (rust-cairo-rs-0.7): 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 c694863379..07cb744fd8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1772,6 +1772,32 @@ exposed as Reader/Writer streams.") "Rust bindings for the Cairo library.") (license license:expat))) +(define-public rust-cairo-rs-0.7 + (package + (inherit rust-cairo-rs-0.8) + (name "rust-cairo-rs") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "cairo-rs" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "171m98g41avp5mmshqir4ka21napp7ma5fx45wi9mw5hwdyv8pg0")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-tempfile" ,rust-tempfile-3.1)))))) + (define-public rust-cairo-sys-rs-0.9 (package (name "rust-cairo-sys-rs") -- cgit v1.2.3 From ed72b99d8cee22e3da627fecf5faee3ffb53e044 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:20:43 +0200 Subject: gnu: Add rust-cssparser-macros-0.3. * gnu/packages/crates-io.scm (rust-cssparser-macros-0.3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 07cb744fd8..a253d4ef56 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3527,6 +3527,33 @@ intrinsics.") Code} (MAC) algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-cssparser-macros-0.3 + (package + (name "rust-cssparser-macros") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1vqyc5xm8a4va92vs1nn0cc46c930l2n21gccijnc5y7hx7cicav")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-phf-codegen" ,rust-phf-codegen-0.7) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Procedural macros for cssparser") + (description + "This package provides the procedural macros for rust-cssparser.") + (license license:mpl2.0))) + (define-public rust-csv-1.1 (package (name "rust-csv") -- cgit v1.2.3 From f58145287469a12806eb08b60cf14fa41c7fdc62 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:40:01 +0200 Subject: gnu: Add rust-cssparser-0.25. * gnu/packages/crates-io.scm (rust-cssparser-0.25): New variable. --- gnu/packages/crates-io.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a253d4ef56..ccd95f1fd5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3527,6 +3527,46 @@ intrinsics.") Code} (MAC) algorithms.") (license (list license:expat license:asl2.0)))) +(define-public rust-cssparser-0.25 + (package + (name "rust-cssparser") + (version "0.25.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "cssparser" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03klvpdzsk4cyh8k0dbnlngzafv7gqywqrnsqqb3gfmrxyj8rqgv")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Some test files missing. + #:cargo-inputs + (("rust-cssparser-macros" ,rust-cssparser-macros-0.3) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-heapsize" ,rust-heapsize-0.4) + ("rust-itoa" ,rust-itoa-0.4) + ("rust-matches" ,rust-matches-0.1) + ("rust-phf" ,rust-phf-0.7) + ("rust-procedural-masquerade" ,rust-procedural-masquerade-0.1) + ("rust-serde" ,rust-serde-1.0) + ("rust-smallvec" ,rust-smallvec-0.6) + ("rust-autocfg" ,rust-autocfg-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1.0) + ("rust-quote" ,rust-quote-1.0) + ("rust-syn" ,rust-syn-1.0)) + #:cargo-development-inputs + (("rust-difference" ,rust-difference-2.0) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (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-macros-0.3 (package (name "rust-cssparser-macros") -- cgit v1.2.3 From 930d8c5a2107a85a76c302d2f1440b37f077fff7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:51:36 +0200 Subject: gnu: Add rust-data-url-0.1. * gnu/packages/crates-io.scm (rust-data-url-0.1): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ccd95f1fd5..5efa6b8e6e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3778,6 +3778,33 @@ attributes.") hexadecimal, base32, and base64.") (license license:expat))) +(define-public rust-data-url-0.1 + (package + (name "rust-data-url") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-url" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "176wa1n8h71iwyaxhar4sqwrgrvb5sxk26az0fy88vnxrsffjgyk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-matches" ,rust-matches-0.1)) + #:cargo-development-inputs + (("rust-rustc-test" ,rust-rustc-test-0.3) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://github.com/servo/rust-url") + (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") + (description + "Processing of data: URL according to WHATWG's Fetch Standard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-datetime-0.4 (package (name "rust-datetime") -- cgit v1.2.3 From 40b9f388767c9cae409277194724dad708a18d95 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:54:29 +0200 Subject: gnu: Add rust-fragile-0.3. * gnu/packages/crates-io.scm (rust-fragile-0.3): 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 5efa6b8e6e..4391b46376 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5562,6 +5562,26 @@ implementation that is more efficient for smaller hash keys.") (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-fragile-0.3 + (package + (name "rust-fragile") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fragile" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yf2hmkw52x2dva3c9km1x8c2z5kwby7qqn8kz5ms3gs480i9y05")))) + (build-system cargo-build-system) + (home-page "https://github.com/mitsuhiko/rust-fragile") + (synopsis "Wrapper types for sending non-send values to other threads") + (description "This package provides wrapper types for sending non-send +values to other threads.") + (license license:asl2.0))) + (define-public rust-freetype-rs-0.23 (package (name "rust-freetype-rs") -- cgit v1.2.3 From 8985755a915acdfb281b8691f318bfd051e29d01 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 10:57:16 +0200 Subject: gnu: Add rust-gir-format-check-0.1. * gnu/packages/crates-io.scm (rust-gir-format-check-0.1): 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 4391b46376..56fbb71d54 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6679,6 +6679,25 @@ DWARF debugging format.") (description "This package provides FFI bindings to libgio-2.0.") (license license:expat))) +(define-public rust-gir-format-check-0.1 + (package + (name "rust-gir-format-check") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gir-format-check" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0znl4qcgmg0656zk9vjkwdn9wj1zpkd0m0l5jnzmahd80ii7vf4b")))) + (build-system cargo-build-system) + (home-page "https://github.com/gtk-rs/gir-format-check") + (synopsis "File format checker") + (description "File format checker in Rust.") + (license license:expat))) + (define-public rust-git2-0.11 (package (name "rust-git2") -- cgit v1.2.3 From ad2c51088f14074c94809f9e5923ff3f15f38f0b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:10:30 +0200 Subject: gnu: Add rust-gio-0.7. * gnu/packages/crates-io.scm (rust-gio-0.7): New variable. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 56fbb71d54..c71717e6c5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6648,6 +6648,41 @@ retrieving random data from system source.") DWARF debugging format.") (license (list license:asl2.0 license:expat)))) +(define-public rust-gio-0.7 + (package + (name "rust-gio") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gio" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1qv0wc1hqyb81c03h81s3xrl9jslrw23fr4yhygxbhih9k9vaqb2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("glib" ,glib))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Gio library") + (description "Rust bindings for the Gio library.") + (license license:expat))) + (define-public rust-gio-sys-0.9 (package (name "rust-gio-sys") -- cgit v1.2.3 From 8511b516504602c5bf5230673967a1b349fa38f7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:21:31 +0200 Subject: gnu: Add rust-gdk-pixbuf-0.7. * gnu/packages/crates-io.scm (rust-gdk-pixbuf-0.7): New variable. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c71717e6c5..0ac2fa4dec 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6399,6 +6399,42 @@ archive to be linked into Rustcode.") API library @code{gdi32}.") (license license:expat))) +(define-public rust-gdk-pixbuf-0.7 + (package + (name "rust-gdk-pixbuf") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gdk-pixbuf" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1k2g3w2p57m68bi5sldvkmgjgslgqswrjsijjhqaibdvw67409lp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-fragile" ,rust-fragile-0.3) + ("rust-futures-preview" ,rust-futures-preview-0.3) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.7) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("gdk-pixbuf" ,gdk-pixbuf))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the GdkPixbuf library") + (description + "Rust bindings for the GdkPixbuf library.") + (license license:expat))) + (define-public rust-gdk-pixbuf-sys-0.9 (package (name "rust-gdk-pixbuf-sys") -- cgit v1.2.3 From c450d81a16786e658b1e0bb3651673206ef96e91 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:23:34 +0200 Subject: gnu: Add rust-rawpointer-0.2. * gnu/packages/crates-io.scm (rust-rawpointer-0.2):New variable. (rust-rawpointer-0.1): Inherit from rust-rawpointer-0.2. --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0ac2fa4dec..521974c8cc 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14412,10 +14412,10 @@ random number generators.") "Interoperability library for Rust Windowing applications.") (license license:expat))) -(define-public rust-rawpointer-0.1 +(define-public rust-rawpointer-0.2 (package (name "rust-rawpointer") - (version "0.1.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -14423,7 +14423,7 @@ random number generators.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))) + "1qy1qvj17yh957vhffnq6agq0brvylw27xgks171qrah75wmg8v0")))) (build-system cargo-build-system) (home-page "https://github.com/bluss/rawpointer/") (synopsis "Extra methods for raw pointers") @@ -14433,6 +14433,20 @@ and @code{ptrdistance}.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rawpointer-0.1 + (package + (inherit rust-rawpointer-0.2) + (name "rust-rawpointer") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rawpointer" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "06ghpm9y7gacks78s3maakha07kbnwrxif5q37r2l7z1sali3b7b")))))) + (define-public rust-rawslice-0.1 (package (name "rust-rawslice") -- cgit v1.2.3 From eef9de5fed7046e8e2d3e3019615e2af220ee79c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:26:37 +0200 Subject: gnu: Add rust-matrixmultiply-0.2. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.2): New variable. (rust-matrixmultiply-0.1): Inherit from rust-matrixmultiply-0.2. --- gnu/packages/crates-io.scm | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 521974c8cc..d789d91dea 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9944,10 +9944,10 @@ platform-independently.") whether an expression matches a pattern.") (license license:expat))) -(define-public rust-matrixmultiply-0.1 +(define-public rust-matrixmultiply-0.2 (package (name "rust-matrixmultiply") - (version "0.1.15") + (version "0.2.3") (source (origin (method url-fetch) @@ -9955,12 +9955,14 @@ whether an expression matches a pattern.") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) + "13s7nfd3dfcsrixld2lk8c563ih5xzczl2w36hprfc016rkfrxyl")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) - #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) + `(#:cargo-inputs + (("rust-rawpointer" ,rust-rawpointer-0.2)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-itertools" ,rust-itertools-0.7)))) (home-page "https://github.com/bluss/matrixmultiply/") (synopsis "General matrix multiplication for f32 and f64 matrices") (description "General matrix multiplication for f32 and f64 matrices. @@ -9971,6 +9973,24 @@ parallelize and optimize.") (license (list license:asl2.0 license:expat)))) +(define-public rust-matrixmultiply-0.1 + (package + (inherit rust-matrixmultiply-0.2) + (name "rust-matrixmultiply") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixmultiply" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))))) + (define-public rust-maybe-uninit-2.0 (package (name "rust-maybe-uninit") -- cgit v1.2.3 From 5f29a63f10084320193a1403990f8f5038128735 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:27:46 +0200 Subject: gnu: rust-matrixmultiply-0.1: Don't skip build. * gnu/packages/crates-io.scm (rust-matrixmultiply-0.1)[arguments]: Don't skip build. --- gnu/packages/crates-io.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d789d91dea..193a203995 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9987,8 +9987,7 @@ parallelize and optimize.") (base32 "00p0fpjhm45qdzi37mgv7ggsy8b9gqvq4999yrbgyn1dxkf6gbfw")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) + `(#:cargo-inputs (("rust-rawpointer" ,rust-rawpointer-0.1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))))) (define-public rust-maybe-uninit-2.0 -- cgit v1.2.3 From 5df93528644ff955b15d8e5c1d311aa9f2f733b3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:47:12 +0200 Subject: gnu: Add rust-recycler-0.1. * gnu/packages/crates-io.scm (rust-recycler-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 193a203995..9083f454c1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14640,6 +14640,27 @@ accessors.") @code{rdrand} and @code{rdseed} instructions") (license license:isc))) +(define-public rust-recycler-0.1 + (package + (name "rust-recycler") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "recycler" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1yll0sqswy6afk9ik7r22djqafa3wfgvgdzqqh7jbczyiqr2gp4q")))) + (build-system cargo-build-system) + (home-page "https://github.com/frankmcsherry/recycler") + (synopsis "Rust library for recycling types containing owned memory") + (description + "This package provides a small Rust library for recycling types containing +owned memory.") + (license license:expat))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-redox-syscall-0.1 -- cgit v1.2.3 From f87fa003617fe990bef4005800a9f40726494b25 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:47:45 +0200 Subject: gnu: Add rust-abomonation-0.7. * gnu/packages/crates-io.scm (rust-abomonation-0.7): 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 9083f454c1..451c0ce31e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48,6 +48,30 @@ ;;; Please: Try to add new module packages in alphabetic order. ;;; +(define-public rust-abomonation-0.7 + (package + (name "rust-abomonation") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abomonation" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1cjg3hjf028n447pdj7zcdgrkngx30as8ndxlxx947wvr49jkrsn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-recycler" ,rust-recycler-0.1)))) + (home-page "https://github.com/TimelyDataflow/abomonation") + (synopsis "High performance and very unsafe serialization library") + (description + "This package provides a high performance and very unsafe serialization +library in Rust.") + (license license:expat))) + (define-public rust-addr2line-0.9 (package (name "rust-addr2line") -- cgit v1.2.3 From 4bf3167de2d47c1b0f5fd4eede63e7e0ebe015d7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:48:13 +0200 Subject: gnu: Add rust-nalgebra-0.18. * gnu/packages/crates-io.scm (rust-nalgebra-0.18): New variable. --- gnu/packages/crates-io.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 451c0ce31e..7eb93a6197 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -10650,6 +10650,48 @@ checking.") "Chaining APIs for both self -> Self and &mut self methods.") (license license:expat))) +(define-public rust-nalgebra-0.18 + (package + (name "rust-nalgebra") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18i1npny8s45ff67p5qpdwwsn36fp23mal8847fkb32cqgdzvada")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-abomonation" ,rust-abomonation-0.7) + ("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.3) + ("rust-generic-array" ,rust-generic-array-0.12) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.2) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.2) + ("rust-num-rational" ,rust-num-rational-0.2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2.1) + ("rust-pest-derive" ,rust-pest-derive-2.1) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-rand" ,rust-rand-0.6) + ("rust-serde" ,rust-serde-1.0) + ("rust-serde-derive" ,rust-serde-derive-1.0) + ("rust-typenum" ,rust-typenum-1.10)) + #:cargo-development-inputs + (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) + ("rust-serde-json" ,rust-serde-json-1.0)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a linear algebra library with transformations and +statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-named-pipe-0.4 (package (name "rust-named-pipe") -- cgit v1.2.3 From d23c34727ff3d6e8822f228f48a3e70390c34254 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 11:51:19 +0200 Subject: gnu: Add rust-rctree-0.3. * gnu/packages/crates-io.scm (rust-rctree-0.3): 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 7eb93a6197..8622ac3ea7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -14682,6 +14682,26 @@ accessors.") ("rust-rand-xorshift" ,rust-rand-xorshift-0.2) ("rust-scoped-tls" ,rust-scoped-tls-1.0)))))) +(define-public rust-rctree-0.3 + (package + (name "rust-rctree") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "rctree" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1a54z2b850albiqx9vw009p9xg363vqzh1ybkwb89zn8375jk7my")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/rctree") + (synopsis "DOM-like tree implemented using reference counting") + (description "This package provides a @code{DOM-like} tree implemented using +reference counting.") + (license license:expat))) + (define-public rust-rdrand-0.4 (package (name "rust-rdrand") -- cgit v1.2.3 From 2d1cc3a4c9db6edbc80df788102f573bd34c733e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:02:00 +0200 Subject: gnu: Add rust-pango-0.7. * gnu/packages/crates-io.scm (rust-pango-0.7): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8622ac3ea7..13f36f120c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12173,6 +12173,40 @@ normally prevent moving a type that has been borrowed from.") "This package provides a library for padding strings at runtime.") (license license:expat))) +(define-public rust-pango-0.7 + (package + (name "rust-pango") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pango" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11np7nxb69g3kid2l78b7k519x1wk1c3f9yy7swgzy24n5qs0grr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("pango" ,pango))) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the Pango library") + (description + "Rust bindings for the Pango library.") + (license license:expat))) + (define-public rust-pango-sys-0.9 (package (name "rust-pango-sys") -- cgit v1.2.3 From b9affb662bab8238ed8b5cf9a8e7e19adfbe78ca Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:08:08 +0200 Subject: gnu: Add rust-pangocairo-0.8. * gnu/packages/crates-io.scm (rust-pangocairo-0.8): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 13f36f120c..a90d28d102 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -12238,6 +12238,43 @@ normally prevent moving a type that has been borrowed from.") (description "This package provides FFI bindings to @code{libpango-1.0}.") (license license:expat))) +(define-public rust-pangocairo-0.8 + (package + (name "rust-pangocairo") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0qjiwsp73x3w0493dzycyjzxnzwq7ixwmf1ccr5r41pjhxbnk1kl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.7) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.10) + ("rust-gtk-rs-lgpl-docs" ,rust-gtk-rs-lgpl-docs-0.1)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (inputs + `(("gtk+" ,gtk+))) + (home-page "http://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "Rust bindings for the PangoCairo library.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.10 (package (name "rust-pangocairo-sys") -- cgit v1.2.3 From 18cef6547b0ba632b18636bb5f6f8ac0a41a1195 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:15:47 +0200 Subject: gnu: Add rust-markup5ever-0.9. * gnu/packages/crates-io.scm (rust-markup5ever-0.9): New variable. (rust-markup5ever-0.8): Inherit from rust-markup-0.9. --- gnu/packages/crates-io.scm | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a90d28d102..64c170df73 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9916,19 +9916,19 @@ platform-independently.") (license (list license:asl2.0 license:expat)))) -(define-public rust-markup5ever-0.8 +(define-public rust-markup5ever-0.9 (package (name "rust-markup5ever") - (version "0.8.1") + (version "0.9.0") (source - (origin - (method url-fetch) - (uri (crate-uri "markup5ever" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))) + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "00wxigkiw8f777pjp7q5kfq77xpwda9zskkwp698assh8yfisf35")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -9940,14 +9940,28 @@ platform-independently.") ("rust-serde" ,rust-serde-1.0) ("rust-serde-derive" ,rust-serde-derive-1.0) ("rust-serde-json" ,rust-serde-json-1.0) - ("rust-string-cache-codegen" - ,rust-string-cache-codegen-0.4)))) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.4)))) (home-page "https://github.com/servo/html5ever") (synopsis "Common code for xml5ever and html5ever") (description "Common code for xml5ever and html5ever.") (license (list license:asl2.0 license:expat)))) +(define-public rust-markup5ever-0.8 + (package + (inherit rust-markup5ever-0.9) + (name "rust-markup5ever") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08ayl9aqjnmf7ly1ipy6dk3wjvyfn4w51l40jzh1fh984ykldbzi")))))) + (define-public rust-matches-0.1 (package (name "rust-matches") -- cgit v1.2.3 From abca147f208052fae784a373c939c272e5d3d008 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 12:19:49 +0200 Subject: gnu: librsvg-next-source: Replace all crates. * gnu/packages/gnome.scm (librsvg-next-source): Replace all remaining vendored crates with packaged ones. --- gnu/packages/gnome.scm | 52 +++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0fb474046d..c6800809fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2242,17 +2242,17 @@ from forcing GEXP-PROMISE." (delete-file-recursively (string-append "vendor/" (car crate))) (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) -;; alga 0.9 + ("alga" . #+(package-source rust-alga-0.9)) ("approx" . #+(package-source rust-approx-0.3)) ("arrayvec" . #+(package-source rust-arrayvec-0.4)) ("atty" . #+(package-source rust-atty-0.2)) ("autocfg" . #+(package-source rust-autocfg-1.0)) ("bitflags" . #+(package-source rust-bitflags-1)) -;; block 0.1 + ("block" . #+(package-source rust-block-0.1)) ("bstr" . #+(package-source rust-bstr-0.2)) ("byteorder" . #+(package-source rust-byteorder-1.3)) -;; cairo-rs 0.7 -;; cairo-sys-rs 0.9 + ("cairo-rs" . #+(package-source rust-cairo-rs-0.7)) + ("cairo-sys-rs" . #+(package-source rust-cairo-sys-rs-0.9)) ("cast" . #+(package-source rust-cast-0.2)) ("cfg-if" . #+(package-source rust-cfg-if-0.1)) ("clap" . #+(package-source rust-clap-2)) @@ -2263,14 +2263,14 @@ from forcing GEXP-PROMISE." ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) -;; cssparser 0.25 -;; cssparser-macros 0.3 + ("cssparser" . #+(package-source rust-cssparser-0.25)) + ("cssparser-macros" . #+(package-source rust-cssparser-macros-0.3)) ("csv" . #+(package-source rust-csv-1.1)) ("csv-core" . #+(package-source rust-csv-core-0.1)) -;; data-url 0.1 -;; downcast-rs 1.0 + ("data-url" . #+(package-source rust-data-url-0.1)) + ("downcast-rs" . #+(package-source rust-downcast-rs-1.1)) ("dtoa" . #+(package-source rust-dtoa-0.4)) -;; dtoa-short 0.3 + ("dtoa-short" . #+(package-source rust-dtoa-short-0.3)) ("either" . #+(package-source rust-either-1.5)) ("encoding" . #+(package-source rust-encoding-0.2)) ("encoding-index-japanese" . #+(package-source rust-encoding-index-japanese-1.20141219)) @@ -2279,16 +2279,16 @@ from forcing GEXP-PROMISE." ("encoding-index-singlebyte" . #+(package-source rust-encoding-index-singlebyte-1.20141219)) ("encoding-index-tradchinese" . #+(package-source rust-encoding-index-tradchinese-1.20141219)) ("encoding_index_tests" . #+(package-source rust-encoding-index-tests-0.1)) -;; float-cmp 0.5 -;; fragile 0.3 + ("float-cmp" . #+(package-source rust-float-cmp-0.5)) + ("fragile" . #+(package-source rust-fragile-0.3)) ("fuchsia-cprng" . #+(package-source rust-fuchsia-cprng-0.1)) ("futf" . #+(package-source rust-futf-0.1)) -;; gdk-pixbuf 0.7 -;; gdk-pixbuf-sys 0.9 + ("gdk-pixbuf" . #+(package-source rust-gdk-pixbuf-0.7)) + ("gdk-pixbuf-sys" . #+(package-source rust-gdk-pixbuf-sys-0.9)) ("generic-array" . #+(package-source rust-generic-array-0.12)) -;; gio 0.7 + ("gio" . #+(package-source rust-gio-0.7)) ("gio-sys" . #+(package-source rust-gio-sys-0.9)) -;; glib 0.8 + ("glib" . #+(package-source rust-glib-0.8)) ("glib-sys" . #+(package-source rust-glib-sys-0.9)) ("gobject-sys" . #+(package-source rust-gobject-sys-0.9)) ("idna" . #+(package-source rust-idna-0.2)) @@ -2297,17 +2297,17 @@ from forcing GEXP-PROMISE." ("language-tags" . #+(package-source rust-language-tags-0.2)) ("lazy_static" . #+(package-source rust-lazy-static-1)) ("libc" . #+(package-source rust-libc-0.2)) - ("libm" . #+(package-source rust-libm-0.1)) + ("libm" . #+(package-source rust-libm-0.2)) ("locale_config" . #+(package-source rust-locale-config-0.3)) ("log" . #+(package-source rust-log-0.4)) ("mac" . #+(package-source rust-mac-0.1)) ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) -;; markup5ever 0.9 + ("markup5ever" . #+(package-source rust-markup5ever-0.9)) ("matches" . #+(package-source rust-matches-0.1)) -;; matrixmultiply 0.2 + ("matrixmultiply" . #+(package-source rust-matrixmultiply-0.2)) ("memchr" . #+(package-source rust-memchr-2.2)) ("memoffset" . #+(package-source rust-memoffset-0.5)) -;; nalgebra 0.18 + ("nalgebra" . #+(package-source rust-nalgebra-0.18)) ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) ("nodrop" . #+(package-source rust-nodrop-0.1)) ("num-complex" . #+(package-source rust-num-complex-0.2)) @@ -2318,10 +2318,10 @@ from forcing GEXP-PROMISE." ("objc" . #+(package-source rust-objc-0.2)) ("objc-foundation" . #+(package-source rust-objc-foundation-0.1)) ("objc_id" . #+(package-source rust-objc-id-0.1)) -;; pango 0.7 -;; pango-sys 0.9 -;; pangocairo 0.8 -;; pangocairo-sys 0.10 + ("pango" . #+(package-source rust-pango-0.7)) + ("pango-sys" . #+(package-source rust-pango-sys-0.9)) + ("pangocairo" . #+(package-source rust-pangocairo-0.8)) + ("pangocairo-sys" . #+(package-source rust-pangocairo-sys-0.10)) ("percent-encoding" . #+(package-source rust-percent-encoding-2.1)) ("phf" . #+(package-source rust-phf-0.7)) ("phf_codegen" . #+(package-source rust-phf-codegen-0.7)) @@ -2330,7 +2330,7 @@ from forcing GEXP-PROMISE." ("pkg-config" . #+(package-source rust-pkg-config-0.3)) ("precomputed-hash" . #+(package-source rust-precomputed-hash-0.1)) ("proc-macro2" . #+(package-source rust-proc-macro2-1.0)) -;; procedural-masquerade 0.1 + ("procedural-masquerade" . #+(package-source rust-procedural-masquerade-0.1)) ("quote" . #+(package-source rust-quote-1.0)) ("rand" . #+(package-source rust-rand-0.6)) ("rand_chacha" . #+(package-source rust-rand-chacha-0.1)) @@ -2343,10 +2343,10 @@ from forcing GEXP-PROMISE." ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) -;; rawpointer 0.2 + ("rawpointer" . #+(package-source rust-rawpointer-0.2)) ("rayon" . #+(package-source rust-rayon-1.3)) ("rayon-core" . #+(package-source rust-rayon-core-1.7)) -;; rctree 0.3 + ("rctree" . #+(package-source rust-rctree-0.3)) ("rdrand" . #+(package-source rust-rdrand-0.4)) ("regex" . #+(package-source rust-regex-1.3)) ("regex-automata" . #+(package-source rust-regex-automata-0.1)) -- cgit v1.2.3 From 6956867056148e897f737c2a44c520290a709e84 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 20:52:32 +0200 Subject: gnu: librsvg-next: Use cargo-build-system. * gnu/packages/gnome.scm (librsvg-next)[source]: Don't use computed source. Add snippet to remove vendored crates. [build-system]: Switch to cargo-build-system. [arguments]: Remove configure-flags, make-flags, imported modules. Add modules and vendor fields. Add crates to cargo-inputs and cargo-development-inputs. Add 'prepare-for-build phase to adjust the source before building. Add 'gnu-configure phase to add the configure phase from the gnu-build-system. Replace the 'build, 'check and 'install phases from the gnu-build-system. [native-inputs]: Remove rust-1.34, rust-1.34:cargo. (computed-origin-method, librsvg-next-source): Remove variables. --- gnu/packages/gnome.scm | 324 ++++++++++++++----------------------------------- 1 file changed, 90 insertions(+), 234 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c6800809fc..6415171904 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2185,245 +2185,83 @@ library.") (base32 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))))) -(define* (computed-origin-method gexp-promise hash-algo hash - #:optional (name "source") - #:key (system (%current-system)) - (guile (default-guile))) - "Return a derivation that executes the G-expression that results -from forcing GEXP-PROMISE." - (mlet %store-monad ((guile (package->derivation guile system))) - (gexp->derivation (or name "computed-origin") - (force gexp-promise) - #:graft? #f ;nothing to graft - #:system system - #:guile-for-build guile))) - -(define librsvg-next-source - (let* ((version "2.46.4") - (upstream-source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/librsvg/" - (version-major+minor version) "/" - "librsvg-" version ".tar.xz")) - (sha256 - (base32 - "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"))))) - (origin - (method computed-origin-method) - (file-name (string-append "librsvg-" version ".tar.xz")) - (sha256 #f) - (uri - (delay - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - (set-path-environment-variable - "PATH" '("bin") - (list "/tmp" - #+(canonical-package xz) - #+(canonical-package gzip) - #+(canonical-package tar))) - (invoke "tar" "xvf" #+upstream-source) - (with-directory-excursion (string-append "librsvg-" #$version) - ;; The following crate(s) are needed in addition to the ones replaced: - (begin - (invoke - "tar" "xvf" #+(package-source rust-autocfg-0.1) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-proc-macro2-0.4) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-quote-0.6) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-unicode-xid-0.1) "-C" "vendor") - (invoke - "tar" "xvf" #+(package-source rust-maybe-uninit-2.0) "-C" "vendor")) - (for-each - (lambda (crate) - (delete-file-recursively (string-append "vendor/" (car crate))) - (invoke "tar" "xvf" (cdr crate) "-C" "vendor")) - '(("aho-corasick" . #+(package-source rust-aho-corasick-0.7)) - ("alga" . #+(package-source rust-alga-0.9)) - ("approx" . #+(package-source rust-approx-0.3)) - ("arrayvec" . #+(package-source rust-arrayvec-0.4)) - ("atty" . #+(package-source rust-atty-0.2)) - ("autocfg" . #+(package-source rust-autocfg-1.0)) - ("bitflags" . #+(package-source rust-bitflags-1)) - ("block" . #+(package-source rust-block-0.1)) - ("bstr" . #+(package-source rust-bstr-0.2)) - ("byteorder" . #+(package-source rust-byteorder-1.3)) - ("cairo-rs" . #+(package-source rust-cairo-rs-0.7)) - ("cairo-sys-rs" . #+(package-source rust-cairo-sys-rs-0.9)) - ("cast" . #+(package-source rust-cast-0.2)) - ("cfg-if" . #+(package-source rust-cfg-if-0.1)) - ("clap" . #+(package-source rust-clap-2)) - ("cloudabi" . #+(package-source rust-cloudabi-0.0)) - ("criterion" . #+(package-source rust-criterion-0.2)) - ("criterion-plot" . #+(package-source rust-criterion-plot-0.3)) - ("crossbeam-deque" . #+(package-source rust-crossbeam-deque-0.7)) - ("crossbeam-epoch" . #+(package-source rust-crossbeam-epoch-0.8)) - ("crossbeam-queue" . #+(package-source rust-crossbeam-queue-0.2)) - ("crossbeam-utils" . #+(package-source rust-crossbeam-utils-0.7)) - ("cssparser" . #+(package-source rust-cssparser-0.25)) - ("cssparser-macros" . #+(package-source rust-cssparser-macros-0.3)) - ("csv" . #+(package-source rust-csv-1.1)) - ("csv-core" . #+(package-source rust-csv-core-0.1)) - ("data-url" . #+(package-source rust-data-url-0.1)) - ("downcast-rs" . #+(package-source rust-downcast-rs-1.1)) - ("dtoa" . #+(package-source rust-dtoa-0.4)) - ("dtoa-short" . #+(package-source rust-dtoa-short-0.3)) - ("either" . #+(package-source rust-either-1.5)) - ("encoding" . #+(package-source rust-encoding-0.2)) - ("encoding-index-japanese" . #+(package-source rust-encoding-index-japanese-1.20141219)) - ("encoding-index-korean" . #+(package-source rust-encoding-index-korean-1.20141219)) - ("encoding-index-simpchinese" . #+(package-source rust-encoding-index-simpchinese-1.20141219)) - ("encoding-index-singlebyte" . #+(package-source rust-encoding-index-singlebyte-1.20141219)) - ("encoding-index-tradchinese" . #+(package-source rust-encoding-index-tradchinese-1.20141219)) - ("encoding_index_tests" . #+(package-source rust-encoding-index-tests-0.1)) - ("float-cmp" . #+(package-source rust-float-cmp-0.5)) - ("fragile" . #+(package-source rust-fragile-0.3)) - ("fuchsia-cprng" . #+(package-source rust-fuchsia-cprng-0.1)) - ("futf" . #+(package-source rust-futf-0.1)) - ("gdk-pixbuf" . #+(package-source rust-gdk-pixbuf-0.7)) - ("gdk-pixbuf-sys" . #+(package-source rust-gdk-pixbuf-sys-0.9)) - ("generic-array" . #+(package-source rust-generic-array-0.12)) - ("gio" . #+(package-source rust-gio-0.7)) - ("gio-sys" . #+(package-source rust-gio-sys-0.9)) - ("glib" . #+(package-source rust-glib-0.8)) - ("glib-sys" . #+(package-source rust-glib-sys-0.9)) - ("gobject-sys" . #+(package-source rust-gobject-sys-0.9)) - ("idna" . #+(package-source rust-idna-0.2)) - ("itertools" . #+(package-source rust-itertools-0.8)) - ("itoa" . #+(package-source rust-itoa-0.4)) - ("language-tags" . #+(package-source rust-language-tags-0.2)) - ("lazy_static" . #+(package-source rust-lazy-static-1)) - ("libc" . #+(package-source rust-libc-0.2)) - ("libm" . #+(package-source rust-libm-0.2)) - ("locale_config" . #+(package-source rust-locale-config-0.3)) - ("log" . #+(package-source rust-log-0.4)) - ("mac" . #+(package-source rust-mac-0.1)) - ("malloc_buf" . #+(package-source rust-malloc-buf-0.0)) - ("markup5ever" . #+(package-source rust-markup5ever-0.9)) - ("matches" . #+(package-source rust-matches-0.1)) - ("matrixmultiply" . #+(package-source rust-matrixmultiply-0.2)) - ("memchr" . #+(package-source rust-memchr-2.2)) - ("memoffset" . #+(package-source rust-memoffset-0.5)) - ("nalgebra" . #+(package-source rust-nalgebra-0.18)) - ("new_debug_unreachable" . #+(package-source rust-new-debug-unreachable-1.0)) - ("nodrop" . #+(package-source rust-nodrop-0.1)) - ("num-complex" . #+(package-source rust-num-complex-0.2)) - ("num-integer" . #+(package-source rust-num-integer-0.1)) - ("num-rational" . #+(package-source rust-num-rational-0.2)) - ("num-traits" . #+(package-source rust-num-traits-0.2)) - ("num_cpus" . #+(package-source rust-num-cpus-1.10)) - ("objc" . #+(package-source rust-objc-0.2)) - ("objc-foundation" . #+(package-source rust-objc-foundation-0.1)) - ("objc_id" . #+(package-source rust-objc-id-0.1)) - ("pango" . #+(package-source rust-pango-0.7)) - ("pango-sys" . #+(package-source rust-pango-sys-0.9)) - ("pangocairo" . #+(package-source rust-pangocairo-0.8)) - ("pangocairo-sys" . #+(package-source rust-pangocairo-sys-0.10)) - ("percent-encoding" . #+(package-source rust-percent-encoding-2.1)) - ("phf" . #+(package-source rust-phf-0.7)) - ("phf_codegen" . #+(package-source rust-phf-codegen-0.7)) - ("phf_generator" . #+(package-source rust-phf-generator-0.7)) - ("phf_shared" . #+(package-source rust-phf-shared-0.7)) - ("pkg-config" . #+(package-source rust-pkg-config-0.3)) - ("precomputed-hash" . #+(package-source rust-precomputed-hash-0.1)) - ("proc-macro2" . #+(package-source rust-proc-macro2-1.0)) - ("procedural-masquerade" . #+(package-source rust-procedural-masquerade-0.1)) - ("quote" . #+(package-source rust-quote-1.0)) - ("rand" . #+(package-source rust-rand-0.6)) - ("rand_chacha" . #+(package-source rust-rand-chacha-0.1)) - ("rand_core-0.3.1" . #+(package-source rust-rand-core-0.3)) - ("rand_core" . #+(package-source rust-rand-core-0.4)) - ("rand_hc" . #+(package-source rust-rand-hc-0.1)) - ("rand_isaac" . #+(package-source rust-rand-isaac-0.1)) - ("rand_jitter" . #+(package-source rust-rand-jitter-0.1)) - ("rand_os" . #+(package-source rust-rand-os-0.1)) - ("rand_pcg" . #+(package-source rust-rand-pcg-0.1)) - ("rand_xorshift" . #+(package-source rust-rand-xorshift-0.1)) - ("rand_xoshiro" . #+(package-source rust-rand-xoshiro-0.1)) - ("rawpointer" . #+(package-source rust-rawpointer-0.2)) - ("rayon" . #+(package-source rust-rayon-1.3)) - ("rayon-core" . #+(package-source rust-rayon-core-1.7)) - ("rctree" . #+(package-source rust-rctree-0.3)) - ("rdrand" . #+(package-source rust-rdrand-0.4)) - ("regex" . #+(package-source rust-regex-1.3)) - ("regex-automata" . #+(package-source rust-regex-automata-0.1)) - ("regex-syntax" . #+(package-source rust-regex-syntax-0.6)) - ("rustc_version" . #+(package-source rust-rustc-version-0.2)) - ("ryu" . #+(package-source rust-ryu-1.0)) - ("same-file" . #+(package-source rust-same-file-1.0)) - ("scopeguard" . #+(package-source rust-scopeguard-1.0)) - ("semver" . #+(package-source rust-semver-0.9)) - ("semver-parser" . #+(package-source rust-semver-parser-0.7)) - ("serde" . #+(package-source rust-serde-1.0)) - ("serde_derive" . #+(package-source rust-serde-derive-1.0)) - ("serde_json" . #+(package-source rust-serde-json-1.0)) - ("siphasher" . #+(package-source rust-siphasher-0.2)) - ("smallvec" . #+(package-source rust-smallvec-0.6)) - ("string_cache" . #+(package-source rust-string-cache-0.7)) - ("string_cache_codegen" . #+(package-source rust-string-cache-codegen-0.4)) - ("string_cache_shared" . #+(package-source rust-string-cache-shared-0.3)) - ("syn" . #+(package-source rust-syn-1.0)) - ("tendril" . #+(package-source rust-tendril-0.4)) - ("textwrap" . #+(package-source rust-textwrap-0.11)) - ("thread_local" . #+(package-source rust-thread-local-1.0)) - ("tinytemplate" . #+(package-source rust-tinytemplate-1.0)) - ("typenum" . #+(package-source rust-typenum-1.10)) - ("unicode-bidi" . #+(package-source rust-unicode-bidi-0.3)) - ("unicode-normalization" . #+(package-source rust-unicode-normalization-0.1)) - ("unicode-width" . #+(package-source rust-unicode-width-0.1)) - ("unicode-xid" . #+(package-source rust-unicode-xid-0.2)) - ("url" . #+(package-source rust-url-2.1)) - ("utf-8" . #+(package-source rust-utf-8-0.7)) - ("walkdir" . #+(package-source rust-walkdir-2.2)) - ("winapi" . #+(package-source rust-winapi-0.3)) - ("winapi-i686-pc-windows-gnu" . #+(package-source rust-winapi-i686-pc-windows-gnu-0.4)) - ("winapi-util" . #+(package-source rust-winapi-util-0.1)) - ("winapi-x86_64-pc-windows-gnu" . #+(package-source rust-winapi-x86-64-pc-windows-gnu-0.4)) - ("xml-rs" . #+(package-source rust-xml-rs-0.8))))) - (format #t "Replacing vendored crates in the tarball and repacking ...~%") - (force-output) - (invoke "tar" "cfa" #$output - ;; Avoid non-determinism in the archive. We set the - ;; mtime of files in the archive to early 1980 because - ;; the build process fails if the mtime of source - ;; files is pre-1980, due to the creation of zip - ;; archives. - "--mtime=@315619200" ; 1980-01-02 UTC - "--owner=root:0" - "--group=root:0" - "--sort=name" - (string-append "librsvg-" #$version)) - #t))))))) - (define-public librsvg-next (package (name "librsvg") (version "2.46.4") - (source librsvg-next-source) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list "--disable-static" - "--enable-vala") ; needed for e.g. gnome-mines - #:make-flags '("CC=gcc") - #:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/librsvg/" + (version-major+minor version) "/" + "librsvg-" version ".tar.xz")) + (sha256 + (base32 + "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "vendor") + ;; Don't demand an exact version for string_cache + (substitute* "rsvg_internals/Cargo.toml" + (("\"=") "\"")) + #t)))) + (build-system cargo-build-system) + (arguments + `(#:modules ((guix build cargo-build-system) + (guix build utils) + ((guix build gnu-build-system) #:prefix gnu:)) + #:vendor-dir "vendor" + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.9) + ("rust-cssparser" ,rust-cssparser-0.25) + ("rust-data-url" ,rust-data-url-0.1) + ("rust-downcast-rs" ,rust-downcast-rs-1.1) + ("rust-encoding" ,rust-encoding-0.2) + ("rust-float-cmp" ,rust-float-cmp-0.5) + ("rust-gdk-pixbuf" ,rust-gdk-pixbuf-0.7) + ("rust-gdk-pixbuf-sys" ,rust-gdk-pixbuf-sys-0.9) + ("rust-gio" ,rust-gio-0.7) + ("rust-gio-sys" ,rust-gio-sys-0.9) + ("rust-glib" ,rust-glib-0.8) + ("rust-glib-sys" ,rust-glib-sys-0.9) + ("rust-gobject-sys" ,rust-gobject-sys-0.9) + ("rust-itertools" ,rust-itertools-0.8) + ("rust-language-tags" ,rust-language-tags-0.2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-locale-config" ,rust-locale-config-0.3) + ("rust-markup5ever" ,rust-markup5ever-0.9) + ("rust-nalgebra" ,rust-nalgebra-0.18) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-pango" ,rust-pango-0.7) + ("rust-pango-sys" ,rust-pango-sys-0.9) + ("rust-pangocairo" ,rust-pangocairo-0.8) + ("rust-phf" ,rust-phf-0.7) + ("rust-rayon" ,rust-rayon-1.3) + ("rust-rctree" ,rust-rctree-0.3) + ("rust-string-cache" ,rust-string-cache-0.7) + ("rust-regex" ,rust-regex-1.3) + ("rust-url" ,rust-url-2.1) + ("rust-xml-rs" ,rust-xml-rs-0.8)) + #:cargo-development-inputs + (("rust-cairo-rs" ,rust-cairo-rs-0.7) + ("rust-criterion" ,rust-criterion-0.2)) #:phases (modify-phases %standard-phases - (add-after 'configure 'patch-cargo-checksums + (add-after 'unpack 'prepare-for-build (lambda _ - (use-modules (guix build cargo-utils)) - (substitute* "librsvg/Cargo.toml" - (("bitflags .*") "bitflags = \"1\"\n")) ; 1.2 is vendored - (substitute* "rsvg_internals/Cargo.toml" - (("\"=") "\"")) - (generate-all-checksums "vendor") - (delete-file "Cargo.lock") - (invoke "cargo" "generate-lockfile"))) + ;; In lieu of #:make-flags + (setenv "CC" "gcc") + ;; Something about the build environment resists building + ;; successfully with the '--locked' flag. + (substitute* '("Makefile.am" + "Makefile.in") + (("--locked") "")) + #t)) (add-before 'configure 'pre-configure - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (substitute* "gdk-pixbuf-loader/Makefile.in" ;; By default the gdk-pixbuf loader is installed under ;; gdk-pixbuf's prefix. Work around that. @@ -2435,6 +2273,27 @@ from forcing GEXP-PROMISE." (("gdk_pixbuf_cache_file = .*$") "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n")) #t)) + (add-after 'configure 'gnu-configure + (assoc-ref gnu:%standard-phases 'configure)) + ;(lambda* (#:key outputs #:allow-other-keys) + ; ((assoc-ref gnu:%standard-phases 'configure) + ; #:outputs outputs + ; #:configure-flags ("--disable-static" + ; "--enable-vala")))) + (add-after 'configure 'dont-vendor-self + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; Don't keep the whole tarball in the vendor directory + (delete-file-recursively + (string-append vendor-dir "/" ,name "-" ,version ".tar.xz")) + #t)) + (replace 'build + (assoc-ref gnu:%standard-phases 'build)) + (replace 'check + (lambda* args + ((assoc-ref gnu:%standard-phases 'check) + #:test-target "check"))) + (replace 'install + (assoc-ref gnu:%standard-phases 'install)) (add-before 'check 'remove-failing-tests (lambda _ (with-directory-excursion "tests/fixtures/reftests" @@ -2458,9 +2317,6 @@ from forcing GEXP-PROMISE." #t))))) (native-inputs `(("pkg-config" ,pkg-config) - ;; This is the minimum supported Rust version in Librsvg 2.46. - ("rust" ,rust-1.34) - ("cargo" ,rust-1.34 "cargo") ("vala" ,vala) ("glib" ,glib "bin") ; glib-mkenums, etc. ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. -- cgit v1.2.3 From 25d39a2a2c3bc9b67f948004923bf7fe6ce8336f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 20:55:13 +0200 Subject: gnu: librsvg-next: Inherit from librsvg. * gnu/packages/gnome.scm (librsvg-next)[inherit]: New field, inherit from librsvg. --- gnu/packages/gnome.scm | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6415171904..c39b4467b9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2187,6 +2187,7 @@ library.") (define-public librsvg-next (package + (inherit librsvg) (name "librsvg") (version "2.46.4") (source (origin @@ -2315,27 +2316,6 @@ library.") ;; This test fails on aarch64: "bugs/777834-empty-text-children.svg"))) #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("vala" ,vala) - ("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection))) ; g-ir-compiler, etc. - (inputs - `(("pango" ,pango) - ("libcroco" ,libcroco) - ("bzip2" ,bzip2) - ("libgsf" ,libgsf) - ("libxml2" ,libxml2))) - (propagated-inputs - ;; librsvg-2.0.pc refers to all of that. - `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib))) - (home-page "https://wiki.gnome.org/LibRsvg") - (synopsis "Render SVG files using Cairo") - (description - "Librsvg is a C library to render SVG files using the Cairo 2D graphics -library.") (license license:lgpl2.1+))) (define-public libidl -- cgit v1.2.3 From f08b6726611ec9391814fe540821a3964baeb0ba Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 19 Mar 2020 21:02:31 +0200 Subject: gnu: vim: Update to 8.2.0411. * gnu/packages/vim.scm (vim): Update to 8.2.0411. --- 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 7bea7fa791..75e8f0bb2e 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -70,7 +70,7 @@ (define-public vim (package (name "vim") - (version "8.2.0343") + (version "8.2.0411") (source (origin (method git-fetch) (uri (git-reference @@ -79,7 +79,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3")))) + "0idjbf15yqk5jz2dqbh2lzj7glxcwn1jl5pp9kk908ps02vzqyai")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit v1.2.3 From be0a672c30ad1401019abb5cb83d59be171813d0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 19 Mar 2020 23:10:25 +0100 Subject: tests: Accept manual installation scripts that exit with SIGTERM. Fixes . Reported by Maxim Cournoyer . Previously we'd error out if the installation script exits with non-zero, which was the case because the 'reboot' program would typically not get a reply, and thus would eventually be killed by PID 1 as the system is brought down. * gnu/tests/install.scm (run-install)[install]: Expect SCRIPT to exit with SIGTERM in addition to exiting with zero. --- gnu/tests/install.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 9ecc45cc04..4f650ffb34 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -270,8 +270,12 @@ packages defined in installation-os." (lambda (port) (write '#$target-os-source port))) marionette) - (exit (marionette-eval '(zero? (system #$script)) - marionette))) + + ;; Run SCRIPT. It typically invokes 'reboot' as a last step and + ;; thus normally gets killed with SIGTERM by PID 1. + (let ((status (marionette-eval '(system #$script) marionette))) + (exit (or (equal? (status:term-sig status) SIGTERM) + (equal? (status:exit-val status) 0))))) (when #$(->bool gui-test) (wait-for-unix-socket "/var/guix/installer-socket" -- cgit v1.2.3 From 29a2f61e9704949cd6cda57aba11f0213104db6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 21 Feb 2020 09:32:01 +0100 Subject: gnu: Add foobillard++. * gnu/packages/games.scm (foobillard++): New variable. * gnu/packages/patches/foobillard++-pkg-config.patch: New file. * gnu/local.mk: Reference new file. --- gnu/local.mk | 1 + gnu/packages/games.scm | 130 +++++++++++++++++++++ gnu/packages/patches/foobillard++-pkg-config.patch | 34 ++++++ 3 files changed, 165 insertions(+) create mode 100644 gnu/packages/patches/foobillard++-pkg-config.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index ca3f2664aa..4fc1818ed4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,6 +873,7 @@ dist_patch_DATA = \ %D%/packages/patches/findutils-test-xargs.patch \ %D%/packages/patches/flann-cmake-3.11.patch \ %D%/packages/patches/flint-ldconfig.patch \ + %D%/packages/patches/foobillard++-pkg-config.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8327.patch \ %D%/packages/patches/foomatic-filters-CVE-2015-8560.patch \ %D%/packages/patches/fribidi-CVE-2019-18397.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 59639a0138..7391851c87 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -598,6 +598,136 @@ regular @command{cat}, but it also adds terminal escape codes between characters and lines resulting in a rainbow effect.") (license license:wtfpl2)))) +(define-public foobillard++ + ;; Even though this latest revision is old already, stable release is + ;; lagging way behind it, and has issues with textures rendering. + (let ((svn-revision 170)) + (package + (name "foobillard++") + (version (string-append "3.43-r" (number->string svn-revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.code.sf.net/p/foobillardplus/code/") + (revision svn-revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00b693ys5zvzjbjzzj3dqfzm5xw64gwjf9m8qv6bkmf0klbhmayk")) + (patches + (search-patches "foobillard++-pkg-config.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Unfortunately, the game includes background music with + ;; a non-commercial clause. Delete it. + (for-each delete-file (find-files "data/music" "\\.ogg$")) + #t)))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + ;; Install data in a less exotic location. + (string-append "--prefix=" (assoc-ref %outputs "out") "/share") + ;; Prevent a build error about undefined trigonometric functions. + "--enable-fastmath=no") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-makefile + ;; Remove hard-coded directories. Also fix installation + ;; rule: it tries to move around non-existent files or + ;; files already moved. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile.am" + (("/usr") (assoc-ref outputs "out")) + (("cp .*?/foobillardplus\\.desktop.*") "") + (("cp .*?/foobillardplus\\.(png|xbm) \\$\\(datarootdir\\).*") + "")) + #t)) + (add-after 'unpack 'unbundle-font + ;; XXX: The package ships with LinBiolinum_aSB.ttf and + ;; LinBiolinum_aS.ttf, which are not provided by + ;; `font-linuxlibertine' package. Therefore, we cannot replace + ;; them yet. + (lambda* (#:key inputs #:allow-other-keys) + (let ((dejavu (string-append (assoc-ref inputs "font-dejavu") + "/share/fonts/truetype/"))) + (with-directory-excursion "data" + (for-each (lambda (f) + (delete-file f) + (symlink (string-append dejavu f) f)) + '("DejaVuSans-Bold.ttf" "DejaVuSans.ttf")))) + #t)) + (replace 'bootstrap + (lambda _ + (invoke "aclocal" "--force") + (invoke "autoconf" "-f") + (invoke "autoheader" "-f") + (invoke "automake" "-a" "-c" "-f"))) + (add-before 'build 'prepare-build + ;; Set correct environment for SDL. + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append (assoc-ref inputs "sdl") + "/include/SDL:" + (or (getenv "CPATH") ""))) + #t)) + (add-before 'build 'fix-settings-directory + ;; Hide foobillardplus settings directory in $HOME. + (lambda _ + (substitute* "src/history.c" + (("/foobillardplus-data") "/.foobillardplus")) + #t)) + (add-before 'install 'create-directories + ;; Install process does not create directories before + ;; trying to move file in it. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/share/icons")) + (mkdir-p (string-append out "/share/applications"))) + #t)) + (add-after 'install 'symlink-executable + ;; Symlink executable to $out/bin. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (mkdir-p bin) + (with-directory-excursion bin + (symlink "../share/foobillardplus/bin/foobillardplus" + "foobillardplus")) + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("pkg-config" ,pkg-config))) + (inputs + `(("font-dejavu" ,font-dejavu) + ("freetype" ,freetype) + ("glu" ,glu) + ("libpng" ,libpng) + ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net))))) + (home-page "http://foobillardplus.sourceforge.net/") + (synopsis "3D billiard game") + (description "FooBillard++ is an advanced 3D OpenGL billiard game +based on the original foobillard 3.0a sources from Florian Berger. +You can play it with one or two players or against the computer. + +The game features: + +@itemize +@item Wood paneled table with gold covers and gold diamonds. +@item Reflections on balls. +@item Zoom in and out, rotation, different angles and bird's eye view. +@item Different game modes: 8 or 9-ball, Snooker or Carambole. +@item Tournaments. Compete against other players. +@item Animated cue with strength and eccentric hit adjustment. +@item Jump shots and snipping. +@item Realistic gameplay and billiard sounds. +@item Red-Green stereo. +@item And much more. +@end itemize") + (license (list license:gpl2 license:silofl1.1))))) + (define-public freedoom (package (name "freedoom") diff --git a/gnu/packages/patches/foobillard++-pkg-config.patch b/gnu/packages/patches/foobillard++-pkg-config.patch new file mode 100644 index 0000000000..7cc40a4777 --- /dev/null +++ b/gnu/packages/patches/foobillard++-pkg-config.patch @@ -0,0 +1,34 @@ +From: Markus Koschany +Date: Thu, 8 Mar 2018 17:49:24 +0100 +Subject: pkg-config + +Use pkg-config instead of the deprecated freetype-config command. + +Bug-Debian: https://bugs.debian.org/892338 +Forwarded: no +--- + src/Makefile.am | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 3b7d0fe..0f5a5dd 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -158,8 +158,8 @@ endif + SDL_CFLAGS = `sdl-config --cflags` + SDL_LIBS = `sdl-config --libs` + +-FREETYPE_CFLAGS = `freetype-config --cflags` +-FREETYPE_LIBS = `freetype-config --libs` ++FREETYPE_CFLAGS = `pkg-config --cflags freetype2` ++FREETYPE_LIBS = `pkg-config --libs freetype2` + + if USE_MATHSINGLE + MATH_CFLAGS = -DVMATH_SINGLE_PRECISION +@@ -233,4 +233,4 @@ AM_CFLAGS = -Wall ${FREETYPE_CFLAGS} ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLA + ${OPTIMIZATION_CFLAGS} ${USESSE_CFLAGS} ${USEWIN_CFLAGS} ${FASTMATH_CFLAGS} ${DEBIAN_CFLAGS} -lm + + AM_LDFLAGS = ${all_libraries} ${FREETYPE_LIBS} ${SDL_LIBS} +-LDADD = ${LDADD_FLAGS} +\ No newline at end of file ++LDADD = ${LDADD_FLAGS} -- cgit v1.2.3 From 9ae3e79172ad0435bf47afee3ed707d56bb28907 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 19 Mar 2020 23:47:50 +0000 Subject: gnu: Add python-easy-thumbnails. * gnu/packages/django.scm (python-easy-thumbnails): New variable. --- gnu/packages/django.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0652ea15e6..70b6662a9e 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -223,6 +223,30 @@ with arguments to the field constructor.") "Django-taggit is a reusable Django application for simple tagging.") (license license:bsd-3))) +(define-public python-easy-thumbnails + (package + (name "python-easy-thumbnails") + (version "2.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "easy-thumbnails" version)) + (sha256 + (base32 + "14gzp5cv24z0qhxb7f7k7v9jgzpaj4n8yhjq83ynpx8183fs1rz4")))) + (build-system python-build-system) + (propagated-inputs + `(("python-django" ,python-django) + ("python-pillow" ,python-pillow))) + (home-page "https://github.com/SmileyChris/easy-thumbnails") + (synopsis "Easy thumbnails for Django") + (description + "Easy thumbnails is a Django plugin to dynamically create thumbnails +based on source images. Multiple thumbnails can be created from a single +source image, using different options to control parameters like the image +size and quality.") + (license license:bsd-3))) + (define-public python-pytest-django (package (name "python-pytest-django") -- cgit v1.2.3 From d82160134a48d01ad56b5b326b8f2020d60a1eab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 19 Mar 2020 02:06:33 +0100 Subject: gnu: php: Update to 7.4.4. * gnu/packages/php.scm (php): Update to 7.4.4. --- gnu/packages/php.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 7bb88a7270..e58d82dab1 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Julien Lepiller ;;; Copyright © 2016 Marius Bakke -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Oleg Pykhalov ;;; @@ -59,7 +59,7 @@ (define-public php (package (name "php") - (version "7.4.3") + (version "7.4.4") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -67,7 +67,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "0alqqs5hn4jmz1adrbysbw92n55nkw6f9vfivqj829kwhxnqa7yg")) + "0k57zj1z8kf8403rd72wymj08bswpa5ikcpzviw9mpykzp7c8wqq")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" -- cgit v1.2.3 From 1f0e7e0d596fb9abe5b77d06d61813d0d3aa0085 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 18 Mar 2020 19:21:53 +0100 Subject: gnu: bs1770gain: Update to 0.6.7. * gnu/packages/audio.scm (bs1770gain): Update to 0.6.7. --- 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 6880e74cce..f3edd21c69 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3271,14 +3271,14 @@ with support for HD extensions.") (define-public bs1770gain (package (name "bs1770gain") - (version "0.6.5") + (version "0.6.7") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/bs1770gain/bs1770gain/" version "/bs1770gain-" version ".tar.gz")) (sha256 - (base32 "15nvlh9bg0a52cpg2mii17mlzmxszwivjjalbb4np1v5nj8l5fk6")) + (base32 "13hsbqj1dkpz1gbclnjxv50kr7b4gcjai6c1l38g01433h217qjc")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 268dc4720c2a9e068233e66eba8598a145865ed0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:29:55 +0100 Subject: gnu: java-plexus-classworlds: Use HTTPS home page. * gnu/packages/java.scm (java-plexus-classworlds)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 76a0c6234c..3fe765c955 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3669,7 +3669,7 @@ these two libraries to vary independently of one another.") #:tests? #f));; FIXME: we need to generate some resources as in pom.xml (native-inputs `(("java-junit" ,java-junit))) - (home-page "http://codehaus-plexus.github.io/plexus-classworlds/") + (home-page "https://codehaus-plexus.github.io/plexus-classworlds/") (synopsis "Java class loader framework") (description "Plexus classworlds replaces the native @code{ClassLoader} mechanism of Java. It is especially useful for dynamic loading of application -- cgit v1.2.3 From e799400d4b0561c3f713397af347729bb650cc3e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 01:29:06 +0100 Subject: gnu: java-jmh: Use HTTPS home page. * gnu/packages/java.scm (java-jmh)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 3fe765c955..b68fc9f715 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4753,7 +4753,7 @@ available in the Java programming language or Commons Lang.") (native-inputs `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core))) - (home-page "http://openjdk.java.net/projects/code-tools/jmh/") + (home-page "https://openjdk.java.net/projects/code-tools/jmh/") (synopsis "Benchmark harness for the JVM") (description "JMH is a Java harness for building, running, and analysing nano/micro/milli/macro benchmarks written in Java and other languages -- cgit v1.2.3 From 14544d2f99775c0dcf8715695890cd15b036726f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 19 Jan 2020 00:53:19 +0100 Subject: gnu: java-joda-time: Use HTTPS home page. * gnu/packages/java.scm (java-joda-time)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b68fc9f715..470f584ffb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10363,7 +10363,7 @@ wider problem of Object to Object transformation.") `(("java-junit" ,java-junit) ("java-hamcrest-core" ,java-hamcrest-core) ("tzdata" ,tzdata))) - (home-page "http://www.joda.org/joda-time/") + (home-page "https://www.joda.org/joda-time/") (synopsis "Replacement for the Java date and time classes") (description "Joda-Time is a replacement for the Java date and time classes prior to Java SE 8.") -- cgit v1.2.3 From 27c0eadef9f8e4b3b9d24f4060f3dbdca6833e60 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:14:17 +0100 Subject: gnu: java-aqute-bnd-annotation: Use HTTPS home page. * gnu/packages/java.scm (java-aqute-bnd-annotation)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 470f584ffb..ec5b6183d3 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8040,7 +8040,7 @@ package contains utilities for obtaining services via the Java SE 6 `(#:jar-name "java-aqute-bnd-annotation.jar" #:source-dir "biz.aQute.bnd.annotation/src" #:tests? #f)); empty test dir - (home-page "http://bnd.bndtools.org/") + (home-page "https://bnd.bndtools.org/") (synopsis "Tools for OSGi") (description "Bnd is a swiss army knife for OSGi, it creates manifest headers based on analyzing the class code, it verifies the project settings, -- cgit v1.2.3 From 7942a129b190dcb16be463c7af8ce6d60b3325f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:53:26 +0100 Subject: gnu: java-modello-plugins-xpp3: Use HTTPS home page. * gnu/packages/java.scm (java-modello-plugins-xpp3)[home-page]: Use HTTPS. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ec5b6183d3..5154dc124e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -4179,7 +4179,7 @@ project and determining what files need to be rebuilt.") ("java-plexus-classworlds" ,java-plexus-classworlds) ("java-geronimo-xbean-reflect" ,java-geronimo-xbean-reflect) ("java-guava" ,java-guava))) - (home-page "http://codehaus-plexus.github.io/modello/") + (home-page "https://codehaus-plexus.github.io/modello/") (synopsis "Framework for code generation from a simple model") (description "Modello is a framework for code generation from a simple model. -- cgit v1.2.3 From 23518188fde04b7574ca43a0312e03f0282daf04 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 22:06:38 +0100 Subject: gnu: emacs-ebib: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-ebib)[home-page]: Use HTTPS. --- 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 62d1adcf74..60ee97e4f9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12618,7 +12618,7 @@ files to be expanded upon opening them.") (build-system emacs-build-system) (propagated-inputs `(("emacs-parsebib" ,emacs-parsebib))) - (home-page "http://joostkremers.github.io/ebib/") + (home-page "https://joostkremers.github.io/ebib/") (synopsis "BibTeX database manager for Emacs") (description "Ebib is a BibTeX database manager that runs in GNU Emacs. -- cgit v1.2.3 From c7a2e64574c6254ef423fa38c2fde1174fed06b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 21:56:16 +0100 Subject: gnu: emacs-mit-scheme-doc: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-mit-scheme-doc)[home-page]: Use HTTPS. --- 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 60ee97e4f9..f5f20b1389 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -4254,7 +4254,7 @@ for @code{AUCTeX}.") (substitute* "mit-scheme-doc.el" (("http://www\\.gnu\\.org/software/mit-scheme/documentation/mit-scheme-ref/") (string-append "file:" doc-dir "/mit-scheme-ref/"))))))))) - (home-page "http://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") + (home-page "https://groups.csail.mit.edu/mac/users/gjs/6.945/dont-panic/") (synopsis "MIT-Scheme documentation lookup for Emacs") (description "This package provides a set of Emacs functions to search definitions of -- cgit v1.2.3 From 837644b48a5107a28acbdb6d172aff0040a8247d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 18 Jan 2020 23:25:58 +0100 Subject: gnu: emacs-company: Use HTTPS home page. * gnu/packages/emacs-xyz.scm (emacs-company)[home-page]: Use HTTPS. --- 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 f5f20b1389..9cfb5e68ab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3658,7 +3658,7 @@ build jobs.") #t))) #:tests? #t #:test-command '("make" "test-batch"))) - (home-page "http://company-mode.github.io/") + (home-page "https://company-mode.github.io/") (synopsis "Modular text completion framework") (description "Company is a modular completion mechanism. Modules for retrieving -- cgit v1.2.3 From e2303e8e375ed2e07c1fd760c86a204eb51fbc6e Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 20 Mar 2020 07:44:18 +0100 Subject: gnu: Add v86d. * gnu/packages/xorg.scm (v86d): New variable. --- gnu/packages/xorg.scm | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index fac114fb82..f4c7329e06 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2019 nee ;;; Copyright © 2019 Yoshinori Arai ;;; Copyright © 2020 Leo Prikler +;;; Copyright © 2020 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -3447,6 +3448,105 @@ X server.") X server.") (license license:x11))) +(define-public v86d + (package + (name "v86d") + (version "0.1.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mjanusz/v86d.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c4iiggb5r9i2hxhk8c6q1m2vpfva39l1w33fsfkrz6fav6x34pp")) + (modules '((guix build utils))) + (snippet + '(begin + ;; remove bundled x86emu + (for-each delete-file + (filter (lambda (name) ;keep customized Makefile + (not (string-suffix? "Makefile" name))) + (find-files "libs/x86emu"))) + ;; remove non-working vbetest utility program (it is unnecessary) + (delete-file "libs/lrmi-0.10/vbe.h") + (delete-file "libs/lrmi-0.10/vbetest.c") + #t)))) + + ;; We keep the bundled copy of the Linux Real Mode Interface lrmi-0.10, + ;; because it includes fixes missing from upstream lrmi. We do not use + ;; libx86, because we already use x86emu with the more current lrmi. + + (inputs `(("xorg-server-sources" ,(package-source xorg-server)) ;for x86emu + ("xorgproto" ,xorgproto))) ;upstream x86emu uses X11/Xfuncproto.h + (outputs '("out" ;main v86d helper + "testvbe")) ;test program for listing video modes + (supported-systems '("i686-linux" "x86_64-linux")) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;there are no tests + #:modules ((guix build utils) + (guix build gnu-build-system) + (ice-9 popen)) + #:phases + (modify-phases %standard-phases + ;; Replace the bundled x86emu with its upstream copy from Xorg-server: + (add-after 'unpack 'unpack-x86emu-sources + (lambda* (#:key inputs #:allow-other-keys) + (begin + (format #t "decompressing x86emu source code~%") + (with-directory-excursion "libs" + (let ((srcs (assoc-ref inputs "xorg-server-sources")) + (tar-binary (string-append (assoc-ref inputs "tar") + "/bin/tar"))) + (invoke tar-binary "xvf" srcs "--strip-components=3" + "--wildcards" "*/hw/xfree86/x86emu/") + ;; extract license: + (with-directory-excursion "x86emu" + (invoke tar-binary "xvf" srcs "--strip-components=1" + "--wildcards" "*/COPYING")) + #t))))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" (which "gcc")) + (setenv "DESTDIR" out) + (invoke "./configure" "--with-x86emu")))) + (add-after 'build 'build-testvbe + (lambda _ + (invoke "make" "testvbe"))) + (add-after 'install 'install-testvbe + (lambda* (#:key outputs #:allow-other-keys) + (let ((testvbe (assoc-ref outputs "testvbe")) + (olddest (getenv "DESTDIR"))) + (setenv "DESTDIR" testvbe) + (invoke "make" "install_testvbe") + (setenv "DESTDIR" olddest) + #t))) + (add-after 'install 'install-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc-dir (string-append out "/share/doc/v86d"))) + (mkdir-p doc-dir) + (copy-file "README" + (string-append doc-dir "/README")) + (copy-file "libs/lrmi-0.10/README" + (string-append doc-dir "/README.lrmi")) + (copy-file "libs/x86emu/COPYING" + (string-append doc-dir "/COPYING.xorg-server.x86emu")) + #t)))))) + (home-page "https://github.com/mjanusz/v86d") + (synopsis "Userspace helper for uvesafb") + (description + "v86d provides a backend for kernel drivers that need to execute x86 BIOS +code. The code is executed in a controlled environment and the results are +passed back to the kernel via the netlink interface. v86d is required by the +uvesafb Linux kernel module that provides an fbdev framebuffer when Kernel +Mode Setting is unavailable. It can be a last resort when no other Xorg X +server driver works.") + (license (list license:gpl2 + license:x11)))) ;for bundled lrmi and x86emu (define-public xf86-video-vmware (package -- cgit v1.2.3 From e84490346d8dac3720a57a331f533ce67ff0da1c Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Fri, 20 Mar 2020 07:28:07 +0100 Subject: gnu: nginx-accept-language-module: Simplify decompression phase. See where a similar change was found to be sufficient. * gnu/packages/web.scm (nginx-accept-language-module)[arguments]: In 'unpack-nginx-sources' phase, extract the compressed tarball using tar's auto-decompression instead of decompressing manually. --- gnu/packages/web.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0f5f4d2d69..10cbf6165b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2019 Jakob L. Kreuze -;;; Copyright © 2019 Florian Pelz +;;; Copyright © 2019, 2020 Florian Pelz ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt @@ -441,20 +441,10 @@ documentation.") (begin ;; The nginx source code is part of the module’s source. (format #t "decompressing nginx source code~%") - (call-with-output-file "nginx.tar" - (lambda (out) - (let* ((gzip (assoc-ref inputs "gzip")) - (nginx-srcs (assoc-ref inputs "nginx-sources")) - (pipe (open-pipe* OPEN_READ - (string-append gzip "/bin/gzip") - "-cd" - nginx-srcs))) - (dump-port pipe out) - (unless (= (status:exit-val (close-pipe pipe)) 0) - (error "gzip decompress failed"))))) - (invoke (string-append (assoc-ref inputs "tar") "/bin/tar") - "xvf" "nginx.tar" "--strip-components=1") - (delete-file "nginx.tar") + (let ((tar (assoc-ref inputs "tar")) + (nginx-srcs (assoc-ref inputs "nginx-sources"))) + (invoke (string-append tar "/bin/tar") + "xvf" nginx-srcs "--strip-components=1")) #t))) (add-after 'unpack 'convert-to-dynamic-module (lambda _ -- cgit v1.2.3 From 819c0df2ee02e69265e087703da5f2272e47c99b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 20 Mar 2020 10:05:59 +0100 Subject: gnu: emacs-company: Update to 0.9.12. * gnu/packages/emacs-xyz.scm (emacs-company): Update to 0.9.12. --- 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 9cfb5e68ab..a56cbb860e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3633,7 +3633,7 @@ build jobs.") (define-public emacs-company (package (name "emacs-company") - (version "0.9.11") + (version "0.9.12") (source (origin (method git-fetch) @@ -3642,7 +3642,7 @@ build jobs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0x7ag716jp4xb7kmcmr8pqlxx1v0f2gkjx5gx34wxxqfrndwyx8i")))) + (base32 "0c31amc6gyfkmb1ii6mm56c75za1yxkj2iyhrjc45nn2mrh7yj7a")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit v1.2.3 From 7ba300ee6ed55eac61e46aa1c0b7de1a65a69ac3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 20 Mar 2020 17:44:06 +0100 Subject: gnu: libosmium: Update to 2.15.4. * gnu/packages/geo.scm (libosmium): Update to 2.15.4. [inputs]: Add bzip2 and utfcpp. --- gnu/packages/geo.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 590da69934..0f22443cbb 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -81,6 +81,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sqlite) + #:use-module (gnu packages textutils) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) @@ -839,7 +840,7 @@ to create databases that are optimized for rendering/tile/map-services.") (define-public libosmium (package (name "libosmium") - (version "2.14.2") + (version "2.15.4") (source (origin (method git-fetch) @@ -848,16 +849,18 @@ to create databases that are optimized for rendering/tile/map-services.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "123ri1l0a2b9fljgpwsl7z2w4i3kmgxz79d4ns9z4mwbp8sw0250")))) + (base32 "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4")))) (build-system cmake-build-system) (propagated-inputs `(("boost" ,boost) + ("bzip2" ,bzip2) ("expat" ,expat) ("gdal" ,gdal) ("geos" ,geos) - ("proj.4" ,proj.4) + ("proj" ,proj) ("protozero" ,protozero) ("sparsehash" ,sparsehash) + ("utfcpp" ,utfcpp) ("zlib" ,zlib))) (native-inputs `(("doxygen" ,doxygen))) -- cgit v1.2.3 From 6145b16778aec8b22daebd9779d65a22cd8843b5 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 20 Mar 2020 17:57:35 +0100 Subject: gnu: osm2pgsql: Update to 1.2.1. * gnu/packages/geo.scm (osm2pgsql): Update to 1.2.1. [inputs]: Add bzip2 and replace proj.4 by proj. [native-inputs]: Replace python-2 by python and python2-psycopg2 by python-psycopg2. --- gnu/packages/geo.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0f22443cbb..bc870f9620 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -873,7 +873,7 @@ OpenStreetMap data.") (define-public osm2pgsql (package (name "osm2pgsql") - (version "0.96.0") + (version "1.2.1") (source (origin (method git-fetch) @@ -882,7 +882,7 @@ OpenStreetMap data.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "032cydh8ynaqfhdzmkvgbmqyjql668y6qln1l59l2s3ni9963bbl")) + (base32 "1ysan01lpqzjxlq3y2kdminfjs5d9zksicpf9vvzpdk3fzq51fc9")) (modules '((guix build utils))) (snippet '(begin @@ -901,16 +901,17 @@ OpenStreetMap data.") "/include")))) (inputs `(("boost" ,boost) + ("bzip2" ,bzip2) ("expat" ,expat) ("libosmium" ,libosmium) ("lua" ,lua) ("postgresql" ,postgresql) - ("proj.4" ,proj.4) + ("proj" ,proj) ("protozero" ,protozero) ("zlib" ,zlib))) (native-inputs - `(("python-2" ,python-2) - ("python2-psycopg2" ,python2-psycopg2))) + `(("python" ,python) + ("python-psycopg2" ,python-psycopg2))) (home-page "https://github.com/openstreetmap/osm2pgsql") (synopsis "OSM data importer to postgresql") (description "Osm2pgsql is a tool for loading OpenStreetMap data into a -- cgit v1.2.3 From 0f6651344f4bf1736d9efc3b5523b2cec70f8ede Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 18:45:42 +0100 Subject: gnu: libiberty: Do not inherit properties from GCC. * gnu/packages/gcc.scm (make-libiberty)[properties]: New field. --- gnu/packages/gcc.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 08afd80358..589e9367da 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -598,6 +598,7 @@ using compilers other than GCC." (outputs '("out")) (native-inputs '()) (propagated-inputs '()) + (properties '()) (synopsis "Collection of subroutines used by various GNU programs"))) (define-public libiberty -- cgit v1.2.3 From 3861fb1c1f0e33ea714093e98da828d03acf21e5 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Tue, 25 Feb 2020 15:59:10 +0100 Subject: gnu: gsettings-desktop-schemas: patch monospace font. * gnu/packages/gnome.scm (gsettings-desktop-schemas)[arguments]: Rename `set-adwaita-theme-file-name' to the more generic `patch-schemas'. Add patch for the monospace font (Source Code Pro 10 -> Monospace 11). Adjust comments. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c39b4467b9..bc78910c64 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019 Jonathan Brielmaier -;;; Copyright © 2019 Leo Prikler +;;; Copyright © 2019, 2020 Leo Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom @@ -1607,15 +1607,17 @@ on the GNOME Desktop with a single simple application.") (build-system meson-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-adwaita-theme-file-name + (add-after 'unpack 'patch-schemas (lambda* (#:key inputs #:allow-other-keys) - ;; Provide the correct file name of the default GNOME - ;; background, 'adwaita-timed.xml'. (let ((theme (assoc-ref inputs "gnome-backgrounds"))) (substitute* (find-files "schemas" "\\.gschema\\.xml\\.in$") + ;; Provide the correct file name of the default GNOME + ;; background, 'adwaita-timed.xml'. (("@datadir@/backgrounds/gnome") - (string-append theme "/share/backgrounds/gnome"))) + (string-append theme "/share/backgrounds/gnome")) + ;; Do not reference fonts, that may not exist. + (("'Source Code Pro 10'") "'Monospace 11'")) #t)))))) (inputs `(("glib" ,glib) -- cgit v1.2.3 From fcafee61bf26fcd3a16fb02aff500a328f5a33ac Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 15 Mar 2020 01:52:37 +0100 Subject: gnu: add premake5. * gnu/packages/build-tools.scm (premake5): New variable. Signed-off-by: Marius Bakke --- gnu/packages/build-tools.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 63dc72e1a7..8cfd26fec0 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Jonathan Brielmaier +;;; Copyright © 2020 Leo Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -245,6 +246,31 @@ other lower-level build files.") (home-page "https://premake.github.io") (license license:bsd-3))) +(define-public premake5 + (package + (inherit premake4) + (version "5.0.0-alpha14") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/premake/premake-core/" + "releases/download/v" version + "/premake-" version "-src.zip")) + (sha256 + (base32 + "0236s7bjvxf7x1l5faywmfzjywflpx42ngyhkn0mqqjnh54a97vw")))) + (arguments + (substitute-keyword-arguments (package-arguments premake4) + ((#:phases phases) + `(modify-phases ,phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "../../bin/release/premake5" + (string-append (assoc-ref outputs "out") "/bin")) + #t)))))) + (description "@code{premake5} is a command line utility that reads a +scripted definition of a software project and outputs @file{Makefile}s or +other lower-level build files."))) + (define-public osc (package (name "osc") -- cgit v1.2.3 From ad64b09df4bcf0a57753c9ad2cdd442b78e205d3 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 15 Mar 2020 20:36:16 +1100 Subject: gnu: Add wev. * gnu/packages/freedesktop.scm (wev): New variable. Signed-off-by: Marius Bakke --- gnu/packages/freedesktop.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 1244da4fa0..b9811fb60e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2017, 2018 Mark H Weaver ;;; Copyright © 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2020 Brendan Tildesley ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Stefan Stefanović @@ -72,6 +72,7 @@ #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) + #:use-module (gnu packages man) #:use-module (gnu packages m4) #:use-module (gnu packages nss) #:use-module (gnu packages perl) @@ -804,6 +805,43 @@ composes the final output. A Wayland compositor is essentially a multiplexer to the KMS/DRM Linux kernel devices.") (license license:expat))) +(define-public wev + ;; There simple tool has no version or release yet. + (let ((commit "cee3dfb2a8b40ee303611018c68ae182d84a7f46")) + (package + (name "wev") + (version (string-append "2020-02-06-" (string-take commit 8))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~sircmpwn/wev") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("scdoc" ,scdoc))) + (inputs + `(("libxkbcommon" ,libxkbcommon) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols))) + (home-page "https://git.sr.ht/~sircmpwn/wev") + (synopsis "Wayland event viewer") + (description "Wev is a tool that opens a window, printing all events +sent to a Wayland window, such as key presses. It is analogous to the X11 tool +XEv.") + (license license:expat)))) + (define-public exempi (package (name "exempi") -- cgit v1.2.3 From 12eb7bb8af3272bb1f16a9b73a3232e1294bd56f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 15 Mar 2020 21:25:54 +0100 Subject: gnu: Add blktrace. * gnu/packages/linux.scm (blktrace): New variable. * gnu/packages/patches/blktrace-use-rmtree.patch: Add file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Marius Bakke --- gnu/local.mk | 2 ++ gnu/packages/linux.scm | 43 ++++++++++++++++++++++++++ gnu/packages/patches/blktrace-use-rmtree.patch | 32 +++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 4fc1818ed4..0207c7547d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -27,6 +27,7 @@ # Copyright © 2019 Brett Gilio # Copyright © 2019 Amin Bandali # Copyright © 2020 Brendan Tildesley +# Copyright © 2020 Vincent Legoll # # This file is part of GNU Guix. # @@ -766,6 +767,7 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ + %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 0e649d0fe3..12da3c8f63 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4012,6 +4012,49 @@ system calls, important for the performance of databases and other advanced applications.") (license license:lgpl2.1+))) +(define-public blktrace + ;; Take a newer commit to get the fix for CVE-2018-10689. + (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc") + (revision "0")) + (package + (name "blktrace") + (version (git-version "1.2.0" revision commit)) + (home-page + "https://git.kernel.org/pub/scm/linux/kernel/git/axboe/blktrace.git") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (sha256 + (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89")) + (file-name (git-file-name name version)) + (patches (search-patches "blktrace-use-rmtree.patch")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags + (list "CC=gcc" (string-append "prefix=" %output)) + #:tests? #f ; no tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'unpack 'fix-gnuplot-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gnuplot (assoc-ref inputs "gnuplot"))) + (substitute* "btt/bno_plot.py" + (("gnuplot %s") + (string-append gnuplot "/bin/gnuplot %s"))) + #t)))))) + (inputs + `(("libaio" ,libaio) + ("gnuplot" ,gnuplot) + ("python" ,python-wrapper))) ;for 'bno_plot.py' + (synopsis "Block layer IO tracing mechanism") + (description "Blktrace is a block layer IO tracing mechanism which provides +detailed information about request queue operations to user space. It extracts +event traces from the kernel (via the relaying through the debug file system).") + (license license:gpl2)))) + (define-public sbc (package (name "sbc") diff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patch new file mode 100644 index 0000000000..bb0a10da72 --- /dev/null +++ b/gnu/packages/patches/blktrace-use-rmtree.patch @@ -0,0 +1,32 @@ +From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001 +From: Vincent Legoll +Date: Mon, 16 Mar 2020 11:43:19 +0100 +Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of + os.system('/bin/rm') + +--- + btt/bno_plot.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index f05cfdc..36fc524 100644 +--- a/btt/bno_plot.py ++++ b/btt/bno_plot.py +@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. + + from __future__ import absolute_import + from __future__ import print_function +-import getopt, glob, os, sys, tempfile ++import getopt, glob, os, sys, tempfile, shutil + + verbose = 0 + cmds = """ +@@ -125,4 +125,4 @@ if __name__ == '__main__': + sys.exit(1) + + os.waitpid(pid, 0) +- os.system('/bin/rm -rf ' + tmpdir) ++ shutil.rmtree(tmpdir) +-- +2.20.1 + -- cgit v1.2.3 From 0f7e6964c7b0daa715ebbd8ef6fe6f875ba47b85 Mon Sep 17 00:00:00 2001 From: guy fleury iteriteka Date: Wed, 18 Mar 2020 09:54:57 +0200 Subject: gnu: make-libiberty: Use install-file. * gnu/packages/gcc.scm(make-libiberty): In phase install use install-file helper function to install file. --- gnu/packages/gcc.scm | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 589e9367da..3d1ae25dc9 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2020 Joseph LaFreniere +;;; Copyright © 2020 Guy Fleury Iteriteka ;;; ;;; This file is part of GNU Guix. ;;; @@ -578,22 +579,17 @@ using compilers other than GCC." #:phases (modify-phases %standard-phases (add-before 'configure 'chdir - (lambda _ - (chdir "libiberty") - #t)) - (replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib/")) - (include (string-append out "/include/"))) - (mkdir-p lib) - (mkdir-p include) - (copy-file "libiberty.a" - (string-append lib "libiberty.a")) - (copy-file "../include/libiberty.h" - (string-append include "libiberty.h")) - #t)))))) + (lambda _ + (chdir "libiberty") + #t)) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/")) + (include (string-append out "/include/"))) + (install-file "libiberty.a" lib) + (install-file "../include/libiberty.h" include)) + #t))))) (inputs '()) (outputs '("out")) (native-inputs '()) -- cgit v1.2.3 From fe2b134cf960c5dd1d077c29cf3b4dca8e154e2f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 20 Mar 2020 02:02:39 +0100 Subject: gnu: emacs-projectile: Update to 2.1.0. * gnu/packages/emacs-xyz.scm (emacs-projectile): Update to 2.1.0. Signed-off-by: Marius Bakke --- 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 a56cbb860e..62217e37f5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6394,7 +6394,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (define-public emacs-projectile (package (name "emacs-projectile") - (version "2.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (string-append "https://raw.githubusercontent.com/bbatsov" @@ -6402,7 +6402,7 @@ like @code{org-edit-src-code} but for arbitrary regions.") (file-name (string-append "projectile-" version ".el")) (sha256 (base32 - "149hablms6n9b4wp78dz4pjz1rzyylfw9ayghq5p9d7k661mvyby")))) + "1jj9wk91clyph3zmxkd7y7d6gdqmjd1vndhyq5fxp7i7dy013571")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit v1.2.3 From baf45671374d4142a96437b75ef9953dccff214c Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 20 Mar 2020 11:45:11 +0100 Subject: gnu: Add squid. * gnu/packages/networking.scm (squid): New variable. Signed-off-by: Marius Bakke --- gnu/packages/networking.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index e9abac2991..7d81b449c1 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -82,6 +82,7 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -98,6 +99,7 @@ #:use-module (gnu packages kerberos) #:use-module (gnu packages ncurses) #:use-module (gnu packages nettle) + #:use-module (gnu packages openldap) #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -862,6 +864,47 @@ prints timing information for each step of the HTTP request (DNS lookup, TCP connection, TLS handshake and so on) in the terminal.") (license license:expat))) +(define-public squid + (package + (name "squid") + (version "4.10") + (source + (origin + (method url-fetch) + (uri (string-append "http://www.squid-cache.org/Versions/v4/squid-" + version ".tar.xz")) + (sha256 + (base32 "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q")))) + (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'build 'fix-true-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test-suite/testheaders.sh" + (("/bin/true") + (string-append (assoc-ref inputs "coreutils") + "/bin/true"))) + #t))))) + (inputs + `(("perl" ,perl) + ("openldap" ,openldap) + ("linux-pam" ,linux-pam) + ("libcap" ,libcap) + ("cyrus-sasl" ,cyrus-sasl) + ("expat" ,expat) + ("libxml2" ,libxml2) + ("openssl" ,openssl))) + (native-inputs + `(("cppunit" ,cppunit) + ("pkg-config" ,pkg-config))) + (synopsis "Web caching proxy") + (description "Squid is a caching proxy for the Web supporting HTTP, HTTPS, +FTP, and more. It reduces bandwidth and improves response times by caching and +reusing frequently-requested web pages.") + (home-page "http://www.squid-cache.org/") + (license license:gpl2+))) + (define-public bwm-ng (package (name "bwm-ng") -- cgit v1.2.3 From 830dab870ab1d4a4ec1127a877a43d19f86c4f7f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Fri, 20 Mar 2020 12:18:57 +0100 Subject: gnu: ansible: Update to 2.9.6. * gnu/packages/admin.scm (ansible): Update to 2.9.6. Signed-off-by: Marius Bakke --- 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 382f631ebd..4d3425d039 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1916,13 +1916,13 @@ of supported upstream metrics systems simultaneously.") (define-public ansible (package (name "ansible") - (version "2.9.5") + (version "2.9.6") (source (origin (method url-fetch) (uri (pypi-uri "ansible" version)) (sha256 - (base32 "19fav6rs58zdc3gfhh1lxhki36jn4252183rrd769sv46b9m1bji")))) + (base32 "1jfbp1i3nl4yvqwd5ssy43dz3pq2x03mn875vb8r56gqh43kmksr")))) (build-system python-build-system) (native-inputs `(("python-bcrypt" ,python-bcrypt) -- cgit v1.2.3 From 0266a6a23b880474d7234add38e528963f5b7c34 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:08:43 +0100 Subject: gnu: python-clikit: Declare Python 2 variant. * gnu/packages/python-xyz.scm (python-clikit)[properties]: New field. (python2-clikit): New public variable. --- gnu/packages/python-xyz.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8271e1ff7e..c3b06a58aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11125,8 +11125,18 @@ more, possibly remote, memcached servers.") (description "CliKit is a group of utilities to build testable command line interfaces.") + (properties `((python2-variant . ,(delay python2-clikit)))) (license license:expat))) +(define-public python2-clikit + (let ((base (package-with-python2 (strip-python2-variant python-clikit)))) + (package/inherit + base + (propagated-inputs + `(("python-enum34" ,python2-enum34) + ("python-typing" ,python2-typing) + ,@(package-propagated-inputs base)))))) + (define-public python-msgpack-python (package (name "python-msgpack-python") -- cgit v1.2.3 From 463e98357bda9ce33aa3cc149418108b25bd1c16 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:11:54 +0100 Subject: gnu: python-pytzdata: Update to 2019.3. * gnu/packages/time.scm (python-pytzdata): Update to 2019.3. [native-inputs]: Remove. [arguments]: New field. [propagated-inputs]: Add PYTHON-CLEO. --- gnu/packages/time.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 0ec9a102a5..bb5351e900 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016 Marius Bakke +;;; Copyright © 2016, 2020 Marius Bakke ;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 ng0 @@ -89,18 +89,20 @@ expressions.") (define-public python-pytzdata (package (name "python-pytzdata") - (version "2017.3.1") + (version "2019.3") (source (origin (method url-fetch) (uri (pypi-uri "pytzdata" version)) (sha256 (base32 - "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8")))) + "0ppfc6kz4p41mxyqxq1g1zp6gvns99g6b344qj6ih0x9vxy6zh7s")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-nose" ,python-nose))) + ;; XXX: The PyPI distribution contains no tests, and the upstream + ;; repository lacks a setup.py! How to build from git? + (arguments '(#:tests? #f)) + (propagated-inputs + `(("python-cleo" ,python-cleo))) (home-page "https://github.com/sdispater/pytzdata") (synopsis "Timezone database for Python") (description -- cgit v1.2.3 From e5023bfd2a0a51f84c5f9c59fda724db59c97cc8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:13:12 +0100 Subject: gnu: python-pendulum: Update to 2.1.0. * gnu/packages/time.scm (python-pendulum): Update to 2.1.0. [native-inputs]: Remove. [arguments]: New field. [propagated-inputs]: Remove PYTHON-TZLOCAL. --- gnu/packages/time.scm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index bb5351e900..f4dc8a2ffd 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -138,22 +138,21 @@ saving time. Almost all of the Olson timezones are supported.") (define-public python-pendulum (package (name "python-pendulum") - (version "1.2.4") + (version "2.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pendulum" version)) (sha256 (base32 - "1fj36yxi2f4lzchzd8ny1qjl67dbypnk0gn8qwad2w78579m8m8z")))) + "1zhzk0ai8is8zclw4v73dllf0hx0l5nmm4sbwrh6cl8h5qsang09")))) (build-system python-build-system) - (native-inputs - `(("python-pytest" ,python-pytest) - ("python-nose" ,python-nose))) + ;; XXX: The PyPI distribution lacks tests, and the upstream repository + ;; lacks a setup.py! + (arguments '(#:tests? #f)) (propagated-inputs `(("python-dateutil" ,python-dateutil) - ("python-pytzdata" ,python-pytzdata) - ("python-tzlocal" ,python-tzlocal))) + ("python-pytzdata" ,python-pytzdata))) (home-page "https://github.com/sdispater/pendulum") (synopsis "Alternate API for Python datetimes") (description "Pendulum is a drop-in replacement for the standard -- cgit v1.2.3 From 9f9335277f0262af89d5d33fff4a0f09892efb3e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 21:39:24 +0100 Subject: gnu: Add python-text-unidecode. * gnu/packages/python-xyz.scm (python-text-unidecode, python2-text-unidecode): New public variables. --- 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 c3b06a58aa..ed5fba5282 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2398,6 +2398,40 @@ somewhat intelligible.") (define-public python2-unidecode (package-with-python2 python-unidecode)) +(define-public python-text-unidecode + (package + (name "python-text-unidecode") + (version "1.3") + (source (origin + (method url-fetch) + (uri (pypi-uri "text-unidecode" version)) + (sha256 + (base32 + "14xb99fdv52j21dsljgsbmbaqv10ps4b453p229r29sdn4xn1mms")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" + (string-append "./build/lib:" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/kmike/text-unidecode/") + (synopsis "Decode Unicode data") + (description + "@code{text-unidecode} is a basic Python port of the @code{Text::Unidecode} +Perl library. It can create ASCII representations of Unicode data. In general +users should prefer the @code{python-unidecode} package which offers better +memory usage and transliteration quality.") + ;; The user can choose either license. + (license (list license:clarified-artistic license:gpl2+)))) + +(define-public python2-text-unidecode + (package-with-python2 python-text-unidecode)) + (define-public python-pyjwt (package (name "python-pyjwt") -- cgit v1.2.3 From 28030d290a9f690800d6ed7c7d0b217d7452b321 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:00:51 +0100 Subject: gnu: Add python-validators. * gnu/packages/python-xyz.scm (python-validators, python2-validators): New public variables. --- 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 ed5fba5282..93b735f1c9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -14062,6 +14062,41 @@ validation of URIs (see RFC 3986) and IRIs (see RFC 3987).") (define-public python2-rfc3987 (package-with-python2 python-rfc3987)) +(define-public python-validators + (package + (name "python-validators") + (version "0.14.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "validators" version)) + (sha256 + (base32 + "024m15j33szd0v8k5l4ccish6n0b4knq81gmb4fq25ynwyyyd4mi")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "pytest" "-vv")))))) + (propagated-inputs + `(("python-decorator" ,python-decorator) + ("python-six" ,python-six))) + (native-inputs + `(("python-flake8" ,python-flake8) + ("python-isort" ,python-isort) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/kvesteri/validators") + (synopsis "Data validation library") + (description + "This package contains validators for different things such as email +addresses, IP addresses, URLs, hashes and more. It has been designed to +be easy to use and not require defining a schema or form just to validate +some input.") + (license license:expat))) + +(define-public python2-validators + (package-with-python2 python-validators)) + (define-public python-validate-email (package (name "python-validate-email") -- cgit v1.2.3 From fe36fdb206be6b189fa0bb5b4eb8074379431612 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:03:35 +0100 Subject: gnu: Add python-random2. * gnu/packages/python-xyz.scm (python-random2, python2-random2): New public variables. --- 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 93b735f1c9..0c7e9e4599 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12163,6 +12163,34 @@ provide extendible implementations of common aspects of a cloud so that you can focus on building massively scalable web applications.") (license license:expat))) +(define-public python-random2 + (package + (name "python-random2") + (version "1.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "random2" version ".zip")) + (sha256 + (base32 + "01y0s4747plsx8fdnxy0nz83dp69naddz58m81r9h0s1qfm31b9l")))) + (build-system python-build-system) + (native-inputs `(("unzip" ,unzip))) + (home-page "http://pypi.python.org/pypi/random2") + (synopsis "Python 3 version of the Python 2 @code{random} module") + (description + "This package provides a Python 3 ported version of Python 2.7’s +@code{random} module. It has also been back-ported to work in Python 2.6. + +In Python 3, the implementation of @code{randrange()} was changed, so that +even with the same seed you get different sequences in Python 2 and 3. + +This package closes that gap, allowing stable random number generation +between the different Python versions.") + (license license:psfl))) + +(define-public python2-random2 + (package-with-python2 python-random2)) + (define-public python-snowballstemmer (package (name "python-snowballstemmer") -- cgit v1.2.3 From a6a7336964da06abba9dd40ce8d7496c9c711177 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:09:12 +0100 Subject: gnu: Update python-faker to to 4.0.2, python2-faker to 3.0.1. * gnu/packages/patches/python-faker-fix-build-32bit.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/python-xyz.scm (python-faker): Update to 4.0.2. [source](patches, modules, snippet): Remove. [arguments]: Adjust check phase. [native-inputs]: Remove PYTHON-EMAIL-VALIDATOR and PYTHON-MOCK. Add PYTHON-FREEZEGUN, PYTHON-PYTEST, PYTHON-RANDOM2, and PYTHON-VALIDATORS. [propagated-inputs]: Remove PYTHON-SIX. Add PYTHON-TEXT-UNIDECODE. (python2-faker): Update to 3.0.1. [native-inputs]: Add PYTHON2-MOCK. --- gnu/local.mk | 1 - .../patches/python-faker-fix-build-32bit.patch | 36 ---------------------- gnu/packages/python-xyz.scm | 34 +++++++++++--------- 3 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/python-faker-fix-build-32bit.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0207c7547d..8ada03180d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1337,7 +1337,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-cffi-x87-stack-clean.patch \ %D%/packages/patches/python2-larch-coverage-4.0a6-compatibility.patch \ %D%/packages/patches/python-configobj-setuptools.patch \ - %D%/packages/patches/python-faker-fix-build-32bit.patch \ %D%/packages/patches/python-flask-restful-werkzeug-compat.patch \ %D%/packages/patches/python-keras-integration-test.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ diff --git a/gnu/packages/patches/python-faker-fix-build-32bit.patch b/gnu/packages/patches/python-faker-fix-build-32bit.patch deleted file mode 100644 index 466b289012..0000000000 --- a/gnu/packages/patches/python-faker-fix-build-32bit.patch +++ /dev/null @@ -1,36 +0,0 @@ -These tests fail on 32-bit due to an overflow. - -Upstream bug URL: https://github.com/joke2k/faker/issues/408 - -diff --git a/tests/__init__.py b/tests/__init__.py -index 6026772..58b6b83 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -384,7 +384,6 @@ class FactoryTestCase(unittest.TestCase): - provider = Provider - # test century - self.assertTrue(self._datetime_to_time(provider.date_time_this_century(after_now=False)) <= self._datetime_to_time(datetime.datetime.now())) -- self.assertTrue(self._datetime_to_time(provider.date_time_this_century(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now())) - # test decade - self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(after_now=False)) <= self._datetime_to_time(datetime.datetime.now())) - self.assertTrue(self._datetime_to_time(provider.date_time_this_decade(before_now=False, after_now=True)) >= self._datetime_to_time(datetime.datetime.now())) -@@ -413,8 +412,6 @@ class FactoryTestCase(unittest.TestCase): - - # ensure all methods provide timezone aware datetimes - with self.assertRaises(TypeError): -- provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now() -- with self.assertRaises(TypeError): - provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now() - with self.assertRaises(TypeError): - provider.date_time_this_year(after_now=False, tzinfo=utc) <= datetime.datetime.now() -@@ -423,7 +420,6 @@ class FactoryTestCase(unittest.TestCase): - - # test century - self.assertTrue(provider.date_time_this_century(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc)) -- self.assertTrue(provider.date_time_this_century(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc)) - # test decade - self.assertTrue(provider.date_time_this_decade(after_now=False, tzinfo=utc) <= datetime.datetime.now(utc)) - self.assertTrue(provider.date_time_this_decade(before_now=False, after_now=True, tzinfo=utc) >= datetime.datetime.now(utc)) --- -2.11.1 - diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c7e9e4599..47a75bc36a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11368,34 +11368,29 @@ parsing UK postcodes.") (define-public python-faker (package (name "python-faker") - (version "0.7.9") + (version "4.0.2") (source (origin (method url-fetch) (uri (pypi-uri "Faker" version)) (sha256 (base32 - "1fh2p2yz0fsdr4fqwxgddwbvfb6qn6vp8yx0qwqzra27yq5d1wsm")) - (patches - (search-patches "python-faker-fix-build-32bit.patch")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file (find-files "." "\\.pyc$")) - #t)))) + "13qq485ydxmdnqn3xbfv1xfyqbf9qfnfw33v1vw5l6jyy9p8cgrd")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ (invoke "python" "-m" "unittest" "-v" "tests")))))) + (lambda _ (invoke "python" "-m" "pytest" "-v")))))) (native-inputs `(;; For testing - ("python-email-validator" ,python-email-validator) - ("python-mock" ,python-mock) - ("python-ukpostcodeparser" ,python-ukpostcodeparser))) + ("python-freezegun" ,python-freezegun) + ("python-pytest" ,python-pytest) + ("python-random2" ,python-random2) + ("python-ukpostcodeparser" ,python-ukpostcodeparser) + ("python-validators" ,python-validators))) (propagated-inputs `(("python-dateutil" ,python-dateutil) - ("python-six" ,python-six))) + ("python-text-unidecode" ,python-text-unidecode))) (home-page "https://github.com/joke2k/faker") (synopsis "Python package that generates fake data") (description @@ -11404,11 +11399,22 @@ addresses, and phone numbers.") (license license:expat) (properties `((python2-variant . ,(delay python2-faker)))))) +;; Faker 4.0 dropped Python 2 support, so we stick with this older version here. (define-public python2-faker (let ((base (package-with-python2 (strip-python2-variant python-faker)))) (package (inherit base) + (version "3.0.1") + (source (origin + (method url-fetch) + (uri (pypi-uri "Faker" version)) + (sha256 + (base32 + "11cr0qvspkdh6198rqy56qildk7bnp6llj8kyy1dan5sp5n4dxy7")))) + (native-inputs + `(("python-mock" ,python2-mock) + ,@(package-native-inputs base))) (propagated-inputs `(("python2-ipaddress" ,python2-ipaddress) ,@(package-propagated-inputs base)))))) -- cgit v1.2.3 From 51d42caa94515f43d677bdd76d53bf8bb8c7bc4e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:20:37 +0100 Subject: gnu: python-orator: Update to 0.9.9. * gnu/packages/databases.scm (python-orator): Update to 0.9.9. [arguments]: Remove #:phases. Add #:tests?. [native-inputs]: Remove. [propagated-inputs]: Add PYTHON-PYYAML. --- gnu/packages/databases.scm | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 130aaa2653..a347467ad1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016 Danny Milosavljevic -;;; Copyright © 2016, 2017, 2018, 2019 Marius Bakke +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017, 2020 Thomas Danckaert ;;; Copyright © 2017 Jelle Licht @@ -2391,32 +2391,17 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") (define-public python-orator (package (name "python-orator") - (version "0.9.7") + (version "0.9.9") (source (origin (method url-fetch) (uri (pypi-uri "orator" version)) (sha256 (base32 - "14r58z64fdp76ixnvmi4lni762b405ynmsx6chr1qihs3yl9zn6c")))) + "0mbgybz63ryhr9p1f4glnls5c57jp6il3dw0kf97f3pj80687rvg")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'loosen-dependencies - ;; Tests are not actually run since they are not included with the - ;; distributed package, but dependencies are checked. - (lambda _ - (substitute* "setup.py" - ((",<.*'") "'") - (("flexmock==0.9.7") "flexmock") - ;; The pytest-mock package is out of date, so we remove minimum - ;; version requirement. - (("pytest-mock.*'") "pytest-mock'")) - #t))))) - (native-inputs - `(("python-pytest-mock" ,python-pytest-mock) - ("python-pytest" ,python-pytest) - ("python-flexmock" ,python-flexmock))) + ;; FIXME: Tests are not distributed with PyPI, and the repository + ;; does not contain setup.py. How to test? + (arguments '(#:tests? #f)) (propagated-inputs `(("python-backpack" ,python-backpack) ("python-blinker" ,python-blinker) @@ -2427,6 +2412,7 @@ Memory-Mapped Database} (LMDB), a high-performance key-value store.") ("python-pendulum" ,python-pendulum) ("python-pyaml" ,python-pyaml) ("python-pygments" ,python-pygments) + ("python-pyyaml" ,python-pyyaml) ("python-simplejson" ,python-simplejson) ("python-six" ,python-six) ("python-wrapt" ,python-wrapt))) -- cgit v1.2.3 From 85bad77facdada73d6fb1397500ed15dc288913d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 20 Mar 2020 22:55:01 +0100 Subject: gnu: python2-faker: Add explicit dependency on six. This is a follow-up to commit a6a7336964da06abba9dd40ce8d7496c9c711177. * gnu/packages/python-xyz.scm (python2-faker)[propagated-inputs]: Add PYTHON2-SIX. --- gnu/packages/python-xyz.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 47a75bc36a..490580262e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11417,6 +11417,7 @@ addresses, and phone numbers.") ,@(package-native-inputs base))) (propagated-inputs `(("python2-ipaddress" ,python2-ipaddress) + ("python2-six" ,python2-six) ,@(package-propagated-inputs base)))))) (define-public python-pyaml -- cgit v1.2.3 From e401653b515cb32650aa885dfb6db185409ccd23 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 21 Feb 2020 11:51:56 -0500 Subject: gnu: FFmpeg: Prefer dav1d over libaom. * gnu/packages/patches/ffmpeg-prefer-dav1d.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (ffmpeg)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/patches/ffmpeg-prefer-dav1d.patch | 43 ++++++++++++++++++++++++++ gnu/packages/video.scm | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 gnu/packages/patches/ffmpeg-prefer-dav1d.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 8ada03180d..d6d129c3cc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -866,6 +866,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ + %D%/packages/patches/ffmpeg-prefer-dav1d.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2018-10360.patch \ diff --git a/gnu/packages/patches/ffmpeg-prefer-dav1d.patch b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch new file mode 100644 index 0000000000..95e3712a7f --- /dev/null +++ b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch @@ -0,0 +1,43 @@ +When decoding AV1 files, prefer dav1d over libaom for performance +reasons. + +Patch copied from upstream source repository: + + + +From dc0806dd25882f41f6085c8356712f95fded56c7 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Sun, 15 Sep 2019 11:29:56 -0300 +Subject: [PATCH] avcodec/allcodecs: make libdav1d the preferred AV1 decoder + +It's considerably faster than libaom in most systems. + +Reviewed-by: BBB +Signed-off-by: James Almer +--- + libavcodec/allcodecs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c +index 5130fca026..d5dfba1877 100644 +--- a/libavcodec/allcodecs.c ++++ b/libavcodec/allcodecs.c +@@ -680,7 +680,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder; + extern AVCodec ff_pcm_mulaw_at_decoder; + extern AVCodec ff_qdmc_at_decoder; + extern AVCodec ff_qdm2_at_decoder; +-extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libaom_av1_encoder; + extern AVCodec ff_libaribb24_decoder; + extern AVCodec ff_libcelt_decoder; +@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder; + /* external libraries, that shouldn't be used by default if one of the + * above is available */ + extern AVCodec ff_h263_v4l2m2m_encoder; ++extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libopenh264_encoder; + extern AVCodec ff_libopenh264_decoder; + extern AVCodec ff_h264_amf_encoder; +-- +2.20.1 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0c245ece6e..d0c35e8e77 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -922,6 +922,8 @@ operate properly.") (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) + ;; See + (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) -- cgit v1.2.3 From f08040c5f864df1e85573172aa921e42ceef6859 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 20 Feb 2020 18:28:36 -0500 Subject: gnu: VLC: Improve AV1 playback. * gnu/packages/video.scm (inputs): Add dav1d. --- gnu/packages/video.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d0c35e8e77..d18fe95b61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1206,6 +1206,10 @@ videoformats depend on the configuration flags of ffmpeg.") (inputs `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) + ;; XXX Try removing dav1d here and testing AV1 playback when FFmpeg 4.3 + ;; is released. + ;; + ("dav1d" ,dav1d) ("dbus" ,dbus) ("eudev" ,eudev) ("flac" ,flac) -- cgit v1.2.3 From fe4a37276b871e29a7397b0aa940aab2b842ce77 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Mar 2020 23:12:36 +0100 Subject: gnu: guix: Install SysV init files to $(prefix)/etc. Fixes . Reported by Maxim Cournoyer . This is a followup to 73fbe04107d38f4561636c74d28d7a4935cbb1ef. * gnu/packages/package-management.scm (guix)[arguments]: In 'bootstrap' phase, change "sysvinitservicedir" in 'nix/local.mk'. --- gnu/packages/package-management.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index b0457ba87a..c321a64751 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -170,6 +170,13 @@ (lambda (port) (display ,version port))) + ;; Install SysV init files to $(prefix)/etc rather + ;; than to /etc. + (substitute* "nix/local.mk" + (("^sysvinitservicedir = .*$") + (string-append "sysvinitservicedir = \ +$(prefix)/etc/init.d\n"))) + (invoke "sh" "bootstrap"))) (add-before 'check 'copy-bootstrap-guile (lambda* (#:key system inputs #:allow-other-keys) -- cgit v1.2.3 From 6b8c390f282936cad9172100c0d882f7391a6fc4 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 21 Mar 2020 00:01:19 +0000 Subject: gnu: python-botocore: Update to 1.15.26. To keep compatability with awscli. * gnu/packages/python-xyz.scm (python-botocore): Update to 1.15.26. --- 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 490580262e..bf6393362e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9408,14 +9408,14 @@ document.") (define-public python-botocore (package (name "python-botocore") - (version "1.12.149") + (version "1.15.26") (source (origin (method url-fetch) (uri (pypi-uri "botocore" version)) (sha256 (base32 - "12597f74khp3ngwr282cb949w0gcqj20rkfc3x275dijavyy5cmf")))) + "1a87pbwkk5vlwz92hy1wizfnpiwn11bhaicr6bmji1i5ybwdhnr8")))) (build-system python-build-system) (arguments ;; FIXME: Many tests are failing. -- cgit v1.2.3 From 46a5d07ef79f7e586a3d0caa359e7117c1f1c500 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:27:48 +0100 Subject: gnu: cl-jonathan: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (cl-jonathan)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d9986463a0..c4dea7711d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4281,7 +4281,7 @@ streams (though primarily the former, while wrapping the latter).") ("sbcl-fast-io" ,sbcl-fast-io) ("sbcl-proc-parse" ,sbcl-proc-parse) ("sbcl-cl-ppcre" ,sbcl-cl-ppcre))) - (home-page "http://rudolph-miller.github.io/jonathan/overview.html") + (home-page "https://rudolph-miller.github.io/jonathan/overview.html") (synopsis "JSON encoder and decoder") (description "High performance JSON encoder and decoder. Currently support: SBCL, -- cgit v1.2.3 From 113c9b97b46344b5e30544ee4d2a6e85460feb02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:18:43 +0100 Subject: gnu: sbcl-cl+ssl: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-cl+ssl)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c4dea7711d..a3cb070fe5 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3504,7 +3504,7 @@ RFC 1321 by R. Rivest, published April 1992.") ("sbcl-trivial-garbage" ,sbcl-trivial-garbage) ("sbcl-alexandria" ,sbcl-alexandria) ("sbcl-trivial-features" ,sbcl-trivial-features))) - (home-page "http://common-lisp.net/project/cl-plus-ssl/") + (home-page "https://common-lisp.net/project/cl-plus-ssl/") (synopsis "Common Lisp bindings to OpenSSL") (description "This library is a fork of SSL-CMUCL. The original SSL-CMUCL source -- cgit v1.2.3 From 9ca4c65492737fbdfe342ce949b442a62575b1c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:49:52 +0100 Subject: gnu: sbcl-parse-js: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-parse-js)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index a3cb070fe5..d025adb89c 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -926,7 +926,7 @@ multiple inspectors with independent history.") (base32 "1wddrnr5kiya5s3gp4cdq6crbfy9fqcz7fr44p81502sj3bvdv39")))) (build-system asdf-build-system/sbcl) - (home-page "http://marijnhaverbeke.nl/parse-js/") + (home-page "https://marijnhaverbeke.nl/parse-js/") (synopsis "Parse JavaScript") (description "Parse-js is a Common Lisp package for parsing JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") -- cgit v1.2.3 From fed4ff33faca7f0a933f848508fb1fcf6c54c8a8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:31:29 +0100 Subject: gnu: sbcl-parse-number: Use HTTPS home page. * gnu/packages/lisp-xyz.scm (sbcl-parse-number)[home-page]: Use HTTPS. --- gnu/packages/lisp-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index d025adb89c..043c219e5e 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -950,7 +950,7 @@ JavaScript (ECMAScript 3). It has basic support for ECMAScript 5.") (base32 "0sk06ib1bhqv9y39vwnnw44vmbc4b0kvqm37xxmkxd4dwchq82d7")))) (build-system asdf-build-system/sbcl) - (home-page "http://www.cliki.net/PARSE-NUMBER") + (home-page "https://www.cliki.net/PARSE-NUMBER") (synopsis "Parse numbers") (description "@code{parse-number} is a library of functions for parsing strings into one of the standard Common Lisp number types without using the -- cgit v1.2.3 From 2d1e064694ae48a90eedcde8da12a51ab4596a68 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:32:29 +0100 Subject: gnu: ocaml-tsdl: Use HTTPS home page. * gnu/packages/ocaml.scm (ocaml-tsdl)[home-page]: Use HTTPS. --- 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 c9a1037902..fae92bbf1c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3341,7 +3341,7 @@ OCaml projects that contain C stubs.") (package (name "ocaml-tsdl") (version "0.9.6") - (home-page "http://erratique.ch/software/tsdl") + (home-page "https://erratique.ch/software/tsdl") (source (origin (method url-fetch) (uri (string-append home-page "/releases/tsdl-" -- cgit v1.2.3 From 786886d1f575773e8c5a58e9802e805e20871a8c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 03:01:02 +0100 Subject: gnu: ocaml-tsdl: Update to 0.9.7. * gnu/packages/ocaml.scm (ocaml-tsdl): Update to 0.9.7. [native-inputs]: Remove ocaml-ocb-stubblr. [inputs]: Remove ocaml-result. --- gnu/packages/ocaml.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index fae92bbf1c..92b28e0148 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3340,7 +3340,7 @@ OCaml projects that contain C stubs.") (define-public ocaml-tsdl (package (name "ocaml-tsdl") - (version "0.9.6") + (version "0.9.7") (home-page "https://erratique.ch/software/tsdl") (source (origin (method url-fetch) @@ -3349,7 +3349,7 @@ OCaml projects that contain C stubs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00krjhmnchsnz33h9zhh0v69xbvi86l0xf0dvy7iivylb7f7x3n4")))) + "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f")))) (build-system ocaml-build-system) (arguments `(#:build-flags '("build") @@ -3360,12 +3360,10 @@ OCaml projects that contain C stubs.") (native-inputs `(("ocamlbuild" ,ocamlbuild) ("ocaml-astring" ,ocaml-astring) - ("ocaml-ocb-stubblr" ,ocaml-ocb-stubblr) ("opam" ,opam) ("pkg-config" ,pkg-config))) (inputs `(("topkg" ,ocaml-topkg) - ("result" ,ocaml-result) ("sdl2" ,sdl2) ("integers" ,ocaml-integers) ("ctypes" ,ocaml-ctypes))) -- cgit v1.2.3 From d8bf501eb258f15f10f55e7b6c96b610ec55b09d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:25:19 +0100 Subject: gnu: ocaml-sedlex: Use HTTPS home page. * gnu/packages/ocaml.scm (ocaml-sedlex)[home-page]: Use HTTPS. --- 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 92b28e0148..5181d6156b 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2088,7 +2088,7 @@ and consumable.") (sha256 (base32 "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk")))))) - (home-page "http://www.cduce.org/download.html#side") + (home-page "https://www.cduce.org/download.html#side") (synopsis "Lexer generator for Unicode and OCaml") (description "Lexer generator for Unicode and OCaml.") (license license:expat))) -- cgit v1.2.3 From 7ea838447c3cc07c35d45ba8ae43e64ae8ff36c3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:07:28 +0100 Subject: gnu: r-maptools: Use HTTPS home page. * gnu/packages/cran.scm (r-maptools)[home-page]: Use HTTPS. --- 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 2fc62edb4b..2ef1b931a8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -5516,7 +5516,7 @@ simple method for converting between file types.") `(("r-foreign" ,r-foreign) ("r-lattice" ,r-lattice) ("r-sp" ,r-sp))) - (home-page "http://r-forge.r-project.org/projects/maptools/") + (home-page "https://r-forge.r-project.org/projects/maptools/") (synopsis "Tools for reading and handling spatial objects") (description "This package provides a set of tools for manipulating and reading -- cgit v1.2.3 From fa2a0fd00bc1a599a34144ea2c5aedc4e41fe237 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 17 Feb 2020 21:21:55 +0100 Subject: gnu: Use ‘license:’ prefix in (gnu packages libreoffice). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/libreoffice.scm: Import (guix licenses) with a #:prefix and adjust all callers. --- gnu/packages/libreoffice.scm | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2ef813907d..88f31c7d1a 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -35,9 +35,7 @@ #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) - #:use-module ((guix licenses) - #:select (gpl2 gpl2+ lgpl2.1+ lgpl3+ mpl1.1 mpl2.0 - non-copyleft x11-style bsd-3)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) @@ -110,7 +108,7 @@ expressions stored in multiple named targets, or \"cells\". The cells can be referenced from each other, and the library takes care of resolving their dependencies automatically upon calculation.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public orcus (package @@ -140,7 +138,7 @@ spreadsheet documents. The library includes import filters for Microsoft Excel 2007 XML, Microsoft Excel 2003 XML, Open Document Spreadsheet, Plain Text, Gnumeric XML, Generic XML. It also includes low-level parsers for CSV, CSS and XML.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public unoconv (package @@ -197,7 +195,7 @@ Format (@file{.odt}, @file{.ods}, @file{.odp})), Portable Document Format @file{.docx}), @file{.xls} and @file{.xlsx}). All required fonts must be installed on the converting system.") - (license gpl2))) + (license license:gpl2))) (define-public librevenge (package @@ -229,7 +227,7 @@ All required fonts must be installed on the converting system.") (description "Librevenge is a base library for writing document import filters. It has interfaces for text documents, vector graphics, spreadsheets and presentations.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libwpd (package @@ -257,7 +255,7 @@ spreadsheets and presentations.") (description "Libwpd is a C++ library designed to help process WordPerfect documents. It is most commonly used to import such documents into other word processors.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libe-book (package @@ -294,7 +292,7 @@ Broad Band eBook, eReader .pdb, FictionBook v. 2 (including zipped files), PalmDoc Ebook, Plucker .pdb, QiOO (mobile format, for java-enabled cellphones), TCR (simple compressed text format), TealDoc, zTXT, ZVR (simple compressed text format).") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libepubgen (package @@ -322,7 +320,7 @@ ZVR (simple compressed text format).") (description "libepubgen is an EPUB generator for librevenge. It supports librevenge's text document interface and--currently in a very limited way--presentation and vector drawing interfaces.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libwpg (package @@ -348,7 +346,7 @@ way--presentation and vector drawing interfaces.") (synopsis "Library and tools for the WordPerfect Graphics format") (description "The libwpg project provides a library and tools for working with graphics in the WPG (WordPerfect Graphics) format.") - (license (list mpl2.0 lgpl2.1+)))) ;dual licensed + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual-licensed (define-public libcmis (package @@ -390,7 +388,8 @@ working with graphics in the WPG (WordPerfect Graphics) format.") (description "LibCMIS is a C++ client library for the CMIS interface. It allows C++ applications to connect to any ECM behaving as a CMIS server such as Alfresco or Nuxeo.") - (license (list mpl1.1 gpl2+ lgpl2.1+)))) ; triple license + (license + (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) ; triple license (define-public libabw (package @@ -418,7 +417,7 @@ as Alfresco or Nuxeo.") (synopsis "Library for parsing the AbiWord format") (description "Libabw is a library that parses the file format of AbiWord documents.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libcdr (package @@ -447,7 +446,7 @@ AbiWord documents.") (synopsis "Library for parsing the CorelDRAW format") (description "Libcdr is a library that parses the file format of CorelDRAW documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libetonyek (package @@ -481,7 +480,7 @@ CorelDRAW documents of all versions.") (synopsis "Library for parsing the Apple Keynote format") (description "Libetonyek is a library that parses the file format of Apple Keynote documents. It currently supports Keynote versions 2 to 5.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public liblangtag (package @@ -507,7 +506,7 @@ for identifying languages as described in RFC 5646. It supports the extensions described in RFC6067 and RFC6497, and Extension T for language/locale identifiers as described in the Unicode CLDR standard 21.0.2.") - (license (list lgpl3+ mpl2.0)))) ; dual license + (license (list license:lgpl3+ license:mpl2.0)))) ; dual license (define-public libexttextcat (package @@ -525,8 +524,8 @@ standard 21.0.2.") (synopsis "Text Categorization library") (description "Libexttextcat is an N-Gram-Based Text Categorization library primarily intended for language guessing.") - (license (non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")))) + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")))) (define-public libfreehand (package @@ -556,7 +555,7 @@ library primarily intended for language guessing.") (synopsis "Library for parsing the FreeHand format") (description "Libfreehand is a library that parses the file format of Aldus/Macromedia/Adobe FreeHand documents.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libmspub (package @@ -583,7 +582,7 @@ Aldus/Macromedia/Adobe FreeHand documents.") (synopsis "Library for parsing the Microsoft Publisher format") (description "Libmspub is a library that parses the file format of Microsoft Publisher documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libnumbertext (package @@ -606,7 +605,7 @@ Microsoft Publisher documents of all versions.") "The libnumbertext library provides language-neutral @code{NUMBERTEXT} and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and Java.") - (license (list lgpl3+ bsd-3)))) + (license (list license:lgpl3+ license:bsd-3)))) (define-public libpagemaker (package @@ -635,7 +634,7 @@ Java.") (description "Libpagemaker is a library that parses the file format of Aldus/Adobe PageMaker documents. Currently it only understands documents created by PageMaker version 6.x and 7.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libvisio (package @@ -665,7 +664,7 @@ created by PageMaker version 6.x and 7.") (synopsis "Library for parsing the Microsoft Visio format") (description "Libvisio is a library that parses the file format of Microsoft Visio documents of all versions.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libodfgen (package @@ -696,7 +695,7 @@ Microsoft Visio documents of all versions.") Open Document Format (ODF). It provides generator implementations for all document interfaces supported by librevenge: text documents, vector drawings, presentations and spreadsheets.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libmwaw (package @@ -723,7 +722,7 @@ text documents, vector drawings, presentations and spreadsheets.") (description "Libmwaw contains some import filters for old Macintosh text documents (MacWrite, ClarisWorks, ... ) and for some graphics and spreadsheet documents.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libstaroffice (package @@ -746,7 +745,7 @@ spreadsheet documents.") (synopsis "Provides LibreOffice support for old StarOffice documents") (description "@code{libstaroffice} is an import filter for the document formats from the old StarOffice (.sdc, .sdw, ...).") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libwps (package @@ -772,7 +771,7 @@ from the old StarOffice (.sdc, .sdw, ...).") (synopsis "Import library for Microsoft Works text documents") (description "Libwps is a library for importing files in the Microsoft Works word processor file format.") - (license (list mpl2.0 lgpl2.1+)))) ; dual license + (license (list license:mpl2.0 license:lgpl2.1+)))) ; dual license (define-public libzmf (package @@ -804,7 +803,7 @@ Works word processor file format.") (description "Libzmf is a library that parses the file format of Zoner Callisto/Draw documents. Currently it only understands documents created by Zoner Draw version 4 and 5.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public hunspell (package @@ -836,7 +835,7 @@ Zoner Draw version 4 and 5.") library and program designed for languages with rich morphology and complex word compounding or character encoding.") ;; Triple license, including "mpl1.1 or later". - (license (list mpl1.1 gpl2+ lgpl2.1+)))) + (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) (define (dicollecte-french-dictionary variant synopsis) ;; Return a French dictionary package from dicollecte.org, for the given @@ -884,7 +883,7 @@ word compounding or character encoding.") "This package provides a dictionary for the Hunspell spell-checking library.") (home-page "https://www.dicollecte.org/home.php?prj=fr") - (license mpl2.0))) + (license license:mpl2.0))) (define-syntax define-french-dictionary (syntax-rules (synopsis) @@ -929,8 +928,9 @@ library.") (synopsis "Hyphenation library") (description "Hyphen is a hyphenation library using TeX hyphenation patterns, which are pre-processed by a perl script.") - ;; triple license, including "mpl1.1 or later" - (license (list mpl1.1 mpl2.0 gpl2+ lgpl2.1+)))) + ;; Triple license, including "mpl1.1 or later". + (license + (list license:mpl1.1 license:mpl2.0 license:gpl2+ license:lgpl2.1+)))) (define-public mythes (package @@ -954,8 +954,8 @@ patterns, which are pre-processed by a perl script.") (description "MyThes is a simple thesaurus that uses a structured text data file and an index file with binary search to look up words and phrases and to return information on pronunciations, meanings and synonyms.") - (license (non-copyleft "file://COPYING" - "See COPYING in the distribution.")))) + (license (license:non-copyleft "file://COPYING" + "See COPYING in the distribution.")))) (define-public libqxp (package @@ -982,7 +982,7 @@ and to return information on pronunciations, meanings and synonyms.") (synopsis "Library and tools for the QuarkXPress file format") (description "libqxp is a library and a set of tools for reading and converting QuarkXPress file format. It supports versions 3.1 to 4.1.") - (license mpl2.0))) + (license license:mpl2.0))) (define-public libreoffice (package @@ -1203,4 +1203,4 @@ a number of components: Writer, a word processor; Calc, a spreadsheet application; Impress, a presentation engine; Draw, a drawing and flowcharting application; Base, a database and database frontend; Math for editing mathematics.") - (license mpl2.0))) + (license license:mpl2.0))) -- cgit v1.2.3 From a7b7817dd8a4a5f71f2311029fb2e8f8bbad38f9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 04:26:42 +0100 Subject: gnu: ruby-omniauth: Update to 1.9.1. * gnu/packages/ruby.scm (ruby-omniauth): Update to 1.9.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 5b6d79c3b7..1511f961dc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017 ng0 ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Efraim Flashner -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Christopher Baines ;;; Copyright © 2018 Vasile Dumitrascu @@ -1279,14 +1279,13 @@ with a similar style to the original OAuth spec.") (define-public ruby-omniauth (package (name "ruby-omniauth") - (version "1.9.0") + (version "1.9.1") (source (origin (method url-fetch) (uri (rubygems-uri "omniauth" version)) (sha256 - (base32 - "1p16h1rp8by05k8gfw17xjhgwp60dk8qmj1xalv1n23kmxfsxb1x")))) + (base32 "002vi9gwamkmhf0dsj2im1d47xw2n1jfhnzl18shxf3ampkqfmyz")))) (build-system ruby-build-system) (arguments '(#:tests? #f)) ; No included tests -- cgit v1.2.3 From 2aaa09f17ddcc14a88468299bd33d8a22928ceee Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:02:00 +0100 Subject: gnu: hdf-eos2: Use HTTPS home page. * gnu/packages/maths.scm (hdf-eos2)[home-page]: Use HTTPS. --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 847cc4a14e..df4971aad8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1139,7 +1139,7 @@ implemented in C.") `( #:configure-flags '("--enable-install-include" "--enable-shared" "CC=h4cc -Df2cFortran" "LIBS=-lgctp") #:parallel-tests? #f)) - (home-page "http://hdfeos.org/software/library.php#HDF-EOS2") + (home-page "https://hdfeos.org/software/library.php#HDF-EOS2") (synopsis "HDF4-based data format for NASA's Earth Observing System") (description "HDF-EOS2 is a software library built on HDF4 which supports the construction of data structures used in NASA's Earth Observing -- cgit v1.2.3 From 69669b2877da7af012a4ddca2a85cb6f54467b28 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:23:31 +0100 Subject: gnu: guile-rsvg: Use HTTPS home page. * gnu/packages/gtk.scm (guile-rsvg)[home-page]: Use HTTPS. --- gnu/packages/gtk.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d52dc41e7e..df9fc05294 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -923,7 +923,7 @@ exceptions, macros, and a dynamic programming environment.") (description "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG images onto Cairo surfaces.") - (home-page "http://wingolog.org/projects/guile-rsvg/") + (home-page "https://wingolog.org/projects/guile-rsvg/") (license license:lgpl2.1+)))) (define-public guile3.0-rsvg -- cgit v1.2.3 From 02e052ba9dc363d2a6aafe04ba79334b5073f6fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:12:08 +0100 Subject: gnu: guile3.0-syntax-highlight: Use HTTPS home page. * gnu/packages/guile-xyz.scm (guile3.0-syntax-highlight)[home-page]: Use HTTPS. --- gnu/packages/guile-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index dbf3c8ee57..a2430b7ea3 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -597,7 +597,7 @@ is not available for Guile 2.0.") highlighting library for GNU Guile. It can parse code written in various programming languages into a simple s-expression that can be converted to HTML (via SXML) or any other format for rendering.") - (home-page "http://dthompson.us/projects/guile-syntax-highlight.html") + (home-page "https://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) (define-public guile3.0-syntax-highlight -- cgit v1.2.3 From f9caa6c7c1af97c9f1da3a7fd033f88cbe4a9827 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 20 Mar 2020 05:14:57 +0100 Subject: gnu: perl-archive-zip: Update to 1.68. * gnu/packages/perl-compression.scm (perl-archive-zip): Update to 1.68. --- gnu/packages/perl-compression.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/perl-compression.scm b/gnu/packages/perl-compression.scm index af6d575435..6bb67bcb59 100644 --- a/gnu/packages/perl-compression.scm +++ b/gnu/packages/perl-compression.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2017 Petter ;;; Copyright © 2017, 2019 Efraim Flashner ;;; @@ -130,7 +130,7 @@ type by using either Perl modules, or command-line tools on your system.") (define-public perl-archive-zip (package (name "perl-archive-zip") - (version "1.67") + (version "1.68") (source (origin (method url-fetch) @@ -138,7 +138,7 @@ type by using either Perl modules, or command-line tools on your system.") "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-" version ".tar.gz")) (sha256 - (base32 "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my")))) + (base32 "0l663s3a68p8r2qjy4pn1g05lx0i8js8wpz7qqln3bsvg1fihklq")))) (build-system perl-build-system) (native-inputs ;; For tests. -- cgit v1.2.3 From acf2b20069b1f74b59185292d981024eea4d7055 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 01:08:08 +0100 Subject: gnu: rsync: Use system zlib and popt libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce our likelihood of contracting security bugs at the expense of compression ratio (in some cases) and compatibility with rsync≤3.1.1. rsync@3.1.2 was released in 2014. Time to upgrade your CentOS box. * gnu/packages/rsync.scm (rsync)[inputs]: Add popt and zlib. [arguments]: Use them. --- gnu/packages/rsync.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rsync.scm b/gnu/packages/rsync.scm index 74efae753c..0d8217ee20 100644 --- a/gnu/packages/rsync.scm +++ b/gnu/packages/rsync.scm @@ -34,7 +34,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu)) - (define-public rsync (package (name "rsync") @@ -47,10 +46,17 @@ (base32 "1h0011dj6jgqpgribir4anljjv7bbrdcs8g91pbsmzf5zr75bk2m")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + ;; The bundled copies are preferred by default. + (list "--without-included-zlib" + "--without-included-popt"))) (native-inputs `(("perl" ,perl))) (inputs - `(("acl" ,acl))) + `(("acl" ,acl) + ("popt" ,popt) + ("zlib" ,zlib))) (synopsis "Remote (and local) file copying tool") (description "Rsync is a fast and versatile file copying tool. It can copy locally, -- cgit v1.2.3 From fa7efe1798b187f832a9d9d6f83497a0886bf1b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:17:13 +0100 Subject: gnu: python2-s3cmd: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-s3cmd)[home-page]: Use HTTPS. --- 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 bf6393362e..eaa17f3736 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10251,7 +10251,7 @@ the same purpose: to provide Python bindings for libmagic.") ;; without libmagic bindings at all: ;; https://github.com/s3tools/s3cmd/issues/198 ("python2-magic" ,python2-magic))) - (home-page "http://s3tools.org/s3cmd") + (home-page "https://s3tools.org/s3cmd") (synopsis "Command line tool for S3-compatible storage services") (description "S3cmd is a command line tool for uploading, retrieving and managing data -- cgit v1.2.3 From 8198c19c127a02eb238a59a15c17aa2100ce9574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:05:03 +0100 Subject: gnu: python-django: Use HTTPS home page. * gnu/packages/django.scm (python-django)[home-page]: Use HTTPS. --- gnu/packages/django.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 70b6662a9e..8e72139a07 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -99,7 +99,7 @@ ("python-tblib" ,python-tblib))) (propagated-inputs `(("python-pytz" ,python-pytz))) - (home-page "http://www.djangoproject.com/") + (home-page "https://www.djangoproject.com/") (synopsis "High-level Python Web framework") (description "Django is a high-level Python Web framework that encourages rapid -- cgit v1.2.3 From dcff9bda97d088a717d6f7c01bdf7c0e68d62b9b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 11:58:26 +0100 Subject: gnu: python-language-server: Build with python-jedi@0.15.2. * gnu/packages/python-xyz.scm (python-language-server)[propagated-inputs]: Remove PYTHON-JEDI. Add PYTHON-JEDI-0.15. (python-jedi-0.15, python-parso-0.5): New public variables. --- gnu/packages/python-xyz.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index eaa17f3736..3937bad5c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3459,7 +3459,9 @@ Server (PLS).") (propagated-inputs `(("python-pluggy" ,python-pluggy) ("python-jsonrpc-server" ,python-jsonrpc-server) - ("python-jedi" ,python-jedi) + ;; Note: Remove the special versions of Jedi and Parso when updating + ;; this package. + ("python-jedi" ,python-jedi-0.15) ("python-yapf" ,python-yapf) ("python-pyflakes" ,python-pyflakes) ("python-pydocstyle" ,python-pydocstyle) @@ -11566,6 +11568,20 @@ well.") (define-public python2-jedi (package-with-python2 python-jedi)) +;; python-language-server requires 0.15 specifically. Remove once unused. +(define-public python-jedi-0.15 + (package + (inherit python-jedi) + (version "0.15.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "jedi" version)) + (sha256 + (base32 + "01zqasl690x1i6dq4mvh13pz0cw8i276xsivsrnn00x90iqm42g9")))) + (propagated-inputs + `(("python-parso" ,python-parso-0.5))))) + (define-public ptpython (package (name "ptpython") @@ -15885,6 +15901,19 @@ Parso is also able to list multiple syntax errors in your Python file.") (define-public python2-parso (package-with-python2 python-parso)) +;; This version is required for Jedi@0.15, which in turn is needed for +;; python-language-server. +(define-public python-parso-0.5 + (package + (inherit python-parso) + (version "0.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "parso" version)) + (sha256 + (base32 + "1qgvrkpma7vylrk047mxxvqd66nwqk978n3ig2w8iz9m3bgjbksm")))))) + (define-public python-async-generator (package (name "python-async-generator") -- cgit v1.2.3 From c61557b1b642b61abdb665527e6a34b97e3d064f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:17:11 +0100 Subject: gnu: gRPC: Move to (gnu packages rpc). * gnu/packages/machine-learning.scm (grpc): Move to ... * gnu/packages/rpc.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/hyperledger.scm: Adjust module imports. --- gnu/local.mk | 1 + gnu/packages/hyperledger.scm | 1 + gnu/packages/machine-learning.scm | 76 +--------------------------- gnu/packages/rpc.scm | 103 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 75 deletions(-) create mode 100644 gnu/packages/rpc.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index d6d129c3cc..f2f096c51c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -441,6 +441,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/rednotebook.scm \ %D%/packages/regex.scm \ %D%/packages/robotics.scm \ + %D%/packages/rpc.scm \ %D%/packages/rrdtool.scm \ %D%/packages/rsync.scm \ %D%/packages/ruby.scm \ diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index f0b33e0deb..1aed8e23d8 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -39,6 +39,7 @@ #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) + #:use-module (gnu packages rpc) #:use-module (gnu packages tbb) #:use-module (gnu packages version-control) #:use-module (gnu packages web)) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 7deb6ee29a..faf4bacfe3 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -73,12 +73,12 @@ #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rpc) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages statistics) #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) - #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) @@ -1296,80 +1296,6 @@ based on the Kaldi toolkit and the GStreamer framework and implemented in Python.") (license license:bsd-2)))) -(define-public grpc - (package - (name "grpc") - (version "1.16.1") - (outputs '("out" "static")) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/grpc/grpc.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) - (build-system cmake-build-system) - (arguments - `(#:tests? #f ; no test target - #:configure-flags - (list "-DgRPC_ZLIB_PROVIDER=package" - "-DgRPC_CARES_PROVIDER=package" - "-DgRPC_SSL_PROVIDER=package" - "-DgRPC_PROTOBUF_PROVIDER=package" - (string-append "-DCMAKE_INSTALL_PREFIX=" - (assoc-ref %outputs "out")) - "-DCMAKE_INSTALL_LIBDIR=lib" - (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") "/lib") - "-DCMAKE_VERBOSE_MAKEFILE=ON") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'configure-shared - (lambda* (#:key (configure-flags '()) #:allow-other-keys) - (mkdir "../build-shared") - (with-directory-excursion "../build-shared" - (apply invoke - "cmake" "../source" - "-DBUILD_SHARED_LIBS=ON" - configure-flags) - (apply invoke "make" - `("-j" ,(number->string (parallel-job-count))))))) - (add-after 'install 'install-shared-libraries - (lambda _ - (with-directory-excursion "../build-shared" - (invoke "make" "install")))) - (add-before 'strip 'move-static-libs - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (static (assoc-ref outputs "static"))) - (mkdir-p (string-append static "/lib")) - (with-directory-excursion - (string-append out "/lib") - (for-each - (lambda (file) - (rename-file file - (string-append static "/lib/" file))) - (find-files "." "\\.a$")))) - #t))))) - (inputs - `(("c-ares" ,c-ares/cmake) - ("openssl" ,openssl) - ("zlib" ,zlib))) - (native-inputs - `(("protobuf" ,protobuf) - ("python" ,python-wrapper))) - (home-page "https://grpc.io") - (synopsis "High performance universal RPC framework") - (description "gRPC is a modern high performance @dfn{Remote Procedure Call} -(RPC) framework that can run in any environment. It can efficiently connect -services in and across data centers with pluggable support for load balancing, -tracing, health checking and authentication. It is also applicable in last -mile of distributed computing to connect devices, mobile applications and -browsers to backend services.") - (license license:asl2.0))) - ;; Note that Tensorflow includes a "third_party" directory, which seems to not ;; only contain modified subsets of upstream library source code, but also ;; adapter headers provided by Google (such as the fft.h header, which is not diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm new file mode 100644 index 0000000000..f37a660fc7 --- /dev/null +++ b/gnu/packages/rpc.scm @@ -0,0 +1,103 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Ricardo Wurmus +;;; Copyright © 2020 Efraim Flashner +;;; +;;; 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 rpc) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix git-download) + #:use-module (guix build-system cmake) + #:use-module (gnu packages adns) + #:use-module (gnu packages compression) + #:use-module (gnu packages protobuf) + #:use-module (gnu packages python) + #:use-module (gnu packages tls)) + +(define-public grpc + (package + (name "grpc") + (version "1.16.1") + (outputs '("out" "static")) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; no test target + #:configure-flags + (list "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_CARES_PROVIDER=package" + "-DgRPC_SSL_PROVIDER=package" + "-DgRPC_PROTOBUF_PROVIDER=package" + (string-append "-DCMAKE_INSTALL_PREFIX=" + (assoc-ref %outputs "out")) + "-DCMAKE_INSTALL_LIBDIR=lib" + (string-append "-DCMAKE_INSTALL_RPATH=" + (assoc-ref %outputs "out") "/lib") + "-DCMAKE_VERBOSE_MAKEFILE=ON") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'configure-shared + (lambda* (#:key (configure-flags '()) #:allow-other-keys) + (mkdir "../build-shared") + (with-directory-excursion "../build-shared" + (apply invoke + "cmake" "../source" + "-DBUILD_SHARED_LIBS=ON" + configure-flags) + (apply invoke "make" + `("-j" ,(number->string (parallel-job-count))))))) + (add-after 'install 'install-shared-libraries + (lambda _ + (with-directory-excursion "../build-shared" + (invoke "make" "install")))) + (add-before 'strip 'move-static-libs + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (mkdir-p (string-append static "/lib")) + (with-directory-excursion + (string-append out "/lib") + (for-each + (lambda (file) + (rename-file file + (string-append static "/lib/" file))) + (find-files "." "\\.a$")))) + #t))))) + (inputs + `(("c-ares" ,c-ares/cmake) + ("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs + `(("protobuf" ,protobuf) + ("python" ,python-wrapper))) + (home-page "https://grpc.io") + (synopsis "High performance universal RPC framework") + (description "gRPC is a modern high performance @dfn{Remote Procedure Call} +(RPC) framework that can run in any environment. It can efficiently connect +services in and across data centers with pluggable support for load balancing, +tracing, health checking and authentication. It is also applicable in last +mile of distributed computing to connect devices, mobile applications and +browsers to backend services.") + (license license:asl2.0))) -- cgit v1.2.3 From f2c7513d1604076049d1834580d218d764e6b85b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:20:14 +0100 Subject: gnu: python-grpcio: Move to (gnu packages rpc). * gnu/packages/python-xyz.scm (python-grpcio): Move from here ... * gnu/packages/rpc.scm (python-grpcio): ... to here. --- gnu/packages/python-xyz.scm | 20 -------------------- gnu/packages/rpc.scm | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3937bad5c3..d0da9b36c3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17022,26 +17022,6 @@ source via the Abstract Syntax Tree.") (define-public python2-astor (package-with-python2 python-astor)) -(define-public python-grpcio - (package - (name "python-grpcio") - (version "1.17.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "grpcio" version)) - (sha256 - (base32 - "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) - (build-system python-build-system) - (propagated-inputs - `(("python-six" ,python-six))) - (home-page "https://grpc.io") - (synopsis "HTTP/2-based RPC framework") - (description "This package provides a Python library for communicating -with the HTTP/2-based RPC framework gRPC.") - (license license:asl2.0))) - (define-public python-astunparse (package (name "python-astunparse") diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index f37a660fc7..991dc89324 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -21,11 +21,14 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix git-download) + #:use-module (guix download) #:use-module (guix build-system cmake) + #:use-module (guix build-system python) #:use-module (gnu packages adns) #:use-module (gnu packages compression) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages tls)) (define-public grpc @@ -101,3 +104,23 @@ tracing, health checking and authentication. It is also applicable in last mile of distributed computing to connect devices, mobile applications and browsers to backend services.") (license license:asl2.0))) + +(define-public python-grpcio + (package + (name "python-grpcio") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "grpcio" version)) + (sha256 + (base32 + "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six))) + (home-page "https://grpc.io") + (synopsis "HTTP/2-based RPC framework") + (description "This package provides a Python library for communicating +with the HTTP/2-based RPC framework gRPC.") + (license license:asl2.0))) -- cgit v1.2.3 From bbeb710de70521010b3d432cb5b4b14ce6e45ca6 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 20 Mar 2020 20:31:59 +0100 Subject: gnu: Add hash-extender. * gnu/packages/crypto.scm (hash-extender): New variable. * gnu/packages/patches/hash-extender-test-suite.patch: New file. * gnu/local.mk (dist_patch_DATA): Register the new file. --- gnu/local.mk | 1 + gnu/packages/crypto.scm | 45 ++++++++++++++++++++++ .../patches/hash-extender-test-suite.patch | 13 +++++++ 3 files changed, 59 insertions(+) create mode 100644 gnu/packages/patches/hash-extender-test-suite.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f2f096c51c..1c4a0b4231 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1005,6 +1005,7 @@ dist_patch_DATA = \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ + %D%/packages/patches/hash-extender-test-suite.patch \ %D%/packages/patches/haskell-mode-unused-variables.patch \ %D%/packages/patches/haskell-mode-make-check.patch \ %D%/packages/patches/hdf4-architectures.patch \ diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b808211b2d..afe85ae497 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -1072,3 +1073,47 @@ cryptographic ratchet. It is written in C and C++11, and exposed as a C API.") (home-page "https://matrix.org/docs/projects/other/olm/") (license license:asl2.0))) + +(define-public hash-extender + (let ((commit "9ecef26809a1ceea2a455f6f591b004298df551b") + (revision "1")) + (package + (name "hash-extender") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/iagox86/hash_extender") + (commit commit))) + (sha256 + (base32 + "0fqy3d559zgf71w39py0931d8na0ylils45r8zs6r79wgr6qn78c")) + (file-name (git-file-name name version)) + (patches + (search-patches "hash-extender-test-suite.patch")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'check + (lambda _ + (invoke "./hash_extender_test"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((outdir (assoc-ref outputs "out")) + (bindir (string-append outdir "/bin")) + (docdir (string-append outdir + "/share/doc/hash-extender-" + ,version))) + (install-file "hash_extender" bindir) + (install-file "README.md" docdir) + #t)))))) + (inputs + `(("openssl" ,openssl))) + (synopsis "Tool for hash length extension attacks") + (description "@command{hash_extender} is a utility for performing hash +length extension attacks supporting MD4, MD5, RIPEMD-160, SHA-0, SHA-1, +SHA-256, SHA-512, and WHIRLPOOL hashes.") + (home-page "https://github.com/iagox86/hash_extender") + (license license:bsd-3)))) diff --git a/gnu/packages/patches/hash-extender-test-suite.patch b/gnu/packages/patches/hash-extender-test-suite.patch new file mode 100644 index 0000000000..59de52dad4 --- /dev/null +++ b/gnu/packages/patches/hash-extender-test-suite.patch @@ -0,0 +1,13 @@ +Make the test suite exit with a non-zero exit code if some tests failed. +Pull request pending upstream: https://github.com/iagox86/hash_extender/pull/13 +--- a/test.c ++++ b/test.c +@@ -79,5 +79,9 @@ void test_report(void) + printf("TESTS PASSED: %d / %d [%2.4f%%]\n", tests_passed, tests_run, 100 * (float)tests_passed / tests_run); + printf("--------------------------------------------------------------------------------\n"); + } ++ ++ if (tests_passed != tests_run) { ++ exit(1); ++ } + } -- cgit v1.2.3 From 1163dacd4b4d9d274be5e8393072323435e9236a Mon Sep 17 00:00:00 2001 From: Naga Malleswari Date: Thu, 19 Mar 2020 13:29:05 +0530 Subject: gnu: Add r-crochet. * gnu/packages/cran.scm (r-crochet): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 2ef1b931a8..a001e135e6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20802,3 +20802,24 @@ statistics and p-values of the correlation coefficients.") scales and utilities, including a spell check function for plot label fields and an overall emphasis on typography.") (license license:expat))) + +(define-public r-crochet + (package + (name "r-crochet") + (version "2.2.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "crochet" version)) + (sha256 + (base32 + "1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6")))) + (build-system r-build-system) + (home-page "https://github.com/agrueneberg/crochet") + (synopsis "Implementation Helper for Matrix-Like Types") + (description + "Functions to help implement the extraction / subsetting / indexing +function @code{[} and replacement function @code{[<-} of custom matrix-like +types (based on S3, S4, etc.), modeled as closely to the base matrix class +as possible (with tests to prove it).") + (license license:expat))) -- cgit v1.2.3 From ba2a1436d8fd8bedb596d792a65517facd2815cc Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Thu, 19 Mar 2020 23:52:50 +0100 Subject: gnu: Add r-boa. * gnu/packages/cran.scm (r-boa): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a001e135e6..e022651616 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20823,3 +20823,24 @@ function @code{[} and replacement function @code{[<-} of custom matrix-like types (based on S3, S4, etc.), modeled as closely to the base matrix class as possible (with tests to prove it).") (license license:expat))) + +(define-public r-boa + (package + (name "r-boa") + (version "1.1.8-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "boa" version)) + (sha256 + (base32 + "04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp")))) + (properties `((upstream-name . "boa"))) + (build-system r-build-system) + (home-page "http://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 +carrying out convergence diagnostics and statistical and graphical analysis of +@dfn{Markov chain Monte Carlo} (MCMC) sampling output.") + (license license:gpl2+))) -- cgit v1.2.3 From 2eb39cd26c58b6ccca38ea9f7514207fe04eb1fd Mon Sep 17 00:00:00 2001 From: Vitaliy Shatrov Date: Sat, 21 Mar 2020 15:03:01 +0100 Subject: gnu: coreutils: Improve description. * gnu/packages/base.scm (coreutils): Improve description and state that there is no shell included. Signed-off-by: Mathieu Othacehe --- gnu/packages/base.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e8150708c0..a49ea25196 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2017 Eric Bavier ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Ricardo Wurmus +;;; Copyright © 2020 Vitaliy Shatrov ;;; ;;; This file is part of GNU Guix. ;;; @@ -353,10 +354,11 @@ used to apply commands with arbitrarily long arguments.") #t))))) (synopsis "Core GNU utilities (file, text, shell)") (description - "GNU Coreutils includes all of the basic command-line tools that are -expected in a POSIX system. These provide the basic file, shell and text -manipulation functions of the GNU system. Most of these tools offer extended -functionality beyond that which is outlined in the POSIX standard.") + "GNU Coreutils package includes all of the basic command-line tools that +are expected in a POSIX system, excluding shell. This package is the union of +the GNU fileutils, sh-utils, and textutils packages. Most of these tools +offer extended functionality beyond that which is outlined in the POSIX +standard.") (license gpl3+) (home-page "https://www.gnu.org/software/coreutils/"))) -- cgit v1.2.3 From 93a267b7a40a762a66fa5149336f2c5545cbed30 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sat, 21 Mar 2020 13:08:25 +0100 Subject: gnu: blktrace: Update to db4f634. * gnu/packages/linux.scm (blktrace): Update to db4f634. [revision]: Increment variable. [patches]: Remove variable. * gnu/packages/patches/blktrace-use-rmtree.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 - gnu/packages/linux.scm | 9 ++++---- gnu/packages/patches/blktrace-use-rmtree.patch | 32 -------------------------- 3 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 gnu/packages/patches/blktrace-use-rmtree.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 1c4a0b4231..e391903473 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -768,7 +768,6 @@ dist_patch_DATA = \ %D%/packages/patches/binutils-loongson-workaround.patch \ %D%/packages/patches/blender-2.79-newer-ffmpeg.patch \ %D%/packages/patches/blender-2.79-python-3.7-fix.patch \ - %D%/packages/patches/blktrace-use-rmtree.patch \ %D%/packages/patches/bluez-CVE-2020-0556.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 12da3c8f63..a1973c1e60 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4014,8 +4014,8 @@ applications.") (define-public blktrace ;; Take a newer commit to get the fix for CVE-2018-10689. - (let ((commit "f4f8ef7cdea138cfaa2f3ca0ee31fa23d3bcf1cc") - (revision "0")) + (let ((commit "db4f6340e04716285ea56fe26d76381c3adabe58") + (revision "1")) (package (name "blktrace") (version (git-version "1.2.0" revision commit)) @@ -4027,9 +4027,8 @@ applications.") (url home-page) (commit commit))) (sha256 - (base32 "1ihdfimg7mfcgdm6l09xfqx5kdyv42x743dxp3z3w65q5vd7xy89")) - (file-name (git-file-name name version)) - (patches (search-patches "blktrace-use-rmtree.patch")))) + (base32 "0ah7xn4qnx09k6bm39p69av7d0c8cl6863drv6a1nf914sq1kpgp")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:make-flags diff --git a/gnu/packages/patches/blktrace-use-rmtree.patch b/gnu/packages/patches/blktrace-use-rmtree.patch deleted file mode 100644 index bb0a10da72..0000000000 --- a/gnu/packages/patches/blktrace-use-rmtree.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6d1ce4a3a1a561644695a50c00cbd28494728061 Mon Sep 17 00:00:00 2001 -From: Vincent Legoll -Date: Mon, 16 Mar 2020 11:43:19 +0100 -Subject: [PATCH 02/10] bno_plot.py: Use shutil.rmtree() instead of - os.system('/bin/rm') - ---- - btt/bno_plot.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/btt/bno_plot.py b/btt/bno_plot.py -index f05cfdc..36fc524 100644 ---- a/btt/bno_plot.py -+++ b/btt/bno_plot.py -@@ -40,7 +40,7 @@ To exit the plotter, enter 'quit' or ^D at the 'gnuplot> ' prompt. - - from __future__ import absolute_import - from __future__ import print_function --import getopt, glob, os, sys, tempfile -+import getopt, glob, os, sys, tempfile, shutil - - verbose = 0 - cmds = """ -@@ -125,4 +125,4 @@ if __name__ == '__main__': - sys.exit(1) - - os.waitpid(pid, 0) -- os.system('/bin/rm -rf ' + tmpdir) -+ shutil.rmtree(tmpdir) --- -2.20.1 - -- cgit v1.2.3 From 6a65ec0945ef5a39073ffe06f51cbacd641883aa Mon Sep 17 00:00:00 2001 From: 6033fe7de85d <6033fe7de85d@airmail.cc> Date: Wed, 18 Mar 2020 18:56:33 +0100 Subject: gnu: Add emacs-objed. *gnu/packages/emacs-xyz.scm (emacs-objed): New variable. Signed-off-by: Mathieu Othacehe --- 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 62217e37f5..1ea3155807 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -64,6 +64,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 6033fe7de85d <6033fe7de85d@airmail.cc> ;;; ;;; This file is part of GNU Guix. ;;; @@ -21711,3 +21712,25 @@ a @samp{date} keywords, and optionally, a @samp{filetags} keyword.") "Daredevil SKK is a version of @acronym{SKK, Simple Kana to Kanji conversion program}, a Japanese input method on Emacs.") (license license:gpl2+)))) + +(define-public emacs-objed + (package + (name "emacs-objed") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://elpa.gnu.org/packages/objed-" version ".tar")) + (sha256 + (base32 + "1s38d6bvggdk5p45ww1jb4gxifzgjwgw1m6ar920nlg0j4fgbcvr")))) + (build-system emacs-build-system) + (home-page "https://github.com/clemera/objed") + (synopsis "Navigate and edit text objects") + (description + "@code{emacs-objed} allows to navigate and edit text objects. It +enables modal editing and composition of commands, too. It combines ideas of +other Editors like Vim or Kakoune and tries to align them with regular Emacs +conventions.") + (license license:gpl3+))) -- cgit v1.2.3 From 7e0f9df9020b184e4f9ceddf953c4b985bda433b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 16:19:01 +0100 Subject: gnu: gnupg: Update to 2.2.20 [security fix]. * gnu/packages/gnupg.scm (gnupg): Update to 2.2.20. --- gnu/packages/gnupg.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 9075978719..c15cabc032 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017 Petter -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Björn Höfling ;;; @@ -247,14 +247,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.19") + (version "2.2.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From c6be7eeddf3a98ab354826f8b33d402e0548a3e0 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:33:58 +0100 Subject: gnu: opencl-clhpp: Use HTTPS home page. * gnu/packages/opencl.scm (opencl-clhpp)[home-page]: Use HTTPS. --- gnu/packages/opencl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm index 32eb360e04..f14d5df130 100644 --- a/gnu/packages/opencl.scm +++ b/gnu/packages/opencl.scm @@ -130,7 +130,7 @@ programming.") ;; The regression tests require a lot more dependencies. #:tests? #f)) (build-system cmake-build-system) - (home-page "http://github.khronos.org/OpenCL-CLHPP/") + (home-page "https://github.khronos.org/OpenCL-CLHPP/") (synopsis "Khronos OpenCL-CLHPP") (description "This package provides the @dfn{host API} C++ headers for OpenCL.") -- cgit v1.2.3 From 35739712092d6ac7b30c2b7162da4d048731c6b4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:13:19 +0100 Subject: gnu: ruby-rspec: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-rspec)[home-page]: Use HTTPS. --- 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 1511f961dc..e988953628 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -719,7 +719,7 @@ interactions.") (description "RSpec is a behavior-driven development (BDD) framework for Ruby. This meta-package includes the RSpec test runner, along with the expectations and mocks frameworks.") - (home-page "http://rspec.info/") + (home-page "https://rspec.info/") (license license:expat))) (define-public ruby-rspec-2 -- cgit v1.2.3 From e2b70d90ca741eb7eca4371f19f930cc12cdeb58 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:03:43 +0100 Subject: gnu: ruby-sequel: Use HTTPS home page. * gnu/packages/ruby.scm (ruby-sequel)[home-page]: Use HTTPS. --- 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 e988953628..a31f177349 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7138,7 +7138,7 @@ generation.") concise DSL for constructing SQL queries and table schemas. It includes a comprehensive ORM layer for mapping records to Ruby objects and handling associated records.") - (home-page "http://sequel.jeremyevans.net") + (home-page "https://sequel.jeremyevans.net") (license license:expat))) (define-public ruby-timecop -- cgit v1.2.3 From 05fe0f5648a75fbf71f3de596512791bc6b83b89 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:12:00 +0100 Subject: gnu: ogre: Use HTTPS home page. * gnu/packages/graphics.scm (ogre)[home-page]: Use HTTPS. --- 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 2d50a5f539..f4bb62857c 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -326,7 +326,7 @@ exception-handling library.") flexible 3D engine written in C++ designed to make it easier and more intuitive for developers to produce applications utilising hardware-accelerated 3D graphics.") - (home-page "http://www.ogre3d.org/") + (home-page "https://www.ogre3d.org/") (license license:expat))) (define-public openexr -- cgit v1.2.3 From de94865859eaca2dd2b8997e4ca11f26b0d78354 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:35:05 +0100 Subject: gnu: git-test-sequence: Use HTTPS home page. * gnu/packages/version-control.scm (git-test-sequence)[home-page]: Use HTTPS. --- 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 d25df4c63d..5049d45f1c 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1256,7 +1256,7 @@ though this can be overridden.") (install-file (string-append source "/" script) bindir) #t)))) - (home-page "http://dustin.sallings.org/2010/03/28/git-test-sequence.html") + (home-page "https://dustin.sallings.org/2010/03/28/git-test-sequence.html") (synopsis "Run a command over a sequence of commits") (description "git-test-sequence is similar to an automated git bisect except it’s -- cgit v1.2.3 From aa033c8e493ff4a6868fcf2f3acd424b636b4e6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:00:24 +0100 Subject: gnu: lua5.2-expat: Use HTTPS home page. * gnu/packages/lua.scm (lua5.2-expat)[home-page]: Use HTTPS. --- gnu/packages/lua.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 45e08e066a..181ce76559 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -182,7 +182,7 @@ language.") (inputs `(("lua" ,lua) ("expat" ,expat))) - (home-page "http://matthewwild.co.uk/projects/luaexpat/") + (home-page "https://matthewwild.co.uk/projects/luaexpat/") (synopsis "SAX XML parser based on the Expat library") (description "LuaExpat is a SAX XML parser based on the Expat library.") (license (package-license lua-5.1)))) -- cgit v1.2.3 From de1d778ef50304e00d8c339b6be6be66f860d7e9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:43:31 +0100 Subject: gnu: go-gopkg.in-mgo.v2: Use HTTPS home page. * gnu/packages/databases.scm (go-gopkg.in-mgo.v2)[home-page]: Use HTTPS. --- gnu/packages/databases.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index a347467ad1..0ac15c8312 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -217,7 +217,7 @@ either single machines or networked clusters.") "@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 "http://labix.org/mgo") + (home-page "https://labix.org/mgo") (license license:bsd-2))) (define-public ephemeralpg -- cgit v1.2.3 From c28a8855f1ab2a07680cd1639b4636033815dd7a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 09:56:05 +0100 Subject: gnu: python-gast: Update to 0.3.3. * gnu/packages/python-xyz.scm (python-gast): Update to 0.3.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 d0da9b36c3..973acce822 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17047,13 +17047,13 @@ distribution.") (define-public python-gast (package (name "python-gast") - (version "0.2.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (pypi-uri "gast" version)) (sha256 - (base32 "1w5dzdb3gpcfmd2s0b93d8gff40a1s41rv31458z14inb3s9v4zy")))) + (base32 "0mrvvfzqafj1wzd0xxfmjf4vphnlxypbhpic1m283aj9i8lfz0dq")))) (build-system python-build-system) (propagated-inputs `(("python-astunparse" ,python-astunparse))) -- cgit v1.2.3 From 447fafe3d7ca1cad0f3dd91da8410c9b9d1ecd5a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:33:15 +0100 Subject: gnu: gRPC: Update to 1.27.3. * gnu/packages/rpc.scm (grpc): Update to 1.27.3. [arguments]: Add "-DgRPC_ABSL_PROVIDER=package" in #:configure-flags. [inputs]: Add ABSEIL-CPP. (grpc-1.16.1): New public variable. * gnu/packages/hyperledger.scm (hyperledger-iroha)[inputs]: Change from GRPC to GRPC-1.16. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs, inputs]: Likewise. --- gnu/packages/hyperledger.scm | 2 +- gnu/packages/machine-learning.scm | 4 ++-- gnu/packages/rpc.scm | 25 ++++++++++++++++++++++--- 3 files changed, 25 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 1aed8e23d8..86eb86d3b5 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -190,7 +190,7 @@ link-time. New implementations can be added as well.") (inputs `(("boost" ,boost-1.69) ("gflags" ,gflags) - ("grpc" ,grpc) + ("grpc" ,grpc-1.16.1) ("hyperledger-iroha-ed25519" ,hyperledger-iroha-ed25519) ("postgresql" ,postgresql) ("protobuf" ,protobuf) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index faf4bacfe3..8ff68123d1 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1708,7 +1708,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) (sha256 (base32 "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) - ("grpc" ,grpc "static") + ("grpc" ,grpc-1.16.1 "static") ("googletest" ,googletest) ("swig" ,swig) ("unzip" ,unzip))) @@ -1730,7 +1730,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("giflib" ,giflib) - ("grpc:bin" ,grpc) + ("grpc:bin" ,grpc-1.16.1) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) ("sqlite" ,sqlite) diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 991dc89324..3691440590 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -26,6 +27,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages adns) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -34,7 +36,7 @@ (define-public grpc (package (name "grpc") - (version "1.16.1") + (version "1.27.3") (outputs '("out" "static")) (source (origin (method git-fetch) @@ -44,12 +46,13 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))) + "0czmbwnafc7jnrrq2fnac2av83vs2q7q0wy4k11w9zbpld7j5h6d")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; no test target #:configure-flags (list "-DgRPC_ZLIB_PROVIDER=package" + "-DgRPC_ABSL_PROVIDER=package" "-DgRPC_CARES_PROVIDER=package" "-DgRPC_SSL_PROVIDER=package" "-DgRPC_PROTOBUF_PROVIDER=package" @@ -89,7 +92,8 @@ (find-files "." "\\.a$")))) #t))))) (inputs - `(("c-ares" ,c-ares/cmake) + `(("abseil-cpp" ,abseil-cpp) + ("c-ares" ,c-ares/cmake) ("openssl" ,openssl) ("zlib" ,zlib))) (native-inputs @@ -105,6 +109,21 @@ mile of distributed computing to connect devices, mobile applications and browsers to backend services.") (license license:asl2.0))) +;; Some packages require this older version. +(define-public grpc-1.16.1 + (package + (inherit grpc) + (version "1.16.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc.git") + (commit (string-append "v" version)))) + (file-name (git-file-name "grpc" version)) + (sha256 + (base32 + "1jimqz3115f9pli5w6ik9wi7mjc7ix6y7yrq4a1ab9fc3dalj7p2")))))) + (define-public python-grpcio (package (name "python-grpcio") -- cgit v1.2.3 From 80a8583a6b4417a771086e9efeeb6fa3effb27bd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:19:03 +0100 Subject: gnu: TensorFlow: Correct gRPC input. * gnu/packages/machine-learning.scm (tensorflow)[native-inputs]: Move GRPC:STATIC ... [inputs]: ... here. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8ff68123d1..2f82ed565c 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1708,7 +1708,6 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) (sha256 (base32 "161g9841rjfsy5pn52fcis0s9hdr7rxvb06pad38j5rppfihvign"))))) - ("grpc" ,grpc-1.16.1 "static") ("googletest" ,googletest) ("swig" ,swig) ("unzip" ,unzip))) @@ -1730,6 +1729,7 @@ INSTALL_RPATH " (assoc-ref outputs "out") "/lib)\n"))) ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("giflib" ,giflib) + ("grpc" ,grpc-1.16.1 "static") ("grpc:bin" ,grpc-1.16.1) ("jsoncpp" ,jsoncpp-for-tensorflow) ("snappy" ,snappy) -- cgit v1.2.3 From 9dec91229b428a8b6c81354fa7cc68df17dcb724 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 12:46:13 +0100 Subject: gnu: python-grpcio: Update to 1.27.2. * gnu/packages/rpc.scm (python-grpcio): Update to 1.27.2. [source](modules, snippet): New fields. [arguments]: Add phases to use system libraries and the correct compiler. [inputs]: Add C-ARES, OPENSSL, and ZLIB. --- gnu/packages/rpc.scm | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rpc.scm b/gnu/packages/rpc.scm index 3691440590..e73695b613 100644 --- a/gnu/packages/rpc.scm +++ b/gnu/packages/rpc.scm @@ -127,15 +127,47 @@ browsers to backend services.") (define-public python-grpcio (package (name "python-grpcio") - (version "1.17.1") + (version "1.27.2") (source (origin (method url-fetch) (uri (pypi-uri "grpcio" version)) (sha256 (base32 - "0qb9y6j83nxa6d4kc60i8yfgdm7a8ms7b54kncjzf5y7nsxp8rzx")))) + "0zl89jwcff9hkd8mi4yf3qbhns9vbv1s4x4vahm5mkpr7jwk5ras")) + (modules '((guix build utils) (ice-9 ftw))) + (snippet + '(begin + (with-directory-excursion "third_party" + ;; Delete the bundled source code of libraries that are possible + ;; to provide as inputs. + (for-each delete-file-recursively + (scandir "." + (lambda (file) + (not (member file + '("." ".." + "abseil-cpp" + "address_sorting" + "upb"))))))) + #t)))) (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-before 'build 'use-system-libraries + (lambda _ + (setenv "GRPC_PYTHON_BUILD_SYSTEM_CARES" "1") + (setenv "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL" "1") + (setenv "GRPC_PYTHON_BUILD_SYSTEM_ZLIB" "1") + #t)) + (add-before 'build 'configure-compiler + (lambda _ + (substitute* '("setup.py" "src/python/grpcio/commands.py") + (("'cc'") "'gcc'")) + #t))))) + (inputs + `(("c-ares" ,c-ares) + ("openssl" ,openssl) + ("zlib" ,zlib))) (propagated-inputs `(("python-six" ,python-six))) (home-page "https://grpc.io") -- cgit v1.2.3 From f142c0775a3ee2d9bf629c8f8a4513d4b8b051a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:13:28 +0100 Subject: gnu: GRUB: Build with the latest version of Flex. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from FLEX-2.6.1 to FLEX. --- gnu/packages/bootloaders.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 770647935a..b8d68b3c89 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -173,10 +173,7 @@ `(("pkg-config" ,pkg-config) ("unifont" ,unifont) ("bison" ,bison) - ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex: - ;; - ;; TODO Try building with flex > 2.6.4. - ("flex" ,flex-2.6.1) + ("flex" ,flex) ("texinfo" ,texinfo) ("help2man" ,help2man) -- cgit v1.2.3 From a67c4ff369c103baa8574f1ffd1e66f969a7b330 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:14:08 +0100 Subject: gnu: GRUB: Use the latest version of QEMU for tests. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from QEMU-MINIMAL-2.10 to QEMU-MINIMAL. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b8d68b3c89..cadcc937e1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -196,7 +196,7 @@ ;; Dependencies for the test suite. The "real" QEMU is needed here, ;; because several targets are used. ("parted" ,parted) - ("qemu" ,qemu-minimal-2.10) + ("qemu" ,qemu-minimal) ("xorriso" ,xorriso))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") -- cgit v1.2.3 From ee38d87c58aaf8f8c1b7599a598a56b94f09f711 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 20:15:48 +0100 Subject: gnu: Remove flex@2.6.1. * gnu/packages/flex.scm (flex-2.6.1): Remove variable. --- gnu/packages/flex.scm | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index f9a21204d9..9e52f3bb38 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -74,16 +74,3 @@ regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) - -(define-public flex-2.6.1 - (package - (inherit flex) - (version "2.6.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/westes/flex" - "/releases/download/v" version "/" - "flex-" version ".tar.xz")) - (sha256 - (base32 - "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic")))))) -- cgit v1.2.3 From 559f37328851fc1ae1d90f27fab7beff3d804421 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 20:16:34 +0100 Subject: gnu: Remove qemu-minimal@2.10. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Remove variable. --- gnu/packages/virtualization.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 03f0ceaeee..b7e2c415fe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -284,34 +284,6 @@ server and embedded PowerPC, and S390 guests.") '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; This package is hidden since we do not backport updates to it. -(define-public qemu-minimal-2.10 - (hidden-package - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) - (patches - (search-patches "qemu-glibc-2.27.patch")))) - ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. - (native-inputs `(("python-2" ,python-2) - ,@(fold alist-delete (package-native-inputs qemu-minimal) - '("python-wrapper" "python-sphinx")))) - (inputs - (fold alist-delete (package-inputs qemu-minimal) - ;; Disable seccomp support, because it's not required for the GRUB - ;; test suite, and because it fails with libseccomp 2.4.2 and later. - '("libseccomp")))))) - (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 0cec5c4eb1b4ac9a3fbe3f11cffff92e01ff4c58 Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sat, 21 Mar 2020 09:10:57 +0200 Subject: gnu: ghc-extra: Downgrade to 1.6.21. * gnu/packages/haskell-xyz.scm (ghc-extra): Downgrade to 1.6.21. Signed-off-by: Marius Bakke --- 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 01fecae850..261bc57305 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3774,7 +3774,7 @@ versions of GHC (i.e., < 6.10).") (define-public ghc-extra (package (name "ghc-extra") - (version "1.7.1") + (version "1.6.21") (source (origin (method url-fetch) @@ -3784,7 +3784,7 @@ versions of GHC (i.e., < 6.10).") ".tar.gz")) (sha256 (base32 - "0zshxv9dnd8vksncmb8dj4wvq2wdybzwxyhmy2zp6a81icm4azx4")))) + "1gjx98w4w61g043k6rzc8i34cbxpcigi8lb6i7pp1vwp8w8jm5vl")))) (build-system haskell-build-system) (inputs `(("ghc-clock" ,ghc-clock) -- cgit v1.2.3 From e7c7912573111d5e86f3e3012a6edab948f7b302 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Fri, 20 Mar 2020 19:34:51 +0000 Subject: gnu: Add gnome-shell-extension-topicons-redux. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-topicons-redux): New variable. Signed-off-by: Marius Bakke --- gnu/packages/gnome-xyz.scm | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index aeeced42bd..d9d757e614 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2020 Alex Griffin ;;; Copyright © 2020 Jack Hill +;;; Copyright © 2020 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,6 +147,47 @@ GNOME Shell.") (home-page "https://github.com/ubuntu/gnome-shell-extension-appindicator/") (license license:gpl2+))) +(define-public gnome-shell-extension-topicons-redux + (package + (name "gnome-shell-extension-topicons-redux") + (version "6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/pop-planet/TopIcons-Redux.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dli9xb545n3xlj6q4wl0y5gzkm903zs47p8fiq71pdvbr6v38rj")))) + (build-system gnu-build-system) + (native-inputs + `(("glib" ,glib "bin"))) + (arguments + `(#:tests? #f ;no test defined in the project + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "make" + "install" + (string-append + "INSTALL_PATH=" + out + "/share/gnome-shell/extensions")))))))) + (home-page "https://gitlab.com/pop-planet/TopIcons-Redux") + (synopsis "Display legacy tray icons in the GNOME Shell top panel") + (description "Many applications, such as chat clients, downloaders, and +some media players, are meant to run long-term in the background even after you +close their window. These applications remain accessible by adding an icon to +the GNOME Shell Legacy Tray. However, the Legacy Tray was removed in GNOME +3.26. TopIcons Redux brings those icons back into the top panel so that it's +easier to keep track of apps running in the backround.") + (license license:gpl2+))) + (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") -- cgit v1.2.3 From 3d2d9cc7b54fde24bcc86888f238faf32146c8b3 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:50:22 +0100 Subject: gnu: python-kivy: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-kivy)[home-page]: Use HTTPS. --- 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 973acce822..faa8f60669 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11712,7 +11712,7 @@ and/or Xon/Xoff. The port is accessed in RAW mode.") ("mesa" ,mesa) ("sdl-union" ,(sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf))))) - (home-page "http://kivy.org") + (home-page "https://kivy.org") (synopsis "Multitouch application framework") (description -- cgit v1.2.3 From 012d2950af36c20189e2c6dfae05eaebba6ad14b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:29:14 +0100 Subject: gnu: python-cheetah: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-cheetah)[home-page]: Use HTTPS. --- 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 faa8f60669..7bb621ac31 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12577,7 +12577,7 @@ possible on all supported Python versions.") (invoke "python" "Cheetah/Tests/Test.py"))))))) (propagated-inputs `(("python-markdown" ,python-markdown))) ;optional - (home-page "http://cheetahtemplate.org/") + (home-page "https://cheetahtemplate.org/") (synopsis "Template engine") (description "Cheetah is a text-based template engine and Python code generator. -- cgit v1.2.3 From 8c9b6f3299d8f1219286cb835ad187c418e69585 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:22:11 +0100 Subject: gnu: python2-element-tree: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-element-tree)[home-page]: Use HTTPS. --- 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 7bb621ac31..f08698532b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1600,7 +1600,7 @@ commands.") (synopsis "Toolkit for XML processing in Python") (description "ElementTree is a Python library supporting lightweight XML processing.") - (home-page "http://effbot.org/zone/element-index.htm") + (home-page "https://effbot.org/zone/element-index.htm") (license (license:x11-style "http://docs.python.org/2/license.html" "Like \"CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2\".")))) -- cgit v1.2.3 From 26be188f35e93868dac4b899dd128c553a74558b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:57:00 +0100 Subject: gnu: python2-pyro: Use HTTPS home page. * gnu/packages/python-xyz.scm (python2-pyro)[home-page]: Use HTTPS. --- 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 f08698532b..58e77900a5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15135,7 +15135,7 @@ objects on other machines, also known as remote procedure calls (RPC).") `(#:python ,python-2 ;; Pyro has no test cases for automatic execution #:tests? #f)) - (home-page "http://pythonhosted.org/Pyro/") + (home-page "https://pythonhosted.org/Pyro/") (synopsis "Distributed object manager for Python") (description "Pyro is a Distributed Object Technology system written in Python that is designed to be easy to use. It resembles -- cgit v1.2.3 From e51b34bb9062f530f9850ceed5eae72a38896869 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:21:20 +0100 Subject: gnu: python-scikit-learn: Use HTTPS home page. * gnu/packages/machine-learning.scm (python-scikit-learn)[home-page]: Use HTTPS. --- gnu/packages/machine-learning.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 2f82ed565c..beb13a81bf 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -842,7 +842,7 @@ computing environments.") (propagated-inputs `(("python-numpy" ,python-numpy) ("python-scipy" ,python-scipy))) - (home-page "http://scikit-learn.org/") + (home-page "https://scikit-learn.org/") (synopsis "Machine Learning in Python") (description "Scikit-learn provides simple and efficient tools for data mining and -- cgit v1.2.3 From 20c604c54e122d09880c75568d48fae58cbb8785 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:07:12 +0100 Subject: gnu: python-scrypt: Use HTTPS home page. * gnu/packages/python-crypto.scm (python-scrypt)[home-page]: Use HTTPS. --- gnu/packages/python-crypto.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 23c06267a7..1286693fc2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1043,7 +1043,7 @@ been constructed to maintain extensive documentation on how to use (build-system python-build-system) (inputs `(("openssl" ,openssl))) - (home-page "http://bitbucket.org/mhallin/py-scrypt") + (home-page "https://bitbucket.org/mhallin/py-scrypt") (synopsis "Bindings for the scrypt key derivation function library") (description "This is a set of Python bindings for the scrypt key derivation function.") -- cgit v1.2.3 From 02d1fd03ad476c1f37a2a4b8ff55426ed25059f2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:01:24 +0100 Subject: gnu: python-future: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-future)[home-page]: Use HTTPS. --- 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 58e77900a5..9361d6664a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -10345,7 +10345,7 @@ development version of CPython that are not available in older releases.") ;; https://github.com/PythonCharmers/python-future/issues/210 (arguments `(#:tests? #f)) - (home-page "http://python-future.org") + (home-page "https://python-future.org") (synopsis "Single-source support for Python 3 and 2") (description "@code{python-future} is the missing compatibility layer between Python 2 and -- cgit v1.2.3 From d7ee58ccd22ffe6f4ccf78a9fcf4f9e3612b131c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:59:12 +0100 Subject: gnu: python-tables: Use HTTPS home page. * gnu/packages/python-xyz.scm (python-tables)[home-page]: Use HTTPS. --- 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 9361d6664a..c47dac8245 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7686,7 +7686,7 @@ printing of sub-tables by specifying a row range.") `(("hdf5" ,hdf5-1.10) ("bzip2" ,bzip2) ("zlib" ,zlib))) - (home-page "http://www.pytables.org/") + (home-page "https://www.pytables.org/") (synopsis "Hierarchical datasets for Python") (description "PyTables is a package for managing hierarchical datasets and designed to efficiently cope with extremely large amounts of data.") -- cgit v1.2.3 From b1ebda07cb475c18d7812cf846141ac50a8fa5f1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 00:45:44 +0100 Subject: gnu: python-pygraphviz: Use HTTPS home page. * gnu/packages/graphviz.scm (python-pygraphviz)[home-page]: Use HTTPS. --- gnu/packages/graphviz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 06216418fe..2d2bb11130 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -228,7 +228,7 @@ visualization tool suite.") `(("python-nose" ,python-nose) ("python-mock" ,python-mock) ("python-doctest-ignore-unicode" ,python-doctest-ignore-unicode))) - (home-page "http://pygraphviz.github.io") + (home-page "https://pygraphviz.github.io") (synopsis "Python interface to Graphviz") (description "PyGraphviz is a Python interface to the Graphviz graph layout and visualization package. With PyGraphviz you can create, edit, read, -- cgit v1.2.3 From dde3f551568bb7157b61eb8415b0fef94bfe8eb4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 21 Mar 2020 20:41:28 +0100 Subject: gnu: gpgme: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported by joshuaBPMan on #guix. * gnu/packages/gnupg.scm (gpgme)[arguments]: Add ‘disable-failing-test’ phase. --- gnu/packages/gnupg.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c15cabc032..856c01a6d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -400,6 +400,15 @@ libskba (working with X.509 certificates and CMS data).") (sha256 (base32 "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'check 'disable-failing-test + ;; XXX gnupg@2.2.20 breaks the expected JSON response for this test. + (lambda _ + (substitute* "tests/json/t-json.c" + (("\"t-keylist-secret\", ") "")) + #t))))) (native-inputs `(("gnupg" ,gnupg))) (propagated-inputs -- cgit v1.2.3 From 18401bdf69b2540b13db86aed199d1ebc585a844 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 21:24:28 +0100 Subject: Revert "gnu: Remove qemu-minimal@2.10." This package was still in use by american-fuzzy-lop. This reverts commit 559f37328851fc1ae1d90f27fab7beff3d804421. --- gnu/packages/virtualization.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index b7e2c415fe..03f0ceaeee 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -284,6 +284,34 @@ server and embedded PowerPC, and S390 guests.") '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) +;; The GRUB test suite fails with later versions of Qemu, so we +;; keep it at 2.10 for now. See +;; . +;; This package is hidden since we do not backport updates to it. +(define-public qemu-minimal-2.10 + (hidden-package + (package + (inherit qemu-minimal) + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) + (patches + (search-patches "qemu-glibc-2.27.patch")))) + ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. + (native-inputs `(("python-2" ,python-2) + ,@(fold alist-delete (package-native-inputs qemu-minimal) + '("python-wrapper" "python-sphinx")))) + (inputs + (fold alist-delete (package-inputs qemu-minimal) + ;; Disable seccomp support, because it's not required for the GRUB + ;; test suite, and because it fails with libseccomp 2.4.2 and later. + '("libseccomp")))))) + (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From 2e59a63b41b5c0a7ee70e45b2e6538cfded2e758 Mon Sep 17 00:00:00 2001 From: wednesday Date: Wed, 24 Apr 2019 16:27:36 +0100 Subject: gnu: global: Add 'python-wrapper' as input. * gnu/packages/code.scm (global)[inputs]: Add 'python-wrapper' to fix tagging python code. --- gnu/packages/code.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index c1eaaf1aab..ff30fbd86f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -125,7 +125,8 @@ highlighting your own code that seemed comprehensible when you wrote it.") (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) ("libltdl" ,libltdl) - ("sqlite" ,sqlite))) + ("sqlite" ,sqlite) + ("python-wrapper" ,python-wrapper))) (arguments `(#:configure-flags (list (string-append "--with-ncurses=" -- cgit v1.2.3 From ae105119812bca8e9f2d74dcf11be95a293c0cc6 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:46:37 +0200 Subject: gnu: Add r-httpcode. * gnu/packages/cran.scm (r-httpcode): New variable. Signed-off-by: Marius Bakke --- gnu/packages/cran.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index e022651616..1e55606ef9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20844,3 +20844,22 @@ as possible (with tests to prove it).") carrying out convergence diagnostics and statistical and graphical analysis of @dfn{Markov chain Monte Carlo} (MCMC) sampling output.") (license license:gpl2+))) + +(define-public r-httpcode + (package + (name "r-httpcode") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (cran-uri "httpcode" version)) + (sha256 + (base32 + "06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv")))) + (build-system r-build-system) + (home-page "https://github.com/sckott/httpcode") + (synopsis "HTTP status code helper") + (description "@code{httpcode} provides functionality for finding and +explaining the meaning of @code{HTTP} status codes. Functions are included for +searching for codes by full or partial number, by message, and to get +appropriate dog and cat images for many status codes.") + (license license:expat))) -- cgit v1.2.3 From 069554dc240078febab777c525a346594d02512e Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:49:13 +0200 Subject: gnu: Add r-latex2exp. * gnu/packages/cran.scm (r-latex2exp): new variable. Signed-off-by: Marius Bakke --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1e55606ef9..f56c3882c3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20863,3 +20863,24 @@ explaining the meaning of @code{HTTP} status codes. Functions are included for searching for codes by full or partial number, by message, and to get appropriate dog and cat images for many status codes.") (license license:expat))) + +(define-public r-latex2exp + (package + (name "r-latex2exp") + (version "0.4.0") + (source (origin + (method url-fetch) + (uri (cran-uri "latex2exp" version)) + (sha256 + (base32 + "12nbcgfmv13k6sc6m326ras9bcvy380b7rxcxphn06r3cfkby0zw")))) + (build-system r-build-system) + (propagated-inputs + `(("r-stringr" ,r-stringr) + ("r-magrittr", r-magrittr))) + (home-page "https://github.com/stefano-meschiari/latex2exp/") + (synopsis "Use LaTeX expressions in plots") + (description "@code{latex2exp} parses and converts LaTeX math formulas to +R's plotmath expressions, used to enter mathematical formulas and symbols to be +rendered as text, axis labels, etc. throughout R's plotting system.") + (license license:expat))) -- cgit v1.2.3 From 3ac12ca61bbe887f2ebc8cfbf9b09a179f30a849 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Thu, 3 Oct 2019 15:51:30 +0200 Subject: gnu: Add r-oai. * gnu/packages/cran.scm (r-oai): new variable. Signed-off-by: Marius Bakke --- 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 f56c3882c3..4c2ea9f130 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20884,3 +20884,29 @@ appropriate dog and cat images for many status codes.") R's plotmath expressions, used to enter mathematical formulas and symbols to be rendered as text, axis labels, etc. throughout R's plotting system.") (license license:expat))) + +(define-public r-oai + (package + (name "r-oai") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri (cran-uri "oai" version)) + (sha256 + (base32 + "1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g")))) + (build-system r-build-system) + (propagated-inputs + `(("r-xml2" ,r-xml2) + ("r-httr" ,r-httr) + ("r-plyr" ,r-plyr) + ("r-stringr" ,r-stringr) + ("r-tibble" ,r-tibble))) + (home-page "https://github.com/ropensci/oai/") + (synopsis "General purpose OAI-PMH services client") + (description "@code{oai} provides a general purpose client to work with +any @dfn{Open Archives Initiative Protocol for 'Metadata' Harvesting} (OAI-PMH) +service. Functions are provided to work with the OAI-PMH verbs: +@code{GetRecord}, @code{Identify}, @code{ListIdentifiers}, +@code{ListMetadataFormats}, @code{ListRecords}, and @code{ListSets}.") + (license license:expat))) -- cgit v1.2.3 From 156b08bd2fcd7dc66d59f2312ddce3f04a28007c Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 06:29:27 -0800 Subject: gnu: stylish-haskell: Update description. * gnu/packages/haskell-apps.scm (stylish-haskell): Update description. Signed-off-by: Marius Bakke --- gnu/packages/haskell-apps.scm | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index f5b45d0bfb..12cb857cbb 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -754,8 +754,26 @@ advanced user's otherwise working script to fail under future circumstances. ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) (home-page "https://github.com/jaspervdj/stylish-haskell") (synopsis "Haskell code prettifier") - (description - "A simple Haskell code prettifier. The goal is not to format all of the -code in a file, just clean up import statements and a few other tedious -items. This tool tries to help where necessary without getting in the way.") + (description "Stylish-haskell is a Haskell code prettifier. The goal is +not to format all of the code in a file, to avoid \"getting in the way\". +However, this tool can e.g. clean up import statements and help doing various +tasks that get tedious very quickly. It can +@itemize +@item +Align and sort @code{import} statements +@item +Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant +pragmas +@item +Remove trailing whitespaces +@item +Align branches in @code{case} and fields in records +@item +Convert line endings (customisable) +@item +Replace tabs by four spaces (turned off by default) +@item +Replace some ASCII sequences by their Unicode equivalent (turned off by +default) +@end itemize") (license license:bsd-3))) -- cgit v1.2.3 From 08c62ac7bdd7c8c90bfa21dfb02008e4c2662e51 Mon Sep 17 00:00:00 2001 From: John Soo Date: Fri, 13 Dec 2019 06:32:00 -0800 Subject: gnu: ghc-stylish-haskell: Deprecate older duplicate package. * gnu/packages/haskell-xyz.scm (ghc-stylish-haskell): Deprecate it. Signed-off-by: Marius Bakke --- gnu/packages/haskell-xyz.scm | 63 +------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 261bc57305..0828dc93c6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11119,68 +11119,7 @@ occurrences of a substring (the first in case of overlaps) with another.") (license license:bsd-3))) (define-public ghc-stylish-haskell - (package - (name "ghc-stylish-haskell") - (version "0.9.2.1") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://hackage/package/stylish-haskell/stylish-haskell-" - version - ".tar.gz")) - (sha256 - (base32 - "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w")))) - (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'update-constraints - (lambda _ - (substitute* "stylish-haskell.cabal" - (("haskell-src-exts >= 1\\.18 && < 1\\.21,") - "haskell-src-exts >= 1.18 && < 1.22,")) - #t))))) - (inputs - `(("ghc-aeson" ,ghc-aeson) - ("ghc-file-embed" ,ghc-file-embed) - ("ghc-haskell-src-exts" ,ghc-haskell-src-exts) - ("ghc-semigroups" ,ghc-semigroups) - ("ghc-syb" ,ghc-syb) - ("ghc-yaml" ,ghc-yaml) - ("ghc-strict" ,ghc-strict) - ("ghc-optparse-applicative" - ,ghc-optparse-applicative))) - (native-inputs - `(("ghc-hunit" ,ghc-hunit) - ("ghc-test-framework" ,ghc-test-framework) - ("ghc-test-framework-hunit" ,ghc-test-framework-hunit))) - (home-page "https://github.com/jaspervdj/stylish-haskell") - (synopsis "Haskell code prettifier") - (description "Stylish-haskell is a Haskell code prettifier. The goal is -not to format all of the code in a file, to avoid \"getting in the way\". -However, this tool can e.g. clean up import statements and help doing various -tasks that get tedious very quickly. It can -@itemize -@item -Align and sort @code{import} statements -@item -Group and wrap @code{{-# LANGUAGE #-}} pragmas, remove (some) redundant -pragmas -@item -Remove trailing whitespaces -@item -Align branches in @code{case} and fields in records -@item -Convert line endings (customisable) -@item -Replace tabs by four spaces (turned off by default) -@item -Replace some ASCII sequences by their Unicode equivalent (turned off by -default) -@end itemize") - (license license:bsd-3))) + (deprecated-package "ghc-stylish-haskell" stylish-haskell)) (define-public ghc-svg-builder (package -- cgit v1.2.3 From d1b3c6c746e4a574651b2d7d52f87a928da59127 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:31:51 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.217. * gnu/packages/linux.scm (linux-libre-4.4-version): Update to 4.4.217. (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 a1973c1e60..c0a5445464 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -394,10 +394,10 @@ 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.216") +(define-public linux-libre-4.4-version "4.4.217") (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "1hjgh9brvxzi6ypgfnk07l3j28xsxgz88sdshnz19vj96bn1w70q"))) + (hash (base32 "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit v1.2.3 From 3e13d780b81d3005e2c7f36ccc75f7c1e2cc00a0 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:32:48 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.217. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.217. (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 c0a5445464..15abba8849 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -386,10 +386,10 @@ 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.216") +(define-public linux-libre-4.9-version "4.9.217") (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "0lgv5k8v5xz9z2z4k42566bh0akyk1gr0dx6s1m1rjrzsf9k86l6"))) + (hash (base32 "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit v1.2.3 From f120eab056537a083b5710cc42d7126755711c52 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:33:13 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.174. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.174. (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 15abba8849..5929d98558 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -378,10 +378,10 @@ 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.173") +(define-public linux-libre-4.14-version "4.14.174") (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0kxp3mgiags8hdax15masab9zr89xraqvl9ri7zwgksx8ixav0m2"))) + (hash (base32 "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit v1.2.3 From 0d624f1fd85f329372a9b61a295ee7b36c4cd97d Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:34:33 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.112. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.112. (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 5929d98558..3a42c19699 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ 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.111") +(define-public linux-libre-4.19-version "4.19.112") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0cjjf3wbvbkjy4mss8c74afx8ng31i22km66ydh9f9mz182piyy6"))) + (hash (base32 "0yiyqwgh6wcyshpdj98s7dc4ahyx47y6whvnww6sjmzdq0fb3hi4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From ee4c927f33a1d3b01cf36be3c74227f6b7fd69ff Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 21 Mar 2020 16:35:12 -0400 Subject: gnu: linux-libre: Update to 5.4.27. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.27. (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 3a42c19699..ffc4776f94 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,10 +362,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.26") +(define-public linux-libre-5.4-version "5.4.27") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1bqdiw4pjzwm7pxml2dl09bj85ijs82rq788c58681zgmvs796k6"))) + (hash (base32 "0szc1p9y6z8gs2f1nj45nrz52sxcabg2xh7zqlljazv45lvcvf8r"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 70236bae9ea7b23191a5fc452323b6fa20f31242 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Tue, 25 Feb 2020 15:17:10 +0000 Subject: gnu: Add dragonfly-reverb * gnu/packages/music.scm (dragonfly-reverb): New variable. --- gnu/packages/music.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 468be9937f..b1470d7820 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5213,3 +5213,55 @@ featureful and easy to use. It offers unlimited automation options, LV2 plugin support, JACK support and chord assistance.") (home-page "https://www.zrythm.org") (license license:agpl3+))) + +(define-public dragonfly-reverb + (package + (name "dragonfly-reverb") + (version "2.0.0") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/michaelwillis/dragonfly-reverb.git") + (commit version) + ;; Bundles a specific commit of the DISTRHO plugin framework. + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qrbv4kk5v6ynx424h1i54qj0w8v6vpw81b759jawxvzzprpgq72")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no check target + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure target + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lv2 (string-append out "/lib/lv2"))) + ;; Install LV2. + (for-each + (lambda (file) + (copy-recursively file + (string-append lv2 "/" (basename file)))) + (find-files "bin" "\\.lv2$" #:directories? #t)) + ;; Install executables. + (install-file "bin/DragonflyRoomReverb" bin) + (install-file "bin/DragonflyHallReverb" bin) + #t)))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("jack" ,jack-1) + ("libx11" ,libx11) + ("mesa" ,mesa))) + (home-page "https://michaelwillis.github.io/dragonfly-reverb/") + (synopsis "Concert hall reverb and room reverb effects") + (description + "Dragonfly Reverb is a bundle of two free audio effects: a concert +hall reverb and a room reverb. Both are available as LV2 plugins as well +as JACK standalone applications.") + (license license:gpl3+))) -- cgit v1.2.3 From 08df188ea83bd8a027c40dc42105bf6e83268991 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 21 Mar 2020 17:42:07 +0100 Subject: gnu: clipmenu: Re-indent. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipmenu): Re-indent Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 106 +++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 53 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index c714b867f4..817eef6c29 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2170,58 +2170,58 @@ tools to complement clipnotify.") (let ((commit "a495bcc7a4ab125182a661c5808364f66938a87c") (revision "1")) (package - (name "clipmenu") - (version (string-append "5.6.0-" - revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cdown/clipnotify.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "clipmenud" - (("has_clipnotify=0") - "has_clipnotify=1") - (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") - "") - (("clipnotify \\|\\| .*") - (string-append (which "clipnotify") "\n")) - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - (substitute* "clipmenu" - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - #t)) - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append %output "/share/doc/" - ,name "-" ,version))) - (install-file "clipdel" bin) - (install-file "clipmenu" bin) - (install-file "clipmenud" bin) - (install-file "README.md" doc) - #t)))) - #:tests? #f)) - (inputs - `(("clipnotify" ,clipnotify) - ("xsel" ,xsel))) - (home-page "https://github.com/cdown/clipmenu") - (synopsis "Simple clipboard manager using dmenu or rofi and xsel") - (description "Start @command{clipmenud}, then run @command{clipmenu} to + (name "clipmenu") + (version (string-append "5.6.0-" + revision "." (string-take commit 7))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cdown/clipnotify.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "12vvircdhl4psqi51cnfd6bqy85v2vwfcmdq1mimjgng727nwzys")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-hardcoded-paths + (lambda _ + (substitute* "clipmenud" + (("has_clipnotify=0") + "has_clipnotify=1") + (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") + "") + (("clipnotify \\|\\| .*") + (string-append (which "clipnotify") "\n")) + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + (substitute* "clipmenu" + (("xsel --logfile") + (string-append (which "xsel") " --logfile"))) + #t)) + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append %output "/share/doc/" + ,name "-" ,version))) + (install-file "clipdel" bin) + (install-file "clipmenu" bin) + (install-file "clipmenud" bin) + (install-file "README.md" doc) + #t)))) + #:tests? #f)) + (inputs + `(("clipnotify" ,clipnotify) + ("xsel" ,xsel))) + (home-page "https://github.com/cdown/clipmenu") + (synopsis "Simple clipboard manager using dmenu or rofi and xsel") + (description "Start @command{clipmenud}, then run @command{clipmenu} to select something to put on the clipboard. When @command{clipmenud} detects changes to the clipboard contents, it writes @@ -2229,4 +2229,4 @@ them out to the cache directory. @command{clipmenu} reads the cache directory to find all available clips and launches @command{dmenu} (or @command{rofi}, depending on the value of @code{CM_LAUNCHER}) to let the user select a clip. After selection, the clip is put onto the PRIMARY and CLIPBOARD X selections.") - (license license:public-domain)))) + (license license:public-domain)))) -- cgit v1.2.3 From fb2709ef988f5a27a7bc60e12288a6d497835725 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 21 Mar 2020 17:45:11 +0100 Subject: gnu: clipnotify: Comment on the lack of a test suite. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipnotify): Add a comment Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 817eef6c29..21165f384f 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -2147,6 +2147,7 @@ configuring visual settings in different UI toolkits separately.") (install-file "README.md" doc) #t)))) #:make-flags (list "CC=gcc") + ;; the package provides no test suite: #:tests? #f)) (inputs `(("libx11" ,libx11) -- cgit v1.2.3 From f5e0634431819f753f5e20e6c8ddc310215d9051 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 21 Mar 2020 17:33:39 +0100 Subject: gnu: clipmenu: Improve the package definition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xdisorg.scm (clipmenu): Add the package's unit-tests to the check phase. Wrap the program so the PATH contains all dependencies. The previous approach to patch the script was incomplete and more complex. Signed-off-by: Ludovic Courtès --- gnu/packages/xdisorg.scm | 52 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 21165f384f..facd63ab53 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -74,6 +74,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages flex) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) #:use-module (gnu packages gl) #:use-module (gnu packages glib) @@ -2188,21 +2189,6 @@ tools to complement clipnotify.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "clipmenud" - (("has_clipnotify=0") - "has_clipnotify=1") - (("command -v clipnotify >/dev/null 2>&1 && has_clipnotify=1") - "") - (("clipnotify \\|\\| .*") - (string-append (which "clipnotify") "\n")) - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - (substitute* "clipmenu" - (("xsel --logfile") - (string-append (which "xsel") " --logfile"))) - #t)) (delete 'configure) (delete 'build) (replace 'install @@ -2215,10 +2201,42 @@ tools to complement clipnotify.") (install-file "clipmenu" bin) (install-file "clipmenud" bin) (install-file "README.md" doc) - #t)))) - #:tests? #f)) + #t))) + (add-after 'install 'wrap-script + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (clipnotify (assoc-ref inputs "clipnotify")) + (coreutils-minimal (assoc-ref inputs "coreutils-minimal")) + (gawk (assoc-ref inputs "gawk")) + (util-linux (assoc-ref inputs "util-linux")) + (xdotool (assoc-ref inputs "xdotool")) + (xsel (assoc-ref inputs "xsel"))) + (for-each + (lambda (prog) + (wrap-script (string-append out "/bin/" prog) + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list clipnotify coreutils-minimal + gawk util-linux xdotool xsel))))) + '("clipmenu" "clipmenud" "clipdel"))) + #t)) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; substitute a shebang appearing inside a string (the test + ;; file writes this string to a temporary file): + (substitute* "tests/test-clipmenu" + (("#!/usr/bin/env bash") + (string-append "#!" (which "bash")))) + (invoke "tests/test-clipmenu") + #t))))) (inputs `(("clipnotify" ,clipnotify) + ("coreutils-minimal" ,coreutils-minimal) + ("gawk" ,gawk) + ("guile" ,guile-3.0) ; for wrap-script + ("util-linux" ,util-linux) + ("xdotool" ,xdotool) ("xsel" ,xsel))) (home-page "https://github.com/cdown/clipmenu") (synopsis "Simple clipboard manager using dmenu or rofi and xsel") -- cgit v1.2.3 From fcc10cb2cbde9c104d394167ba354b0c9f2cd752 Mon Sep 17 00:00:00 2001 From: "pinoaffe@airmail.cc" Date: Sat, 21 Mar 2020 08:57:21 +0000 Subject: gnu: radare2: Update to 4.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2): Update to 4.2.1. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6adb142ffb..04c83d0c78 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1309,14 +1309,16 @@ bindings for Python, Java, OCaml and more.") (define-public radare2 (package (name "radare2") - (version "3.5.1") + (version "4.2.1") (source (origin - (method url-fetch) - (uri (string-append "https://radare.mikelloc.com/get/" version "/" - "radare2-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/radareorg/radare2") + (commit version))) (sha256 (base32 - "174x5545fw2nyf000gd46hi7rx2bn3bw5bsnvizn9yi99pn7m4mw")) + "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) + (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 6f3475655a60e25328d6fc8a1ce4af19620f0a02 Mon Sep 17 00:00:00 2001 From: "pinoaffe@airmail.cc" Date: Sat, 21 Mar 2020 08:58:35 +0000 Subject: gnu: cutter: Update to 1.10.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (cutter): Update to 1.10.1. Signed-off-by: Ludovic Courtès --- 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 04c83d0c78..28a30a6831 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2138,7 +2138,7 @@ simulation.") (define-public cutter (package (name "cutter") - (version "1.8.3") + (version "1.10.1") (source (origin (method git-fetch) @@ -2148,7 +2148,7 @@ simulation.") (file-name (git-file-name name version)) (sha256 (base32 - "03f3cdckh51anx9gd1b0ndb2fg7061hqngvygf32ky29mm2m2lyv")))) + "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 405c0c947cfd59d7bfb81052545cd635970d2d0c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 18 Mar 2020 12:38:15 +0200 Subject: services: Add fontconfig-file-system-service. * gnu/services/desktop.scm (%fontconfig-file-system, fontconfig-file-system-service): New variables. (%desktop-services): Add fontconfig-file-system-service. --- gnu/services/desktop.scm | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 1294d748ac..16ee4d3537 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2016 Sou Bunnbu ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2017 ng0 -;;; Copyright © 2018 Efraim Flashner +;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2017, 2019 Christopher Baines ;;; Copyright © 2019 Tim Gesthuizen @@ -36,7 +36,7 @@ #:use-module (gnu services networking) #:use-module (gnu services sound) #:use-module ((gnu system file-systems) - #:select (%elogind-file-systems)) + #:select (%elogind-file-systems file-system)) #:use-module (gnu system) #:use-module (gnu system shadow) #:use-module (gnu system pam) @@ -106,6 +106,9 @@ elogind-service elogind-service-type + %fontconfig-file-system + fontconfig-file-system-service + accountsservice-service-type accountsservice-service @@ -797,6 +800,27 @@ when they log out." ;;; +;;; Fontconfig and other desktop file-systems. +;;; + +(define %fontconfig-file-system + (file-system + (device "none") + (mount-point "/var/cache/fontconfig") + (type "tmpfs") + (flags '(read-only)) + (check? #f))) + +;; The global fontconfig cache directory can sometimes contain stale entries, +;; possibly referencing fonts that have been GC'd, so mount it read-only. +;; As mentioned https://debbugs.gnu.org/cgi/bugreport.cgi?bug=36924#8 and +;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=38046#10 and elsewhere. +(define fontconfig-file-system-service + (simple-service 'fontconfig-file-system + file-system-service-type + (list %fontconfig-file-system))) + +;;; ;;; AccountsService service. ;;; @@ -1185,6 +1209,11 @@ or setting its password with passwd."))) ;; perform administrative tasks (similar to "sudo"). polkit-wheel-service + ;; The global fontconfig cache directory can sometimes contain + ;; stale entries, possibly referencing fonts that have been GC'd, + ;; so mount it read-only. + fontconfig-file-system-service + ;; NetworkManager and its applet. (service network-manager-service-type) (service wpa-supplicant-service-type) ;needed by NetworkManager -- cgit v1.2.3 From 2573709cc9154993f1ff62219a4125a68d27e6f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 15:55:22 +0200 Subject: gnu: Add go-golang-org-x-image. * gnu/packages/golang.scm (go-golang-org-x-image): New variable. --- gnu/packages/golang.scm | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index f684470419..3d38b50d1c 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 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Matthew Jordan ;;; Copyright © 2016 Andy Wingo ;;; Copyright © 2016, 2019 Ludovic Courtès @@ -692,6 +692,36 @@ for the Go language.") (home-page "https://go.googlesource.com/net") (license license:bsd-3)))) +(define-public go-golang-org-x-image + (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") + (revision "1")) + (package + (name "go-golang-org-x-image") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/image") + (commit commit))) + (file-name (string-append "go.googlesource.com-image-" + version "-checkout")) + (sha256 + (base32 + "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/x/image" + ; Source-only package + #:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'build)))) + (home-page "https://go.googlesource.com/image") + (synopsis "Supplemental Go image libraries") + (description "This package provides supplemental Go libraries for image +processing.") + (license license:bsd-3)))) + (define-public go-golang-org-x-sys (let ((commit "749cb33beabd9aa6d3178e3de05bcc914f70b2bf") (revision "5")) -- cgit v1.2.3 From 3770bd6526d4c280507df12447cdc719e1bfb933 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:11:40 +0200 Subject: gnu: Add go-golang-org-rainycape-unidecode. * gnu/packages/golang.scm (go-golang-org-rainycape-unidecode): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 3d38b50d1c..35e933d6d1 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3472,3 +3472,28 @@ efficient space usage.") based on murmurhash.") (home-page "https://github.com/willf/bloom") (license license:bsd-2))) + +(define-public go-golang-org-rainycape-unidecode + (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c") + (revision "1")) + (package + (name "go-golang-org-rainycape-unidecode") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rainycape/unidecode") + (commit commit))) + (file-name (string-append "go-golang-org-rainycape-unidecode-" + version "-checkout")) + (sha256 + (base32 + "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5")))) + (build-system go-build-system) + (arguments + `(#:import-path "golang.org/rainycape/unidecode")) + (home-page "https://github.com/rainycape/unidecode") + (synopsis "Unicode transliterator in Golang") + (description "Unicode transliterator in Golang - Replaces non-ASCII +characters with their ASCII approximations.") + (license license:asl2.0)))) -- cgit v1.2.3 From ae863ccd63fedb734138d4bbc28fb51de26ac290 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:12:19 +0200 Subject: gnu: Add go-github-com-golang-freetype. * gnu/packages/golang.scm (go-github-com-golang-freetype): New variable. --- gnu/packages/golang.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 35e933d6d1..5ab4bd52a5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3497,3 +3497,30 @@ based on murmurhash.") (description "Unicode transliterator in Golang - Replaces non-ASCII characters with their ASCII approximations.") (license license:asl2.0)))) + +(define-public go-github-com-golang-freetype + (let ((commit "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4") + (revision "1")) + (package + (name "go-github-com-golang-freetype") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/golang/freetype") + (commit commit))) + (file-name (string-append "go-github-com-golang-freetype-" + version "-checkout")) + (sha256 + (base32 + "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/golang/freetype")) + (propagated-inputs + `(("go-golang-org-x-image" ,go-golang-org-x-image))) + (home-page "https://github.com/golang/freetype") + (synopsis "Freetype font rasterizer in the Go programming language") + (description "The Freetype font rasterizer in the Go programming language.") + (license (list license:freetype + license:gpl2+))))) -- cgit v1.2.3 From 40c86b39c3a9046e3371c0d4f2e530d7c6411771 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:13:04 +0200 Subject: gnu: Add go-github-com-fogleman-gg. * gnu/packages/golang.scm (go-github-com-fogleman-gg): 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 5ab4bd52a5..52e8d7d52c 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3524,3 +3524,27 @@ characters with their ASCII approximations.") (description "The Freetype font rasterizer in the Go programming language.") (license (list license:freetype license:gpl2+))))) + +(define-public go-github-com-fogleman-gg + (package + (name "go-github-com-fogleman-gg") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fogleman/gg") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1nkldjghbqnzj2djfaxhiv35kk341xhcrj9m2dwq65v684iqkk8n")))) + (build-system go-build-system) + (arguments + `(#:tests? #f ; Issue with test flags. + #:import-path "github.com/fogleman/gg")) + (propagated-inputs + `(("go-github-com-golang-freetype" ,go-github-com-golang-freetype))) + (home-page "https://github.com/fogleman/gg") + (synopsis "2D rendering in Go") + (description "@code{gg} is a library for rendering 2D graphics in pure Go.") + (license license:expat))) -- cgit v1.2.3 From 44b9e8fd8f10c4f028607501f01a2f70e3c5d780 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:13:42 +0200 Subject: gnu: Add go-github-com-gedex-inflector. * gnu/packages/golang.scm (go-github-com-gedex-inflector): 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 52e8d7d52c..9a0b097201 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3548,3 +3548,27 @@ characters with their ASCII approximations.") (synopsis "2D rendering in Go") (description "@code{gg} is a library for rendering 2D graphics in pure Go.") (license license:expat))) + +(define-public go-github-com-gedex-inflector + (let ((commit "16278e9db8130ac7ec405dc174cfb94344f16325") + (revision "1")) + (package + (name "go-github-com-gedex-inflector") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gedex/inflector") + (commit commit))) + (file-name (string-append "go-github-com-gedex-inflector-" + version "-checkout")) + (sha256 + (base32 + "05hjqw1m71vww4914d9h6nqa9jw3lgjzwsy7qaffl02s2lh1amks")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/gedex/inflector")) + (home-page "https://github.com/gedex/inflector") + (synopsis "Go library that pluralizes and singularizes English nouns") + (description "Go library that pluralizes and singularizes English nouns.") + (license license:bsd-2)))) -- cgit v1.2.3 From cb380998395b4b6f64dfaed6de5ced8c8c0682aa Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:14:15 +0200 Subject: gnu: Add go-github-com-klauspost-cpuid. * gnu/packages/golang.scm (go-github-com-klauspost-cpuid): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9a0b097201..4a3b50e588 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3572,3 +3572,28 @@ characters with their ASCII approximations.") (synopsis "Go library that pluralizes and singularizes English nouns") (description "Go library that pluralizes and singularizes English nouns.") (license license:bsd-2)))) + +(define-public go-github-com-klauspost-cpuid + (package + (name "go-github-com-klauspost-cpuid") + (version "1.2.3") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klauspost/cpuid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1s510210wdj5dkamii1qrk7v87k4qpdcrrjzflp5ha9iscw6b06l")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/klauspost/cpuid")) + (home-page "https://github.com/klauspost/cpuid") + (synopsis "CPU feature identification for Go") + (description "@code{cpuid} provides information about the CPU running the +current program. CPU features are detected on startup, and kept for fast access +through the life of the application. Currently x86 / x64 (AMD64) is supported, +and no external C (cgo) code is used, which should make the library very eas +to use.") + (license license:expat))) -- cgit v1.2.3 From 03baf02e6f2ad81cc30b25762d702a343a775f2c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:14:45 +0200 Subject: gnu: Add go-github-com-pbnjay-memory. * gnu/packages/golang.scm (go-github-com-pbnjay-memory): 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 4a3b50e588..03863529c7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3597,3 +3597,29 @@ through the life of the application. Currently x86 / x64 (AMD64) is supported, and no external C (cgo) code is used, which should make the library very eas to use.") (license license:expat))) + +(define-public go-github-com-pbnjay-memory + (let ((commit "974d429e7ae40c89e7dcd41cfcc22a0bfbe42510") + (revision "1")) + (package + (name "go-github-com-pbnjay-memory") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pbnjay/memory") + (commit commit))) + (file-name (string-append "go-github-com-pbnjay-memory-" + version "-checkout")) + (sha256 + (base32 + "0kazg5psdn90pqadrzma5chdwh0l2by9z31sspr47gx93fhjmkkq")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/pbnjay/memory")) + (home-page "https://github.com/gedex/inflector") + (synopsis "Go library to report total system memory") + (description "@code{memory} provides a single method reporting total +physical system memory accessible to the kernel. It does not account for memory +used by other processes.") + (license license:bsd-3)))) -- cgit v1.2.3 From 62cfb4915970e90d2379456ac1d0581ffbf04b76 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:15:28 +0200 Subject: gnu: Add go-github-com-surge-glog. * gnu/packages/golang.scm (go-github-com-surge-glog): 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 03863529c7..e207a57aa5 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3623,3 +3623,27 @@ to use.") physical system memory accessible to the kernel. It does not account for memory used by other processes.") (license license:bsd-3)))) + +(define-public go-github-com-surge-glog + (let ((commit "2578deb2b95c665e6b1ebabf304ce2085c9e1985") + (revision "1")) + (package + (name "go-github-com-surge-glog") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/surge/glog") + (commit commit))) + (file-name (string-append "go-github-com-surge-glog-" + version "-checkout")) + (sha256 + (base32 + "1bxcwxvsvr2hfpjz9hrrn0wrgykwmrbyk567102k3vafw9xdcwk4")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/surge/glog")) + (home-page "https://github.com/surge/glog") + (synopsis "Leveled execution logs for Go") + (description "Leveled execution logs for Go.") + (license license:asl2.0)))) -- cgit v1.2.3 From 073c64dc792c79c2a988edae9f4e568d3b09f3b5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:16:03 +0200 Subject: gnu: Add go-github-com-surgebase-porter2. * gnu/packages/golang.scm (go-github-com-surgebase-porter2): New variable. --- gnu/packages/golang.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index e207a57aa5..a7470eaa72 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3647,3 +3647,33 @@ used by other processes.") (synopsis "Leveled execution logs for Go") (description "Leveled execution logs for Go.") (license license:asl2.0)))) + +(define-public go-github-com-surgebase-porter2 + (let ((commit "56e4718818e8dc4ea5ba6348402fc7661863732a") + (revision "1")) + (package + (name "go-github-com-surgebase-porter2") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/surgebase/porter2") + (commit commit))) + (file-name (string-append "go-github-com-surgebase-porter2-" + version "-checkout")) + (sha256 + (base32 + "1ivcf83jlj9s7q5y9dfbpyl0br35cz8fcp0dm8sxxvqh54py06v2")))) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/surgebase/porter2")) + (native-inputs + `(("go-github-com-stretchr-testify" ,go-github-com-stretchr-testify) + ("go-github-com-surge-glog" ,go-github-com-surge-glog))) + (home-page "https://github.com/surgebase/porter2") + (synopsis "Go library implementing english Porter2 stemmer") + (description "Porter2 implements the +@url{http://snowball.tartarus.org/algorithms/english/stemmer.html, english +Porter2 stemmer}. It is written completely using finite state machines to do +suffix comparison, rather than the string-based or tree-based approaches.") + (license license:asl2.0)))) -- cgit v1.2.3 From 7d13a942158a73cfe4bf9b9a266edac144e040a1 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:21:34 +0200 Subject: gnu: Add edirect-go-programs. * gnu/packages/bioinformatics.scm (edirect-go-programs): New variable. (edirect)[source]: Adjust snippet to not use non-free software. --- gnu/packages/bioinformatics.scm | 57 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 54 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6dfc23c1dc..242aafc632 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -42,6 +42,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system go) #:use-module (guix build-system haskell) #:use-module (guix build-system meson) #:use-module (guix build-system ocaml) @@ -68,15 +69,17 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) + #:use-module (gnu packages dlang) #:use-module (gnu packages file) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) - #:use-module (gnu packages gtk) + #:use-module (gnu packages golang) #:use-module (gnu packages glib) #:use-module (gnu packages graph) #:use-module (gnu packages groff) + #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages haskell-check) @@ -87,7 +90,6 @@ #:use-module (gnu packages java) #:use-module (gnu packages java-compression) #:use-module (gnu packages jemalloc) - #:use-module (gnu packages dlang) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) #:use-module (gnu packages logging) @@ -2766,7 +2768,12 @@ quantitative phenotypes.") "093zp7klv81ph0y8mm8d78a9hnpfxbv2kdym70gzdf3vz176rw33")) (modules '((guix build utils))) (snippet - '(begin (delete-file "Mozilla-CA.tar.gz") #t)))) + '(begin (delete-file "Mozilla-CA.tar.gz") + (substitute* "rchive.go" + ;; This go library does not have any license. + (("github.com/fiam/gounidecode/unidecode") + "golang.org/rainycape/unidecode")) + #t)))) (build-system perl-build-system) (arguments `(#:phases @@ -2826,6 +2833,50 @@ in structured XML format. This can eliminate the need for writing custom software to answer ad hoc questions.") (license license:public-domain))) +(define-public edirect-go-programs + (package + (inherit edirect) + (name "edirect-go-programs") + (build-system go-build-system) + (arguments + `(#:install-source? #f + #:tests? #f ; No tests. + #:import-path "ncbi.nlm.nih.gov/entrez/edirect" + #: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" "-v" "-x" "j2x.go") + (invoke "go" "build" "-v" "-x" "t2x.go") + (invoke "go" "build" "-v" "-x" "-o" + "xtract.Linux" "xtract.go" "common.go") + (invoke "go" "build" "-v" "-x" "-o" + "rchive.Linux" "rchive.go" "common.go") + (invoke "go" "build" "-v" "-x" "-o" "symbols.Linux" "s2p.go")))) + (replace 'install + (lambda* (#:key outputs import-path #:allow-other-keys) + (let ((dest (string-append (assoc-ref outputs "out") "/bin")) + (source (string-append "src/" import-path "/"))) + (for-each (lambda (file) + (format #t "installing ~a~%" file) + (install-file (string-append source file) dest)) + '("j2x" "t2x" "symbols.Linux" "xtract.Linux" "rchive.Linux")) + #t)))))) + (native-inputs '()) + (propagated-inputs '()) + (inputs + `(("go-github-com-fatih-color" ,go-github-com-fatih-color) + ("go-github-com-fogleman-gg" ,go-github-com-fogleman-gg) + ("go-github-com-gedex-inflector" ,go-github-com-gedex-inflector) + ("go-github-com-golang-freetype" ,go-github-com-golang-freetype) + ("go-github-com-klauspost-cpuid" ,go-github-com-klauspost-cpuid) + ("go-github-com-pbnjay-memory" ,go-github-com-pbnjay-memory) + ("go-github-com-surgebase-porter2" ,go-github-com-surgebase-porter2) + ("go-golang-org-rainycape-unidecode" ,go-golang-org-rainycape-unidecode) + ("go-golang-org-x-image" ,go-golang-org-x-image) + ("go-golang-org-x-text" ,go-golang-org-x-text))))) + (define-public exonerate (package (name "exonerate") -- cgit v1.2.3 From 10d3fbf051da1af4d45e269394433ad072b1f6c7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 15 Mar 2020 23:27:45 +0200 Subject: gnu: edirect: Install more programs. * gnu/packages/bioinformatics.scm (edirect)[arguments]: Add 'patch-programs phase to work around not finding binaries in the PATH. Rewrite 'install phase to install many more scripts. Rewrite 'wrap-program to wrap more scripts with more programs. [inputs]: Add edirect-go-programs. [native-search-paths]: New field. --- gnu/packages/bioinformatics.scm | 55 ++++++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 242aafc632..33dda7ef39 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2781,19 +2781,48 @@ quantitative phenotypes.") (delete 'configure) (delete 'build) (delete 'check) ; simple check after install + (add-after 'unpack 'patch-programs + (lambda* (#:key inputs #:allow-other-keys) + ;; Ignore errors about missing xtract.Linux and rchive.Linux. + (substitute* "pm-refresh" + (("cat \\\"\\$target") + "grep ^[[:digit:]] \"$target")) + #t)) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (install-file "edirect.pl" - (string-append (assoc-ref outputs "out") "/bin")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (edirect-go (assoc-ref inputs "edirect-go-programs"))) + (for-each + (lambda (file) + (install-file file bin)) + '("archive-pubmed" "asp-cp" "asp-ls" "download-ncbi-data" + "download-pubmed" "edirect.pl" "efetch" "epost" "esearch" + "fetch-pubmed" "ftp-cp" "ftp-ls" "has-asp" "index-pubmed" + "pm-prepare" "pm-refresh" "pm-stash" "pm-collect" + "pm-index" "pm-invert" "pm-merge" "pm-promote")) + (symlink (string-append edirect-go "/bin/xtract.Linux") + (string-append bin "/xtract")) + (symlink (string-append edirect-go "/bin/rchive.Linux") + (string-append bin "/rchive"))) #t)) (add-after 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure 'edirect.pl' finds all perl inputs at runtime. - (let* ((out (assoc-ref outputs "out")) + ;; Make sure everything can run in a pure environment. + (let ((out (assoc-ref outputs "out")) (path (getenv "PERL5LIB"))) - (wrap-program (string-append out "/bin/edirect.pl") - `("PERL5LIB" ":" prefix (,path)))) - #t)) + (for-each + (lambda (file) + (wrap-program file + `("PERL5LIB" ":" prefix (,path))) + (wrap-program file + `("PATH" ":" prefix (,(string-append out "/bin") + ,(dirname (which "sed")) + ,(dirname (which "gzip")) + ,(dirname (which "grep")) + ,(dirname (which "perl")) + ,(dirname (which "uname")))))) + (find-files out "."))) + #t)) (add-after 'wrap-program 'check (lambda* (#:key outputs #:allow-other-keys) (invoke (string-append (assoc-ref outputs "out") @@ -2801,7 +2830,8 @@ quantitative phenotypes.") "-filter" "-help") #t))))) (inputs - `(("perl-html-parser" ,perl-html-parser) + `(("edirect-go-programs" ,edirect-go-programs) + ("perl-html-parser" ,perl-html-parser) ("perl-encode-locale" ,perl-encode-locale) ("perl-file-listing" ,perl-file-listing) ("perl-html-tagset" ,perl-html-tagset) @@ -2831,6 +2861,13 @@ EDirect also provides an argument-driven function that simplifies the extraction of data from document summaries or other results that are returned in structured XML format. This can eliminate the need for writing custom software to answer ad hoc questions.") + (native-search-paths + ;; Ideally this should be set for LWP somewhere. + (list (search-path-specification + (variable "PERL_LWP_SSL_CA_FILE") + (file-type 'regular) + (separator #f) + (files '("/etc/ssl/certs/ca-certificates.crt"))))) (license license:public-domain))) (define-public edirect-go-programs -- cgit v1.2.3 From 9a684b4078ef4bc05b3fd18ae5ca8235db66c910 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 08:59:18 +0200 Subject: gnu: Add python-keyrings.alt. * gnu/packages/python-crypto.scm (python-keyring.alt): New variable. --- gnu/packages/python-crypto.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 1286693fc2..6e85c0eea2 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -377,6 +377,45 @@ password storage.") (propagated-inputs `(("python2-pycrypto" ,python2-pycrypto)))))) +(define-public python-keyrings.alt + (package + (name "python-keyrings.alt") + (version "3.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keyrings.alt" version)) + (sha256 + (base32 + "0gdjdqpq2hf770p6iwi891mil0vbsdhvy88x0v8b2w4y4b28lcli")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "keyrings/alt/_win_crypto.py") + ;; Rely on python-keyring>20: + ;; https://github.com/jaraco/keyrings.alt/issues/33 + (substitute* '("keyrings/alt/tests/test_Gnome.py" + "keyrings/alt/tests/test_Google.py" + "keyrings/alt/tests/test_Windows.py" + "keyrings/alt/tests/test_file.py" + "keyrings/alt/tests/test_pyfs.py") + (("keyring.tests.test_backend") "keyring.testing.backend") + (("keyring.tests.util") "keyring.testing.util")) + #t)))) + (build-system python-build-system) + (native-inputs + `(("python-keyring" ,python-keyring) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) + (home-page "https://github.com/jaraco/keyrings.alt") + (synopsis "Alternate keyring implementations") + (description "Keyrings in this package may have security risks or other +implications. These backends were extracted from the main keyring project to +make them available for those who wish to employ them, but are discouraged for +general production use. Include this module and use its backends at your own +risk.") + (license license:expat))) + (define-public python-certifi (package (name "python-certifi") -- cgit v1.2.3 From 2eb09a5cfdbf2fc1a1515ffee828a2b541323f28 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 09:01:13 +0200 Subject: gnu: Add python-fusepyng. * gnu/packages/python-xyz.scm (python-fusepyng): New variable. --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c47dac8245..d006b2a1b6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16049,6 +16049,39 @@ MacFUSE. The binding is created using the standard @code{ctypes} library.") (define-public python2-fusepy (package-with-python2 python-fusepy)) +(define-public python-fusepyng + (package + (name "python-fusepyng") + (version "1.0.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "fusepyng" version)) + (sha256 + (base32 + "17w9iw6m6zjbmnhs4ikd27pq4mb1nan6k4ahlwyz40463vw6wkwb")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-libfuse-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((fuse (assoc-ref inputs "fuse"))) + (substitute* "fusepyng.py" + (("os.environ.get\\('FUSE_LIBRARY_PATH'\\)") + (string-append "\"" fuse "/lib/libfuse.so\"")))) + #t))))) + (inputs + `(("fuse" ,fuse))) + (propagated-inputs + `(("python-paramiko" ,python-paramiko))) + (home-page "https://github.com/rianhunter/fusepyng") + (synopsis "Simple ctypes bindings for FUSE") + (description "@code{fusepyng} is a Python module that provides a simple +interface to FUSE on various operating systems. It's just one file and is +implemented using @code{ctypes}.") + (license license:isc))) + (define-public python2-gdrivefs (package (name "python2-gdrivefs") -- cgit v1.2.3 From 24200bdf9d04edd87f6984b447d1b529201279f4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 09:01:59 +0200 Subject: gnu: Add python-userspacefs. * gnu/packages/python-xyz.scm (python-userspacefs): 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 d006b2a1b6..8814a632af 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16123,6 +16123,27 @@ implemented using @code{ctypes}.") under Python 2.7.") (license license:gpl2))) +(define-public python-userspacefs + (package + (name "python-userspacefs") + (version "1.0.13") + (source + (origin + (method url-fetch) + (uri (pypi-uri "userspacefs" version)) + (sha256 + (base32 + "0kyz52jyxw3m7hqvn5g6z0sx9cq6k0nq1wj44lvdrghdljjgyk2z")))) + (build-system python-build-system) + (propagated-inputs + `(("python-fusepyng" ,python-fusepyng))) + (home-page "https://github.com/rianhunter/userspacefs") + (synopsis "User-space file systems for Python") + (description + "@code{userspacefs} is a library that allows you to easily write +user-space file systems in Python.") + (license license:gpl3+))) + (define-public pybind11 (package (name "pybind11") -- cgit v1.2.3 From 0831063778ee98d8aa9bdfaeeb7cd1673ef2a580 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 09:02:53 +0200 Subject: gnu: Add python-argon2-cffi. * gnu/packages/python-crypto.scm (python-argon2-cffi): New variable. --- gnu/packages/python-crypto.scm | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 6e85c0eea2..f1604212e7 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -47,6 +47,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) + #:use-module (gnu packages password-utils) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-check) @@ -1303,3 +1304,46 @@ items and collections, editing items, locking and unlocking collections "This is a low-level, pure Python DBus protocol client. It has an I/O-free core, and integration modules for different event loops.") (license license:expat))) + +(define-public python-argon2-cffi + (package + (name "python-argon2-cffi") + (version "19.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "argon2-cffi" version)) + (sha256 + (base32 + "18xxfw30gi3lwaz4vwb05iavzlrk3fa1x9fippzrgd3px8z65apz")) + (modules '((guix build utils))) + (snippet '(begin (delete-file-recursively "extras") #t)))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (setenv "ARGON2_CFFI_USE_SYSTEM" "1") + (invoke "python" "setup.py" "build"))) + (replace 'check + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) + (invoke "pytest") + (invoke "python" "-m" "argon2" "--help") + ;; see tox.ini + (invoke "python" "-m" "argon2" "-n" "1" "-t" "1" "-m" "8" "-p" "1")))))) + (propagated-inputs + `(("python-cffi" ,python-cffi) + ("python-six" ,python-six))) + (inputs `(("argon2" ,argon2))) + (native-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pytest" ,python-pytest))) + (home-page "https://argon2-cffi.readthedocs.io/") + (synopsis "Secure Password Hashes for Python") + (description + "Argon2 is a secure password hashing algorithm. It is designed to have +both a configurable runtime as well as memory consumption. This means that you +can decide how long it takes to hash a password and how much memory is required.") + (license license:expat))) -- cgit v1.2.3 From 0a124c4615bd150c36dd90c2595942b79dabef6e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 09:03:55 +0200 Subject: gnu: Add python-privy. * gnu/packages/python-crypto.scm (python-privy): New variable. --- gnu/packages/python-crypto.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index f1604212e7..0601799c2b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1347,3 +1347,38 @@ I/O-free core, and integration modules for different event loops.") both a configurable runtime as well as memory consumption. This means that you can decide how long it takes to hash a password and how much memory is required.") (license license:expat))) + +(define-public python-privy + (package + (name "python-privy") + (version "6.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; Releases are untagged + (url "https://github.com/ofek/privy") + (commit "2838db3df239797c71bddacc48a4c49a83f35747"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1m32dh5fqc8cy7jyf1z5fs6zvmdkbq5fi98hr609gbl7s0l0y0i9")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (invoke "python" "-m" "pytest")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (propagated-inputs + `(("python-argon2-cffi" ,python-argon2-cffi) + ("python-cryptography" ,python-cryptography))) + (home-page "https://www.dropbox.com/developers") + (synopsis "Library to password-protect your data") + (description + "Privy is a small and fast utility for password-protecting secret +data such as API keys, cryptocurrency wallets, or seeds for digital +signatures.") + (license (list license:expat license:asl2.0)))) ; dual licensed -- cgit v1.2.3 From 34bf3ed26b76d2978b2b0134676225e159c1d984 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 17 Mar 2020 09:05:14 +0200 Subject: gnu: Add python-block-tracing. * gnu/packages/python-xyz.scm (python-block-tracing): 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 8814a632af..d2a3329dfb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18412,3 +18412,24 @@ sequences.") (define-public python2-fuzzywuzzy (package-with-python2 python-fuzzywuzzy)) + +(define-public python-block-tracing + (package + (name "python-block-tracing") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "block_tracing" version)) + (sha256 + (base32 + "0s2y729qr5rs7n506qfh8cssk8m2bi6k2y5vbrh2z3raf2d01alz")))) + (build-system python-build-system) + (arguments '(#:tests? #f)) ; no tests + (home-page "https://github.com/rianhunter/block_tracing") + (synopsis "Protect process memory") + (description + "@code{block_tracing} is a tiny Python library that can be used to +prevent debuggers and other applications from inspecting the memory within +your process.") + (license license:expat))) -- cgit v1.2.3 From e64ea84392ca85d1ef23ebc5e4c1ec759f29b8cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Mar 2020 10:39:08 +0200 Subject: gnu: python-bleach: Update to 3.1.3 (fixes CVE-2020-6816). * gnu/packages/python-xyz.scm (python-bleach): Update to 3.1.3. [native-inputs]: Remove python-pytest-runner2. Add python-datrie, python-genshi, python-lxml. [home-page]: Update to new home-page. --- gnu/packages/python-xyz.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d2a3329dfb..65bc6df4aa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -8197,22 +8197,24 @@ Jupyter Notebook format and Python APIs for working with notebooks.") (define-public python-bleach (package (name "python-bleach") - (version "3.1.1") + (version "3.1.3") (source (origin (method url-fetch) (uri (pypi-uri "bleach" version)) (sha256 (base32 - "0j4xlnw99m1xy0s7wxz9fk5f3c1n8r296fh75jn5p5j61w6qg2xa")))) + "0al437aw4p2xp83az5hhlrp913nsf0cg6kg4qj3fjhv4wakxipzq")))) (build-system python-build-system) (propagated-inputs `(("python-webencodings" ,python-webencodings) ("python-six" ,python-six))) (native-inputs - `(("python-pytest" ,python-pytest) - ("python-pytest-runner" ,python-pytest-runner-2))) - (home-page "https://github.com/jsocol/bleach") + `(("python-datrie" ,python-datrie) + ("python-genshi" ,python-genshi) + ("python-lxml" ,python-lxml) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/mozilla/bleach") (synopsis "Whitelist-based HTML-sanitizing tool") (description "Bleach is an easy whitelist-based HTML-sanitizing tool.") (license license:asl2.0))) -- cgit v1.2.3 From 1550db6fd47f84672b5bf554be922b96da2be3d8 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 22 Mar 2020 10:52:43 +0100 Subject: tests: install: Abort when one installation step fails. When marionette-eval calls fail in gui-test-program, the installation continues which results in two scenarios: - hang forever at the next marionette-eval call, - keep going and start a broken installation, which is annoying because it clears the terminal and hides the error. Make sure that gui-test-program is exited with #f return code when one of the marionette-eval calls fail. * gnu/tests/install.scm (gui-test-program): Add a new macro "marionette-eval*". Throw an exception when one on the marionette-eval calls fail. --- gnu/tests/install.scm | 85 +++++++++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 40 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 4f650ffb34..83988873c2 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2017, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -946,67 +947,71 @@ build (current-guix) and then store a couple of full system images.") (marionette-control (string-append "screendump " file) #$marionette)) + (define-syntax-rule (marionette-eval* exp marionette) + (or (marionette-eval exp marionette) + (throw 'marionette-eval-failure 'exp))) + (setvbuf (current-output-port) 'none) (setvbuf (current-error-port) 'none) - (marionette-eval '(use-modules (gnu installer tests)) - #$marionette) + (marionette-eval* '(use-modules (gnu installer tests)) + #$marionette) ;; Arrange so that 'converse' prints debugging output to the console. - (marionette-eval '(let ((console (open-output-file "/dev/console"))) - (setvbuf console 'none) - (conversation-log-port console)) - #$marionette) + (marionette-eval* '(let ((console (open-output-file "/dev/console"))) + (setvbuf console 'none) + (conversation-log-port console)) + #$marionette) ;; Tell the installer to not wait for the Connman "online" status. - (marionette-eval '(call-with-output-file "/tmp/installer-assume-online" - (const #t)) - #$marionette) + (marionette-eval* '(call-with-output-file "/tmp/installer-assume-online" + (const #t)) + #$marionette) ;; Run 'guix system init' with '--no-grafts', to cope with the lack of ;; network access. - (marionette-eval '(call-with-output-file - "/tmp/installer-system-init-options" - (lambda (port) - (write '("--no-grafts" "--no-substitutes") - port))) - #$marionette) - - (marionette-eval '(define installer-socket - (open-installer-socket)) - #$marionette) + (marionette-eval* '(call-with-output-file + "/tmp/installer-system-init-options" + (lambda (port) + (write '("--no-grafts" "--no-substitutes") + port))) + #$marionette) + + (marionette-eval* '(define installer-socket + (open-installer-socket)) + #$marionette) (screenshot "installer-start.ppm") - (marionette-eval '(choose-locale+keyboard installer-socket) - #$marionette) + (marionette-eval* '(choose-locale+keyboard installer-socket) + #$marionette) (screenshot "installer-locale.ppm") ;; Choose the host name that the "basic" test expects. - (marionette-eval '(enter-host-name+passwords installer-socket - #:host-name "liberigilo" - #:root-password - #$%root-password - #:users - '(("alice" "pass1") - ("bob" "pass2"))) - #$marionette) + (marionette-eval* '(enter-host-name+passwords installer-socket + #:host-name "liberigilo" + #:root-password + #$%root-password + #:users + '(("alice" "pass1") + ("bob" "pass2"))) + #$marionette) (screenshot "installer-services.ppm") - (marionette-eval '(choose-services installer-socket - #:desktop-environments '() - #:choose-network-service? - (const #f)) - #$marionette) + (marionette-eval* '(choose-services installer-socket + #:desktop-environments '() + #:choose-network-service? + (const #f)) + #$marionette) (screenshot "installer-partitioning.ppm") - (marionette-eval '(choose-partitioning installer-socket - #:encrypted? #$encrypted? - #:passphrase #$%luks-passphrase) - #$marionette) + (marionette-eval* '(choose-partitioning installer-socket + #:encrypted? #$encrypted? + #:passphrase #$%luks-passphrase) + #$marionette) (screenshot "installer-run.ppm") - (marionette-eval '(conclude-installation installer-socket) - #$marionette) + (marionette-eval* '(conclude-installation installer-socket) + #$marionette) (sync) #t)) -- cgit v1.2.3 From 5c79f238634c5adb6657f1b4b1bb4ddb8bb73ef1 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Tue, 18 Feb 2020 10:42:07 +0100 Subject: system: Add kernel-loadable-modules to operating-system. * gnu/system.scm (): Add kernel-loadable-modules. (operating-system-directory-base-entries): Use it. * doc/guix.texi (operating-system Reference): Document KERNEL-LOADABLE-MODULES. * gnu/build/linux-modules.scm (depmod): New procedure. (make-linux-module-directory): New procedure. Export it. * guix/profiles.scm (linux-module-database): New procedure. Export it. * gnu/tests/linux-modules.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/linux.scm (make-linux-libre*)[arguments]<#:phases>[install]: Disable depmod. Remove "build" and "source" symlinks. [native-inputs]: Remove kmod. --- doc/guix.texi | 4 ++ gnu/build/linux-modules.scm | 46 +++++++++++++++++++- gnu/local.mk | 1 + gnu/packages/linux.scm | 26 ++++++++--- gnu/system.scm | 16 +++++-- gnu/tests/linux-modules.scm | 103 ++++++++++++++++++++++++++++++++++++++++++++ guix/profiles.scm | 50 ++++++++++++++++++++- 7 files changed, 235 insertions(+), 11 deletions(-) create mode 100644 gnu/tests/linux-modules.scm (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index 92125abccc..6346cf78a1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11221,6 +11221,10 @@ The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported. In the future, it will be possible to use the GNU@tie{}Hurd.}. +@item @code{kernel-loadable-modules} (default: '()) +A list of objects (usually packages) to collect loadable kernel modules +from--e.g. @code{(list ddcci-driver-linux)}. + @item @code{kernel-arguments} (default: @code{'("quiet")}) List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{("console=ttyS0")}. diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm index a149eff329..aa1c7cfeae 100644 --- a/gnu/build/linux-modules.scm +++ b/gnu/build/linux-modules.scm @@ -22,12 +22,14 @@ #:use-module (guix elf) #:use-module (guix glob) #:use-module (guix build syscalls) - #:use-module ((guix build utils) #:select (find-files)) + #:use-module ((guix build utils) #:select (find-files invoke)) + #:use-module (guix build union) #:use-module (rnrs io ports) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (ice-9 ftw) #:use-module (ice-9 vlist) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) @@ -56,7 +58,9 @@ write-module-name-database write-module-alias-database - write-module-device-database)) + write-module-device-database + + make-linux-module-directory)) ;;; Commentary: ;;; @@ -631,4 +635,42 @@ be loaded on-demand, such as file system modules." module devname type major minor))) aliases)))) +(define (depmod version directory) + "Given an (existing) DIRECTORY, invoke depmod on it for +kernel version VERSION." + (let ((destination-directory (string-append directory "/lib/modules/" + version)) + ;; Note: "System.map" is an input file. + (maps-file (string-append directory "/System.map")) + ;; Note: "Module.symvers" is an input file. + (symvers-file (string-append directory "/Module.symvers"))) + ;; These files will be regenerated by depmod below. + (for-each (lambda (basename) + (when (and (string-prefix? "modules." basename) + ;; Note: "modules.builtin" is an input file. + (not (string=? "modules.builtin" basename)) + ;; Note: "modules.order" is an input file. + (not (string=? "modules.order" basename))) + (delete-file (string-append destination-directory "/" + basename)))) + (scandir destination-directory)) + (invoke "depmod" + "-e" ; Report symbols that aren't supplied + ;"-w" ; Warn on duplicates + "-b" directory + "-F" maps-file + ;"-E" symvers-file ; using both "-E" and "-F" is not possible. + version))) + +(define (make-linux-module-directory inputs version output) + "Create a new directory OUTPUT and ensure that the directory +OUTPUT/lib/modules/VERSION can be used as a source of Linux +kernel modules for the first kmod in PATH now to eventually +load. Take modules to put into OUTPUT from INPUTS. + +Right now that means it creates @code{modules.*.bin} which +@command{modprobe} will use to find loadable modules." + (union-build output inputs #:create-all-directories? #t) + (depmod version output)) + ;;; linux-modules.scm ends here diff --git a/gnu/local.mk b/gnu/local.mk index e391903473..a080745220 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -635,6 +635,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/nfs.scm \ %D%/tests/install.scm \ %D%/tests/ldap.scm \ + %D%/tests/linux-modules.scm \ %D%/tests/mail.scm \ %D%/tests/messaging.scm \ %D%/tests/networking.scm \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ffc4776f94..c39c411e3d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -654,7 +654,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." `(("perl" ,perl) ("bc" ,bc) ("openssl" ,openssl) - ("kmod" ,kmod) ("elfutils" ,elfutils) ; Needed to enable CONFIG_STACK_VALIDATION ("flex" ,flex) ("bison" ,bison) @@ -678,6 +677,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (guix build utils) (srfi srfi-1) (srfi srfi-26) + (ice-9 ftw) (ice-9 match)) #:phases (modify-phases %standard-phases @@ -750,8 +750,7 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (lambda* (#:key inputs native-inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (moddir (string-append out "/lib/modules")) - (dtbdir (string-append out "/lib/dtbs")) - (kmod (assoc-ref (or native-inputs inputs) "kmod"))) + (dtbdir (string-append out "/lib/dtbs"))) ;; Install kernel image, kernel configuration and link map. (for-each (lambda (file) (install-file file out)) (find-files "." "^(\\.config|bzImage|zImage|Image|vmlinuz|System\\.map|Module\\.symvers)$")) @@ -763,12 +762,29 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." ;; Install kernel modules (mkdir-p moddir) (invoke "make" - (string-append "DEPMOD=" kmod "/bin/depmod") + ;; Disable depmod because the Guix system's module directory + ;; is an union of potentially multiple packages. It is not + ;; possible to use depmod to usefully calculate a dependency + ;; graph while building only one of those packages. + "DEPMOD=true" (string-append "MODULE_DIR=" moddir) (string-append "INSTALL_PATH=" out) (string-append "INSTALL_MOD_PATH=" out) "INSTALL_MOD_STRIP=1" - "modules_install"))))) + "modules_install") + (let* ((versions (filter (lambda (name) + (not (string-prefix? "." name))) + (scandir moddir))) + (version (match versions + ((x) x)))) + ;; There are symlinks to the build and source directory, + ;; both of which will point to target /tmp/guix-build* + ;; and thus not be useful in a profile. Delete the symlinks. + (false-if-file-not-found + (delete-file (string-append moddir "/" version "/build"))) + (false-if-file-not-found + (delete-file (string-append moddir "/" version "/source")))) + #t)))) #:tests? #f)) (home-page "https://www.gnu.org/software/linux-libre/") (synopsis "100% free redistribution of a cleaned Linux kernel") diff --git a/gnu/system.scm b/gnu/system.scm index 06c58c27ba..c90d8c6cbc 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Meiyo Peng +;;; Copyright © 2020 Danny Milosavljevic ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,6 +169,8 @@ (kernel operating-system-kernel ; package (default linux-libre)) + (kernel-loadable-modules operating-system-kernel-loadable-modules + (default '())) ; list of packages (kernel-arguments operating-system-user-kernel-arguments (default '("quiet"))) ; list of gexps/strings (bootloader operating-system-bootloader) ; @@ -472,9 +475,16 @@ OS." "Return the basic entries of the 'system' directory of OS for use as the value of the SYSTEM-SERVICE-TYPE service." (let ((locale (operating-system-locale-directory os))) - (mlet %store-monad ((kernel -> (operating-system-kernel os)) - (initrd -> (operating-system-initrd-file os)) - (params (operating-system-boot-parameters-file os))) + (mlet* %store-monad ((kernel -> (operating-system-kernel os)) + (modules -> + (operating-system-kernel-loadable-modules os)) + (kernel + (profile-derivation + (packages->manifest + (cons kernel modules)) + #:hooks (list linux-module-database))) + (initrd -> (operating-system-initrd-file os)) + (params (operating-system-boot-parameters-file os))) (return `(("kernel" ,kernel) ("parameters" ,params) ("initrd" ,initrd) diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm new file mode 100644 index 0000000000..39e11587c6 --- /dev/null +++ b/gnu/tests/linux-modules.scm @@ -0,0 +1,103 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2020 Danny Milosavljevic +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu tests linux-modules) + #:use-module (gnu packages linux) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (gnu tests) + #:use-module (guix derivations) + #:use-module (guix gexp) + #:use-module (guix modules) + #:use-module (guix monads) + #:use-module (guix store) + #:export (%test-loadable-kernel-modules-0 + %test-loadable-kernel-modules-1 + %test-loadable-kernel-modules-2)) + +;;; Commentary: +;;; +;;; Test kernel-loadable-modules. +;;; +;;; Code: + +(define* (module-loader-program os modules) + "Return an executable store item that, upon being evaluated, will dry-run +load MODULES." + (program-file + "load-kernel-modules.scm" + (with-imported-modules (source-module-closure '((guix build utils))) + #~(begin + (use-modules (guix build utils)) + (for-each (lambda (module) + (invoke (string-append #$kmod "/bin/modprobe") "-n" "--" + module)) + '#$modules))))) + +(define* (run-loadable-kernel-modules-test module-packages module-names) + "Run a test of an OS having MODULE-PACKAGES, and modprobe MODULE-NAMES." + (define os + (marionette-operating-system + (operating-system + (inherit (simple-operating-system)) + (kernel-loadable-modules module-packages)) + #:imported-modules '((guix combinators)))) + (define vm (virtual-machine os)) + (define (test script) + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-64)) + (define marionette + (make-marionette (list #$vm))) + (mkdir #$output) + (chdir #$output) + (test-begin "loadable-kernel-modules") + (test-assert "script successfully evaluated" + (marionette-eval + '(primitive-load #$script) + marionette)) + (test-end) + (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (gexp->derivation "loadable-kernel-modules" (test (module-loader-program os module-names)))) + +(define %test-loadable-kernel-modules-0 + (system-test + (name "loadable-kernel-modules-0") + (description "Tests loadable kernel modules facility of +with no extra modules.") + (value (run-loadable-kernel-modules-test '() '())))) + +(define %test-loadable-kernel-modules-1 + (system-test + (name "loadable-kernel-modules-1") + (description "Tests loadable kernel modules facility of +with one extra module.") + (value (run-loadable-kernel-modules-test + (list ddcci-driver-linux) + '("ddcci"))))) + +(define %test-loadable-kernel-modules-2 + (system-test + (name "loadable-kernel-modules-2") + (description "Tests loadable kernel modules facility of +with two extra modules.") + (value (run-loadable-kernel-modules-test + (list acpi-call-linux-module ddcci-driver-linux) + '("acpi_call" "ddcci"))))) diff --git a/guix/profiles.scm b/guix/profiles.scm index 0d38b2513f..20a2973579 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017 Maxim Cournoyer ;;; Copyright © 2019 Kyle Meyer ;;; Copyright © 2019 Mathieu Othacehe +;;; Copyright © 2020 Danny Milosavljevic ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,7 +140,9 @@ %current-profile ensure-profile-directory canonicalize-profile - user-friendly-profile)) + user-friendly-profile + + linux-module-database)) ;;; Commentary: ;;; @@ -1137,6 +1140,51 @@ for both major versions of GTK+." (hook . gtk-im-modules))) (return #f))))) +(define (linux-module-database manifest) + "Return a derivation that unites all the kernel modules of the manifest +and creates the dependency graph of all these kernel modules. + +This is meant to be used as a profile hook." + (define kmod ; lazy reference + (module-ref (resolve-interface '(gnu packages linux)) 'kmod)) + (define build + (with-imported-modules + (source-module-closure '((guix build utils) + (gnu build linux-modules))) + #~(begin + (use-modules (ice-9 ftw) + (ice-9 match) + (srfi srfi-1) ; append-map + (gnu build linux-modules)) + (let* ((inputs '#$(manifest-inputs manifest)) + (module-directories + (map (lambda (directory) + (string-append directory "/lib/modules")) + inputs)) + (directory-entries + (lambda (directory) + (scandir directory (lambda (basename) + (not + (string-prefix? "." basename)))))) + ;; Note: Should usually result in one entry. + (versions (delete-duplicates + (append-map directory-entries + module-directories)))) + (match versions + ((version) + (let ((old-path (getenv "PATH"))) + (setenv "PATH" #+(file-append kmod "/bin")) + (make-linux-module-directory inputs version #$output) + (setenv "PATH" old-path))) + (_ (error "Specified Linux kernel and Linux kernel modules +are not all of the same version"))))))) + (gexp->derivation "linux-module-database" build + #:local-build? #t + #:substitutable? #f + #:properties + `((type . profile-hook) + (hook . linux-module-database)))) + (define (xdg-desktop-database manifest) "Return a derivation that builds the @file{mimeinfo.cache} database from desktop files. It's used to query what applications can handle a given -- cgit v1.2.3 From 8506fce04bb45ad90309829f1bbf06389fe19b3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Mar 2020 15:34:12 +0200 Subject: gnu: libcaca: Update license field. * gnu/packages/video.scm (libcaca)[license]: List as wtfpl2. --- 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 d18fe95b61..38e9d36307 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -750,7 +750,7 @@ ASS/SSA (Advanced Substation Alpha/SubStation Alpha) subtitle format.") pixels, so that it can work on older video cards or text terminals. It supports Unicode, 2048 colors, dithering of color images, and advanced text canvas operations.") - (license (license:fsf-free "file://COPYING")))) ;WTFPL version 2 + (license license:wtfpl2))) (define-public libdca (package -- cgit v1.2.3 From ff66791d3a0470507f03c2115c542889bff9565f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Mar 2020 15:35:37 +0200 Subject: gnu: zzuf: Update license field. * gnu/packages/debug.scm (zzuf)[license]: List as wtfpl2. --- 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 718a76310d..caf9d1f805 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 Eric Bavier -;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pkill -9 @@ -369,7 +369,7 @@ conditions.") (description "Zzuf is a transparent application input fuzzer. It works by intercepting file operations and changing random bits in the program's input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.") - (license (non-copyleft "http://www.wtfpl.net/txt/copying/")))) + (license wtfpl2))) (define-public scanmem (package -- cgit v1.2.3 From 113309e044ee3572c52851d9312d3a08de928e06 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Mar 2020 15:37:27 +0200 Subject: gnu: r-dt: Update license field. * gnu/packages/statistics.scm (r-dt)[license]: Add wtfpl2. --- 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 be6eb9f9ed..fd34639b5e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015 Vicente Vera Parra ;;; Copyright © 2016 Andreas Enge -;;; Copyright © 2016, 2017, 2019 Efraim Flashner +;;; Copyright © 2016, 2017, 2019, 2020 Efraim Flashner ;;; Copyright © 2016 Pjotr Prins ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016 Ben Woodcroft @@ -3166,7 +3166,7 @@ Shiny). The @code{DataTables} library has been included in this R package.") (license (list license:gpl3 license:expat license:asl2.0 - (license:non-copyleft "http://www.wtfpl.net/txt/copying/"))))) + license:wtfpl2)))) (define-public r-base64enc (package -- cgit v1.2.3 From 179be4bbe488d6c18d482da69b4997f7682d5a58 Mon Sep 17 00:00:00 2001 From: "pinoaffe@airmail.cc" Date: Sun, 22 Mar 2020 10:38:51 +0000 Subject: gnu: icestorm: Update to latest revision. * gnu/packages/fpga.scm (icestorm): Update to latest revision. Signed-off-by: Danny Milosavljevic --- gnu/packages/fpga.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index dca67ad3ca..5cfc9a96f6 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -212,8 +212,8 @@ For synthesis, the compiler generates netlists in the desired format.") (license license:isc))) (define-public icestorm - (let ((commit "c0cbae88ab47a3879aacf80d53b6a85710682a6b") - (revision "2")) + (let ((commit "0ec00d892a91cc68e45479b46161f649caea2933") + (revision "3")) (package (name "icestorm") (version (git-version "0.0" revision commit)) @@ -225,7 +225,7 @@ For synthesis, the compiler generates netlists in the desired format.") (file-name (git-file-name name version)) (sha256 (base32 - "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya")))) + "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no unit tests that don't need an FPGA exist. -- cgit v1.2.3 From 363989e6689068daeca81b442358b183b7d983d1 Mon Sep 17 00:00:00 2001 From: "pinoaffe@airmail.cc" Date: Sun, 22 Mar 2020 10:47:48 +0000 Subject: gnu: Add nextpnr-ice40. * gnu/packages/fpga.scm (nextpnr-ice40): New variable. Signed-off-by: Danny Milosavljevic --- gnu/packages/fpga.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 5cfc9a96f6..8f34ef8282 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -44,6 +44,9 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages gawk) #:use-module (gnu packages version-control) + #:use-module (gnu packages qt) + #:use-module (gnu packages boost) + #:use-module (gnu packages algebra) #:use-module (gnu packages libftdi)) (define-public abc @@ -256,6 +259,41 @@ For synthesis, the compiler generates netlists in the desired format.") Includes the actual FTDI connector.") (license license:isc)))) +(define-public nextpnr-ice40 + (let [(commit "c192ba261d77ad7f0a744fb90b01e4a5b63938c4") + (revision "0")] + (package + (name "nextpnr-ice40") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://github.com/YosysHQ/nextpnr") + (commit commit))) + (sha256 + (base32 + "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf")))) + (inputs + `(("qtbase" ,qtbase) + ("boost" ,boost-with-python3) + ("yosys" ,yosys) + ("eigen" ,eigen) + ("python" ,python) + ("icestorm" ,icestorm))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags `("-DARCH=ice40" + ,(string-append "-DICEBOX_ROOT=" + (assoc-ref %build-inputs "icestorm") + "/share/icebox")) + #:tests? #f)) + (synopsis "Place-and-Route tool for FPGAs") + (description "nextpnr aims to be a vendor neutral, timing driven, +FOSS FPGA place and route tool. ") + (home-page "https://github.com/YosysHQ/nextpnr") + (license license:expat)))) + (define-public arachne-pnr (let ((commit "840bdfdeb38809f9f6af4d89dd7b22959b176fdd") (revision "2")) -- cgit v1.2.3 From 99b23eabdbb660b46403649997c3ed41aeab95bb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Mar 2020 15:51:40 +0100 Subject: installer: Do not include the host (guix config). Previously, "locales.drv" would depend on the host's (guix config). Thus, the derivation would depend on details of the user's installation. * gnu/installer.scm (not-config?): New procedure. (build-compiled-file): Pass it to 'source-module-closure' and use 'make-config.scm'. --- gnu/installer.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/installer.scm b/gnu/installer.scm index 6c11fa6198..50f5b1aa77 100644 --- a/gnu/installer.scm +++ b/gnu/installer.scm @@ -61,6 +61,14 @@ (('guix 'build _ ...) #t) (_ #f))) +(define not-config? + ;; Select (guix …) and (gnu …) modules, except (guix config). + (match-lambda + (('guix 'config) #f) + (('guix _ ...) #t) + (('gnu _ ...) #t) + (_ #f))) + (define* (build-compiled-file name locale-builder) "Return a file-like object that evalutes the gexp LOCALE-BUILDER and store its result in the scheme file NAME. The derivation will also build a compiled @@ -75,8 +83,10 @@ version of this file." (define builder (with-extensions (list guile-json-3) - (with-imported-modules (source-module-closure - '((gnu installer locale))) + (with-imported-modules `(,@(source-module-closure + '((gnu installer locale)) + #:select? not-config?) + ((guix config) => ,(make-config.scm))) #~(begin (use-modules (gnu installer locale)) -- cgit v1.2.3 From 23b39478977bd0812f861e24324915d18979aa70 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Mar 2020 16:48:14 +0100 Subject: gnu: libchop: Build against libtirpc and related tools. * gnu/packages/backup.scm (libchop)[source]: Add 'modules' and 'snippet'. [arguments]: Add #:configure-flags; add 'set-libtirpc-include-path' phase. [native-inputs]: Add RPCSVC-PROTO. [inputs]: Add LIBTIRPC. --- gnu/packages/backup.scm | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index b18dbf30f0..4d24dff0a3 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages linux) #:use-module (gnu packages mcrypt) #:use-module (gnu packages nettle) + #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -470,10 +471,26 @@ rsnapshot uses hard links to deduplicate identical files.") (sha256 (base32 "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g")) - (patches (search-patches "diffutils-gets-undeclared.patch")))) + (patches (search-patches "diffutils-gets-undeclared.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Include all the libtirpc headers necessary to get the + ;; definitions of 'u_int', etc. + (substitute* '("src/block-server.c" + "include/chop/block-server.h" + "utils/chop-block-server.c") + (("#include " _ header) + (string-append "#include \n" + "#include \n" + "#include \n"))) + #t)))) (build-system gnu-build-system) (arguments - '(#:phases (modify-phases %standard-phases + '(;; Link against libtirpc. + #:configure-flags '("LDFLAGS=-ltirpc -Wl,--as-needed") + + #:phases (modify-phases %standard-phases (add-before 'configure 'adjust-configure-script (lambda _ ;; Mimic upstream commit @@ -483,6 +500,15 @@ rsnapshot uses hard links to deduplicate identical files.") (string-append "GUILE=" middle "--variable bindir`/guile"))) #t)) + (add-before 'build 'set-libtirpc-include-path + (lambda* (#:key inputs #:allow-other-keys) + ;; Allow & co. to be found. + (let ((libtirpc (assoc-ref inputs "libtirpc"))) + (setenv "CPATH" + (string-append (getenv "CPATH") + ":" libtirpc + "/include/tirpc")) + #t))) (add-before 'check 'skip-test (lambda _ ;; XXX: This test fails (1) because current GnuTLS no @@ -493,10 +519,12 @@ rsnapshot uses hard links to deduplicate identical files.") (native-inputs `(("guile" ,guile-2.0) ("gperf" ,gperf-3.0) ;see - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' (inputs `(("guile" ,guile-2.0) ("util-linux" ,util-linux) + ("libtirpc" ,libtirpc) ("gnutls" ,gnutls) ("tdb" ,tdb) ("bdb" ,bdb) -- cgit v1.2.3 From aaa8893715cd97aa8fdecab2180dac1fd0894070 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 22 Mar 2020 17:06:36 +0100 Subject: gnu: qbittorrent: Fix icons not showing in GUI. * gnu/packages/bittorrent.scm (qbittorrent)[arguments]: Add a wrap-qt phase. --- gnu/packages/bittorrent.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index fa63c49920..0f63c3d0f2 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -434,7 +434,18 @@ desktops.") (assoc-ref %build-inputs "boost") "/lib") "--enable-debug" - "QMAKE_LRELEASE=lrelease"))) + "QMAKE_LRELEASE=lrelease") + #:modules ((guix build gnu-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build qt-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qbittorrent") + #t))))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) -- cgit v1.2.3 From 9720894cc8d2534f746b24247341a4b8cb21f492 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sun, 22 Mar 2020 11:11:32 -0500 Subject: gnu: gnome-shell-extension-paperwm: Update to 36.0. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-paperwm): Update to 36.0. --- 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 d9d757e614..24a1dc256c 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -433,7 +433,7 @@ It uses ES6 syntax and claims to be more actively maintained than others.") (define-public gnome-shell-extension-paperwm (package (name "gnome-shell-extension-paperwm") - (version "34.3") + (version "36.0") (source (origin (method git-fetch) (uri (git-reference @@ -442,7 +442,7 @@ It uses ES6 syntax and claims to be more actively maintained than others.") (file-name (git-file-name name version)) (sha256 (base32 - "1qry75f696pgmd9yzqvwhq5h6cipin2fvk7h881g29cjcpxim37a")) + "1ssnabwxrns36c61ppspjkr9i3qifv08pf2jpwl7cjv3pvyn4kly")) (snippet '(begin (delete-file "schemas/gschemas.compiled"))))) (build-system copy-build-system) -- cgit v1.2.3 From e6a0cd9aa1f6acaafe89ecbcab5cd33fdad0a471 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 22 Mar 2020 19:03:52 +0100 Subject: gnu: electron-cash: Update to 4.0.13. This package was inheriting from electrum, but as now almost all the fields have differences, let's make these two packages independent from each other. * gnu/packages/finance.scm (electron-cash): Update to 4.0.13. [inputs]: Add libevent, openssl, python-cython, python-hidapi, python-keepkey, python-stem, python-trezor, qtsvg and zlib. [arguments]: Add a wrap-qt phase allowing qtsvg to be found at runtime to show SVG icons correctly. --- gnu/packages/finance.scm | 57 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0e44802fe1..af75722b74 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -451,9 +451,8 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package - (inherit electrum) (name "electron-cash") - (version "4.0.12") + (version "4.0.13") (source (origin (method git-fetch) @@ -462,22 +461,52 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0gidrx8499v7rig7ljhd70wssshs1qm0gp1553g70i323hcbf62x")))) + (base32 "1x9as1dn9n93vgyrixwvp9bh0aarr9vsfz5hdmw16j3wj3wj621f")))) + (build-system python-build-system) (inputs - `(,@(package-inputs electrum) + `(("libevent" ,libevent) ("libsecp256k1", libsecp256k1) + ("openssl" ,openssl) + ("python-cython" ,python-cython) ("python-dateutil", python-dateutil) - ("python-dnspython", python-dnspython))) + ("python-dnspython" ,python-dnspython) + ("python-ecdsa" ,python-ecdsa) + ("python-hidapi" ,python-hidapi) + ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix) + ("python-keepkey" ,python-keepkey) + ("python-protobuf" ,python-protobuf) + ("python-pyaes" ,python-pyaes) + ("python-pyqt" ,python-pyqt) + ("python-pysocks" ,python-pysocks) + ("python-qrcode" ,python-qrcode) + ("python-requests" ,python-requests) + ("python-stem" ,python-stem) + ("python-trezor" ,python-trezor) + ("qtsvg" ,qtsvg) + ("zlib" ,zlib))) (arguments - (substitute-keyword-arguments (package-arguments electrum) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'unpack 'use-libsecp256k1-input - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lib/secp256k1.py" - (("library_paths = .* 'libsecp256k1.so.0'.") - (string-append "library_paths = ('" (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))))))) + `(#:tests? #f ; No tests + #:modules ((guix build python-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%python-build-system-modules + (guix build qt-utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-home + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "setup.py" + (("~/.local/share") + (string-append (assoc-ref outputs "out") "/local/share"))))) + (add-after 'unpack 'use-libsecp256k1-input + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/secp256k1.py" + (("library_paths = .* 'libsecp256k1.so.0'.") + (string-append "library_paths = ('" (assoc-ref inputs "libsecp256k1") "/lib/libsecp256k1.so.0'"))))) + (add-after 'install 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "electron-cash") + #t))))) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") (description -- cgit v1.2.3 From c9164d3098a28e8b87f7ceaf8e389899198c6dd9 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 21 Mar 2020 17:57:30 -0400 Subject: gnu: Prefix licenses in (gnu packages debug). * gnu/packages/debug.scm: Add a license prefix. --- gnu/packages/debug.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index caf9d1f805..ad207bf707 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -22,7 +22,7 @@ (define-module (gnu packages debug) #:use-module (guix packages) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) @@ -96,7 +96,7 @@ isolate a small failure-inducing substring of a large input that causes your program to exhibit a bug.") ;; See License.txt, which is a bsd-3 license, despite the project's ;; home-page pointing to a bsd-2 license. - (license bsd-3))) + (license license:bsd-3))) (define-public c-reduce (package @@ -156,7 +156,7 @@ property of interest (such as triggering a compiler bug) and automatically produces a much smaller C/C++ program that has the same property. It is intended for use by people who discover and report bugs in compilers and other tools that process C/C++ code.") - (license ncsa))) + (license license:ncsa))) (define-public american-fuzzy-lop (let ((machine (match (or (%current-target-system) @@ -283,7 +283,7 @@ targeted binary. This substantially improves the functional coverage for the fuzzed code. The compact synthesized corpora produced by the tool are also useful for seeding other, more labor- or resource-intensive testing regimes down the road.") - (license asl2.0)))) + (license license:asl2.0)))) (define-public stress-make (let ((commit "9e92dff8f0157f012aaf31de5b8b8112ad720100") @@ -346,8 +346,8 @@ Stress Make, then it is likely that the @code{Makefile} contains no race conditions.") ;; stress-make wrapper is under BSD-3-modifications-must-be-indicated, ;; and patched GNU Make is under its own license. - (license (list (non-copyleft "LICENSE.md") - gpl3+))))) + (license (list (license:non-copyleft "LICENSE.md") + license:gpl3+))))) (define-public zzuf (package @@ -369,7 +369,7 @@ conditions.") (description "Zzuf is a transparent application input fuzzer. It works by intercepting file operations and changing random bits in the program's input. Zzuf's behaviour is deterministic, making it easy to reproduce bugs.") - (license wtfpl2))) + (license license:wtfpl2))) (define-public scanmem (package @@ -427,7 +427,7 @@ several different times. After several scans of the process, scanmem isolates the position of the variable and allows you to modify its value.") ;; The library is covered by LGPLv3 or later; the application is covered ;; by GPLv3 or later. - (license (list lgpl3+ gpl3+)))) + (license (list license:lgpl3+ license:gpl3+)))) (define-public rr (package @@ -490,4 +490,4 @@ execution of applications (trees of processes and threads). Debugging extends GDB with very efficient reverse-execution, which in combination with standard GDB/x86 features like hardware data watchpoints, makes debugging much more fun.") - (license expat))) + (license license:expat))) -- cgit v1.2.3 From 268efd97c255d75ac488c163ff1b8c66c6bcb2b6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 21 Mar 2020 18:13:08 -0400 Subject: gnu: Remove qemu-minimal-2.10. * gnu/packages/virtualization.scm (qemu-minimal-2.10): Remove variable. * gnu/packages/debug.scm (qemu-for-american-fuzzy-lop): New variable. (american-fuzzy-lop)[inputs]: Remove custom-qemu and add qemu-for-american-fuzzy-lop. [arguments]: Adjust reference to QEMU in the 'install-qemu' phase. --- gnu/packages/debug.scm | 216 +++++++++++++++++++++++++++++----------- gnu/packages/virtualization.scm | 28 ------ 2 files changed, 160 insertions(+), 84 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index ad207bf707..75dd94d868 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -28,16 +28,23 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (gnu packages) + #:use-module (gnu packages attr) #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages code) + #:use-module (gnu packages compression) #:use-module (gnu packages flex) #:use-module (gnu packages gdb) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages golang) + #:use-module (gnu packages image) + #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages ncurses) #:use-module (gnu packages ninja) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -47,6 +54,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages serialization) #:use-module (gnu packages virtualization) + #:use-module (gnu packages xdisorg) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) @@ -183,61 +191,7 @@ tools that process C/C++ code.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (inputs - `(("custom-qemu" - ;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied. - ,(package (inherit qemu-minimal-2.10) - (name "afl-qemu") - (inputs - `(("afl-src" ,source) - ,@(package-inputs qemu-minimal))) - ;; afl only supports using a single afl-qemu-trace executable, so - ;; we only build qemu for the native target. - (arguments - `(#:modules ((srfi srfi-1) - ,@%gnu-build-system-modules) - ,@(substitute-keyword-arguments (package-arguments qemu-minimal) - ((#:configure-flags config-flags) - ``(,(string-append "--target-list=" ,machine "-linux-user") - ,@(remove (λ (f) (string-prefix? "--target-list=" f)) - ,config-flags))) - ((#:phases qemu-phases) - `(modify-phases ,qemu-phases - (add-after - 'unpack 'apply-afl-patches - (lambda* (#:key inputs #:allow-other-keys) - (let* ((afl-src (assoc-ref inputs "afl-src")) - (patch-dir "qemu_mode/patches")) - (copy-recursively (string-append afl-src "/" - patch-dir) - patch-dir) - (install-file - (string-append patch-dir - "/afl-qemu-cpu-inl.h") - ".") - (copy-file (string-append afl-src "/config.h") - "./afl-config.h") - (install-file (string-append afl-src "/types.h") - ".") - (substitute* "afl-qemu-cpu-inl.h" - (("\\.\\./\\.\\./config.h") "afl-config.h")) - (substitute* (string-append patch-dir - "/cpu-exec.diff") - (("\\.\\./patches/") "")) - - ;; These were already applied to qemu-minimal-2.10. - (for-each (lambda (obsolete-patch) - (delete-file (string-append - patch-dir "/" - obsolete-patch))) - (list "configure.diff" - "memfd.diff")) - - (for-each (lambda (patch-file) - (invoke "patch" "--force" "-p1" - "--input" patch-file)) - (find-files patch-dir - "\\.diff$")) - #t)))))))))))) + `(("qemu" ,qemu-for-american-fuzzy-lop))) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "DOC_PATH=$(PREFIX)/share/doc/" @@ -267,7 +221,7 @@ tools that process C/C++ code.") ;; TODO: Build and install the afl-llvm tool. 'install 'install-qemu (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((qemu (assoc-ref inputs "custom-qemu")) + (let ((qemu (assoc-ref inputs "qemu")) (out (assoc-ref outputs "out"))) (symlink (string-append qemu "/bin/qemu-" ,machine) (string-append out "/bin/afl-qemu-trace")) @@ -285,6 +239,156 @@ useful for seeding other, more labor- or resource-intensive testing regimes down the road.") (license license:asl2.0)))) +(define-public qemu-for-american-fuzzy-lop + ;; afl only supports using a single afl-qemu-trace executable, so + ;; we only build qemu for the native target. + (let ((machine (match (or (%current-target-system) + (%current-system)) + ("x86_64-linux" "x86_64") + ("i686-linux" "i386") + ("aarch64-linux" "aarch64") + ("armhf-linux" "arm") + ("mips64el-linux" "mips64el") + ;; Prevent errors when querying this package on unsupported + ;; platforms, e.g. when running "guix package --search=" + (_ "UNSUPPORTED")))) + (hidden-package + (package + (name "qemu") + (version "2.10.2") + (source (origin + (method url-fetch) + (uri (string-append "https://download.qemu.org/qemu-" + version ".tar.xz")) + (sha256 + (base32 + "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) + (patches + (search-patches "qemu-glibc-2.27.patch")))) + (build-system gnu-build-system) + (arguments + `(;; Running tests in parallel can occasionally lead to failures, like: + ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) + #:parallel-tests? #f + #:configure-flags + (list (string-append "--target-list=" ,machine "-linux-user")) + #:make-flags '("V=1") + #:phases + (modify-phases %standard-phases + (replace 'configure + (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/libqtest.c" + (("/bin/sh") (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))))) + (add-after + 'unpack 'apply-afl-patches + (lambda* (#:key inputs #:allow-other-keys) + (let* ((afl-src (assoc-ref inputs "afl-source")) + (patch-dir "qemu_mode/patches")) + (copy-recursively (string-append afl-src "/" + patch-dir) + patch-dir) + (install-file + (string-append patch-dir + "/afl-qemu-cpu-inl.h") + ".") + (copy-file (string-append afl-src "/config.h") + "./afl-config.h") + (install-file (string-append afl-src "/types.h") + ".") + (substitute* "afl-qemu-cpu-inl.h" + (("\\.\\./\\.\\./config.h") "afl-config.h")) + (substitute* (string-append patch-dir + "/cpu-exec.diff") + (("\\.\\./patches/") "")) + + ;; These were already applied to qemu-minimal-2.10. + (for-each (lambda (obsolete-patch) + (delete-file (string-append + patch-dir "/" + obsolete-patch))) + (list "configure.diff" + "memfd.diff")) + + (for-each (lambda (patch-file) + (invoke "patch" "--force" "-p1" + "--input" patch-file)) + (find-files patch-dir + "\\.diff$")) + #t))) + (add-before 'check 'disable-unusable-tests + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "tests/Makefile.include" + ;; Comment out the test-qga test, which needs /sys and + ;; fails within the build environment. + (("check-unit-.* tests/test-qga" all) + (string-append "# " all))) + (substitute* "tests/Makefile.include" + ;; Comment out the test-char test, which needs networking and + ;; fails within the build environment. + (("check-unit-.* tests/test-char" all) + (string-append "# " all))) + #t))))) + (native-inputs + `(("python-2" ,python-2) ; QEMU 2 needs Python 2 + ("glib:bin" ,glib "bin") + ("perl" ,perl) + ("flex" ,flex) + ("bison" ,bison) + ("pkg-config" ,pkg-config))) + (inputs + `(("afl-source" ,(package-source american-fuzzy-lop)) + ("alsa-lib" ,alsa-lib) + ("attr" ,attr) + ("glib" ,glib) + ("libaio" ,libaio) + ("libattr" ,attr) + ("libcap" ,libcap) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("ncurses" ,ncurses) + ("pixman" ,pixman) + ("util-linux" ,util-linux) + ("zlib" ,zlib))) + (home-page "https://www.qemu.org") + (synopsis "Machine emulator and virtualizer (without GUI) for american fuzzy lop") + (description + "QEMU is a generic machine emulator and virtualizer. This package +of QEMU is used only by the american fuzzy lop package. + +When used as a machine emulator, QEMU can run OSes and programs made for one +machine (e.g. an ARM board) on a different machine---e.g., your own PC. By +using dynamic translation, it achieves very good performance. + +When used as a virtualizer, QEMU achieves near native performances by +executing the guest code directly on the host CPU. QEMU supports +virtualization when executing under the Xen hypervisor or using +the KVM kernel module in Linux. When using KVM, QEMU can virtualize x86, +server and embedded PowerPC, and S390 guests.") + ;; Many files are GPLv2+, but some are GPLv2-only---e.g., `memory.c'. + (license license:gpl2) + ;; Several tests fail on MIPS. + (supported-systems (delete "mips64el-linux" %supported-systems)))))) + (define-public stress-make (let ((commit "9e92dff8f0157f012aaf31de5b8b8112ad720100") (revision "1")) ;No official source distribution diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 03f0ceaeee..b7e2c415fe 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -284,34 +284,6 @@ server and embedded PowerPC, and S390 guests.") '("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+" "usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2"))))) -;; The GRUB test suite fails with later versions of Qemu, so we -;; keep it at 2.10 for now. See -;; . -;; This package is hidden since we do not backport updates to it. -(define-public qemu-minimal-2.10 - (hidden-package - (package - (inherit qemu-minimal) - (version "2.10.2") - (source (origin - (method url-fetch) - (uri (string-append "https://download.qemu.org/qemu-" - version ".tar.xz")) - (sha256 - (base32 - "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw")) - (patches - (search-patches "qemu-glibc-2.27.patch")))) - ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary. - (native-inputs `(("python-2" ,python-2) - ,@(fold alist-delete (package-native-inputs qemu-minimal) - '("python-wrapper" "python-sphinx")))) - (inputs - (fold alist-delete (package-inputs qemu-minimal) - ;; Disable seccomp support, because it's not required for the GRUB - ;; test suite, and because it fails with libseccomp 2.4.2 and later. - '("libseccomp")))))) - (define-public libosinfo (package (name "libosinfo") -- cgit v1.2.3 From d4842a7c478230b7c12e65d04106db1e14c98cac Mon Sep 17 00:00:00 2001 From: Alexandru-Sergiu Marton Date: Sun, 22 Mar 2020 21:21:29 +0200 Subject: gnu: i3-gaps: Update to 4.18. * gnu/packages/wm.scm (i3-gaps): Update to 1.18. Signed-off-by: Leo Famulari --- 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 7fee167185..25ec278e2c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2019 Evan Straw ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2019 Noodles! -;;; Copyright © 2019 Alexandru-Sergiu Marton +;;; Copyright © 2019, 2020 Alexandru-Sergiu Marton ;;; Copyright © 2020 Nicolas Goaziou ;;; Copyright © 2020 Brice Waegeneire ;;; @@ -338,7 +338,7 @@ many programming languages.") (define-public i3-gaps (package (inherit i3-wm) (name "i3-gaps") - (version "4.17.1") + (version "4.18") (source (origin (method url-fetch) (uri (string-append @@ -346,7 +346,7 @@ many programming languages.") version "/i3-" version ".tar.bz2")) (sha256 (base32 - "0gqcr6s53dk3f2y9h6cna00rnwnh4yymk96li7lbym3d84cxjzrs")))) + "0id4qm9a7kc5yawff85blmph4zbizhb6ka88aqm10wrpfsknri3j")))) (home-page "https://github.com/Airblader/i3") (synopsis "Tiling window manager with gaps") (description "i3-gaps is a fork of i3wm, a tiling window manager -- cgit v1.2.3 From ae5c4a92923b2adeebd9d2b6d89976e73cfcfc7a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 22 Mar 2020 21:58:03 +0100 Subject: services: console-font: Fix docstring. * gnu/services/base.scm (console-font-service-type): Use quasiquote and unquote appropriately in docstring. --- gnu/services/base.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 669a03b041..8d9a563e2b 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -817,13 +817,13 @@ tty/font pairs. The font can be the name of a font provided by the @code{kbd} package or any valid argument to @command{setfont}, as in this example: @example -'((\"tty1\" . \"LatGrkCyr-8x16\") - (\"tty2\" . (file-append - font-tamzen - \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\")) - (\"tty3\" . (file-append - font-terminus - \"/share/consolefonts/ter-132n\"))) ; for HDPI +`((\"tty1\" . \"LatGrkCyr-8x16\") + (\"tty2\" . ,(file-append + font-tamzen + \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\")) + (\"tty3\" . ,(file-append + font-terminus + \"/share/consolefonts/ter-132n\"))) ; for HDPI @end example\n"))) (define* (console-font-service tty #:optional (font "LatGrkCyr-8x16")) -- cgit v1.2.3 From 6607aad53cce018e55fc26fc643978389132eddb Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sun, 22 Mar 2020 19:01:02 -0400 Subject: gnu: wxmaxima: Update to 20.03.1. * gnu/packages/maths.scm (wxmaxima): Update to 20.03.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index df4971aad8..51dcc1b1ee 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3030,7 +3030,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "20.02.4") + (version "20.03.1") (source (origin (method git-fetch) @@ -3039,7 +3039,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "106a7jrjwfmymzj70nsv44fm3jbxngr8pmkaghhpwy0ln38lhf54")))) + (base32 "09ciip0wkahps5jdsqqr72bwjrd15bacw38zp23v3hm71xfk8hky")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From 155f9afde5ce7f1aa72ee0e889d1f9d432896c41 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 12:09:25 -0400 Subject: gnu: emacs: Remove obsolete FIXME comment. * gnu/packages/aux-files/emacs/guix-emacs.el: Remove comment. --- gnu/packages/aux-files/emacs/guix-emacs.el | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/aux-files/emacs/guix-emacs.el b/gnu/packages/aux-files/emacs/guix-emacs.el index 25a87ee52d..ca9146c535 100644 --- a/gnu/packages/aux-files/emacs/guix-emacs.el +++ b/gnu/packages/aux-files/emacs/guix-emacs.el @@ -45,8 +45,6 @@ The files in the list do not have extensions (.el, .elc)." 'Autoload' means to load the 'autoloads' files matching `guix-emacs-autoloads-regexp'." - ;; FIXME: The autoloads generated by the emacs-build-system are not byte - ;; compiled. (interactive) (let* ((emacs-non-core-load-path-directories ;; Filter out core Elisp directories, which are already autoloaded -- cgit v1.2.3 From d0a64567f1218bec0de98e685c1e610e4a32038c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 12:10:26 -0400 Subject: Revert "gnu: emacs: Byte compile the site-lisp directory." This reverts commit 4714d0fc1a96eb6d421b64b0b585fe8043dcd07b. Rational: Having to rebuild Emacs every time (guix build emacs-utils) changes is not great. --- gnu/packages/emacs.scm | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fd9c7fa875..794cbca38d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -129,11 +129,6 @@ `(#:tests? #f ; no check target #:configure-flags (list "--with-modules" "--disable-build-details") - #:modules ((guix build emacs-utils) - (guix build glib-or-gtk-build-system) - (guix build utils)) - #:imported-modules ((guix build emacs-utils) - ,@%glib-or-gtk-build-system-modules) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-/bin/pwd @@ -148,8 +143,7 @@ ;; Elisp packages found in EMACSLOADPATH. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp-dir (string-append out "/share/emacs/site-lisp")) - (emacs (string-append out "/bin/emacs"))) + (lisp-dir (string-append out "/share/emacs/site-lisp"))) (copy-file (assoc-ref inputs "guix-emacs.el") (string-append lisp-dir "/guix-emacs.el")) (with-output-to-file (string-append lisp-dir "/site-start.el") @@ -162,9 +156,6 @@ ;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; which leads to conflicts. (delete-file (string-append lisp-dir "/subdirs.el")) - ;; Byte compile the site-start files. - (parameterize ((%emacs emacs)) - (emacs-byte-compile-directory lisp-dir)) #t)))))) (inputs `(("gnutls" ,gnutls) @@ -333,12 +324,6 @@ languages.") (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) - ((#:imported-modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) ((#:phases phases) `(modify-phases ,phases (delete 'install-site-start))) @@ -358,12 +343,6 @@ editor (with xwidgets support)") (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) - ((#:imported-modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) ((#:configure-flags flags ''()) `(cons "--with-xwidgets" ,flags)))) (inputs @@ -377,14 +356,6 @@ editor (with xwidgets support)") (synopsis "The extensible, customizable, self-documenting text editor (console only)") (build-system gnu-build-system) - (arguments - (substitute-keyword-arguments (package-arguments emacs) - ((#:modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) - ((#:imported-modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)))) (inputs (fold alist-delete (package-inputs emacs) '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" @@ -403,15 +374,9 @@ editor (without an X toolkit)" ) (inputs (append `(("inotify-tools" ,inotify-tools)) (alist-delete "gtk+" (package-inputs emacs)))) (arguments - (substitute-keyword-arguments (package-arguments emacs) - ((#:modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) - ((#:imported-modules _) - `((guix build emacs-utils) - ,@%gnu-build-system-modules)) - ((#:configure-flags cf) - `(cons "--with-x-toolkit=no" ,cf)))))) + `(,@(substitute-keyword-arguments (package-arguments emacs) + ((#:configure-flags cf) + `(cons "--with-x-toolkit=no" ,cf))))))) (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") -- cgit v1.2.3 From ffaec30702f392a50cbd6d3ba229506b5a38e207 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 12:40:25 -0400 Subject: gnu: emacs: Byte compile the site-lisp directory, without coupling. This re-instates what the previously reverted commit did, but without adding a dependency on the (guix build emacs-utils) module. * gnu/packages/emacs.scm (emacs)[phases]{install-site-start}: Define a EMACS-BYTE-COMPILE-DIRECTORY procedure, and use it. --- gnu/packages/emacs.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 794cbca38d..ec5e6687fd 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 ng0 ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017, 2019 Maxim Cournoyer +;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017 Jan Nieuwenhuizen @@ -143,7 +143,18 @@ ;; Elisp packages found in EMACSLOADPATH. (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (lisp-dir (string-append out "/share/emacs/site-lisp"))) + (lisp-dir (string-append out "/share/emacs/site-lisp")) + (emacs (string-append out "/bin/emacs"))) + + ;; This is duplicated from emacs-utils to prevent coupling. + (define* (emacs-byte-compile-directory dir) + (let ((expr `(progn + (setq byte-compile-debug t) + (byte-recompile-directory + (file-name-as-directory ,dir) 0 1)))) + (invoke emacs "--quick" "--batch" + (format "--eval=~s" expr)))) + (copy-file (assoc-ref inputs "guix-emacs.el") (string-append lisp-dir "/guix-emacs.el")) (with-output-to-file (string-append lisp-dir "/site-start.el") @@ -156,7 +167,8 @@ ;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; which leads to conflicts. (delete-file (string-append lisp-dir "/subdirs.el")) - #t)))))) + ;; Byte compile the site-start files. + (emacs-byte-compile-directory lisp-dir))))))) (inputs `(("gnutls" ,gnutls) ("ncurses" ,ncurses) -- cgit v1.2.3 From 3bd3a6257f33901ca66183b17f03f1dc6a059067 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 12:44:24 -0400 Subject: gnu: emacs: Re-indent. * gnu/packages/emacs.scm (emacs): Fix indentation. --- gnu/packages/emacs.scm | 92 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ec5e6687fd..cf84af950d 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -76,54 +76,54 @@ (name "emacs") (version "26.3") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/emacs/emacs-" - version ".tar.xz")) - (sha256 - (base32 - "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d")) - (patches (search-patches "emacs-exec-path.patch" - "emacs-fix-scheme-indent-function.patch" - "emacs-source-date-epoch.patch")) - (modules '((guix build utils))) - (snippet - '(with-directory-excursion "lisp" - ;; Delete the bundled byte-compiled elisp files and generated - ;; autoloads. - (for-each delete-file - (append (find-files "." "\\.elc$") - (find-files "." "loaddefs\\.el$") - ;; This is the only "autoloads" file that - ;; does not have "*loaddefs.el" name. - ;; TODO: Next time changing this package, - ;; replace the following with a call to - ;; `find-files', so that `delete-file' - ;; wouldn't error out when the file is - ;; missing, making the entire snippet field - ;; reusable as-is for `emacs-next' below. - '("eshell/esh-groups.el"))) + (method url-fetch) + (uri (string-append "mirror://gnu/emacs/emacs-" + version ".tar.xz")) + (sha256 + (base32 + "119ldpk7sgn9jlpyngv5y4z3i7bb8q3xp4p0qqi7i5nq39syd42d")) + (patches (search-patches "emacs-exec-path.patch" + "emacs-fix-scheme-indent-function.patch" + "emacs-source-date-epoch.patch")) + (modules '((guix build utils))) + (snippet + '(with-directory-excursion "lisp" + ;; Delete the bundled byte-compiled elisp files and generated + ;; autoloads. + (for-each delete-file + (append (find-files "." "\\.elc$") + (find-files "." "loaddefs\\.el$") + ;; This is the only "autoloads" file that + ;; does not have "*loaddefs.el" name. + ;; TODO: Next time changing this package, + ;; replace the following with a call to + ;; `find-files', so that `delete-file' + ;; wouldn't error out when the file is + ;; missing, making the entire snippet field + ;; reusable as-is for `emacs-next' below. + '("eshell/esh-groups.el"))) - ;; Make sure Tramp looks for binaries in the right places on - ;; remote Guix System machines, where 'getconf PATH' returns - ;; something bogus. - (substitute* "net/tramp-sh.el" - ;; Patch the line after "(defcustom tramp-remote-path". - (("\\(tramp-default-remote-path") - (format #f "(tramp-default-remote-path ~s ~s ~s ~s " - "~/.guix-profile/bin" "~/.guix-profile/sbin" - "/run/current-system/profile/bin" - "/run/current-system/profile/sbin"))) + ;; Make sure Tramp looks for binaries in the right places on + ;; remote Guix System machines, where 'getconf PATH' returns + ;; something bogus. + (substitute* "net/tramp-sh.el" + ;; Patch the line after "(defcustom tramp-remote-path". + (("\\(tramp-default-remote-path") + (format #f "(tramp-default-remote-path ~s ~s ~s ~s " + "~/.guix-profile/bin" "~/.guix-profile/sbin" + "/run/current-system/profile/bin" + "/run/current-system/profile/sbin"))) - ;; Make sure Man looks for C header files in the right - ;; places. - (substitute* "man.el" - (("\"/usr/local/include\"" line) - (string-join - (list line - "\"~/.guix-profile/include\"" - "\"/var/guix/profiles/system/profile/include\"") - " "))) - #t)))) + ;; Make sure Man looks for C header files in the right + ;; places. + (substitute* "man.el" + (("\"/usr/local/include\"" line) + (string-join + (list line + "\"~/.guix-profile/include\"" + "\"/var/guix/profiles/system/profile/include\"") + " "))) + #t)))) (build-system glib-or-gtk-build-system) (arguments `(#:tests? #f ; no check target -- cgit v1.2.3 From 393c5e69281d997b345362626d7ffb988ab862f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 12:46:39 -0400 Subject: gnu: emacs-minimal: Install the custom site-start file. This makes the EMACS-MINIMAL package more generally useful, by adding support to load autoload definitions. Note that this doesn't negatively impact the performance of the emacs-build-system, because at that time the --quick option is used, which disables loading site-start.el (which is the one calling GUIX-EMACS-AUTOLOAD-PACKAGES). * gnu/packages/emacs.scm (emacs-minimal)[phases]: Do not delete the 'install-site-start phase. [inputs]: Add the emacs/guix-emacs.el auxiliary file. --- gnu/packages/emacs.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index cf84af950d..3be3ff0188 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -336,13 +336,11 @@ languages.") (build-system gnu-build-system) (arguments (substitute-keyword-arguments (package-arguments emacs) - ((#:phases phases) - `(modify-phases ,phases - (delete 'install-site-start))) ((#:configure-flags flags ''()) `(list "--with-gnutls=no" "--disable-build-details")))) (inputs - `(("ncurses" ,ncurses))) + `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) + ("ncurses" ,ncurses))) (native-inputs `(("pkg-config" ,pkg-config))))) -- cgit v1.2.3 From 4cbd60698daf648979fe8ad924602e87dcdefde1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 21 Mar 2020 23:16:08 -0400 Subject: gnu: emacs: Patch references to /bin/sh. When attempting to run ert-runner in the build side environment where /bin/sh doesn't exist as part of the emacs-elpy test suite, Emacs was throwing the error "Searching for program: No such file or directory, /bin/sh". This is because the default shell when SHELL is not set was "/bin/sh", as can be seen in callproc.c: sh = getenv ("SHELL"); Vshell_file_name = build_string (sh ? sh : "/bin/sh"); Thus, patch the occurrences of "/bin/sh" in the source files of Emacs to refer to their correct store location. * gnu/packages/emacs.scm (emacs)[phases]{patch-program-file-names}: Add phase. --- gnu/packages/emacs.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 3be3ff0188..de19998a41 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -131,6 +131,16 @@ "--disable-build-details") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-program-file-names + (lambda _ + (substitute* '("src/callproc.c" + "lisp/term.el" + "lisp/htmlfontify.el" + "lisp/textmodes/artist.el" + "lisp/progmodes/sh-script.el") + (("\"/bin/sh\"") + (format "~s" (which "sh")))) + #t)) (add-before 'configure 'fix-/bin/pwd (lambda _ ;; Use `pwd', not `/bin/pwd'. -- cgit v1.2.3 From 4ef89d884db8dae3aa300e36a3ad89def374e012 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 07:23:15 -0400 Subject: gnu: emacs-elpy: Update to 1.32.0. * gnu/packages/emacs-xyz.scm (emacs-elpy): Update to 1.32.0. [phases]{fake-virtualenv}: Rename to 'do-not-use-virtualenv. Use the new ELPY_TEST_DONT_USE_VIRTUALENV environment variable to skip tests using virtualenv, and set the elpy-rpc-virtualenv-path default value to 'system so that a virtualenv is not needed. [native-inputs]: Move the Python dependencies to... [propagated] ...here. This is so that Elpy doesn't nag users with fetching those from PyPI. Add python-rope. Fixes . Reported-by: sirgazil --- gnu/packages/emacs-xyz.scm | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1ea3155807..fe2210ac79 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6690,7 +6690,7 @@ indentation guides in Emacs: (define-public emacs-elpy (package (name "emacs-elpy") - (version "1.31.0") + (version "1.32.0") (source (origin (method git-fetch) (uri (git-reference @@ -6699,20 +6699,20 @@ indentation guides in Emacs: (file-name (git-file-name name version)) (sha256 (base32 - "0bvmgqs3c80bhs9v5ymgadv7vk4iamha10y7rl09pixmjm4mzagk")))) + "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj")))) (build-system emacs-build-system) (arguments `(#:include (cons* "^elpy/[^/]+\\.py$" "^snippets\\/" %default-include) #:phases - ;; TODO: Make `elpy-config' display Guix commands :) (modify-phases %standard-phases - ;; One elpy test depends on being run inside a Python virtual - ;; environment to pass. We have nothing to gain from doing so here, - ;; so we just trick Elpy into thinking we are (see: - ;; https://github.com/jorgenschaefer/elpy/pull/1293). - (add-before 'check 'fake-virtualenv + ;; 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 (lambda _ - (setenv "VIRTUAL_ENV" "/tmp") + (setenv "ELPY_TEST_DONT_USE_VIRTUALENV" "1") + (substitute* "elpy-rpc.el" + (("defcustom elpy-rpc-virtualenv-path 'default") + "defcustom elpy-rpc-virtualenv-path 'system")) #t)) (add-before 'check 'build-doc (lambda _ @@ -6738,16 +6738,20 @@ indentation guides in Emacs: ("emacs-highlight-indentation" ,emacs-highlight-indentation) ("emacs-yasnippet" ,emacs-yasnippet) ("pyvenv" ,emacs-pyvenv) - ("s" ,emacs-s))) - (native-inputs - `(("ert-runner" ,emacs-ert-runner) - ("emacs-f" ,emacs-f) - ("python" ,python-wrapper) + ("s" ,emacs-s) + ;; The following are recommended Python dependencies that make Elpy + ;; much more useful. Installing these avoids Elpy prompting to install them + ;; from PyPI using pip. ("python-autopep8" ,python-autopep8) ("python-black" ,python-black) ("python-flake8" ,python-flake8) ("python-jedi" ,python-jedi) - ("python-yapf" ,python-yapf) + ("python-rope" ,python-rope) + ("python-yapf" ,python-yapf))) + (native-inputs + `(("ert-runner" ,emacs-ert-runner) + ("emacs-f" ,emacs-f) + ("python" ,python-wrapper) ;; For documentation. ("python-sphinx" ,python-sphinx) ("texinfo" ,texinfo))) -- cgit v1.2.3 From 37f8c50cdc2e99189c74999319f3a1854d419546 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 23 Mar 2020 02:42:56 +0000 Subject: gnu: linux-libre-arm-veyron: Deprecate package. * gnu/packages/linux (linux-libre-arm-veyron): Mark as deprecated package. (kernel-config-veyron): Remove obsolete function. * gnu/system/examples/asus-c201.tmpl: Update to use linux-libre-arm-generic. * gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf: Delete file. * Makefile.am (AUX_FILES): Update accordingly. --- Makefile.am | 1 - .../aux-files/linux-libre/5.4-arm-veyron.conf | 5040 -------------------- gnu/packages/linux.scm | 15 +- gnu/system/examples/asus-c201.tmpl | 2 +- 4 files changed, 2 insertions(+), 5056 deletions(-) delete mode 100644 gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf (limited to 'gnu') diff --git a/Makefile.am b/Makefile.am index d5829f3633..344ecdbc42 100644 --- a/Makefile.am +++ b/Makefile.am @@ -322,7 +322,6 @@ AUX_FILES = \ gnu/packages/aux-files/chromium/master-preferences.json \ gnu/packages/aux-files/emacs/guix-emacs.el \ gnu/packages/aux-files/linux-libre/5.4-arm.conf \ - gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf \ gnu/packages/aux-files/linux-libre/5.4-arm64.conf \ gnu/packages/aux-files/linux-libre/5.4-i686.conf \ gnu/packages/aux-files/linux-libre/5.4-x86_64.conf \ diff --git a/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf b/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf deleted file mode 100644 index 7d827afb2e..0000000000 --- a/gnu/packages/aux-files/linux-libre/5.4-arm-veyron.conf +++ /dev/null @@ -1,5040 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Linux/arm 5.4.5 Kernel Configuration -# - -# -# Compiler: gcc (GCC) 7.4.0 -# -CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=70400 -CONFIG_CLANG_VERSION=0 -CONFIG_CC_CAN_LINK=y -CONFIG_CC_HAS_ASM_GOTO=y -CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y -CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y -CONFIG_IRQ_WORK=y -CONFIG_BUILDTIME_EXTABLE_SORT=y - -# -# General setup -# -CONFIG_INIT_ENV_ARG_LIMIT=32 -# CONFIG_COMPILE_TEST is not set -# CONFIG_HEADER_TEST is not set -CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set -CONFIG_BUILD_SALT="" -CONFIG_HAVE_KERNEL_GZIP=y -CONFIG_HAVE_KERNEL_LZMA=y -CONFIG_HAVE_KERNEL_XZ=y -CONFIG_HAVE_KERNEL_LZO=y -CONFIG_HAVE_KERNEL_LZ4=y -# CONFIG_KERNEL_GZIP is not set -# CONFIG_KERNEL_LZMA is not set -CONFIG_KERNEL_XZ=y -# CONFIG_KERNEL_LZO is not set -# CONFIG_KERNEL_LZ4 is not set -CONFIG_DEFAULT_HOSTNAME="debsus" -CONFIG_SWAP=y -CONFIG_SYSVIPC=y -CONFIG_SYSVIPC_SYSCTL=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_CROSS_MEMORY_ATTACH=y -# CONFIG_USELIB is not set -# CONFIG_AUDIT is not set -CONFIG_HAVE_ARCH_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_HARDIRQS_SW_RESEND=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=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_ARCH_CLOCKSOURCE_DATA=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y - -# -# Timers subsystem -# -CONFIG_TICK_ONESHOT=y -CONFIG_NO_HZ_COMMON=y -# CONFIG_HZ_PERIODIC is not set -CONFIG_NO_HZ_IDLE=y -# CONFIG_NO_HZ_FULL is not set -CONFIG_NO_HZ=y -CONFIG_HIGH_RES_TIMERS=y -# end of Timers subsystem - -# CONFIG_PREEMPT_NONE is not set -# CONFIG_PREEMPT_VOLUNTARY is not set -CONFIG_PREEMPT=y -CONFIG_PREEMPT_COUNT=y -CONFIG_PREEMPTION=y - -# -# CPU/Task time and stats accounting -# -CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set -# CONFIG_IRQ_TIME_ACCOUNTING is not set -# CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_TASKSTATS is not set -# CONFIG_PSI is not set -# end of CPU/Task time and stats accounting - -CONFIG_CPU_ISOLATION=y - -# -# RCU Subsystem -# -CONFIG_PREEMPT_RCU=y -# CONFIG_RCU_EXPERT is not set -CONFIG_SRCU=y -CONFIG_TREE_SRCU=y -CONFIG_TASKS_RCU=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RCU_NEED_SEGCBLIST=y -# end of RCU Subsystem - -# 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 -# -# end of Scheduler features - -CONFIG_CGROUPS=y -CONFIG_PAGE_COUNTER=y -CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y -CONFIG_BLK_CGROUP=y -CONFIG_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=y -# CONFIG_CGROUP_DEBUG is not set -CONFIG_SOCK_CGROUP_DATA=y -CONFIG_NAMESPACES=y -CONFIG_UTS_NS=y -CONFIG_IPC_NS=y -CONFIG_USER_NS=y -CONFIG_PID_NS=y -CONFIG_NET_NS=y -# CONFIG_CHECKPOINT_RESTORE is not set -CONFIG_SCHED_AUTOGROUP=y -# CONFIG_SYSFS_DEPRECATED is not set -CONFIG_RELAY=y -CONFIG_BLK_DEV_INITRD=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_RD_GZIP=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y -CONFIG_RD_LZ4=y -# CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE is not set -CONFIG_CC_OPTIMIZE_FOR_SIZE=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=y -# CONFIG_SYSCTL_SYSCALL is not set -CONFIG_FHANDLE=y -CONFIG_POSIX_TIMERS=y -CONFIG_PRINTK=y -CONFIG_PRINTK_NMI=y -CONFIG_BUG=y -CONFIG_ELF_CORE=y -CONFIG_BASE_FULL=y -CONFIG_FUTEX=y -CONFIG_FUTEX_PI=y -CONFIG_EPOLL=y -CONFIG_SIGNALFD=y -CONFIG_TIMERFD=y -CONFIG_EVENTFD=y -CONFIG_SHMEM=y -CONFIG_AIO=y -CONFIG_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_SYSCALL=y -# CONFIG_BPF_JIT_ALWAYS_ON is not set -CONFIG_USERFAULTFD=y -CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y -CONFIG_RSEQ=y -# CONFIG_DEBUG_RSEQ is not set -CONFIG_EMBEDDED=y -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_SLUB_DEBUG is not set -# 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 is not set -# CONFIG_SLAB_FREELIST_HARDENED is not set -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_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_STACKTRACE_SUPPORT=y -CONFIG_LOCKDEP_SUPPORT=y -CONFIG_TRACE_IRQFLAGS_SUPPORT=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_ARM_PATCH_PHYS_VIRT=y -CONFIG_GENERIC_BUG=y -CONFIG_PGTABLE_LEVELS=3 - -# -# System Type -# -CONFIG_MMU=y -CONFIG_ARCH_MMAP_RND_BITS_MIN=8 -CONFIG_ARCH_MMAP_RND_BITS_MAX=16 -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_EBSA110 is not set -# CONFIG_ARCH_EP93XX is not set -# CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_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 is not set -# 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_AXXIA is not set -# CONFIG_ARCH_BCM is not set -# CONFIG_ARCH_BERLIN is not set -# CONFIG_ARCH_DIGICOLOR is not set -# CONFIG_ARCH_EXYNOS is not set -# CONFIG_ARCH_HIGHBANK is not set -# CONFIG_ARCH_HISI is not set -# CONFIG_ARCH_MXC 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_MVEBU is not set -# CONFIG_ARCH_NPCM is not set - -# -# TI OMAP/AM/DM/DRA Family -# -# CONFIG_ARCH_OMAP3 is not set -# CONFIG_ARCH_OMAP4 is not set -# CONFIG_SOC_OMAP5 is not set -# CONFIG_SOC_AM33XX is not set -# CONFIG_SOC_AM43XX is not set -# CONFIG_SOC_DRA7XX 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_REALVIEW is not set -CONFIG_ARCH_ROCKCHIP=y -# CONFIG_ARCH_S5PV210 is not set -# CONFIG_ARCH_RENESAS is not set -# CONFIG_ARCH_SOCFPGA is not set -# CONFIG_PLAT_SPEAR is not set -# CONFIG_ARCH_STI is not set -# CONFIG_ARCH_STM32 is not set -# CONFIG_ARCH_SUNXI is not set -# CONFIG_ARCH_TANGO is not set -# CONFIG_ARCH_TEGRA is not set -# CONFIG_ARCH_UNIPHIER is not set -# CONFIG_ARCH_U8500 is not set -# CONFIG_ARCH_VEXPRESS is not set -# CONFIG_ARCH_WM8850 is not set -# CONFIG_ARCH_ZX is not set -# CONFIG_ARCH_ZYNQ is not set - -# -# Processor Type -# -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=y -CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_SWP_EMULATE=y -# 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_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_DEBUG_ALIGN_RODATA=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=y -CONFIG_ARM_ERRATA_821420=y -CONFIG_ARM_ERRATA_825619=y -CONFIG_ARM_ERRATA_857271=y -# CONFIG_ARM_ERRATA_852421 is not set -CONFIG_ARM_ERRATA_852423=y -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=y -# CONFIG_SCHED_SMT is not set -CONFIG_HAVE_ARM_SCU=y -CONFIG_HAVE_ARM_ARCH_TIMER=y -CONFIG_HAVE_ARM_TWD=y -# CONFIG_MCPM is not set -# CONFIG_BIG_LITTLE is not set -CONFIG_VMSPLIT_3G=y -# CONFIG_VMSPLIT_2G is not set -# CONFIG_VMSPLIT_1G is not set -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_NR_CPUS=4 -CONFIG_HOTPLUG_CPU=y -CONFIG_ARM_PSCI=y -CONFIG_ARCH_NR_GPIO=288 -CONFIG_HZ_FIXED=0 -# CONFIG_HZ_100 is not set -# CONFIG_HZ_200 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_500 is not set -CONFIG_HZ_1000=y -CONFIG_HZ=1000 -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_HAVE_ARCH_PFN_VALID=y -CONFIG_HIGHMEM=y -CONFIG_HIGHPTE=y -CONFIG_HW_PERF_EVENTS=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -# CONFIG_ARM_MODULE_PLTS is not set -CONFIG_FORCE_MAX_ZONEORDER=12 -CONFIG_ALIGNMENT_TRAP=y -# CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_SECCOMP=y -# CONFIG_PARAVIRT is not set -# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set -# CONFIG_XEN is not set -CONFIG_STACKPROTECTOR_PER_TASK=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 is not set -CONFIG_CMDLINE="" -# CONFIG_KEXEC is not set -# CONFIG_CRASH_DUMP is not set -CONFIG_AUTO_ZRELADDR=y -# CONFIG_EFI is not set -# 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 is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# 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 is not set -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set - -# -# CPU frequency scaling drivers -# -CONFIG_CPUFREQ_DT=y -CONFIG_CPUFREQ_DT_PLATDEV=y -# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set -# CONFIG_QORIQ_CPUFREQ is not set -# end of CPU Frequency scaling - -# -# 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 -# CONFIG_ARM_HIGHBANK_CPUIDLE is not set -# end of ARM CPU Idle Drivers -# 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_HIBERNATION is not set -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 is not set -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 is not set -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ARM_SCPI_POWER_DOMAIN=y -# CONFIG_FIRMWARE_MEMMAP is not set -# CONFIG_FW_CFG_SYSFS is not set -# CONFIG_TRUSTED_FOUNDATIONS is not set -CONFIG_HAVE_ARM_SMCCC=y -CONFIG_ARM_PSCI_FW=y -# CONFIG_ARM_PSCI_CHECKER is not set -# CONFIG_GOOGLE_FIRMWARE is not set - -# -# Tegra firmware driver -# -# end of Tegra firmware driver -# end of Firmware Drivers - -# CONFIG_ARM_CRYPTO is not set -# CONFIG_VIRTUALIZATION is not set - -# -# General architecture-dependent options -# -# CONFIG_OPROFILE is not set -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_CLK=y -CONFIG_HAVE_HW_BREAKPOINT=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_RCU_TABLE_FREE=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_SECCOMP_FILTER=y -CONFIG_HAVE_STACKPROTECTOR=y -CONFIG_CC_HAS_STACKPROTECTOR_NONE=y -CONFIG_STACKPROTECTOR=y -CONFIG_STACKPROTECTOR_STRONG=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_HAVE_EXIT_THREAD=y -CONFIG_ARCH_MMAP_RND_BITS=8 -CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OLD_SIGACTION=y -CONFIG_64BIT_TIME=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_REFCOUNT_FULL=y -# CONFIG_LOCK_EVENT_COUNTS is not set - -# -# GCOV-based kernel profiling -# -# CONFIG_GCOV_KERNEL is not set -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -# end of GCOV-based kernel profiling - -CONFIG_PLUGIN_HOSTCC="g++" -CONFIG_HAVE_GCC_PLUGINS=y -CONFIG_GCC_PLUGINS=y - -# -# GCC plugins -# -# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set -# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set -# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set -CONFIG_GCC_PLUGIN_ARM_SSP_PER_TASK=y -# end of GCC plugins -# 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=y -# CONFIG_MODVERSIONS is not set -# CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_MODULE_SIG is not set -# CONFIG_MODULE_COMPRESS 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_SCSI_REQUEST=y -CONFIG_BLK_DEV_BSG=y -# CONFIG_BLK_DEV_BSGLIB is not set -CONFIG_BLK_DEV_INTEGRITY=y -# CONFIG_BLK_DEV_ZONED is not set -# CONFIG_BLK_DEV_THROTTLING is not set -# CONFIG_BLK_CMDLINE_PARSER is not set -# CONFIG_BLK_WBT is not set -# CONFIG_BLK_CGROUP_IOLATENCY is not set -# CONFIG_BLK_CGROUP_IOCOST is not set -# CONFIG_BLK_DEBUG_FS is not set -# CONFIG_BLK_SED_OPAL is not set - -# -# Partition Types -# -CONFIG_PARTITION_ADVANCED=y -# CONFIG_ACORN_PARTITION is not set -# CONFIG_AIX_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set -# CONFIG_MAC_PARTITION is not set -CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_KARMA_PARTITION is not set -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_PM=y - -# -# IO Schedulers -# -CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=y -# CONFIG_IOSCHED_BFQ is not set -# end of IO Schedulers - -CONFIG_ASN1=y -CONFIG_UNINLINE_SPIN_UNLOCK=y -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_FREEZER=y - -# -# Executable file formats -# -CONFIG_BINFMT_ELF=y -# CONFIG_BINFMT_ELF_FDPIC is not set -CONFIG_ELFCORE=y -CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y -CONFIG_BINFMT_SCRIPT=y -CONFIG_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_FLATMEM=y -CONFIG_FLAT_NODE_MEM_MAP=y -CONFIG_HAVE_FAST_GUP=y -CONFIG_ARCH_KEEP_MEMBLOCK=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_SPLIT_PTLOCK_CPUS=4 -CONFIG_COMPACTION=y -CONFIG_MIGRATION=y -CONFIG_CONTIG_ALLOC=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_BOUNCE=y -CONFIG_KSM=y -CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 -CONFIG_TRANSPARENT_HUGEPAGE=y -# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y -CONFIG_TRANSPARENT_HUGE_PAGECACHE=y -# CONFIG_CLEANCACHE is not set -CONFIG_FRONTSWAP=y -CONFIG_CMA=y -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_AREAS=7 -CONFIG_ZSWAP=y -CONFIG_ZPOOL=y -CONFIG_ZBUD=y -# CONFIG_Z3FOLD is not set -CONFIG_ZSMALLOC=y -# CONFIG_PGTABLE_MAPPING is not set -# CONFIG_ZSMALLOC_STAT is not set -CONFIG_GENERIC_EARLY_IOREMAP=y -# CONFIG_IDLE_PAGE_TRACKING is not set -# CONFIG_PERCPU_STATS is not set -# CONFIG_GUP_BENCHMARK 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_NET_INGRESS=y -CONFIG_SKB_EXTENSIONS=y - -# -# Networking options -# -CONFIG_PACKET=y -CONFIG_PACKET_DIAG=y -CONFIG_UNIX=y -CONFIG_UNIX_SCM=y -CONFIG_UNIX_DIAG=y -# CONFIG_TLS is not set -CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set -# CONFIG_XFRM_INTERFACE is not set -# CONFIG_XFRM_SUB_POLICY is not set -# CONFIG_XFRM_MIGRATE is not set -# CONFIG_XFRM_STATISTICS is not set -# CONFIG_NET_KEY is not set -# CONFIG_XDP_SOCKETS is not set -CONFIG_INET=y -CONFIG_IP_MULTICAST=y -# CONFIG_IP_ADVANCED_ROUTER is not set -# CONFIG_IP_PNP is not set -# CONFIG_NET_IPIP is not set -# CONFIG_NET_IPGRE_DEMUX is not set -# CONFIG_IP_MROUTE is not set -CONFIG_SYN_COOKIES=y -# CONFIG_NET_IPVTI is not set -# CONFIG_NET_FOU is not set -# CONFIG_INET_AH is not set -# CONFIG_INET_ESP is not set -# CONFIG_INET_IPCOMP is not set -# CONFIG_INET_DIAG is not set -# CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_CUBIC=y -CONFIG_DEFAULT_TCP_CONG="cubic" -# CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m -CONFIG_IPV6_ROUTER_PREF=y -CONFIG_IPV6_ROUTE_INFO=y -CONFIG_IPV6_OPTIMISTIC_DAD=y -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -CONFIG_IPV6_MIP6=m -# CONFIG_IPV6_ILA is not set -# CONFIG_IPV6_VTI is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set -# CONFIG_IPV6_SEG6_LWTUNNEL is not set -# CONFIG_IPV6_SEG6_HMAC is not set -CONFIG_NETWORK_SECMARK=y -CONFIG_NET_PTP_CLASSIFY=y -# CONFIG_NETWORK_PHY_TIMESTAMPING is not set -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -# CONFIG_BRIDGE_NETFILTER is not set - -# -# Core Netfilter Configuration -# -CONFIG_NETFILTER_INGRESS=y -# CONFIG_NETFILTER_NETLINK_ACCT is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NETFILTER_NETLINK_OSF is not set -CONFIG_NF_CONNTRACK=y -# CONFIG_NF_LOG_NETDEV is not set -CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CONNTRACK_SECMARK=y -# CONFIG_NF_CONNTRACK_ZONES is not set -CONFIG_NF_CONNTRACK_PROCFS=y -CONFIG_NF_CONNTRACK_EVENTS=y -CONFIG_NF_CONNTRACK_TIMEOUT=y -CONFIG_NF_CONNTRACK_TIMESTAMP=y -# CONFIG_NF_CONNTRACK_LABELS is not set -# CONFIG_NF_CT_PROTO_DCCP is not set -# CONFIG_NF_CT_PROTO_SCTP is not set -# CONFIG_NF_CT_PROTO_UDPLITE is not set -# CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_FTP is not set -# CONFIG_NF_CONNTRACK_H323 is not set -# CONFIG_NF_CONNTRACK_IRC is not set -# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -# CONFIG_NF_CONNTRACK_SNMP is not set -# CONFIG_NF_CONNTRACK_PPTP is not set -# CONFIG_NF_CONNTRACK_SANE is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_NF_CONNTRACK_TFTP is not set -# CONFIG_NF_CT_NETLINK is not set -# CONFIG_NF_CT_NETLINK_TIMEOUT is not set -# CONFIG_NF_NAT is not set -# CONFIG_NF_TABLES is not set -CONFIG_NETFILTER_XTABLES=y - -# -# Xtables combined modules -# -# CONFIG_NETFILTER_XT_MARK is not set -# CONFIG_NETFILTER_XT_CONNMARK is not set - -# -# Xtables targets -# -# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_CONNSECMARK is not set -# CONFIG_NETFILTER_XT_TARGET_HMARK is not set -# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set -# CONFIG_NETFILTER_XT_TARGET_LED is not set -# CONFIG_NETFILTER_XT_TARGET_LOG is not set -# CONFIG_NETFILTER_XT_TARGET_MARK is not set -# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -# CONFIG_NETFILTER_XT_TARGET_TEE is not set -# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set -# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set - -# -# Xtables matches -# -# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_BPF is not set -CONFIG_NETFILTER_XT_MATCH_CGROUP=m -# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y -# CONFIG_NETFILTER_XT_MATCH_CPU is not set -# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set -# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -# CONFIG_NETFILTER_XT_MATCH_ECN is not set -# CONFIG_NETFILTER_XT_MATCH_ESP is not set -# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -# CONFIG_NETFILTER_XT_MATCH_HL is not set -# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set -# CONFIG_NETFILTER_XT_MATCH_L2TP is not set -# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set -# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_MAC is not set -# CONFIG_NETFILTER_XT_MATCH_MARK is not set -# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set -# CONFIG_NETFILTER_XT_MATCH_OSF is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set -# CONFIG_NETFILTER_XT_MATCH_POLICY is not set -# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -# CONFIG_NETFILTER_XT_MATCH_REALM is not set -# CONFIG_NETFILTER_XT_MATCH_RECENT is not set -# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set -# CONFIG_NETFILTER_XT_MATCH_STATE is not set -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -# CONFIG_NETFILTER_XT_MATCH_STRING is not set -# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -# end of Core Netfilter Configuration - -# CONFIG_IP_SET is not set -# CONFIG_IP_VS is not set - -# -# IP: Netfilter Configuration -# -CONFIG_NF_DEFRAG_IPV4=y -# CONFIG_NF_SOCKET_IPV4 is not set -# CONFIG_NF_TPROXY_IPV4 is not set -# CONFIG_NF_DUP_IPV4 is not set -# CONFIG_NF_LOG_ARP is not set -# CONFIG_NF_LOG_IPV4 is not set -# CONFIG_NF_REJECT_IPV4 is not set -CONFIG_IP_NF_IPTABLES=y -# CONFIG_IP_NF_MATCH_AH is not set -# CONFIG_IP_NF_MATCH_ECN is not set -# CONFIG_IP_NF_MATCH_TTL is not set -CONFIG_IP_NF_FILTER=y -# CONFIG_IP_NF_TARGET_REJECT is not set -# CONFIG_IP_NF_TARGET_SYNPROXY is not set -# CONFIG_IP_NF_NAT is not set -# CONFIG_IP_NF_MANGLE is not set -# CONFIG_IP_NF_RAW is not set -# CONFIG_IP_NF_ARPTABLES is not set -# end of IP: Netfilter Configuration - -# -# IPv6: Netfilter Configuration -# -# CONFIG_NF_SOCKET_IPV6 is not set -# CONFIG_NF_TPROXY_IPV6 is not set -# CONFIG_NF_DUP_IPV6 is not set -# CONFIG_NF_REJECT_IPV6 is not set -# CONFIG_NF_LOG_IPV6 is not set -# CONFIG_IP6_NF_IPTABLES is not set -# end of IPv6: Netfilter Configuration - -CONFIG_NF_DEFRAG_IPV6=y -CONFIG_NF_CONNTRACK_BRIDGE=m -# CONFIG_BRIDGE_NF_EBTABLES is not set -# CONFIG_BPFILTER is not set -# CONFIG_IP_DCCP is not set -# CONFIG_IP_SCTP is not set -# CONFIG_RDS is not set -# CONFIG_TIPC is not set -# CONFIG_ATM is not set -# CONFIG_L2TP is not set -CONFIG_STP=m -CONFIG_BRIDGE=m -CONFIG_BRIDGE_IGMP_SNOOPING=y -CONFIG_HAVE_NET_DSA=y -# CONFIG_NET_DSA is not set -# CONFIG_VLAN_8021Q is not set -# CONFIG_DECNET is not set -CONFIG_LLC=y -# CONFIG_LLC2 is not set -CONFIG_ATALK=y -# CONFIG_DEV_APPLETALK is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set -# CONFIG_PHONET is not set -# CONFIG_6LOWPAN is not set -# CONFIG_IEEE802154 is not set -# CONFIG_NET_SCHED is not set -# CONFIG_DCB is not set -# CONFIG_DNS_RESOLVER is not set -# CONFIG_BATMAN_ADV is not set -# CONFIG_OPENVSWITCH is not set -# CONFIG_VSOCKETS is not set -# CONFIG_NETLINK_DIAG is not set -# CONFIG_MPLS is not set -# CONFIG_NET_NSH is not set -# CONFIG_HSR is not set -# CONFIG_NET_SWITCHDEV is not set -# CONFIG_NET_L3_MASTER_DEV is not set -# CONFIG_NET_NCSI is not set -CONFIG_RPS=y -CONFIG_RFS_ACCEL=y -CONFIG_XPS=y -CONFIG_CGROUP_NET_PRIO=y -CONFIG_CGROUP_NET_CLASSID=y -CONFIG_NET_RX_BUSY_POLL=y -CONFIG_BQL=y -CONFIG_BPF_JIT=y -# CONFIG_BPF_STREAM_PARSER is not set -CONFIG_NET_FLOW_LIMIT=y - -# -# Network testing -# -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_DROP_MONITOR is not set -# end of Network testing -# end of Networking options - -# CONFIG_HAMRADIO is not set -# CONFIG_CAN is not set -CONFIG_BT=y -CONFIG_BT_BREDR=y -CONFIG_BT_RFCOMM=y -# CONFIG_BT_RFCOMM_TTY is not set -CONFIG_BT_BNEP=y -# CONFIG_BT_BNEP_MC_FILTER is not set -CONFIG_BT_BNEP_PROTO_FILTER=y -CONFIG_BT_HIDP=y -CONFIG_BT_HS=y -CONFIG_BT_LE=y -# CONFIG_BT_LEDS is not set -# CONFIG_BT_SELFTEST is not set -# CONFIG_BT_DEBUGFS is not set - -# -# Bluetooth device drivers -# -CONFIG_BT_INTEL=y -CONFIG_BT_HCIBTUSB=y -# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set -# CONFIG_BT_HCIBTUSB_BCM is not set -CONFIG_BT_HCIBTUSB_MTK=y -# CONFIG_BT_HCIBTUSB_RTL is not set -# CONFIG_BT_HCIBTSDIO is not set -# 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 is not set -# CONFIG_BT_ATH3K is not set -# CONFIG_BT_MTKSDIO is not set -# end of Bluetooth device drivers - -# CONFIG_AF_RXRPC is not set -# CONFIG_AF_KCM is not set -CONFIG_WIRELESS=y -CONFIG_WEXT_CORE=y -CONFIG_WEXT_PROC=y -CONFIG_CFG80211=y -# 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_MAC80211=y -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 is not set -CONFIG_MAC80211_LEDS=y -# CONFIG_MAC80211_DEBUGFS is not set -# CONFIG_MAC80211_MESSAGE_TRACING is not set -# CONFIG_MAC80211_DEBUG_MENU is not set -CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 -# CONFIG_WIMAX is not set -CONFIG_RFKILL=y -CONFIG_RFKILL_LEDS=y -# CONFIG_RFKILL_INPUT is not set -# CONFIG_RFKILL_GPIO is not set -CONFIG_NET_9P=m -CONFIG_NET_9P_VIRTIO=m -# CONFIG_NET_9P_DEBUG is not set -# CONFIG_CAIF is not set -# CONFIG_CEPH_LIB is not set -# CONFIG_NFC is not set -# CONFIG_PSAMPLE is not set -# CONFIG_NET_IFE is not set -# CONFIG_LWTUNNEL is not set -CONFIG_GRO_CELLS=y -CONFIG_FAILOVER=m -CONFIG_HAVE_EBPF_JIT=y - -# -# Device Drivers -# -CONFIG_ARM_AMBA=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 is not set -# CONFIG_PCIE_ECRC is not set -CONFIG_PCIEASPM=y -# CONFIG_PCIEASPM_DEBUG is not set -CONFIG_PCIEASPM_DEFAULT=y -# CONFIG_PCIEASPM_POWERSAVE is not set -# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set -# CONFIG_PCIEASPM_PERFORMANCE is not set -CONFIG_PCIE_PME=y -# CONFIG_PCIE_DPC is not set -# CONFIG_PCIE_PTM is not set -# CONFIG_PCIE_BW is not set -# CONFIG_PCI_MSI is not set -CONFIG_PCI_QUIRKS=y -# CONFIG_PCI_DEBUG is not set -# CONFIG_PCI_STUB is not set -# CONFIG_PCI_IOV is not set -# CONFIG_PCI_PRI is not set -# CONFIG_PCI_PASID is not set -# CONFIG_HOTPLUG_PCI is not set - -# -# PCI controller drivers -# - -# -# Cadence PCIe controllers support -# -# CONFIG_PCIE_CADENCE_HOST is not set -# end of Cadence PCIe controllers support - -# CONFIG_PCI_FTPCI100 is not set -# CONFIG_PCI_HOST_GENERIC is not set -# CONFIG_PCIE_XILINX is not set -# CONFIG_PCI_V3_SEMI is not set -# CONFIG_PCIE_ALTERA is not set - -# -# DesignWare PCI Core Support -# -# end of DesignWare PCI Core 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_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 is not set -CONFIG_FW_LOADER_COMPRESS=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_GENERIC_CPU_AUTOPROBE=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_IRQ=y -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 is not set -# CONFIG_SIMPLE_PM_BUS is not set -# CONFIG_VEXPRESS_CONFIG is not set -# end of Bus devices - -CONFIG_CONNECTOR=m -# CONFIG_GNSS is not set -# CONFIG_MTD is not set -CONFIG_DTC=y -CONFIG_OF=y -# CONFIG_OF_UNITTEST is not set -CONFIG_OF_FLATTREE=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_KOBJ=y -CONFIG_OF_DYNAMIC=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_IRQ=y -CONFIG_OF_NET=y -CONFIG_OF_MDIO=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OF_RESOLVE=y -CONFIG_OF_OVERLAY=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -# CONFIG_PARPORT is not set -CONFIG_BLK_DEV=y -# CONFIG_BLK_DEV_NULL_BLK is not set -CONFIG_CDROM=y -# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set -CONFIG_ZRAM=y -# CONFIG_ZRAM_WRITEBACK is not set -# CONFIG_ZRAM_MEMORY_TRACKING is not set -# CONFIG_BLK_DEV_UMEM is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_DRBD is not set -# CONFIG_BLK_DEV_NBD is not set -# CONFIG_BLK_DEV_SX8 is not set -CONFIG_BLK_DEV_RAM=m -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_CDROM_PKTCDVD is not set -# CONFIG_ATA_OVER_ETH is not set -CONFIG_VIRTIO_BLK=m -# CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_BLK_DEV_RBD is not set -# CONFIG_BLK_DEV_RSXX is not set - -# -# NVME Support -# -# CONFIG_BLK_DEV_NVME is not set -# CONFIG_NVME_FC is not set -# CONFIG_NVME_TARGET is not set -# end of NVME Support - -# -# Misc devices -# -# CONFIG_AD525X_DPOT is not set -# CONFIG_DUMMY_IRQ is not set -# CONFIG_PHANTOM is not set -# CONFIG_TIFM_CORE is not set -# CONFIG_ICS932S401 is not set -# CONFIG_ENCLOSURE_SERVICES is not set -# CONFIG_HP_ILO is not set -# CONFIG_APDS9802ALS is not set -# CONFIG_ISL29003 is not set -# CONFIG_ISL29020 is not set -# CONFIG_SENSORS_TSL2550 is not set -# CONFIG_SENSORS_BH1770 is not set -# CONFIG_SENSORS_APDS990X is not set -# CONFIG_HMC6352 is not set -# CONFIG_DS1682 is not set -# 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=y -# CONFIG_PVPANIC is not set -# CONFIG_C2PORT is not set - -# -# EEPROM support -# -# CONFIG_EEPROM_AT24 is not set -# CONFIG_EEPROM_AT25 is not set -# CONFIG_EEPROM_LEGACY is not set -# CONFIG_EEPROM_MAX6875 is not set -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 is not set - -# -# Texas Instruments shared transport line discipline -# -# CONFIG_TI_ST is not set -# end of Texas Instruments shared transport line discipline - -# CONFIG_SENSORS_LIS3_SPI is not set -# CONFIG_SENSORS_LIS3_I2C is not set -# CONFIG_ALTERA_STAPL is not set - -# -# Intel MIC & related support -# - -# -# Intel MIC Bus Driver -# - -# -# SCIF Bus Driver -# - -# -# VOP Bus Driver -# -# CONFIG_VOP_BUS is not set - -# -# Intel MIC Host Driver -# - -# -# Intel MIC Card Driver -# - -# -# SCIF Driver -# - -# -# Intel MIC Coprocessor State Management (COSM) Drivers -# - -# -# VOP Driver -# -# end of Intel MIC & related support - -# CONFIG_ECHO is not set -# CONFIG_MISC_ALCOR_PCI is not set -# CONFIG_MISC_RTSX_PCI is not set -CONFIG_MISC_RTSX_USB=y -# CONFIG_HABANA_AI is not set -# end of Misc devices - -CONFIG_HAVE_IDE=y -# CONFIG_IDE is not set - -# -# SCSI device support -# -CONFIG_SCSI_MOD=y -# CONFIG_RAID_ATTRS is not set -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y - -# -# SCSI support type (disk, tape, CD-ROM) -# -CONFIG_BLK_DEV_SD=y -# CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y -# CONFIG_BLK_DEV_SR_VENDOR is not set -# CONFIG_CHR_DEV_SG is not set -# CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set -# CONFIG_SCSI_SCAN_ASYNC is not set - -# -# SCSI Transports -# -CONFIG_SCSI_SPI_ATTRS=y -# CONFIG_SCSI_FC_ATTRS is not set -# CONFIG_SCSI_ISCSI_ATTRS is not set -# CONFIG_SCSI_SAS_ATTRS is not set -# CONFIG_SCSI_SAS_LIBSAS is not set -# CONFIG_SCSI_SRP_ATTRS is not set -# end of SCSI Transports - -CONFIG_SCSI_LOWLEVEL=y -# CONFIG_ISCSI_TCP is not set -# CONFIG_ISCSI_BOOT_SYSFS is not set -# CONFIG_SCSI_CXGB3_ISCSI is not set -# CONFIG_SCSI_BNX2_ISCSI is not set -# CONFIG_BE2ISCSI is not set -# CONFIG_BLK_DEV_3W_XXXX_RAID is not set -# CONFIG_SCSI_HPSA is not set -# CONFIG_SCSI_3W_9XXX is not set -# CONFIG_SCSI_3W_SAS is not set -# CONFIG_SCSI_ACARD is not set -# 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 is not set -# CONFIG_SCSI_MVUMI is not set -# CONFIG_SCSI_ADVANSYS is not set -# CONFIG_SCSI_ARCMSR is not set -# CONFIG_SCSI_ESAS2R is not set -# CONFIG_MEGARAID_NEWGEN is not set -# CONFIG_MEGARAID_LEGACY is not set -# CONFIG_MEGARAID_SAS is not set -# CONFIG_SCSI_MPT3SAS is not set -# CONFIG_SCSI_MPT2SAS is not set -# CONFIG_SCSI_SMARTPQI is not set -# CONFIG_SCSI_UFSHCD is not set -# CONFIG_SCSI_HPTIOP is not set -# CONFIG_SCSI_MYRB is not set -# CONFIG_SCSI_MYRS is not set -# CONFIG_SCSI_SNIC is not set -# CONFIG_SCSI_DMX3191D is not set -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 is not set -# CONFIG_SCSI_SYM53C8XX_2 is not set -# CONFIG_SCSI_QLOGIC_1280 is not set -# CONFIG_SCSI_QLA_ISCSI is not set -# CONFIG_SCSI_DC395x is not set -# CONFIG_SCSI_AM53C974 is not set -# CONFIG_SCSI_NSP32 is not set -# CONFIG_SCSI_WD719X is not set -# CONFIG_SCSI_DEBUG is not set -# CONFIG_SCSI_PMCRAID is not set -# CONFIG_SCSI_PM8001 is not set -# CONFIG_SCSI_VIRTIO is not set -# CONFIG_SCSI_DH is not set -# end of SCSI device support - -# CONFIG_ATA is not set -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -# CONFIG_MD_LINEAR is not set -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -CONFIG_MD_RAID10=m -CONFIG_MD_RAID456=m -# CONFIG_MD_MULTIPATH is not set -# CONFIG_MD_FAULTY is not set -# CONFIG_BCACHE 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_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_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 is not set -# CONFIG_FUSION is not set - -# -# IEEE 1394 (FireWire) support -# -# CONFIG_FIREWIRE is not set -# CONFIG_FIREWIRE_NOSY is not set -# end of IEEE 1394 (FireWire) support - -CONFIG_NETDEVICES=y -CONFIG_MII=y -CONFIG_NET_CORE=y -# CONFIG_BONDING is not set -# CONFIG_DUMMY is not set -# CONFIG_EQUALIZER is not set -# CONFIG_NET_FC is not set -# CONFIG_NET_TEAM is not set -# CONFIG_MACVLAN is not set -# CONFIG_IPVLAN is not set -# CONFIG_VXLAN is not set -# CONFIG_GENEVE is not set -# CONFIG_GTP is not set -# CONFIG_MACSEC is not set -# CONFIG_NETCONSOLE is not set -CONFIG_TUN=y -# CONFIG_TUN_VNET_CROSS_LE is not set -# CONFIG_VETH is not set -CONFIG_VIRTIO_NET=m -# CONFIG_NLMON is not set -# CONFIG_ARCNET is not set - -# -# CAIF transport drivers -# - -# -# Distributed Switch Architecture drivers -# -# end of Distributed Switch Architecture drivers - -# CONFIG_ETHERNET is not set -# CONFIG_FDDI is not set -# CONFIG_HIPPI is not set -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_BUS=y -# CONFIG_MDIO_BCM_UNIMAC is not set -# CONFIG_MDIO_BITBANG is not set -# CONFIG_MDIO_BUS_MUX_GPIO is not set -# CONFIG_MDIO_BUS_MUX_MMIOREG is not set -# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set -# CONFIG_MDIO_HISI_FEMAC is not set -# CONFIG_MDIO_MSCC_MIIM is not set -CONFIG_PHYLIB=y -CONFIG_SWPHY=y -# CONFIG_LED_TRIGGER_PHY is not set - -# -# MII PHY device drivers -# -# CONFIG_ADIN_PHY is not set -# CONFIG_AMD_PHY is not set -# CONFIG_AQUANTIA_PHY is not set -# CONFIG_AX88796B_PHY is not set -# CONFIG_AT803X_PHY is not set -# CONFIG_BCM7XXX_PHY is not set -# CONFIG_BCM87XX_PHY is not set -# CONFIG_BROADCOM_PHY is not set -# CONFIG_CICADA_PHY is not set -# CONFIG_CORTINA_PHY is not set -# CONFIG_DAVICOM_PHY is not set -# CONFIG_DP83822_PHY is not set -# CONFIG_DP83TC811_PHY is not set -# CONFIG_DP83848_PHY is not set -# CONFIG_DP83867_PHY is not set -CONFIG_FIXED_PHY=y -# CONFIG_ICPLUS_PHY is not set -# CONFIG_INTEL_XWAY_PHY is not set -# CONFIG_LSI_ET1011C_PHY is not set -# CONFIG_LXT_PHY is not set -# CONFIG_MARVELL_PHY is not set -# CONFIG_MARVELL_10G_PHY is not set -# CONFIG_MICREL_PHY is not set -CONFIG_MICROCHIP_PHY=y -# CONFIG_MICROCHIP_T1_PHY is not set -# CONFIG_MICROSEMI_PHY is not set -# CONFIG_NATIONAL_PHY is not set -# CONFIG_QSEMI_PHY is not set -# CONFIG_REALTEK_PHY is not set -# CONFIG_RENESAS_PHY is not set -# CONFIG_ROCKCHIP_PHY is not set -# CONFIG_SMSC_PHY is not set -# CONFIG_STE10XP is not set -# CONFIG_TERANETICS_PHY is not set -# CONFIG_VITESSE_PHY is not set -# CONFIG_XILINX_GMII2RGMII is not set -# CONFIG_MICREL_KS8995MA is not set -# CONFIG_PPP is not set -# CONFIG_SLIP is not set -CONFIG_USB_NET_DRIVERS=y -# CONFIG_USB_CATC is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_PEGASUS is not set -CONFIG_USB_RTL8150=y -CONFIG_USB_RTL8152=y -CONFIG_USB_LAN78XX=y -CONFIG_USB_USBNET=y -CONFIG_USB_NET_AX8817X=y -CONFIG_USB_NET_AX88179_178A=y -CONFIG_USB_NET_CDCETHER=y -CONFIG_USB_NET_CDC_EEM=y -# CONFIG_USB_NET_CDC_NCM is not set -# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set -# CONFIG_USB_NET_CDC_MBIM is not set -# CONFIG_USB_NET_DM9601 is not set -# CONFIG_USB_NET_SR9700 is not set -# CONFIG_USB_NET_SR9800 is not set -CONFIG_USB_NET_SMSC75XX=y -CONFIG_USB_NET_SMSC95XX=y -# CONFIG_USB_NET_GL620A is not set -# CONFIG_USB_NET_NET1080 is not set -# CONFIG_USB_NET_PLUSB is not set -# CONFIG_USB_NET_MCS7830 is not set -# CONFIG_USB_NET_RNDIS_HOST is not set -CONFIG_USB_NET_CDC_SUBSET_ENABLE=y -CONFIG_USB_NET_CDC_SUBSET=y -# CONFIG_USB_ALI_M5632 is not set -# CONFIG_USB_AN2720 is not set -# CONFIG_USB_BELKIN is not set -CONFIG_USB_ARMLINUX=y -# CONFIG_USB_EPSON2888 is not set -# CONFIG_USB_KC2190 is not set -# CONFIG_USB_NET_ZAURUS is not set -# CONFIG_USB_NET_CX82310_ETH is not set -# CONFIG_USB_NET_KALMIA is not set -# CONFIG_USB_NET_QMI_WWAN is not set -# CONFIG_USB_HSO is not set -# CONFIG_USB_NET_INT51X1 is not set -# CONFIG_USB_IPHETH is not set -# CONFIG_USB_SIERRA_NET is not set -# CONFIG_USB_VL600 is not set -# CONFIG_USB_NET_CH9200 is not set -# CONFIG_USB_NET_AQC111 is not set -CONFIG_WLAN=y -# CONFIG_WIRELESS_WDS is not set -# CONFIG_WLAN_VENDOR_ADMTEK is not set -CONFIG_ATH_COMMON=m -CONFIG_WLAN_VENDOR_ATH=y -# CONFIG_ATH_DEBUG is not set -# CONFIG_ATH5K is not set -# CONFIG_ATH5K_PCI is not set -CONFIG_ATH9K_HW=m -CONFIG_ATH9K_COMMON=m -CONFIG_ATH9K_BTCOEX_SUPPORT=y -# CONFIG_ATH9K is not set -CONFIG_ATH9K_HTC=m -# CONFIG_ATH9K_HTC_DEBUGFS is not set -# CONFIG_CARL9170 is not set -# CONFIG_ATH6KL is not set -# CONFIG_AR5523 is not set -# CONFIG_WIL6210 is not set -# CONFIG_ATH10K is not set -# CONFIG_WCN36XX is not set -# CONFIG_WLAN_VENDOR_ATMEL is not set -# CONFIG_WLAN_VENDOR_BROADCOM is not set -# CONFIG_WLAN_VENDOR_CISCO is not set -# CONFIG_WLAN_VENDOR_INTEL is not set -# CONFIG_WLAN_VENDOR_INTERSIL is not set -# CONFIG_WLAN_VENDOR_MARVELL is not set -# CONFIG_WLAN_VENDOR_MEDIATEK is not set -# CONFIG_WLAN_VENDOR_RALINK is not set -# CONFIG_WLAN_VENDOR_REALTEK is not set -# CONFIG_WLAN_VENDOR_RSI is not set -# CONFIG_WLAN_VENDOR_ST is not set -# CONFIG_WLAN_VENDOR_TI is not set -# CONFIG_WLAN_VENDOR_ZYDAS is not set -# CONFIG_WLAN_VENDOR_QUANTENNA is not set -# CONFIG_MAC80211_HWSIM is not set -# CONFIG_USB_NET_RNDIS_WLAN is not set -# CONFIG_VIRT_WIFI is not set - -# -# Enable WiMAX (Networking options) to see the WiMAX drivers -# -# CONFIG_WAN is not set -# CONFIG_VMXNET3 is not set -# CONFIG_NETDEVSIM is not set -CONFIG_NET_FAILOVER=m -# CONFIG_ISDN is not set -# CONFIG_NVM is not set - -# -# Input device support -# -CONFIG_INPUT=y -CONFIG_INPUT_LEDS=y -# CONFIG_INPUT_FF_MEMLESS is not set -# CONFIG_INPUT_POLLDEV is not set -# CONFIG_INPUT_SPARSEKMAP is not set -CONFIG_INPUT_MATRIXKMAP=y - -# -# Userland interfaces -# -# CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_JOYDEV is not set -CONFIG_INPUT_EVDEV=y -# 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 is not set -# CONFIG_KEYBOARD_ADP5589 is not set -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_KEYBOARD_QT1050 is not set -# CONFIG_KEYBOARD_QT1070 is not set -# CONFIG_KEYBOARD_QT2160 is not set -# 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 is not set -# CONFIG_KEYBOARD_LM8333 is not set -# CONFIG_KEYBOARD_MAX7359 is not set -# CONFIG_KEYBOARD_MCS is not set -# CONFIG_KEYBOARD_MPR121 is not set -# CONFIG_KEYBOARD_NEWTON is not set -# CONFIG_KEYBOARD_OPENCORES is not set -# CONFIG_KEYBOARD_SAMSUNG is not set -# CONFIG_KEYBOARD_STOWAWAY is not set -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_OMAP4 is not set -# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set -# CONFIG_KEYBOARD_TWL4030 is not set -# CONFIG_KEYBOARD_XTKBD is not set -CONFIG_KEYBOARD_CROS_EC=y -# CONFIG_KEYBOARD_CAP11XX is not set -# CONFIG_KEYBOARD_BCM is not set -CONFIG_INPUT_MOUSE=y -# CONFIG_MOUSE_PS2 is not set -# 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=y -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=y -# CONFIG_MOUSE_SYNAPTICS_USB is not set -# CONFIG_INPUT_JOYSTICK is not set -# CONFIG_INPUT_TABLET is not set -# CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set -# CONFIG_RMI4_CORE is not set - -# -# Hardware I/O ports -# -# CONFIG_SERIO 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_SERIAL_NONSTANDARD is not set -# CONFIG_NOZOMI is not set -# CONFIG_N_GSM is not set -# CONFIG_TRACE_SINK is not set -CONFIG_NULL_TTY=m -CONFIG_LDISC_AUTOLOAD=y -CONFIG_DEVMEM=y -# CONFIG_DEVKMEM is not set - -# -# Serial drivers -# -CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y -# CONFIG_SERIAL_8250_FINTEK is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_PCI=y -CONFIG_SERIAL_8250_EXAR=y -CONFIG_SERIAL_8250_NR_UARTS=4 -CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -# CONFIG_SERIAL_8250_EXTENDED is not set -# CONFIG_SERIAL_8250_ASPEED_VUART is not set -CONFIG_SERIAL_8250_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_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_MAX3100 is not set -# CONFIG_SERIAL_MAX310X is not set -# CONFIG_SERIAL_UARTLITE is not set -CONFIG_SERIAL_CORE=y -CONFIG_SERIAL_CORE_CONSOLE=y -# CONFIG_SERIAL_JSM is not set -# CONFIG_SERIAL_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 is not set -# 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 -# end of Serial drivers - -CONFIG_SERIAL_MCTRL_GPIO=y -# CONFIG_SERIAL_DEV_BUS is not set -# CONFIG_TTY_PRINTK is not set -# CONFIG_HVC_DCC is not set -# CONFIG_VIRTIO_CONSOLE is not set -# CONFIG_IPMI_HANDLER is not set -CONFIG_HW_RANDOM=m -CONFIG_HW_RANDOM_TIMERIOMEM=m -CONFIG_HW_RANDOM_VIRTIO=m -# CONFIG_APPLICOM is not set -# CONFIG_RAW_DRIVER is not set -CONFIG_TCG_TPM=y -# CONFIG_TCG_TIS is not set -# CONFIG_TCG_TIS_SPI is not set -# CONFIG_TCG_TIS_I2C_ATMEL is not set -CONFIG_TCG_TIS_I2C_INFINEON=y -# CONFIG_TCG_TIS_I2C_NUVOTON is not set -# CONFIG_TCG_ATMEL is not set -# CONFIG_TCG_VTPM_PROXY is not set -# CONFIG_TCG_TIS_ST33ZP24_I2C is not set -# CONFIG_TCG_TIS_ST33ZP24_SPI is not set -CONFIG_DEVPORT=y -# CONFIG_XILLYBUS is not set -# end of Character devices - -# CONFIG_RANDOM_TRUST_BOOTLOADER is not set - -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -# CONFIG_I2C_COMPAT is not set -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_MUX=y - -# -# 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_ALGOBIT=y - -# -# 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 is not set -# 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_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_GPIO=y -# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set -# CONFIG_I2C_NOMADIK is not set -# CONFIG_I2C_OCORES is not set -# CONFIG_I2C_PCA_PLATFORM is not set -CONFIG_I2C_RK3X=y -# CONFIG_I2C_SIMTEC is not set -# CONFIG_I2C_XILINX is not set - -# -# External I2C/SMBus adapter drivers -# -# CONFIG_I2C_DIOLAN_U2C is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_ROBOTFUZZ_OSIF is not set -# CONFIG_I2C_TAOS_EVM is not set -# CONFIG_I2C_TINY_USB is not set - -# -# Other I2C/SMBus bus drivers -# -CONFIG_I2C_CROS_EC_TUNNEL=y -# end of I2C Hardware Bus support - -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_SLAVE is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# 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 is not set - -# -# SPI Master Controller Drivers -# -# CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AXI_SPI_ENGINE is not set -CONFIG_SPI_BITBANG=y -# CONFIG_SPI_CADENCE is not set -# CONFIG_SPI_DESIGNWARE is not set -# CONFIG_SPI_NXP_FLEXSPI is not set -CONFIG_SPI_GPIO=y -# CONFIG_SPI_FSL_SPI is not set -# CONFIG_SPI_OC_TINY is not set -# CONFIG_SPI_PL022 is not set -# CONFIG_SPI_PXA2XX is not set -CONFIG_SPI_ROCKCHIP=y -# CONFIG_SPI_SC18IS602 is not set -# CONFIG_SPI_SIFIVE is not set -# CONFIG_SPI_MXIC is not set -# CONFIG_SPI_XCOMM is not set -# CONFIG_SPI_XILINX is not set -# CONFIG_SPI_ZYNQMP_GQSPI is not set - -# -# SPI Protocol Masters -# -# CONFIG_SPI_SPIDEV is not set -# CONFIG_SPI_LOOPBACK_TEST is not set -# CONFIG_SPI_TLE62X0 is not set -# CONFIG_SPI_SLAVE is not set -# CONFIG_SPMI is not set -# CONFIG_HSI 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 is not set -# CONFIG_PPS_CLIENT_GPIO is not set - -# -# PPS generators support -# - -# -# PTP clock support -# -CONFIG_PTP_1588_CLOCK=y - -# -# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. -# -# 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 is not set -# CONFIG_PINCTRL_AMD is not set -# 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_PALMAS=y -# CONFIG_PINCTRL_RK805 is not set -# CONFIG_PINCTRL_OCELOT is not set -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_FASTPATH_LIMIT=512 -CONFIG_OF_GPIO=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_DEBUG_GPIO is not set -CONFIG_GPIO_SYSFS=y -CONFIG_GPIO_GENERIC=y - -# -# Memory mapped GPIO drivers -# -# CONFIG_GPIO_74XX_MMIO is not set -# CONFIG_GPIO_ALTERA is not set -# CONFIG_GPIO_CADENCE is not set -# CONFIG_GPIO_DWAPB is not set -# CONFIG_GPIO_EXAR is not set -# CONFIG_GPIO_FTGPIO010 is not set -CONFIG_GPIO_GENERIC_PLATFORM=y -# CONFIG_GPIO_GRGPIO is not set -# CONFIG_GPIO_HLWD is not set -# CONFIG_GPIO_MB86S7X is not set -# CONFIG_GPIO_MPC8XXX is not set -CONFIG_GPIO_PL061=y -# CONFIG_GPIO_SAMA5D2_PIOBU is not set -# CONFIG_GPIO_SYSCON is not set -CONFIG_GPIO_XILINX=m -# CONFIG_GPIO_ZEVIO is not set -# 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 is not set -# 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_DA9052 is not set -# CONFIG_HTC_EGPIO is not set -CONFIG_GPIO_PALMAS=y -CONFIG_GPIO_TWL4030=y -CONFIG_GPIO_TWL6040=y -# end of MFD GPIO expanders - -# -# PCI GPIO expanders -# -# CONFIG_GPIO_BT8XX is not set -# 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 -# end of SPI GPIO expanders - -# -# USB GPIO expanders -# -# end of USB GPIO expanders - -# CONFIG_GPIO_MOCKUP is not set -# CONFIG_W1 is not set -CONFIG_POWER_AVS=y -CONFIG_ROCKCHIP_IODOMAIN=y -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_AS3722=y -# CONFIG_POWER_RESET_BRCMKONA is not set -# CONFIG_POWER_RESET_BRCMSTB is not set -CONFIG_POWER_RESET_GPIO=y -CONFIG_POWER_RESET_GPIO_RESTART=y -# CONFIG_POWER_RESET_LTC2952 is not set -CONFIG_POWER_RESET_RESTART=y -# CONFIG_POWER_RESET_VERSATILE is not set -CONFIG_POWER_RESET_SYSCON=y -CONFIG_POWER_RESET_SYSCON_POWEROFF=y -CONFIG_REBOOT_MODE=y -CONFIG_SYSCON_REBOOT_MODE=y -CONFIG_NVMEM_REBOOT_MODE=m -CONFIG_POWER_SUPPLY=y -# CONFIG_POWER_SUPPLY_DEBUG is not set -# CONFIG_PDA_POWER is not set -# CONFIG_APM_POWER is not set -# CONFIG_GENERIC_ADC_BATTERY is not set -# CONFIG_TEST_POWER is not set -# CONFIG_CHARGER_ADP5061 is not set -# CONFIG_BATTERY_DS2780 is not set -# CONFIG_BATTERY_DS2781 is not set -# CONFIG_BATTERY_DS2782 is not set -# CONFIG_BATTERY_LEGO_EV3 is not set -CONFIG_BATTERY_SBS=y -# CONFIG_CHARGER_SBS is not set -# CONFIG_MANAGER_SBS is not set -# CONFIG_BATTERY_BQ27XXX is not set -# CONFIG_BATTERY_DA9052 is not set -# CONFIG_AXP20X_POWER is not set -# CONFIG_AXP288_FUEL_GAUGE is not set -# CONFIG_BATTERY_MAX17040 is not set -# CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_ISP1704 is not set -# CONFIG_CHARGER_MAX8903 is not set -# CONFIG_CHARGER_TWL4030 is not set -# CONFIG_CHARGER_LP8727 is not set -CONFIG_CHARGER_GPIO=y -# CONFIG_CHARGER_MANAGER is not set -# CONFIG_CHARGER_LT3651 is not set -# CONFIG_CHARGER_DETECTOR_MAX14656 is not set -# CONFIG_CHARGER_BQ2415X is not set -# CONFIG_CHARGER_BQ24190 is not set -# CONFIG_CHARGER_BQ24257 is not set -# CONFIG_CHARGER_BQ24735 is not set -# CONFIG_CHARGER_BQ25890 is not set -# CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GAUGE_LTC2941 is not set -# CONFIG_CHARGER_RT9455 is not set -# CONFIG_CHARGER_CROS_USBPD is not set -# CONFIG_CHARGER_UCS1002 is not set -# CONFIG_CHARGER_BD70528 is not set -# CONFIG_HWMON is not set -CONFIG_THERMAL=y -# CONFIG_THERMAL_STATISTICS is not set -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_OF=y -# CONFIG_THERMAL_WRITABLE_TRIPS is not set -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set -# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set -# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set -CONFIG_THERMAL_GOV_FAIR_SHARE=y -CONFIG_THERMAL_GOV_STEP_WISE=y -# CONFIG_THERMAL_GOV_BANG_BANG is not set -# CONFIG_THERMAL_GOV_USER_SPACE is not set -# CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set -CONFIG_CPU_THERMAL=y -# CONFIG_CLOCK_THERMAL is not set -# CONFIG_DEVFREQ_THERMAL is not set -# CONFIG_THERMAL_EMULATION is not set -# CONFIG_THERMAL_MMIO is not set -# CONFIG_QORIQ_THERMAL is not set -CONFIG_ROCKCHIP_THERMAL=y -# CONFIG_GENERIC_ADC_THERMAL is not set -CONFIG_WATCHDOG=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WATCHDOG_NOWAYOUT is not set -CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y -CONFIG_WATCHDOG_OPEN_TIMEOUT=0 -# CONFIG_WATCHDOG_SYSFS is not set - -# -# Watchdog Pretimeout Governors -# -# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set - -# -# Watchdog Device Drivers -# -# CONFIG_SOFT_WATCHDOG is not set -CONFIG_BD70528_WATCHDOG=m -# CONFIG_DA9052_WATCHDOG is not set -# CONFIG_GPIO_WATCHDOG is not set -# CONFIG_XILINX_WATCHDOG is not set -# CONFIG_ZIIRAVE_WATCHDOG is not set -# CONFIG_ARM_SP805_WATCHDOG is not set -# CONFIG_CADENCE_WATCHDOG is not set -# CONFIG_FTWDT010_WATCHDOG is not set -CONFIG_DW_WATCHDOG=y -# CONFIG_TWL4030_WATCHDOG is not set -# CONFIG_MAX63XX_WATCHDOG is not set -# CONFIG_ALIM7101_WDT is not set -# CONFIG_I6300ESB_WDT is not set -# CONFIG_MEN_A21_WDT is not set - -# -# 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 is not set -CONFIG_BCMA_POSSIBLE=y -# CONFIG_BCMA is not set - -# -# Multifunction device drivers -# -CONFIG_MFD_CORE=y -# CONFIG_MFD_ACT8945A 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 is not set -CONFIG_MFD_AXP20X=y -CONFIG_MFD_AXP20X_I2C=y -CONFIG_MFD_CROS_EC_DEV=y -# CONFIG_MFD_MADERA 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_MC13XXX_SPI is not set -# CONFIG_MFD_MC13XXX_I2C is not set -# 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 is not set -# 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_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 is not set -# CONFIG_MFD_RETU is not set -# CONFIG_MFD_PCF50633 is not set -# CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_RDC321X is not set -# CONFIG_MFD_RT5033 is not set -# CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=y -# CONFIG_MFD_RN5T618 is not set -CONFIG_MFD_SEC_CORE=y -# CONFIG_MFD_SI476X_CORE is not set -# CONFIG_MFD_SM501 is not set -# CONFIG_MFD_SKY81452 is not set -# CONFIG_MFD_SMSC is not set -# CONFIG_ABX500_CORE is not set -# CONFIG_MFD_STMPE is not set -CONFIG_MFD_SYSCON=y -# CONFIG_MFD_TI_AM335X_TSCADC is not set -# CONFIG_MFD_LP3943 is not set -# CONFIG_MFD_LP8788 is not set -# CONFIG_MFD_TI_LMU is not set -CONFIG_MFD_PALMAS=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 is not set -CONFIG_MFD_ROHM_BD70528=m -# CONFIG_MFD_STPMIC1 is not set -# CONFIG_MFD_STMFX 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=y -# CONFIG_REGULATOR_AD5398 is not set -# CONFIG_REGULATOR_ANATOP is not set -CONFIG_REGULATOR_AS3722=y -# CONFIG_REGULATOR_AXP20X is not set -CONFIG_REGULATOR_BD70528=m -# CONFIG_REGULATOR_DA9052 is not set -# CONFIG_REGULATOR_DA9210 is not set -# CONFIG_REGULATOR_DA9211 is not set -CONFIG_REGULATOR_FAN53555=y -# CONFIG_REGULATOR_GPIO is not set -# 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 is not set -# CONFIG_REGULATOR_MAX77802 is not set -# CONFIG_REGULATOR_MCP16502 is not set -# CONFIG_REGULATOR_MT6311 is not set -CONFIG_REGULATOR_PALMAS=y -# 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=y -CONFIG_REGULATOR_RK808=y -# CONFIG_REGULATOR_S2MPA01 is not set -# CONFIG_REGULATOR_S2MPS11 is not set -# CONFIG_REGULATOR_S5M8767 is not set -CONFIG_REGULATOR_SLG51000=m -# CONFIG_REGULATOR_SY8106A is not set -# CONFIG_REGULATOR_SY8824X is not set -# 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_RC_CORE is not set -# CONFIG_MEDIA_SUPPORT is not set - -# -# Graphics support -# -CONFIG_VGA_ARB=y -CONFIG_VGA_ARB_MAX_GPUS=16 -# CONFIG_IMX_IPUV3_CORE is not set -CONFIG_DRM=y -CONFIG_DRM_MIPI_DSI=y -# CONFIG_DRM_DP_AUX_CHARDEV is not set -# CONFIG_DRM_DEBUG_MM is not set -# CONFIG_DRM_DEBUG_SELFTEST is not set -CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y -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_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_GEM_SHMEM_HELPER=y -CONFIG_DRM_SCHED=y - -# -# 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 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 - -# -# ACP (Audio CoProcessor) Configuration -# -# end of ACP (Audio CoProcessor) Configuration - -# CONFIG_DRM_NOUVEAU is not set -# CONFIG_DRM_VGEM is not set -# CONFIG_DRM_VKMS is not set -# CONFIG_DRM_EXYNOS is not set -CONFIG_DRM_ROCKCHIP=y -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 is not set -# CONFIG_DRM_AST is not set -# CONFIG_DRM_MGAG200 is not set -# CONFIG_DRM_CIRRUS_QEMU 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_OMAP is not set -# CONFIG_DRM_TILCDC is not set -# CONFIG_DRM_QXL is not set -# CONFIG_DRM_BOCHS is not set -# CONFIG_DRM_VIRTIO_GPU is not set -# CONFIG_DRM_FSL_DCU is not set -# CONFIG_DRM_STM is not set -CONFIG_DRM_PANEL=y - -# -# Display Panels -# -# CONFIG_DRM_PANEL_ARM_VERSATILE is not set -# CONFIG_DRM_PANEL_LVDS is not set -CONFIG_DRM_PANEL_SIMPLE=y -# 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_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_NT39016 is not set -# 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_ROCKTECH_JH057N00900 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_S6E8AA0 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_ST7789V is not set -# CONFIG_DRM_PANEL_SONY_ACX565AKM 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 -# end of Display Panels - -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_PANEL_BRIDGE=y - -# -# Display Interface Bridges -# -# CONFIG_DRM_ANALOGIX_ANX78XX is not set -# CONFIG_DRM_CDNS_DSI is not set -# CONFIG_DRM_DUMB_VGA_DAC is not set -# CONFIG_DRM_LVDS_ENCODER is not set -# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set -# CONFIG_DRM_NXP_PTN3460 is not set -# CONFIG_DRM_PARADE_PS8622 is not set -# CONFIG_DRM_SIL_SII8620 is not set -# CONFIG_DRM_SII902X is not set -# CONFIG_DRM_SII9234 is not set -# CONFIG_DRM_THINE_THC63LVD1024 is not set -# CONFIG_DRM_TOSHIBA_TC358764 is not set -# CONFIG_DRM_TOSHIBA_TC358767 is not set -# CONFIG_DRM_TI_TFP410 is not set -# CONFIG_DRM_TI_SN65DSI86 is not set -CONFIG_DRM_ANALOGIX_DP=y -# CONFIG_DRM_I2C_ADV7511 is not set -CONFIG_DRM_DW_HDMI=y -# CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set -CONFIG_DRM_DW_HDMI_I2S_AUDIO=y -# CONFIG_DRM_DW_HDMI_CEC is not set -CONFIG_DRM_DW_MIPI_DSI=y -# end of Display Interface Bridges - -# CONFIG_DRM_STI is not set -# CONFIG_DRM_ETNAVIV is not set -# CONFIG_DRM_ARCPGU is not set -# CONFIG_DRM_MXSFB is not set -CONFIG_DRM_GM12U320=m -# CONFIG_TINYDRM_HX8357D is not set -# CONFIG_TINYDRM_ILI9225 is not set -# CONFIG_TINYDRM_ILI9341 is not set -# 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_LIMA is not set -CONFIG_DRM_PANFROST=y -CONFIG_DRM_MCDE=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_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_MODE_HELPERS=y -# CONFIG_FB_TILEBLITTING is not set - -# -# Frame buffer hardware drivers -# -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_ARMCLCD 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_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 is not set -# 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 is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_VT8623 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_ARK is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_CARMINE is not set -# CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_UDL is not set -# CONFIG_FB_IBM_GXT4500 is not set -# CONFIG_FB_VIRTUAL is not set -# CONFIG_FB_METRONOME is not set -# CONFIG_FB_MB862XX 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 is not set -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y -CONFIG_BACKLIGHT_PWM=y -# CONFIG_BACKLIGHT_DA9052 is not set -# CONFIG_BACKLIGHT_PM8941_WLED is not set -# CONFIG_BACKLIGHT_ADP8860 is not set -# CONFIG_BACKLIGHT_ADP8870 is not set -# CONFIG_BACKLIGHT_LM3630A is not set -# CONFIG_BACKLIGHT_LM3639 is not set -# CONFIG_BACKLIGHT_LP855X is not set -# CONFIG_BACKLIGHT_PANDORA is not set -# CONFIG_BACKLIGHT_GPIO is not set -# CONFIG_BACKLIGHT_LV5207LP is not set -# CONFIG_BACKLIGHT_BD6107 is not set -# CONFIG_BACKLIGHT_ARCXCNN is not set -# end of Backlight & LCD device support - -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 is not set -# 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=y -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_PCM_ELD=y -CONFIG_SND_PCM_IEC958=y -CONFIG_SND_DMAENGINE_PCM=y -CONFIG_SND_SEQ_DEVICE=y -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -# CONFIG_SND_OSSEMUL is not set -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_HRTIMER=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 -# CONFIG_SND_SUPPORT_OLD_API is not set -CONFIG_SND_PROC_FS=y -# CONFIG_SND_VERBOSE_PROCFS is not set -# CONFIG_SND_VERBOSE_PRINTK is not set -# CONFIG_SND_DEBUG is not set -CONFIG_SND_SEQUENCER=y -# CONFIG_SND_SEQ_DUMMY is not set -CONFIG_SND_SEQ_HRTIMER_DEFAULT=y -# CONFIG_SND_DRIVERS is not set -CONFIG_SND_PCI=y -# CONFIG_SND_AD1889 is not set -# CONFIG_SND_ALS300 is not set -# CONFIG_SND_ALI5451 is not set -# 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 is not set -# CONFIG_SND_BT87X is not set -# CONFIG_SND_CA0106 is not set -# CONFIG_SND_CMIPCI is not set -# CONFIG_SND_OXYGEN is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CTXFI is not set -# CONFIG_SND_DARLA20 is not set -# CONFIG_SND_GINA20 is not set -# CONFIG_SND_LAYLA20 is not set -# CONFIG_SND_DARLA24 is not set -# CONFIG_SND_GINA24 is not set -# CONFIG_SND_LAYLA24 is not set -# CONFIG_SND_MONA is not set -# CONFIG_SND_MIA is not set -# CONFIG_SND_ECHO3G is not set -# CONFIG_SND_INDIGO is not set -# CONFIG_SND_INDIGOIO is not set -# CONFIG_SND_INDIGODJ is not set -# CONFIG_SND_INDIGOIOX is not set -# CONFIG_SND_INDIGODJX is not set -# CONFIG_SND_EMU10K1 is not set -# CONFIG_SND_EMU10K1X is not set -# CONFIG_SND_ENS1370 is not set -# CONFIG_SND_ENS1371 is not set -# CONFIG_SND_ES1938 is not set -# CONFIG_SND_ES1968 is not set -# CONFIG_SND_FM801 is not set -# CONFIG_SND_HDSP is not set -# CONFIG_SND_HDSPM is not set -# CONFIG_SND_ICE1712 is not set -# 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 is not set -# CONFIG_SND_LX6464ES is not set -# CONFIG_SND_MAESTRO3 is not set -# CONFIG_SND_MIXART is not set -# CONFIG_SND_NM256 is not set -# CONFIG_SND_PCXHR is not set -# CONFIG_SND_RIPTIDE is not set -# CONFIG_SND_RME32 is not set -# CONFIG_SND_RME96 is not set -# CONFIG_SND_RME9652 is not set -# CONFIG_SND_SE6X is not set -# CONFIG_SND_SONICVIBES is not set -# CONFIG_SND_TRIDENT is not set -# CONFIG_SND_VIA82XX is not set -# CONFIG_SND_VIA82XX_MODEM is not set -# CONFIG_SND_VIRTUOSO is not set -# CONFIG_SND_VX222 is not set -# CONFIG_SND_YMFPCI is not set - -# -# HD-Audio -# -# CONFIG_SND_HDA_INTEL is not set -# end of HD-Audio - -CONFIG_SND_HDA_PREALLOC_SIZE=64 -# CONFIG_SND_ARM is not set -# CONFIG_SND_SPI is not set -# CONFIG_SND_USB is not set -CONFIG_SND_SOC=y -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -# CONFIG_SND_SOC_AMD_ACP is not set -# CONFIG_SND_ATMEL_SOC is not set -CONFIG_SND_DESIGNWARE_I2S=y -# CONFIG_SND_DESIGNWARE_PCM is not set - -# -# SoC Audio for Freescale CPUs -# - -# -# Common SoC Audio options for Freescale CPUs: -# -# CONFIG_SND_SOC_FSL_ASRC is not set -# CONFIG_SND_SOC_FSL_SAI is not set -# CONFIG_SND_SOC_FSL_AUDMIX is not set -# CONFIG_SND_SOC_FSL_SSI is not set -# CONFIG_SND_SOC_FSL_SPDIF is not set -# CONFIG_SND_SOC_FSL_ESAI is not set -# CONFIG_SND_SOC_FSL_MICFIL is not set -# CONFIG_SND_SOC_IMX_AUDMUX is not set -# end of SoC Audio for Freescale CPUs - -# CONFIG_SND_I2S_HI6210_I2S is not set -# CONFIG_SND_SOC_IMG is not set -# CONFIG_SND_SOC_MTK_BTCVSD is not set -CONFIG_SND_SOC_ROCKCHIP=y -CONFIG_SND_SOC_ROCKCHIP_I2S=y -CONFIG_SND_SOC_ROCKCHIP_PDM=y -CONFIG_SND_SOC_ROCKCHIP_SPDIF=y -CONFIG_SND_SOC_ROCKCHIP_MAX98090=y -CONFIG_SND_SOC_ROCKCHIP_RT5645=y -CONFIG_SND_SOC_RK3288_HDMI_ANALOG=y -# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set -# CONFIG_SND_SOC_SOF_TOPLEVEL is not set - -# -# STMicroelectronics STM32 SOC audio support -# -# end of STMicroelectronics STM32 SOC audio support - -# 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=y - -# -# CODEC drivers -# -# CONFIG_SND_SOC_AC97_CODEC is not set -# CONFIG_SND_SOC_ADAU1701 is not set -# CONFIG_SND_SOC_ADAU1761_I2C is not set -# CONFIG_SND_SOC_ADAU1761_SPI is not set -# CONFIG_SND_SOC_ADAU7002 is not set -# CONFIG_SND_SOC_AK4104 is not set -# CONFIG_SND_SOC_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_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_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_DMIC is not set -CONFIG_SND_SOC_HDMI_CODEC=y -# 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=y -CONFIG_SND_SOC_ES8328_I2C=y -CONFIG_SND_SOC_ES8328_SPI=y -# 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=y -# 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 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_PCM512x_I2C is not set -# CONFIG_SND_SOC_PCM512x_SPI is not set -CONFIG_SND_SOC_RK3328=m -CONFIG_SND_SOC_RL6231=y -# CONFIG_SND_SOC_RT5616 is not set -# CONFIG_SND_SOC_RT5631 is not set -CONFIG_SND_SOC_RT5645=y -# CONFIG_SND_SOC_SGTL5000 is not set -# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set -# CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set -# CONFIG_SND_SOC_SPDIF is not set -# CONFIG_SND_SOC_SSM2305 is not set -# CONFIG_SND_SOC_SSM2602_SPI is not set -# CONFIG_SND_SOC_SSM2602_I2C is not set -# CONFIG_SND_SOC_SSM4567 is not set -# CONFIG_SND_SOC_STA32X is not set -# CONFIG_SND_SOC_STA350 is not set -# CONFIG_SND_SOC_STI_SAS is not set -# CONFIG_SND_SOC_TAS2552 is not set -# CONFIG_SND_SOC_TAS5086 is not set -# CONFIG_SND_SOC_TAS571X is not set -# CONFIG_SND_SOC_TAS5720 is not set -# CONFIG_SND_SOC_TAS6424 is not set -# CONFIG_SND_SOC_TDA7419 is not set -# CONFIG_SND_SOC_TFA9879 is not set -# CONFIG_SND_SOC_TLV320AIC23_I2C is not set -# CONFIG_SND_SOC_TLV320AIC23_SPI is not set -# CONFIG_SND_SOC_TLV320AIC31XX is not set -# CONFIG_SND_SOC_TLV320AIC32X4_I2C is not set -# CONFIG_SND_SOC_TLV320AIC32X4_SPI is not set -# CONFIG_SND_SOC_TLV320AIC3X is not set -CONFIG_SND_SOC_TS3A227E=y -# 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 is not set -# 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 is not set -# CONFIG_SND_SOC_WM8904 is not set -# CONFIG_SND_SOC_WM8960 is not set -# CONFIG_SND_SOC_WM8962 is not set -# CONFIG_SND_SOC_WM8974 is not set -# CONFIG_SND_SOC_WM8978 is not set -# CONFIG_SND_SOC_WM8985 is not set -# CONFIG_SND_SOC_ZX_AUD96P22 is not set -# CONFIG_SND_SOC_MAX9759 is not set -# CONFIG_SND_SOC_MT6351 is not set -# CONFIG_SND_SOC_MT6358 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 -# end of CODEC drivers - -# CONFIG_SND_SIMPLE_CARD is not set -# CONFIG_SND_AUDIO_GRAPH_CARD is not set - -# -# HID support -# -CONFIG_HID=y -# CONFIG_HID_BATTERY_STRENGTH is not set -CONFIG_HIDRAW=y -CONFIG_UHID=y -CONFIG_HID_GENERIC=y - -# -# Special HID drivers -# -# CONFIG_HID_A4TECH is not set -# CONFIG_HID_ACCUTOUCH is not set -# CONFIG_HID_ACRUX is not set -# CONFIG_HID_APPLE is not set -# CONFIG_HID_APPLEIR is not set -# CONFIG_HID_ASUS is not set -# CONFIG_HID_AUREAL is not set -# CONFIG_HID_BELKIN is not set -# CONFIG_HID_BETOP_FF is not set -# CONFIG_HID_BIGBEN_FF is not set -# CONFIG_HID_CHERRY is not set -# CONFIG_HID_CHICONY is not set -CONFIG_HID_CORSAIR=y -# CONFIG_HID_COUGAR is not set -# CONFIG_HID_MACALLY is not set -# CONFIG_HID_PRODIKEYS is not set -# CONFIG_HID_CMEDIA is not set -# CONFIG_HID_CP2112 is not set -# CONFIG_HID_CREATIVE_SB0540 is not set -# CONFIG_HID_CYPRESS is not set -# CONFIG_HID_DRAGONRISE is not set -# CONFIG_HID_EMS_FF is not set -CONFIG_HID_ELAN=y -# CONFIG_HID_ELECOM is not set -# CONFIG_HID_ELO is not set -# CONFIG_HID_EZKEY is not set -# CONFIG_HID_GEMBIRD is not set -# CONFIG_HID_GFRM is not set -# CONFIG_HID_HOLTEK is not set -# CONFIG_HID_GOOGLE_HAMMER is not set -# CONFIG_HID_GT683R is not set -# CONFIG_HID_KEYTOUCH is not set -# CONFIG_HID_KYE is not set -# CONFIG_HID_UCLOGIC is not set -# CONFIG_HID_WALTOP is not set -# CONFIG_HID_VIEWSONIC is not set -# CONFIG_HID_GYRATION is not set -# CONFIG_HID_ICADE is not set -# CONFIG_HID_ITE is not set -# CONFIG_HID_JABRA is not set -# CONFIG_HID_TWINHAN is not set -# CONFIG_HID_KENSINGTON is not set -# CONFIG_HID_LCPOWER is not set -# CONFIG_HID_LED is not set -# CONFIG_HID_LENOVO is not set -# CONFIG_HID_LOGITECH is not set -# CONFIG_HID_MAGICMOUSE is not set -# CONFIG_HID_MALTRON is not set -# CONFIG_HID_MAYFLASH is not set -# CONFIG_HID_REDRAGON is not set -# CONFIG_HID_MICROSOFT is not set -# CONFIG_HID_MONTEREY is not set -# CONFIG_HID_MULTITOUCH is not set -# CONFIG_HID_NTI is not set -# CONFIG_HID_NTRIG is not set -# CONFIG_HID_ORTEK is not set -# CONFIG_HID_PANTHERLORD is not set -# CONFIG_HID_PENMOUNT is not set -# CONFIG_HID_PETALYNX is not set -# CONFIG_HID_PICOLCD is not set -# CONFIG_HID_PLANTRONICS is not set -# CONFIG_HID_PRIMAX is not set -# CONFIG_HID_RETRODE is not set -# CONFIG_HID_ROCCAT is not set -# CONFIG_HID_SAITEK is not set -# CONFIG_HID_SAMSUNG is not set -# CONFIG_HID_SONY is not set -# CONFIG_HID_SPEEDLINK is not set -# CONFIG_HID_STEAM is not set -# CONFIG_HID_STEELSERIES is not set -# CONFIG_HID_SUNPLUS is not set -# CONFIG_HID_RMI is not set -# CONFIG_HID_GREENASIA is not set -# CONFIG_HID_SMARTJOYPLUS is not set -# CONFIG_HID_TIVO is not set -# CONFIG_HID_TOPSEED is not set -# CONFIG_HID_THINGM is not set -# CONFIG_HID_THRUSTMASTER is not set -# CONFIG_HID_UDRAW_PS3 is not set -CONFIG_HID_U2FZERO=m -# CONFIG_HID_WACOM is not set -# CONFIG_HID_WIIMOTE is not set -# CONFIG_HID_XINMO is not set -# CONFIG_HID_ZEROPLUS is not set -# CONFIG_HID_ZYDACRON is not set -# CONFIG_HID_SENSOR_HUB is not set -# CONFIG_HID_ALPS is not set -# end of Special HID drivers - -# -# USB HID support -# -CONFIG_USB_HID=y -CONFIG_HID_PID=y -# CONFIG_USB_HIDDEV is not set -# end of USB HID support - -# -# I2C HID support -# -CONFIG_I2C_HID=y -# 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 is not set -# CONFIG_USB_ULPI_BUS is not set -# CONFIG_USB_CONN_GPIO is not set -CONFIG_USB_ARCH_HAS_HCD=y -CONFIG_USB=y -CONFIG_USB_PCI=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y - -# -# Miscellaneous USB options -# -CONFIG_USB_DEFAULT_PERSIST=y -CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y -# CONFIG_USB_OTG_WHITELIST is not set -# CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_FSM is not set -# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set -CONFIG_USB_AUTOSUSPEND_DELAY=2 -CONFIG_USB_MON=y - -# -# USB Host Controller Drivers -# -# CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_XHCI_HCD=y -# CONFIG_USB_XHCI_DBGCAP is not set -CONFIG_USB_XHCI_PCI=y -CONFIG_USB_XHCI_PLATFORM=y -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 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 is not set -# CONFIG_USB_UHCI_HCD is not set -# CONFIG_USB_SL811_HCD is not set -# CONFIG_USB_R8A66597_HCD is not set -# CONFIG_USB_HCD_TEST_MODE is not set - -# -# USB Device Class drivers -# -# CONFIG_USB_ACM is not set -CONFIG_USB_PRINTER=y -# CONFIG_USB_WDM is not set -# CONFIG_USB_TMC is not set - -# -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may -# - -# -# also be needed; see USB_STORAGE Help for more info -# -CONFIG_USB_STORAGE=y -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_REALTEK=y -CONFIG_REALTEK_AUTOPM=y -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y -CONFIG_USB_STORAGE_ENE_UB6250=y -CONFIG_USB_UAS=y - -# -# USB Imaging devices -# -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_MICROTEK is not set -# CONFIG_USBIP_CORE is not set -# CONFIG_USB_CDNS3 is not set -# CONFIG_USB_MUSB_HDRC is not set -# CONFIG_USB_DWC3 is not set -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y - -# -# Gadget/Dual-role mode requires USB Gadget support to be enabled -# -# 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 is not set -# CONFIG_USB_ISP1760 is not set - -# -# USB port drivers -# -# CONFIG_USB_SERIAL is not set - -# -# USB Miscellaneous drivers -# -# CONFIG_USB_EMI62 is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_ADUTUX is not set -# CONFIG_USB_SEVSEG is not set -# CONFIG_USB_LEGOTOWER is not set -# CONFIG_USB_LCD is not set -# CONFIG_USB_CYPRESS_CY7C63 is not set -# CONFIG_USB_CYTHERM is not set -# CONFIG_USB_IDMOUSE is not set -# CONFIG_USB_FTDI_ELAN is not set -# CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_LD is not set -# CONFIG_USB_TRANCEVIBRATOR is not set -# CONFIG_USB_IOWARRIOR is not set -# CONFIG_USB_TEST is not set -# CONFIG_USB_EHSET_TEST_FIXTURE is not set -# CONFIG_USB_ISIGHTFW is not set -# CONFIG_USB_YUREX is not set -# CONFIG_USB_EZUSB_FX2 is not set -# CONFIG_USB_HUB_USB251XB is not set -# CONFIG_USB_HSIC_USB3503 is not set -# CONFIG_USB_HSIC_USB4604 is not set -# CONFIG_USB_LINK_LAYER_TEST is not set -CONFIG_USB_CHAOSKEY=m - -# -# USB Physical Layer drivers -# -CONFIG_USB_PHY=y -CONFIG_NOP_USB_XCEIV=y -# CONFIG_AM335X_PHY_USB is not set -CONFIG_USB_GPIO_VBUS=y -# CONFIG_USB_ISP1301 is not set -# CONFIG_USB_ULPI is not set -# end of USB Physical Layer drivers - -# CONFIG_USB_GADGET is not set -# CONFIG_TYPEC is not set -# CONFIG_USB_ROLE_SWITCH is not set -CONFIG_MMC=y -CONFIG_PWRSEQ_EMMC=y -CONFIG_PWRSEQ_SIMPLE=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=16 -# CONFIG_SDIO_UART is not set -# CONFIG_MMC_TEST is not set - -# -# MMC/SD/SDIO Host Controller Drivers -# -# CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_ARMMMCI is not set -CONFIG_MMC_SDHCI=y -# CONFIG_MMC_SDHCI_PCI is not set -CONFIG_MMC_SDHCI_PLTFM=y -# 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_DWCMSHC is not set -CONFIG_MMC_SDHCI_CADENCE=y -# CONFIG_MMC_SDHCI_F_SDH30 is not set -# CONFIG_MMC_TIFM_SD is not set -CONFIG_MMC_SPI=y -# CONFIG_MMC_CB710 is not set -# CONFIG_MMC_VIA_SDMMC is not set -CONFIG_MMC_DW=y -CONFIG_MMC_DW_PLTFM=y -# 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 is not set -# CONFIG_MMC_DW_PCI is not set -CONFIG_MMC_DW_ROCKCHIP=y -# CONFIG_MMC_VUB300 is not set -CONFIG_MMC_USHC=y -# CONFIG_MMC_USDHI6ROL0 is not set -CONFIG_MMC_REALTEK_USB=y -# CONFIG_MMC_CQHCI is not set -# CONFIG_MMC_TOSHIBA_PCI is not set -# CONFIG_MMC_MTK is not set -# CONFIG_MMC_SDHCI_XENON is not set -# CONFIG_MMC_SDHCI_OMAP is not set -# CONFIG_MMC_SDHCI_AM654 is not set -# CONFIG_MEMSTICK is not set -CONFIG_NEW_LEDS=y -CONFIG_LEDS_CLASS=y -# CONFIG_LEDS_CLASS_FLASH is not set -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set - -# -# LED drivers -# -# CONFIG_LEDS_AN30259A is not set -# CONFIG_LEDS_BCM6328 is not set -# CONFIG_LEDS_BCM6358 is not set -# CONFIG_LEDS_CR0014114 is not set -# CONFIG_LEDS_LM3530 is not set -# CONFIG_LEDS_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 is not set -# CONFIG_LEDS_LP3944 is not set -# CONFIG_LEDS_LP3952 is not set -# CONFIG_LEDS_LP5521 is not set -# CONFIG_LEDS_LP5523 is not set -# CONFIG_LEDS_LP5562 is not set -# CONFIG_LEDS_LP8501 is not set -# CONFIG_LEDS_LP8860 is not set -# CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_DA9052 is not set -# CONFIG_LEDS_DAC124S085 is not set -# CONFIG_LEDS_PWM is not set -# CONFIG_LEDS_REGULATOR is not set -# CONFIG_LEDS_BD2802 is not set -# CONFIG_LEDS_LT3593 is not set -# 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 - -# -# LED Triggers -# -CONFIG_LEDS_TRIGGERS=y -# CONFIG_LEDS_TRIGGER_TIMER is not set -# CONFIG_LEDS_TRIGGER_ONESHOT is not set -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -CONFIG_LEDS_TRIGGER_CPU=y -# CONFIG_LEDS_TRIGGER_ACTIVITY is not set -# CONFIG_LEDS_TRIGGER_GPIO is not set -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set - -# -# iptables trigger is under Netfilter config (LED target) -# -# CONFIG_LEDS_TRIGGER_TRANSIENT is not set -# CONFIG_LEDS_TRIGGER_CAMERA is not set -# CONFIG_LEDS_TRIGGER_PANIC is not set -# CONFIG_LEDS_TRIGGER_NETDEV is not set -# CONFIG_LEDS_TRIGGER_PATTERN is not set -# CONFIG_LEDS_TRIGGER_AUDIO is not set -# CONFIG_ACCESSIBILITY is not set -# CONFIG_INFINIBAND is not set -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -# CONFIG_EDAC is not set -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_AS3722 is not set -# CONFIG_RTC_DRV_DS1307 is not set -# CONFIG_RTC_DRV_DS1374 is not set -# CONFIG_RTC_DRV_DS1672 is not set -CONFIG_RTC_DRV_HYM8563=y -# CONFIG_RTC_DRV_MAX6900 is not set -# CONFIG_RTC_DRV_MAX77686 is not set -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 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_TWL4030 is not set -# CONFIG_RTC_DRV_PALMAS 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_RV8803 is not set -# CONFIG_RTC_DRV_S5M 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_RX6110 is not set -# CONFIG_RTC_DRV_RS5C348 is not set -# CONFIG_RTC_DRV_MAX6902 is not set -# CONFIG_RTC_DRV_PCF2123 is not set -# CONFIG_RTC_DRV_MCP795 is not set -CONFIG_RTC_I2C_AND_SPI=y - -# -# SPI and I2C RTC drivers -# -# CONFIG_RTC_DRV_DS3232 is not set -# CONFIG_RTC_DRV_PCF2127 is not set -# CONFIG_RTC_DRV_RV3029C2 is not set - -# -# Platform RTC drivers -# -# CONFIG_RTC_DRV_CMOS is not set -# 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 is not set -# 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=y - -# -# on-CPU RTC drivers -# -# CONFIG_RTC_DRV_PL030 is not set -# CONFIG_RTC_DRV_PL031 is not set -# CONFIG_RTC_DRV_CADENCE is not set -# CONFIG_RTC_DRV_FTRTC010 is not set -# CONFIG_RTC_DRV_SNVS is not set -# CONFIG_RTC_DRV_R7301 is not set - -# -# HID Sensor RTC drivers -# -CONFIG_DMADEVICES=y -# CONFIG_DMADEVICES_DEBUG is not set - -# -# DMA Devices -# -CONFIG_DMA_ENGINE=y -CONFIG_DMA_VIRTUAL_CHANNELS=y -CONFIG_DMA_OF=y -# CONFIG_ALTERA_MSGDMA is not set -CONFIG_AMBA_PL08X=y -# CONFIG_DW_AXI_DMAC is not set -# CONFIG_FSL_EDMA is not set -# CONFIG_FSL_QDMA is not set -# CONFIG_INTEL_IDMA64 is not set -# CONFIG_NBPFAXI_DMA is not set -CONFIG_PL330_DMA=y -# CONFIG_QCOM_HIDMA_MGMT is not set -# CONFIG_QCOM_HIDMA is not set -# CONFIG_DW_DMAC is not set -# CONFIG_DW_DMAC_PCI is not set - -# -# DMA Clients -# -# CONFIG_ASYNC_TX_DMA is not set -# CONFIG_DMATEST is not set - -# -# DMABUF options -# -CONFIG_SYNC_FILE=y -# CONFIG_SW_SYNC is not set -# CONFIG_UDMABUF is not set -# CONFIG_DMABUF_SELFTESTS is not set -# end of DMABUF options - -# CONFIG_AUXDISPLAY is not set -# CONFIG_UIO is not set -# CONFIG_VFIO is not set -# CONFIG_VIRT_DRIVERS is not set -CONFIG_VIRTIO=y -# CONFIG_VIRTIO_MENU is not set - -# -# Microsoft Hyper-V guest support -# -# end of Microsoft Hyper-V guest support - -# CONFIG_GREYBUS is not set -# CONFIG_STAGING is not set -# CONFIG_GOLDFISH is not set -CONFIG_MFD_CROS_EC=y -CONFIG_CHROME_PLATFORMS=y -CONFIG_CROS_EC=y -CONFIG_CROS_EC_I2C=y -CONFIG_CROS_EC_SPI=y -CONFIG_CROS_EC_PROTO=y -CONFIG_CROS_EC_CHARDEV=y -CONFIG_CROS_EC_LIGHTBAR=y -CONFIG_CROS_EC_VBC=m -CONFIG_CROS_EC_DEBUGFS=m -CONFIG_CROS_EC_SYSFS=m -# CONFIG_MELLANOX_PLATFORM is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_COMMON_CLK=y - -# -# Common Clock Framework -# -# CONFIG_CLK_HSDK is not set -# CONFIG_COMMON_CLK_MAX77686 is not set -# CONFIG_COMMON_CLK_MAX9485 is not set -CONFIG_COMMON_CLK_RK808=y -# CONFIG_COMMON_CLK_SCPI is not set -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 is not set -# CONFIG_CLK_TWL6040 is not set -# CONFIG_CLK_QORIQ is not set -# CONFIG_COMMON_CLK_PALMAS is not set -# 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 -# end of Common Clock Framework - -# CONFIG_HWSPINLOCK is not set - -# -# Clock Source drivers -# -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_CLKSRC_MMIO=y -CONFIG_DW_APB_TIMER=y -CONFIG_DW_APB_TIMER_OF=y -CONFIG_ROCKCHIP_TIMER=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_GLOBAL_TIMER=y -CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y -# end of Clock Source drivers - -CONFIG_MAILBOX=y -# CONFIG_ARM_MHU is not set -# CONFIG_PLATFORM_MHU is not set -CONFIG_PL320_MBOX=y -CONFIG_ROCKCHIP_MBOX=y -# CONFIG_ALTERA_MBOX is not set -# CONFIG_MAILBOX_TEST is not set -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_ROCKCHIP_IOMMU=y -# CONFIG_ARM_SMMU is not set - -# -# Remoteproc drivers -# -CONFIG_REMOTEPROC=y -# 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 - -# -# Aspeed SoC drivers -# -# end of Aspeed SoC drivers - -# -# Broadcom SoC drivers -# -# CONFIG_SOC_BRCMSTB is not set -# 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 - -# -# Qualcomm SoC drivers -# -# end of Qualcomm SoC drivers - -CONFIG_ROCKCHIP_GRF=y -CONFIG_ROCKCHIP_PM_DOMAINS=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=y -CONFIG_DEVFREQ_GOV_PERFORMANCE=m -CONFIG_DEVFREQ_GOV_POWERSAVE=m -CONFIG_DEVFREQ_GOV_USERSPACE=m -CONFIG_DEVFREQ_GOV_PASSIVE=m - -# -# DEVFREQ Drivers -# -CONFIG_ARM_RK3399_DMC_DEVFREQ=m -CONFIG_PM_DEVFREQ_EVENT=y -CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m -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 is not set -# CONFIG_EXTCON_PTN5150 is not set -# CONFIG_EXTCON_RT8973A is not set -# CONFIG_EXTCON_SM5502 is not set -# CONFIG_EXTCON_USB_GPIO is not set -# CONFIG_EXTCON_USBC_CROS_EC is not set -# CONFIG_MEMORY is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -# CONFIG_IIO_BUFFER_CB is not set -# CONFIG_IIO_BUFFER_HW_CONSUMER is not set -CONFIG_IIO_KFIFO_BUF=y -CONFIG_IIO_TRIGGERED_BUFFER=y -# CONFIG_IIO_CONFIGFS is not set -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 -# CONFIG_IIO_SW_DEVICE is not set -# CONFIG_IIO_SW_TRIGGER is not set - -# -# Accelerometers -# -# CONFIG_ADIS16201 is not set -# CONFIG_ADIS16209 is not set -# CONFIG_ADXL345_I2C is not set -# CONFIG_ADXL345_SPI is not set -# CONFIG_ADXL372_SPI is not set -# CONFIG_ADXL372_I2C is not set -# CONFIG_BMA180 is not set -# CONFIG_BMA220 is not set -# CONFIG_BMC150_ACCEL is not set -# CONFIG_DA280 is not set -# CONFIG_DA311 is not set -# CONFIG_DMARD06 is not set -# CONFIG_DMARD09 is not set -# CONFIG_DMARD10 is not set -# CONFIG_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_AD7124 is not set -# CONFIG_AD7266 is not set -# CONFIG_AD7291 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_AXP20X_ADC is not set -# CONFIG_AXP288_ADC is not set -# CONFIG_CC10001_ADC is not set -# CONFIG_ENVELOPE_DETECTOR is not set -# CONFIG_HI8435 is not set -# CONFIG_HX711 is not set -# CONFIG_INA2XX_ADC is not set -# CONFIG_LTC2471 is not set -# CONFIG_LTC2485 is not set -# CONFIG_LTC2497 is not set -# CONFIG_MAX1027 is not set -# CONFIG_MAX11100 is not set -# CONFIG_MAX1118 is not set -# CONFIG_MAX1363 is not set -# CONFIG_MAX9611 is not set -# CONFIG_MCP320X is not set -# CONFIG_MCP3422 is not set -# CONFIG_MCP3911 is not set -# CONFIG_NAU7802 is not set -# CONFIG_PALMAS_GPADC is not set -CONFIG_ROCKCHIP_SARADC=y -CONFIG_SD_ADC_MODULATOR=y -# 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_TWL4030_MADC is not set -# CONFIG_TWL6030_GPADC is not set -# CONFIG_VF610_ADC is not set -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 -# end of Amplifiers - -# -# Chemical Sensors -# -# CONFIG_ATLAS_PH_SENSOR is not set -# CONFIG_BME680 is not set -# CONFIG_CCS811 is not set -# CONFIG_IAQCORE is not set -# CONFIG_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 -# -# 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 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_LTC1660 is not set -# CONFIG_LTC2632 is not set -# CONFIG_AD5686_SPI is not set -# CONFIG_AD5696_I2C is not set -# CONFIG_AD5755 is not set -# CONFIG_AD5758 is not set -# CONFIG_AD5761 is not set -# CONFIG_AD5764 is not set -# CONFIG_AD5791 is not set -# CONFIG_AD7303 is not set -# CONFIG_AD8801 is not set -# CONFIG_DPOT_DAC is not set -# CONFIG_DS4424 is not set -# CONFIG_M62332 is not set -# CONFIG_MAX517 is not set -# CONFIG_MAX5821 is not set -# CONFIG_MCP4725 is not set -# CONFIG_MCP4922 is not set -# CONFIG_TI_DAC082S085 is not set -# CONFIG_TI_DAC5571 is not set -# CONFIG_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_ADXRS450 is not set -# CONFIG_BMG160 is not set -# CONFIG_FXAS21002C is not set -# 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_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_ADIS16480 is not set -# CONFIG_BMI160_I2C is not set -# CONFIG_BMI160_SPI is not set -# CONFIG_KMX61 is not set -# CONFIG_INV_MPU6050_I2C is not set -# CONFIG_INV_MPU6050_SPI is not set -# CONFIG_IIO_ST_LSM6DSX is not set -# end of Inertial measurement units - -# -# Light sensors -# -# CONFIG_ADJD_S311 is not set -# CONFIG_AL3320A is not set -# CONFIG_APDS9300 is not set -# CONFIG_APDS9960 is not set -# CONFIG_BH1750 is not set -# CONFIG_BH1780 is not set -# CONFIG_CM32181 is not set -# CONFIG_CM3232 is not set -# CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set -# CONFIG_CM36651 is not set -# CONFIG_GP2AP020A00F is not set -# CONFIG_SENSORS_ISL29018 is not set -# CONFIG_SENSORS_ISL29028 is not set -# CONFIG_ISL29125 is not set -# CONFIG_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_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_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 -# -# end of Inclinometer sensors - -# -# Triggers - standalone -# -# CONFIG_IIO_INTERRUPT_TRIGGER is not set -CONFIG_IIO_SYSFS_TRIGGER=y -# end of Triggers - standalone - -# -# 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_DPS310=m -# CONFIG_HP03 is not set -# CONFIG_MPL115_I2C is not set -# CONFIG_MPL115_SPI is not set -# CONFIG_MPL3115 is not set -# CONFIG_MS5611 is not set -# CONFIG_MS5637 is not set -# CONFIG_IIO_ST_PRESS is not set -# CONFIG_T5403 is not set -# CONFIG_HP206C is not set -# CONFIG_ZPA2326 is not set -# 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_RFD77402 is not set -# CONFIG_SRF04 is not set -# CONFIG_SX9500 is not set -# CONFIG_SRF08 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_MAXIM_THERMOCOUPLE 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_CROS_EC=y -# CONFIG_PWM_FSL_FTM is not set -# CONFIG_PWM_PCA9685 is not set -CONFIG_PWM_ROCKCHIP=y -# CONFIG_PWM_TWL is not set -# CONFIG_PWM_TWL_LED is not set - -# -# IRQ chip support -# -CONFIG_IRQCHIP=y -CONFIG_ARM_GIC=y -CONFIG_ARM_GIC_MAX_NR=1 -# CONFIG_AL_FIC is not set -# end of IRQ chip support - -# CONFIG_IPACK_BUS is not set -CONFIG_ARCH_HAS_RESET_CONTROLLER=y -CONFIG_RESET_CONTROLLER=y -# CONFIG_RESET_TI_SYSCON is not set - -# -# PHY Subsystem -# -CONFIG_GENERIC_PHY=y -CONFIG_GENERIC_PHY_MIPI_DPHY=y -# CONFIG_BCM_KONA_USB2_PHY is not set -# CONFIG_PHY_CADENCE_DP is not set -# CONFIG_PHY_CADENCE_DPHY is not set -# CONFIG_PHY_CADENCE_SIERRA is not set -# CONFIG_PHY_FSL_IMX8MQ_USB is not set -CONFIG_PHY_MIXEL_MIPI_DPHY=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_ROCKCHIP_DP=y -CONFIG_PHY_ROCKCHIP_EMMC=y -# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set -# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set -# CONFIG_PHY_ROCKCHIP_PCIE is not set -# CONFIG_PHY_ROCKCHIP_TYPEC is not set -CONFIG_PHY_ROCKCHIP_USB=y -# CONFIG_PHY_SAMSUNG_USB2 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_PMU=y -# end of Performance monitor support - -CONFIG_RAS=y - -# -# Android -# -# CONFIG_ANDROID is not set -# end of Android - -# CONFIG_LIBNVDIMM is not set -# CONFIG_DAX is not set -CONFIG_NVMEM=y -CONFIG_NVMEM_SYSFS=y -CONFIG_ROCKCHIP_EFUSE=y - -# -# 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_PM_OPP=y -# CONFIG_SIOX is not set -# CONFIG_SLIMBUS is not set -# CONFIG_INTERCONNECT is not set -# CONFIG_COUNTER 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 is not set -# CONFIG_JFS_FS is not set -CONFIG_XFS_FS=m -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_POSIX_ACL is not set -# CONFIG_XFS_RT is not set -# CONFIG_XFS_ONLINE_SCRUB is not set -# CONFIG_XFS_WARN is not set -# CONFIG_XFS_DEBUG is not set -# CONFIG_GFS2_FS is not set -# CONFIG_OCFS2_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 is not set -# CONFIG_F2FS_FS is not set -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 is not set -CONFIG_INOTIFY_USER=y -CONFIG_FANOTIFY=y -# CONFIG_QUOTA is not set -CONFIG_AUTOFS4_FS=m -CONFIG_AUTOFS_FS=m -CONFIG_FUSE_FS=m -# CONFIG_CUSE is not set -# CONFIG_VIRTIO_FS is not set -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=y -# CONFIG_FSCACHE_STATS is not set -# CONFIG_FSCACHE_HISTOGRAM is not set -# CONFIG_FSCACHE_DEBUG is not set -# CONFIG_FSCACHE_OBJECT_LIST is not set -CONFIG_CACHEFILES=y -# 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/NT Filesystems -# -CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set -CONFIG_VFAT_FS=y -CONFIG_FAT_DEFAULT_CODEPAGE=850 -CONFIG_FAT_DEFAULT_IOCHARSET="utf8" -CONFIG_FAT_DEFAULT_UTF8=y -CONFIG_NTFS_FS=y -# CONFIG_NTFS_DEBUG is not set -CONFIG_NTFS_RW=y -# end of DOS/FAT/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_HUGETLBFS is not set -CONFIG_MEMFD_CREATE=y -CONFIG_CONFIGFS_FS=y -# end of Pseudo filesystems - -CONFIG_MISC_FILESYSTEMS=y -# CONFIG_ORANGEFS_FS is not set -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -CONFIG_ECRYPT_FS=y -# CONFIG_ECRYPT_FS_MESSAGING is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_CRAMFS 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 is not set -CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_LZ4 is not set -# CONFIG_SQUASHFS_LZO is not set -# CONFIG_SQUASHFS_XZ is not set -# 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 is not set -# CONFIG_MINIX_FS is not set -# CONFIG_OMFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set -# CONFIG_PSTORE is not set -# CONFIG_SYSV_FS is not set -# CONFIG_UFS_FS is not set -# CONFIG_EROFS_FS is not set -# CONFIG_NETWORK_FILESYSTEMS is not set -CONFIG_NLS=y -CONFIG_NLS_DEFAULT="utf8" -CONFIG_NLS_CODEPAGE_437=y -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -CONFIG_NLS_CODEPAGE_850=y -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -# CONFIG_NLS_ASCII is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set -# CONFIG_NLS_MAC_ROMAN is not set -# CONFIG_NLS_MAC_CELTIC is not set -# CONFIG_NLS_MAC_CENTEURO is not set -# CONFIG_NLS_MAC_CROATIAN is not set -# CONFIG_NLS_MAC_CYRILLIC is not set -# CONFIG_NLS_MAC_GAELIC is not set -# CONFIG_NLS_MAC_GREEK is not set -# CONFIG_NLS_MAC_ICELAND is not set -# CONFIG_NLS_MAC_INUIT is not set -# CONFIG_NLS_MAC_ROMANIAN is not set -# CONFIG_NLS_MAC_TURKISH is not set -CONFIG_NLS_UTF8=y -# CONFIG_DLM is not set -# CONFIG_UNICODE is not set -# end of File systems - -# -# Security options -# -CONFIG_KEYS=y -CONFIG_KEYS_REQUEST_CACHE=y -# CONFIG_PERSISTENT_KEYRINGS is not set -# CONFIG_BIG_KEYS is not set -# CONFIG_TRUSTED_KEYS is not set -# CONFIG_ENCRYPTED_KEYS is not set -# CONFIG_KEY_DH_OPERATIONS is not set -# CONFIG_SECURITY_DMESG_RESTRICT is not set -# CONFIG_SECURITY is not set -CONFIG_SECURITYFS=y -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_DEFAULT_SECURITY_DAC=y -CONFIG_LSM="yama,loadpin,safesetid,integrity" - -# -# Kernel hardening options -# -CONFIG_GCC_PLUGIN_STRUCTLEAK=y - -# -# Memory initialization -# -# CONFIG_INIT_STACK_NONE is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set -# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set -CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL=y -# CONFIG_GCC_PLUGIN_STRUCTLEAK_VERBOSE is not set -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_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_AKCIPHER2=y -CONFIG_CRYPTO_AKCIPHER=y -CONFIG_CRYPTO_KPP2=y -CONFIG_CRYPTO_KPP=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -# CONFIG_CRYPTO_USER is not set -# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set -# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_NULL2=y -# CONFIG_CRYPTO_PCRYPT is not set -# CONFIG_CRYPTO_CRYPTD is not set -CONFIG_CRYPTO_AUTHENC=m -# CONFIG_CRYPTO_TEST is not set -CONFIG_CRYPTO_ENGINE=m - -# -# Public-key cryptography -# -CONFIG_CRYPTO_RSA=y -# CONFIG_CRYPTO_DH is not set -CONFIG_CRYPTO_ECC=y -CONFIG_CRYPTO_ECDH=y -CONFIG_CRYPTO_ECRDSA=m - -# -# Authenticated Encryption with Associated Data -# -CONFIG_CRYPTO_CCM=y -CONFIG_CRYPTO_GCM=y -# CONFIG_CRYPTO_CHACHA20POLY1305 is not set -# CONFIG_CRYPTO_AEGIS128 is not set -CONFIG_CRYPTO_SEQIV=y -# CONFIG_CRYPTO_ECHAINIV is not set - -# -# Block modes -# -CONFIG_CRYPTO_CBC=y -# CONFIG_CRYPTO_CFB is not set -CONFIG_CRYPTO_CTR=y -# CONFIG_CRYPTO_CTS is not set -CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_OFB is not set -# CONFIG_CRYPTO_PCBC is not set -CONFIG_CRYPTO_XTS=y -# CONFIG_CRYPTO_KEYWRAP is not set -# CONFIG_CRYPTO_ADIANTUM is not set -CONFIG_CRYPTO_ESSIV=m - -# -# Hash modes -# -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_HMAC=y -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_VMAC is not set - -# -# Digest -# -CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32 is not set -CONFIG_CRYPTO_XXHASH=m -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_GHASH=y -# CONFIG_CRYPTO_POLY1305 is not set -# CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_MICHAEL_MIC is not set -# CONFIG_CRYPTO_RMD128 is not set -# CONFIG_CRYPTO_RMD160 is not set -# CONFIG_CRYPTO_RMD256 is not set -# CONFIG_CRYPTO_RMD320 is not set -CONFIG_CRYPTO_SHA1=y -CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_SHA256=y -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_SHA3 is not set -# CONFIG_CRYPTO_SM3 is not set -CONFIG_CRYPTO_STREEBOG=m -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_WP512 is not set - -# -# Ciphers -# -CONFIG_CRYPTO_LIB_AES=y -CONFIG_CRYPTO_AES=y -# CONFIG_CRYPTO_AES_TI is not set -# CONFIG_CRYPTO_ANUBIS is not set -CONFIG_CRYPTO_LIB_ARC4=y -CONFIG_CRYPTO_ARC4=y -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -CONFIG_CRYPTO_LIB_DES=y -CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_CHACHA20 is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SERPENT is not set -# CONFIG_CRYPTO_SM4 is not set -# CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set - -# -# Compression -# -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_LZO=y -# CONFIG_CRYPTO_842 is not set -CONFIG_CRYPTO_LZ4=y -# CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set - -# -# Random Number Generation -# -# CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_DRBG_HMAC=y -# CONFIG_CRYPTO_DRBG_HASH is not set -# CONFIG_CRYPTO_DRBG_CTR is not set -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_JITTERENTROPY=y -# CONFIG_CRYPTO_USER_API_HASH is not set -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set -# CONFIG_CRYPTO_USER_API_RNG is not set -# CONFIG_CRYPTO_USER_API_AEAD is not set -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HW=y -CONFIG_CRYPTO_DEV_ATMEL_I2C=m -CONFIG_CRYPTO_DEV_ATMEL_ECC=m -CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m -CONFIG_CRYPTO_DEV_ROCKCHIP=y -CONFIG_CRYPTO_DEV_VIRTIO=m -# CONFIG_CRYPTO_DEV_SAFEXCEL is not set -# CONFIG_CRYPTO_DEV_CCREE is not set -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_X509_CERTIFICATE_PARSER=y -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set -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_PACKING is not set -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 is not set -CONFIG_RATIONAL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -# CONFIG_CRC_CCITT is not set -CONFIG_CRC16=y -CONFIG_CRC_T10DIF=y -CONFIG_CRC_ITU_T=y -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 is not set -# CONFIG_CRC4 is not set -CONFIG_CRC7=y -CONFIG_LIBCRC32C=y -# CONFIG_CRC8 is not set -CONFIG_XXHASH=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=y -CONFIG_LZ4_DECOMPRESS=y -CONFIG_ZSTD_COMPRESS=m -CONFIG_ZSTD_DECOMPRESS=m -CONFIG_XZ_DEC=y -# CONFIG_XZ_DEC_X86 is not set -# CONFIG_XZ_DEC_POWERPC is not set -# CONFIG_XZ_DEC_IA64 is not set -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_ARMTHUMB=y -# CONFIG_XZ_DEC_SPARC is not set -CONFIG_XZ_DEC_BCJ=y -# CONFIG_XZ_DEC_TEST is not set -CONFIG_DECOMPRESS_GZIP=y -CONFIG_DECOMPRESS_BZIP2=y -CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_XZ=y -CONFIG_DECOMPRESS_LZO=y -CONFIG_DECOMPRESS_LZ4=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_XARRAY_MULTI=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAS_DMA=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_DMA_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_COHERENT_TO_PFN=y -CONFIG_SWIOTLB=y -CONFIG_DMA_REMAP=y -CONFIG_DMA_CMA=y - -# -# Default contiguous memory area size: -# -CONFIG_CMA_SIZE_MBYTES=16 -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_ALIGNMENT=8 -# CONFIG_DMA_API_DEBUG is not set -CONFIG_SGL_ALLOC=y -CONFIG_CPU_RMAP=y -CONFIG_DQL=y -CONFIG_GLOB=y -# CONFIG_GLOB_SELFTEST is not set -CONFIG_NLATTR=y -CONFIG_CLZ_TAB=y -CONFIG_IRQ_POLL=y -CONFIG_MPILIB=y -CONFIG_LIBFDT=y -CONFIG_OID_REGISTRY=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_SG_POOL=y -CONFIG_SBITMAP=y -# CONFIG_STRING_SELFTEST is not set -# end of Library routines - -# -# Kernel hacking -# - -# -# printk and dmesg options -# -CONFIG_PRINTK_TIME=y -# CONFIG_PRINTK_CALLER is not set -CONFIG_CONSOLE_LOGLEVEL_DEFAULT=8 -CONFIG_CONSOLE_LOGLEVEL_QUIET=4 -CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 -# CONFIG_BOOT_PRINTK_DELAY is not set -CONFIG_DYNAMIC_DEBUG=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_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_ENABLE_MUST_CHECK=y -CONFIG_FRAME_WARN=1024 -CONFIG_STRIP_ASM_SYMS=y -# CONFIG_READABLE_ASM is not set -CONFIG_DEBUG_FS=y -# CONFIG_HEADERS_INSTALL is not set -CONFIG_OPTIMIZE_INLINING=y -# CONFIG_DEBUG_SECTION_MISMATCH is not set -# CONFIG_SECTION_MISMATCH_WARN_ONLY 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 - -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 -# CONFIG_MAGIC_SYSRQ_SERIAL is not set -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_DEBUG_OBJECTS is not set -# CONFIG_SLUB_STATS is not set -CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set -# CONFIG_DEBUG_STACK_USAGE is not set -# CONFIG_DEBUG_VM is not set -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -# CONFIG_DEBUG_VIRTUAL is not set -# CONFIG_DEBUG_MEMORY_INIT is not set -# CONFIG_DEBUG_PER_CPU_MAPS is not set -# CONFIG_DEBUG_HIGHMEM is not set -CONFIG_CC_HAS_KASAN_GENERIC=y -CONFIG_KASAN_STACK=1 -# end of Memory Debugging - -CONFIG_ARCH_HAS_KCOV=y -CONFIG_CC_HAS_SANCOV_TRACE_PC=y -# CONFIG_KCOV is not set -# CONFIG_DEBUG_SHIRQ is not set - -# -# Debug Lockups and Hangs -# -# CONFIG_SOFTLOCKUP_DETECTOR is not set -CONFIG_DETECT_HUNG_TASK=y -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=300 -# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set -CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0 -# CONFIG_WQ_WATCHDOG is not set -# end of Debug Lockups and Hangs - -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 -# CONFIG_SCHED_DEBUG is not set -# CONFIG_SCHEDSTATS is not set -CONFIG_SCHED_STACK_END_CHECK=y -# CONFIG_DEBUG_TIMEKEEPING is not set -# CONFIG_DEBUG_PREEMPT 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 -# 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_DEBUG_BUGVERBOSE=y -# 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_DEBUG_CREDENTIALS is not set - -# -# RCU Debugging -# -# CONFIG_RCU_PERF_TEST is not set -# CONFIG_RCU_TORTURE_TEST is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -# CONFIG_RCU_TRACE is not set -# CONFIG_RCU_EQS_DEBUG is not set -# 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_NOTIFIER_ERROR_INJECTION is not set -# CONFIG_FAULT_INJECTION is not set -# CONFIG_LATENCYTOP is not set -CONFIG_NOP_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_TRACER_MAX_TRACE=y -CONFIG_TRACE_CLOCK=y -CONFIG_RING_BUFFER=y -CONFIG_EVENT_TRACING=y -CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_TRACING=y -CONFIG_GENERIC_TRACER=y -CONFIG_TRACING_SUPPORT=y -CONFIG_FTRACE=y -CONFIG_FUNCTION_TRACER=y -CONFIG_FUNCTION_GRAPH_TRACER=y -# CONFIG_PREEMPTIRQ_EVENTS is not set -# CONFIG_IRQSOFF_TRACER is not set -# CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_HWLAT_TRACER is not set -CONFIG_FTRACE_SYSCALLS=y -CONFIG_TRACER_SNAPSHOT=y -# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set -CONFIG_BRANCH_PROFILE_NONE=y -# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set -# CONFIG_PROFILE_ALL_BRANCHES is not set -CONFIG_STACK_TRACER=y -# CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_KPROBE_EVENTS is not set -CONFIG_UPROBE_EVENTS=y -CONFIG_BPF_EVENTS=y -CONFIG_DYNAMIC_EVENTS=y -CONFIG_PROBE_EVENTS=y -CONFIG_DYNAMIC_FTRACE=y -CONFIG_DYNAMIC_FTRACE_WITH_REGS=y -# CONFIG_FUNCTION_PROFILER is not set -CONFIG_FTRACE_MCOUNT_RECORD=y -# CONFIG_FTRACE_STARTUP_TEST is not set -# CONFIG_TRACEPOINT_BENCHMARK is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set -# CONFIG_RING_BUFFER_STARTUP_TEST is not set -# CONFIG_PREEMPTIRQ_DELAY_TEST is not set -# CONFIG_TRACE_EVAL_MAP_FILE is not set -# CONFIG_RUNTIME_TESTING_MENU is not set -# CONFIG_MEMTEST is not set -# CONFIG_BUG_ON_DATA_CORRUPTION is not set -# CONFIG_SAMPLES is not set -CONFIG_HAVE_ARCH_KGDB=y -# CONFIG_KGDB is not set -# CONFIG_UBSAN is not set -CONFIG_UBSAN_ALIGNMENT=y -CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y -# CONFIG_STRICT_DEVMEM is not set -# CONFIG_ARM_PTDUMP_DEBUGFS is not set -# CONFIG_DEBUG_WX 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 Kernel hacking diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c39c411e3d..4e1f48de19 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -566,15 +566,6 @@ for ARCH and optionally VARIANT, or #f if there is no such configuration." (file (string-append "linux-libre/" name))) (search-auxiliary-file file))) -;; FIXME: merge into kernel-config -(define* (kernel-config-veyron arch #:key variant) - "Return the absolute file name of the Linux-Libre build configuration file -for ARCH and optionally VARIANT, or #f if there is no such configuration." - (let* ((name (string-append (if variant (string-append variant "-") "") - (if (string=? "i386" arch) "i686" arch) "-veyron.conf")) - (file (string-append "linux-libre/" name))) - (search-auxiliary-file file))) - (define %default-extra-linux-options `(;; Some very mild hardening. ("CONFIG_SECURITY_DMESG_RESTRICT" . #t) @@ -845,11 +836,7 @@ It has been modified to remove all non-free binary blobs.") ;;; (define-public linux-libre-arm-veyron - (make-linux-libre* linux-libre-version - linux-libre-source - '("armhf-linux") - #:configuration-file kernel-config-veyron - #:extra-version "arm-veyron")) + (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) (define-public linux-libre-arm-generic (make-linux-libre* linux-libre-version diff --git a/gnu/system/examples/asus-c201.tmpl b/gnu/system/examples/asus-c201.tmpl index 098958f4a2..c08f85367f 100644 --- a/gnu/system/examples/asus-c201.tmpl +++ b/gnu/system/examples/asus-c201.tmpl @@ -18,7 +18,7 @@ ;; The ASUS C201PA requires a very particular kernel to boot, ;; as well as the following arguments. - (kernel linux-libre-arm-veyron) + (kernel linux-libre-arm-generic) (kernel-arguments '("console=tty1")) ;; We do not need any special modules for initrd, and the -- cgit v1.2.3 From 058e96c59f0d7700f8301a63154684da58acbad0 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sat, 14 Mar 2020 18:58:05 -0700 Subject: gnu: Add linux-libre-arm64-generic. * gnu/packages/linux (linux-libre-arm64-generic): New variable. --- gnu/packages/linux.scm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4e1f48de19..27ea07bd48 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -880,6 +880,13 @@ It has been modified to remove all non-free binary blobs.") #:defconfig "omap2plus_defconfig" #:extra-version "arm-omap2plus")) +(define-public linux-libre-arm64-generic + (make-linux-libre* linux-libre-version + linux-libre-source + '("aarch64-linux") + #:defconfig "defconfig" + #:extra-version "arm64-generic")) + (define-public linux-libre-riscv64-generic (make-linux-libre* linux-libre-version linux-libre-source -- cgit v1.2.3 From 1eb27d5caec488dc901965b4cff8723e3670be90 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Mar 2020 01:33:31 -0400 Subject: Re-order the armhf linux-libre kernel packages to fix the build. This is a followup to commit 37f8c50cdc2e99189c74999319f3a1854d419546. Previously, building Guix crashed like this: ------ In ice-9/eval.scm: 619:8 4 (_ #f) 626:19 3 (_ #) 159:9 2 (_ #) 223:20 1 (proc #) In unknown file: 0 (%resolve-variable (7 . linux-libre-arm-generic) #) ERROR: In procedure %resolve-variable: error: linux-libre-arm-generic: unbound variable ------ * gnu/packages/linux.scm (linux-libre-arm-veyron): Move after linux-libre-arm-generic. --- 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 27ea07bd48..f2dcc325ff 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -835,9 +835,6 @@ It has been modified to remove all non-free binary blobs.") ;;; Specialized kernel variants. ;;; -(define-public linux-libre-arm-veyron - (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) - (define-public linux-libre-arm-generic (make-linux-libre* linux-libre-version linux-libre-source @@ -845,6 +842,9 @@ It has been modified to remove all non-free binary blobs.") #:defconfig "multi_v7_defconfig" #:extra-version "arm-generic")) +(define-public linux-libre-arm-veyron + (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) + (define-public linux-libre-arm-generic-4.19 (make-linux-libre* linux-libre-4.19-version linux-libre-4.19-source -- cgit v1.2.3 From ea6e2299b40c6fbd9749563c52a2d77698bd9337 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Mar 2020 12:08:10 +0100 Subject: machine: ssh: Make sanity checks in a single round trip. * gnu/machine/ssh.scm (): New record type. (remote-let): New macro. (machine-check-file-system-availability): Rewrite to use 'remote-let' instead of 'mlet' and 'machine-remote-eval'. (machine-check-initrd-modules): Likewise. (machine-check-building-for-appropriate-system): Make non-monadic. (check-deployment-sanity): Rewrite to gather all the assertions as a single gexp and pass it to 'machine-remote-eval'. --- gnu/machine/ssh.scm | 142 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 59 deletions(-) (limited to 'gnu') diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 6374373e22..85ecbb6d14 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Jakob L. Kreuze +;;; Copyright © 2020 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,6 +40,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 textual-ports) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) @@ -142,9 +144,24 @@ an environment type of 'managed-host." ;;; Safety checks. ;;; +;; Assertion to be executed remotely. This abstraction exists to allow us to +;; gather a list of expressions to be evaluated and eventually evaluate them +;; all at once instead of one by one. (This is pretty much a monad.) +(define-record-type + (remote-assertion exp proc) + remote-assertion? + (exp remote-assertion-expression) + (proc remote-assertion-procedure)) + +(define-syntax-rule (remote-let ((var exp)) body ...) + "Return a that binds VAR to the result of evaluating EXP, +a gexp, remotely, and evaluate BODY in that context." + (remote-assertion exp (lambda (var) body ...))) + (define (machine-check-file-system-availability machine) - "Raise a '&message' error condition if any of the file-systems specified in -MACHINE's 'system' declaration do not exist on the machine." + "Return a list of that raise a '&message' error condition +if any of the file-systems specified in MACHINE's 'system' declaration do not +exist on the machine." (define file-systems (filter (lambda (fs) (and (file-system-mount? fs) @@ -154,22 +171,18 @@ MACHINE's 'system' declaration do not exist on the machine." (operating-system-file-systems (machine-operating-system machine)))) (define (check-literal-file-system fs) - (define remote-exp - #~(catch 'system-error - (lambda () - (stat #$(file-system-device fs)) - #t) - (lambda args - (system-error-errno args)))) - - (mlet %store-monad ((errno (machine-remote-eval machine remote-exp))) + (remote-let ((errno #~(catch 'system-error + (lambda () + (stat #$(file-system-device fs)) + #t) + (lambda args + (system-error-errno args))))) (when (number? errno) (raise (condition (&message (message (format #f (G_ "device '~a' not found: ~a") (file-system-device fs) - (strerror errno))))))) - (return #t))) + (strerror errno))))))))) (define (check-labeled-file-system fs) (define remote-exp @@ -180,14 +193,13 @@ MACHINE's 'system' declaration do not exist on the machine." (find-partition-by-label #$(file-system-label->string (file-system-device fs)))))) - (mlet %store-monad ((result (machine-remote-eval machine remote-exp))) + (remote-let ((result remote-exp)) (unless result (raise (condition (&message (message (format #f (G_ "no file system with label '~a'") (file-system-label->string - (file-system-device fs)))))))) - (return #t))) + (file-system-device fs)))))))))) (define (check-uuid-file-system fs) (define remote-exp @@ -203,31 +215,30 @@ MACHINE's 'system' declaration do not exist on the machine." (find-partition-by-uuid uuid)))) - (mlet %store-monad ((result (machine-remote-eval machine remote-exp))) + (remote-let ((result remote-exp)) (unless result (raise (condition (&message (message (format #f (G_ "no file system with UUID '~a'") - (uuid->string (file-system-device fs)))))))) - (return #t))) - - (mbegin %store-monad - (mapm %store-monad check-literal-file-system - (filter (lambda (fs) - (string? (file-system-device fs))) - file-systems)) - (mapm %store-monad check-labeled-file-system - (filter (lambda (fs) - (file-system-label? (file-system-device fs))) - file-systems)) - (mapm %store-monad check-uuid-file-system - (filter (lambda (fs) - (uuid? (file-system-device fs))) - file-systems)))) + (uuid->string (file-system-device fs)))))))))) + + (append (map check-literal-file-system + (filter (lambda (fs) + (string? (file-system-device fs))) + file-systems)) + (map check-labeled-file-system + (filter (lambda (fs) + (file-system-label? (file-system-device fs))) + file-systems)) + (map check-uuid-file-system + (filter (lambda (fs) + (uuid? (file-system-device fs))) + file-systems)))) (define (machine-check-initrd-modules machine) - "Raise a '&message' error condition if any of the modules needed by -'needed-for-boot' file systems in MACHINE are not available in the initrd." + "Return a list of that raise a '&message' error condition +if any of the modules needed by 'needed-for-boot' file systems in MACHINE are +not available in the initrd." (define file-systems (filter file-system-needed-for-boot? (operating-system-file-systems (machine-operating-system machine)))) @@ -255,20 +266,16 @@ MACHINE's 'system' declaration do not exist on the machine." (missing-modules dev '#$(operating-system-initrd-modules (machine-operating-system machine))))))) - (mlet %store-monad ((missing (machine-remote-eval machine remote-exp))) - (return (list fs missing)))) - - (mlet %store-monad ((device (mapm %store-monad missing-modules file-systems))) - (for-each (match-lambda - ((fs missing) - (unless (null? missing) - (raise (condition - (&message - (message (format #f (G_ "~a missing modules ~{ ~a~}~%") - (file-system-device fs) - missing)))))))) - device) - (return #t))) + + (remote-let ((missing remote-exp)) + (unless (null? missing) + (raise (condition + (&message + (message (format #f (G_ "~a missing modules ~{ ~a~}~%") + (file-system-device fs) + missing)))))))) + + (map missing-modules file-systems)) (define (machine-check-building-for-appropriate-system machine) "Raise a '&message' error condition if MACHINE is configured to be built @@ -280,21 +287,38 @@ by MACHINE." (not (string= system (machine-ssh-configuration-system config)))) (raise (condition (&message - (message (format #f (G_ "incorrect target system \ -('~a' was given, while the system reports that it is '~a')~%") + (message (format #f (G_ "incorrect target system\ + ('~a' was given, while the system reports that it is '~a')~%") (machine-ssh-configuration-system config) - system))))))) - (with-monad %store-monad (return #t))) + system)))))))) (define (check-deployment-sanity machine) "Raise a '&message' error condition if it is clear that deploying MACHINE's 'system' declaration would fail." - ;; Order is important here -- an incorrect value for 'system' will cause - ;; invocations of 'remote-eval' to fail. - (mbegin %store-monad - (machine-check-building-for-appropriate-system machine) - (machine-check-file-system-availability machine) - (machine-check-initrd-modules machine))) + (define assertions + (append (machine-check-file-system-availability machine) + (machine-check-initrd-modules machine))) + + (define aggregate-exp + ;; Gather all the expressions so that a single round-trip is enough to + ;; evaluate all the ASSERTIONS remotely. + #~(map (lambda (file) + (false-if-exception (primitive-load file))) + '#$(map (lambda (assertion) + (scheme-file "remote-assertion.scm" + (remote-assertion-expression assertion))) + assertions))) + + ;; First check MACHINE's system type--an incorrect value for 'system' would + ;; cause subsequent invocations of 'remote-eval' to fail. + (machine-check-building-for-appropriate-system machine) + + (mlet %store-monad ((values (machine-remote-eval machine aggregate-exp))) + (for-each (lambda (proc value) + (proc value)) + (map remote-assertion-procedure assertions) + values) + (return #t))) ;;; -- cgit v1.2.3 From 8bc745052e051d142213a0ea74c39bdd7c5ace70 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 20 Mar 2020 14:54:42 +0100 Subject: machine: ssh: Better report missing initrd modules. * gnu/machine/ssh.scm (machine-check-initrd-modules): Improve message upon module mismatch. --- gnu/machine/ssh.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/machine/ssh.scm b/gnu/machine/ssh.scm index 85ecbb6d14..116da86327 100644 --- a/gnu/machine/ssh.scm +++ b/gnu/machine/ssh.scm @@ -271,7 +271,7 @@ not available in the initrd." (unless (null? missing) (raise (condition (&message - (message (format #f (G_ "~a missing modules ~{ ~a~}~%") + (message (format #f (G_ "missing modules for ~a:~{ ~a~}~%") (file-system-device fs) missing)))))))) -- cgit v1.2.3 From 670da39888170d8f6acb9d0f2cf724b02c9f7ccb Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 21 Mar 2020 19:38:41 +0000 Subject: gnu: Add lv2toweb. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (lv2toweb): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index f3edd21c69..bad6f4a18d 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -78,6 +78,7 @@ #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages man) #:use-module (gnu packages maths) #:use-module (gnu packages mp3) ;taglib #:use-module (gnu packages multiprecision) @@ -4081,3 +4082,39 @@ given plugin and its UI(s) match up with the provided metadata and adhere to well-known best practices.") (home-page "https://open-music-kontrollers.ch/lv2/lv2lint/") (license license:artistic2.0))) + +(define-public lv2toweb + (package + (name "lv2toweb") + (version "0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x42/lv2toweb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "007aysqvgkf25za8nkmyd5g9kp1zla460dcpidlj5xg1zc3fcdfi")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no "check" target + #:make-flags (list "CC=gcc" + (string-append "PREFIX=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) + (inputs + `(("jalv", jalv) + ("lilv", lilv))) + (native-inputs + `(("help2man", help2man) + ("pkg-config", pkg-config))) + (synopsis "Documentation generator for LV2 plugins") + (description + "lv2toweb allows the user to create an xhtml page with information +about the given LV2 plugin, provided that the plugin and its UI(s) match up +with the provided metadata and adhere to well-known best practices.") + (home-page "https://github.com/x42/lv2toweb") + (license (list license:isc license:gpl2)))) -- cgit v1.2.3 From 591faabd8c93bfb6879910d8a424f0db835066c2 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 21 Mar 2020 19:45:14 +0000 Subject: gnu: Add python-gcovr. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-gcovr): New variable. Signed-off-by: Ludovic Courtès --- 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 65bc6df4aa..5336df0ab7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -70,6 +70,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil ;;; Copyright © 2020 Sebastian Schott +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -18435,3 +18436,27 @@ sequences.") prevent debuggers and other applications from inspecting the memory within your process.") (license license:expat))) + +(define-public python-gcovr + (package + (name "python-gcovr") + (version "4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gcovr" version)) + (sha256 + (base32 + "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs")))) + (build-system python-build-system) + (propagated-inputs + `(("python-lxml" ,python-lxml) + ("python-jinja2" ,python-jinja2))) + (home-page "https://gcovr.com/") + (synopsis "Utility for generating code coverage results") + (description + "Gcovr provides a utility for managing the use of the GNU gcov +utility and generating summarized code coverage results. It is inspired +by the Python coverage.py package, which provides a similar utility for +Python.") + (license license:bsd-3))) -- cgit v1.2.3 From 7ff639510096ff762b9cced5fba6db254a961af9 Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Mon, 23 Mar 2020 11:42:36 +0100 Subject: gnu: Add circos. * gnu/local.mk: Register circos-remove-findbin.patch. * gnu/packages/patches/circos-remove-findbin.patch: New file. * gnu/packages/perl.scm: New variable. --- gnu/local.mk | 1 + gnu/packages/patches/circos-remove-findbin.patch | 544 +++++++++++++++++++++++ gnu/packages/perl.scm | 96 ++++ 3 files changed, 641 insertions(+) create mode 100644 gnu/packages/patches/circos-remove-findbin.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index a080745220..7cce60b7c0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -777,6 +777,7 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-remove-test-unrar.patch \ %D%/packages/patches/casync-renameat2-declaration.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ + %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ diff --git a/gnu/packages/patches/circos-remove-findbin.patch b/gnu/packages/patches/circos-remove-findbin.patch new file mode 100644 index 0000000000..5675172e5d --- /dev/null +++ b/gnu/packages/patches/circos-remove-findbin.patch @@ -0,0 +1,544 @@ +This patch was created by Roel Janssen . + +Circos uses paths relative to the "circos" script to find its Perl modules. +This patch removes that mechanism, and instead expects the 'Circos' modules +to be available in the global Perl path. + +diff -crB circos-0.69-6/bin/circos circos-0.69-6-new/bin/circos +*** circos-0.69-6/bin/circos 2016-02-19 01:42:59.000000000 +0100 +--- circos-0.69-6-new/bin/circos 2018-01-12 09:59:25.662731269 +0100 +*************** +*** 474,486 **** + + use strict; + use warnings; +- use FindBin; + use Getopt::Long qw(:config pass_through posix_default auto_abbrev); + use Pod::Usage; + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; + use Circos; + + use Cwd; +--- 474,482 ---- +diff -crB circos-0.69-6/lib/Circos/Colors.pm circos-0.69-6-new/lib/Circos/Colors.pm +*** circos-0.69-6/lib/Circos/Colors.pm 2015-03-17 01:25:43.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Colors.pm 2018-01-12 10:10:39.174797379 +0100 +*************** +*** 49,55 **** + + use Carp qw( carp confess croak ); + use Digest::MD5 qw(md5_hex); +- use FindBin; + use File::Basename; + use File::Spec::Functions; + use File::Temp qw(tempdir); +--- 49,54 ---- +*************** +*** 65,74 **** + #use Time::HiRes qw(gettimeofday tv_interval); + #use List::Util qw( max min ); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use POSIX qw(pow); + + use Circos::Configuration; +--- 64,69 ---- +diff -crB circos-0.69-6/lib/Circos/Configuration.pm circos-0.69-6-new/lib/Circos/Configuration.pm +*** circos-0.69-6/lib/Circos/Configuration.pm 2015-03-17 22:11:01.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Configuration.pm 2018-01-12 10:11:41.064008273 +0100 +*************** +*** 59,68 **** + use Params::Validate qw(:all); + use List::MoreUtils qw(uniq); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Constants; + use Circos::Debug; + use Circos::Utils; +--- 59,64 ---- +diff -crB circos-0.69-6/lib/Circos/DataPoint.pm circos-0.69-6-new/lib/Circos/DataPoint.pm +*** circos-0.69-6/lib/Circos/DataPoint.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/DataPoint.pm 2018-01-12 10:11:54.888270731 +0100 +*************** +*** 38,51 **** + + use Carp qw( carp confess croak ); + use Data::Dumper; +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; + use Circos::Debug; +--- 38,46 ---- +diff -crB circos-0.69-6/lib/Circos/Debug.pm circos-0.69-6-new/lib/Circos/Debug.pm +*** circos-0.69-6/lib/Circos/Debug.pm 2015-03-24 01:26:13.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Debug.pm 2018-01-12 10:12:07.192502006 +0100 +*************** +*** 63,75 **** + + use Carp qw( carp confess croak ); + use Data::Dumper; +- use FindBin; + use Memoize; + use List::MoreUtils qw(uniq); + use Time::HiRes qw(gettimeofday tv_interval); +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; + + use Circos::Constants; + +--- 63,71 ---- +diff -crB circos-0.69-6/lib/Circos/Division.pm circos-0.69-6-new/lib/Circos/Division.pm +*** circos-0.69-6/lib/Circos/Division.pm 2015-11-17 00:55:58.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Division.pm 2018-01-12 10:12:21.544769084 +0100 +*************** +*** 37,52 **** + our @EXPORT = qw(); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD; + use Math::Round; + use List::MoreUtils qw(uniq); + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Constants; + use Circos::Debug; +--- 37,47 ---- +diff -crB circos-0.69-6/lib/Circos/Error.pm circos-0.69-6-new/lib/Circos/Error.pm +*** circos-0.69-6/lib/Circos/Error.pm 2015-03-17 22:46:36.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Error.pm 2018-01-12 10:12:32.472970548 +0100 +*************** +*** 44,53 **** + use Params::Validate; + use Text::Format; + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Constants; + use Circos::Debug; + use Circos::Utils; +--- 44,49 ---- +diff -crB circos-0.69-6/lib/Circos/Expression.pm circos-0.69-6-new/lib/Circos/Expression.pm +*** circos-0.69-6/lib/Circos/Expression.pm 2015-11-30 23:49:36.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Expression.pm 2018-01-12 10:12:41.953144015 +0100 +*************** +*** 39,55 **** + + use Carp qw( carp confess croak ); + use Data::Dumper; +- use FindBin; + use Params::Validate qw(:all); + use Math::Round; + use Math::VecStat qw(average); + use List::Util qw(min max); + use Text::Balanced qw(extract_bracketed); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Constants; + use Circos::Debug; +--- 39,50 ---- +diff -crB circos-0.69-6/lib/Circos/Font.pm circos-0.69-6-new/lib/Circos/Font.pm +*** circos-0.69-6/lib/Circos/Font.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Font.pm 2018-01-12 10:12:51.657320357 +0100 +*************** +*** 45,59 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Font::TTF::Font; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS fetch_conf); + use Circos::Constants; + use Circos::Colors; +--- 45,54 ---- +diff -crB circos-0.69-6/lib/Circos/Geometry.pm circos-0.69-6-new/lib/Circos/Geometry.pm +*** circos-0.69-6/lib/Circos/Geometry.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Geometry.pm 2018-01-12 10:12:58.961452282 +0100 +*************** +*** 41,54 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS fetch_conf); + use Circos::Constants; + use Circos::Debug; +--- 41,49 ---- +diff -crB circos-0.69-6/lib/Circos/Heatmap.pm circos-0.69-6-new/lib/Circos/Heatmap.pm +*** circos-0.69-6/lib/Circos/Heatmap.pm 2016-03-30 22:08:12.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Heatmap.pm 2018-01-12 10:13:09.953649538 +0100 +*************** +*** 24,40 **** + use Carp qw( carp confess croak ); + use Clone; + use Data::Dumper; +- use FindBin; + use GD::Image; + use Math::VecStat qw(min max); + use Params::Validate qw(:all); + use List::MoreUtils qw(uniq); + use Regexp::Common qw(number); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Constants; + use Circos::Colors; +--- 24,35 ---- +diff -crB circos-0.69-6/lib/Circos/Ideogram.pm circos-0.69-6-new/lib/Circos/Ideogram.pm +*** circos-0.69-6/lib/Circos/Ideogram.pm 2015-11-17 01:18:53.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/Ideogram.pm 2018-01-12 10:13:22.045864798 +0100 +*************** +*** 40,46 **** + + use Carp qw( carp confess croak ); + use Cwd; +- use FindBin; + use File::Spec::Functions; + use Math::Round; + use Math::VecStat qw(max); +--- 40,45 ---- +*************** +*** 50,59 **** + + use POSIX qw(floor ceil); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Constants; + use Circos::Debug; +--- 49,54 ---- +diff -crB circos-0.69-6/lib/Circos/Image.pm circos-0.69-6-new/lib/Circos/Image.pm +*** circos-0.69-6/lib/Circos/Image.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Image.pm 2018-01-12 10:13:31.094024696 +0100 +*************** +*** 45,58 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Colors; + use Circos::Constants; +--- 45,53 ---- +diff -crB circos-0.69-6/lib/Circos/IO.pm circos-0.69-6-new/lib/Circos/IO.pm +*** circos-0.69-6/lib/Circos/IO.pm 2015-12-03 05:51:11.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/IO.pm 2018-01-12 10:13:41.686210640 +0100 +*************** +*** 39,45 **** + use Carp qw( carp confess croak ); + use Storable qw(dclone); + use Cwd; +- use FindBin; + use Data::Dumper; + use File::Spec::Functions; + use Math::Round; +--- 39,44 ---- +*************** +*** 49,58 **** + + use POSIX qw(floor ceil); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Constants; + use Circos::Colors; + use Circos::Configuration; +--- 48,53 ---- +diff -crB circos-0.69-6/lib/Circos/Karyotype.pm circos-0.69-6-new/lib/Circos/Karyotype.pm +*** circos-0.69-6/lib/Circos/Karyotype.pm 2014-09-09 00:15:58.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Karyotype.pm 2018-01-12 10:13:53.318413330 +0100 +*************** +*** 38,44 **** + + use Carp qw( carp confess croak ); + use Cwd; +- use FindBin; + use Math::Round; + use Math::VecStat qw(max); + use Params::Validate qw(:all); +--- 38,43 ---- +*************** +*** 48,57 **** + #use Regexp::Common qw(number); + #use POSIX qw(floor ceil); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Constants; + use Circos::Debug; +--- 47,52 ---- +diff -crB circos-0.69-6/lib/Circos/PNG.pm circos-0.69-6-new/lib/Circos/PNG.pm +*** circos-0.69-6/lib/Circos/PNG.pm 2014-09-17 05:33:06.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/PNG.pm 2018-01-12 10:14:31.011059637 +0100 +*************** +*** 37,51 **** + our @EXPORT = qw(); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD; + use Math::VecStat qw(min max); + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Colors; + use Circos::Constants; +--- 37,46 ---- +diff -crB circos-0.69-6/lib/Circos/Rule.pm circos-0.69-6-new/lib/Circos/Rule.pm +*** circos-0.69-6/lib/Circos/Rule.pm 2014-10-02 01:14:25.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Rule.pm 2018-01-12 10:14:38.195181067 +0100 +*************** +*** 38,51 **** + + use Carp qw( carp confess croak ); + use Data::Dumper; +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; + use Circos::DataPoint; +--- 38,46 ---- +diff -crB circos-0.69-6/lib/Circos/SVG.pm circos-0.69-6-new/lib/Circos/SVG.pm +*** circos-0.69-6/lib/Circos/SVG.pm 2015-11-30 23:23:52.000000000 +0100 +--- circos-0.69-6-new/lib/Circos/SVG.pm 2018-01-12 10:14:47.803342631 +0100 +*************** +*** 26,39 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + use Circos::Colors; + use Circos::Constants; +--- 26,34 ---- +diff -crB circos-0.69-6/lib/Circos/Text.pm circos-0.69-6-new/lib/Circos/Text.pm +*** circos-0.69-6/lib/Circos/Text.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Text.pm 2018-01-12 10:14:57.083497772 +0100 +*************** +*** 42,55 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; + use Circos::Colors; +--- 42,50 ---- +diff -crB circos-0.69-6/lib/Circos/Track/Highlight.pm circos-0.69-6-new/lib/Circos/Track/Highlight.pm +*** circos-0.69-6/lib/Circos/Track/Highlight.pm 2014-10-01 00:43:27.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Track/Highlight.pm 2018-01-12 10:15:06.795659206 +0100 +*************** +*** 37,50 **** + our @EXPORT = qw(); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; + #use Circos::Colors; +--- 37,45 ---- +diff -crB circos-0.69-6/lib/Circos/Track/Link.pm circos-0.69-6-new/lib/Circos/Track/Link.pm +*** circos-0.69-6/lib/Circos/Track/Link.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Track/Link.pm 2018-01-12 10:15:17.387834198 +0100 +*************** +*** 37,50 **** + our @EXPORT = qw(); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD::Image; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; + #use Circos::Colors; +--- 37,45 ---- +diff -crB circos-0.69-6/lib/Circos/Track.pm circos-0.69-6-new/lib/Circos/Track.pm +*** circos-0.69-6/lib/Circos/Track.pm 2014-09-16 05:31:46.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Track.pm 2018-01-12 10:15:29.628035063 +0100 +*************** +*** 41,56 **** + + use Carp qw( carp confess croak ); + use Data::Dumper; +- use FindBin; + use GD::Image; + use List::MoreUtils qw(uniq); + use Math::VecStat qw(min max); + use Params::Validate qw(:all); + use Regexp::Common; + use Statistics::Basic qw(average stddev); +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; + + use Circos::Configuration; # qw(%CONF $DIMS); + use Circos::Constants; +--- 41,52 ---- +diff -crB circos-0.69-6/lib/Circos/Unit.pm circos-0.69-6-new/lib/Circos/Unit.pm +*** circos-0.69-6/lib/Circos/Unit.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Unit.pm 2018-01-12 10:15:37.892169871 +0100 +*************** +*** 46,60 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use Data::Dumper; + use Params::Validate qw(:all); + use Regexp::Common qw(number); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration qw(%CONF $DIMS); + use Circos::Constants; + use Circos::Debug; +--- 46,55 ---- +diff -crB circos-0.69-6/lib/Circos/URL.pm circos-0.69-6-new/lib/Circos/URL.pm +*** circos-0.69-6/lib/Circos/URL.pm 2014-05-12 18:20:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/URL.pm 2018-01-12 10:15:46.092303006 +0100 +*************** +*** 39,52 **** + ); + + use Carp qw( carp confess croak ); +- use FindBin; + use GD; + use Params::Validate qw(:all); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Configuration; + #use Circos::Colors; + use Circos::Constants; +--- 39,47 ---- +diff -crB circos-0.69-6/lib/Circos/Utils.pm circos-0.69-6-new/lib/Circos/Utils.pm +*** circos-0.69-6/lib/Circos/Utils.pm 2014-10-01 21:36:19.000000000 +0200 +--- circos-0.69-6-new/lib/Circos/Utils.pm 2018-01-12 10:16:11.576712858 +0100 +*************** +*** 105,114 **** + + use POSIX qw(floor ceil); + +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; +- + use Circos::Constants; + use Circos::Debug; + use Circos::Error; +--- 105,110 ---- +diff -crB circos-0.69-6/lib/Circos.pm circos-0.69-6-new/lib/Circos.pm +*** circos-0.69-6/lib/Circos.pm 2016-06-25 00:19:27.000000000 +0200 +--- circos-0.69-6-new/lib/Circos.pm 2018-01-12 10:16:35.801097176 +0100 +*************** +*** 49,57 **** + + use strict; + use warnings; +- use lib "$FindBin::RealBin"; +- use lib "$FindBin::RealBin/../lib"; +- use lib "$FindBin::RealBin/lib"; + + BEGIN { + require Circos::Modules; +--- 49,54 ---- diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 7e27ea01e7..0d4dcd6fe0 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gd) #:use-module (gnu packages less) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl-check) @@ -870,6 +871,101 @@ the Carp.pm module doesn't help.") ;; Either GPLv2 or the "Artistic" license. (license (list gpl2 artistic2.0)))) +(define-public circos + (package + (name "circos") + (version "0.69-9") + (source (origin + (method url-fetch) + (uri (string-append + "http://circos.ca/distribution/circos-" version ".tgz")) + (sha256 + (base32 "1ll9yxbk0v64813np0qz6h8bc53qlnhg9y1053b57xgkxgmxgn1l")) + (patches (list (search-patch "circos-remove-findbin.patch"))))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; There are no tests. + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'build) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (datapath (string-append out "/share/Circos")) + (error (string-append out "/share/Circos/error")) + (fonts (string-append out "/share/Circos/fonts")) + (data (string-append out "/share/Circos/data")) + (tiles (string-append out "/share/Circos/tiles")) + (etc (string-append out "/share/Circos/etc")) + (lib (string-append out "/lib/perl5/site_perl/" + ,(package-version perl))) + (install-directory (lambda (source target) + (mkdir-p target) + (copy-recursively source target)))) + ;; Circos looks into a relative path for its configuration + ;; files. We need to provide an absolute path towards the + ;; corresponding paths in the store. + (substitute* '("bin/circos" "etc/colors_fonts_patterns.conf" + "etc/gddiag.conf" "etc/brewer.conf" "README") + (("< Date: Sat, 21 Mar 2020 18:44:13 +0000 Subject: gnu: Add ztoolkit. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (ztoolkit): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/audio.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index bad6f4a18d..b9cb3a4c29 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4118,3 +4118,33 @@ about the given LV2 plugin, provided that the plugin and its UI(s) match up with the provided metadata and adhere to well-known best practices.") (home-page "https://github.com/x42/lv2toweb") (license (list license:isc license:gpl2)))) + +(define-public ztoolkit + (package + (name "ztoolkit") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.zrythm.org/git/ztoolkit") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "07xl3cmdaf7k9mm58m93cn8i1jvgimmiifdw1w7v2jl88nx60pm1")))) + (build-system meson-build-system) + (inputs + `(("cairo" ,cairo) + ("libx11" ,libx11))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "GUI toolkit for LV2 plugins") + (description "ZToolkit (Ztk) is a cross-platform GUI toolkit heavily +inspired by GTK. It handles events and low level drawing on behalf of +the user and provides a high-level API for managing the UI and custom +widgets. ZToolkit is written in C and was created to be used for building +audio plugin UIs, where the dependencies often need to be kept to a +minimum.") + (home-page "https://git.zrythm.org/cgit/ztoolkit/") + (license license:agpl3+))) -- cgit v1.2.3 From 360ebe50b5c5eaffe9fcf6685ff78b850667be2d Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 21 Mar 2020 18:45:51 +0000 Subject: gnu: Add ztoolkit-rsvg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (ztoolkit-rsvg): New variable. Signed-off-by: Jakub Kądziołka [with modifications] --- gnu/packages/audio.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b9cb3a4c29..803efb5cd1 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -4148,3 +4148,14 @@ audio plugin UIs, where the dependencies often need to be kept to a minimum.") (home-page "https://git.zrythm.org/cgit/ztoolkit/") (license license:agpl3+))) + +(define-public ztoolkit-rsvg + (package + (inherit ztoolkit) + (name "ztoolkit-rsvg") + (arguments + `(#:configure-flags `("-Denable_rsvg=true"))) + (inputs + `(("librsvg" ,librsvg) + ,@(package-inputs ztoolkit))) + (synopsis "ZToolkit with SVG support"))) -- cgit v1.2.3 From d3e7282ec35d87842e8143f0230e27fd5ec5e74d Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sat, 21 Mar 2020 18:49:06 +0000 Subject: gnu: Add zlfo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/music.scm (zlfo): New variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/music.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b1470d7820..7c67fb27ab 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5265,3 +5265,31 @@ plugin support, JACK support and chord assistance.") hall reverb and a room reverb. Both are available as LV2 plugins as well as JACK standalone applications.") (license license:gpl3+))) + +(define-public zlfo + (package + (name "zlfo") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.zrythm.org/git/ZLFO") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bm466ci5xyvxvq7l9p6xyh789lvk6i31b4zja1igqh13akbjnjz")))) + (build-system meson-build-system) + (inputs + `(("librsvg" ,librsvg) + ("lv2" ,lv2) + ("ztoolkit-rsvg" ,ztoolkit-rsvg))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (synopsis "Low frequency oscillator plugin") + (description "ZLFO is a fully featured +@dfn{low frequency oscillator} (LFO) for @dfn{control voltage} (CV)-based +automation that comes as an LV2 plugin bundle with a custom UI.") + (home-page "https://git.zrythm.org/cgit/ZLFO/") + (license license:agpl3+))) -- cgit v1.2.3 From c2d468a111093ff3be874ea6d45d04308c9a083a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 9 Mar 2020 03:00:18 +0100 Subject: gnu: extremetuxracer: Update to 0.8.0. * gnu/packages/games.scm (extremetuxracer): Update to 0.8.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 7391851c87..2b03a36c43 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2558,7 +2558,7 @@ Protocol).") (define-public extremetuxracer (package (name "extremetuxracer") - (version "0.7.5") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append @@ -2566,7 +2566,7 @@ Protocol).") version "/etr-" version ".tar.xz")) (sha256 (base32 - "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg")))) + "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 5490b2c733c96887c7d0dbfd6ce438df170870a1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 23 Mar 2020 17:40:29 +0100 Subject: gnu: parallel: Update to 20200322. * gnu/packages/parallel.scm (parallel): Update to 20200322. --- 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 f1060bb66b..8545c87bb7 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017, 2018 Rutger Helling -;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2019 Ludovic Courtès ;;; @@ -54,14 +54,14 @@ (define-public parallel (package (name "parallel") - (version "20200122") + (version "20200322") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "070cv3b1ja8lmn2a5h1ry6b5y35jpm4z5r9yv9nb5kd5im11wvqi")))) + (base32 "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From f9b6f75d1c387acbedfb27962d5dbd34bc3c1492 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 23 Mar 2020 18:35:51 +0100 Subject: installer: Fix cow-store umount issue. * gnu/installer/final.scm (kill-cow-users): Ignore exception that could be raised if a process disappears between reading its pid and its maps file. --- gnu/installer/final.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/final.scm b/gnu/installer/final.scm index 3c170e5d0f..4c2da484c9 100644 --- a/gnu/installer/final.scm +++ b/gnu/installer/final.scm @@ -111,12 +111,13 @@ USERS." (let ((pids (filter-map (lambda (pid) - (call-with-input-file - (string-append "/proc/" pid "/maps") - (lambda (port) - (and (string-contains (get-string-all port) - cow-path) - (string->number pid))))) + (false-if-exception + (call-with-input-file + (string-append "/proc/" pid "/maps") + (lambda (port) + (and (string-contains (get-string-all port) + cow-path) + (string->number pid)))))) (scandir "/proc" string->number)))) (for-each (lambda (pid) ;; cmdline does not always exist. -- cgit v1.2.3 From 80168c4b5bb1cb91cec9cbef723fa2e81fc3e720 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 23:54:32 -0400 Subject: gnu: emacs-dash: Update to 2.17.0. * (emacs-dash): Update to 2.17.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 fe2210ac79..4aca6e2170 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2059,7 +2059,7 @@ and stored in memory.") (define-public emacs-dash (package (name "emacs-dash") - (version "2.16.0") + (version "2.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -2068,7 +2068,7 @@ and stored in memory.") (file-name (git-file-name name version)) (sha256 (base32 - "150k48llqz2mb66vbznpyj47r6g16amfl7hbg8q46djq8mp7zc2v")))) + "153f55dqkhs8w2xlf6b88wp5vlkap7h8vjd9wxh4jp2ram5g4l1n")))) (build-system emacs-build-system) (arguments `(#:tests? #t -- cgit v1.2.3 From 09c09c4c7c93bf8d6dc96abbcbf584dbc6edc6ad Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 22 Mar 2020 23:54:54 -0400 Subject: gnu: emacs-ert-runner: Update to 0.8.0. * (emacs-ert-runner): Update to 0.8.0. --- gnu/packages/emacs-xyz.scm | 95 ++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 49 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4aca6e2170..65ea8a7caf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9969,57 +9969,54 @@ Emacs.") ;; Tests for ert-runner have a circular dependency with ecukes, and therefore ;; cannot be run (define-public emacs-ert-runner - (let ((version "0.7.0") - (revision "1") - (commit "90b8fdd5970ef76a4649be60003b37f82cdc1a65")) - (package - (name "emacs-ert-runner") - (version (git-version "0.7.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/rejeep/ert-runner.el.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04nxmyzncacj2wmzd84vv9wkkr2dk9lcb10dvygqmg3p1gadnwzz")))) - (build-system emacs-build-system) - (inputs - `(("emacs-ansi" ,emacs-ansi) - ("emacs-commander" ,emacs-commander) - ("emacs-dash" ,emacs-dash) - ("emacs-f" ,emacs-f) - ("emacs-s" ,emacs-s) - ("emacs-shut-up" ,emacs-shut-up))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (source-directory (string-append - (getenv "TMPDIR") "/source"))) - (substitute* "bin/ert-runner" - (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp"))) - (install-file "bin/ert-runner" (string-append out "/bin")) - (wrap-program (string-append out "/bin/ert-runner") - (list "EMACSLOADPATH" ":" 'prefix - ;; Do not capture the transient source directory in - ;; the wrapper. - (delete source-directory - (string-split (getenv "EMACSLOADPATH") #\:)))) - #t)))) - #:include (cons* "^reporters/.*\\.el$" %default-include))) - (home-page "https://github.com/rejeep/ert-runner.el") - (synopsis "Opinionated Ert testing workflow") - (description "@code{ert-runner} is a tool for Emacs projects tested + (package + (name "emacs-ert-runner") + (version "0.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rejeep/ert-runner.el.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98")))) + (build-system emacs-build-system) + (inputs + `(("emacs-ansi" ,emacs-ansi) + ("emacs-commander" ,emacs-commander) + ("emacs-dash" ,emacs-dash) + ("emacs-f" ,emacs-f) + ("emacs-s" ,emacs-s) + ("emacs-shut-up" ,emacs-shut-up))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'install-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (source-directory (string-append + (getenv "TMPDIR") "/source"))) + (substitute* "bin/ert-runner" + (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") + (string-append "ERT_RUNNER=\"" out + "/share/emacs/site-lisp"))) + (install-file "bin/ert-runner" (string-append out "/bin")) + (wrap-program (string-append out "/bin/ert-runner") + (list "EMACSLOADPATH" ":" 'prefix + ;; Do not capture the transient source directory in + ;; the wrapper. + (delete source-directory + (string-split (getenv "EMACSLOADPATH") #\:)))) + #t)))) + #:include (cons* "^reporters/.*\\.el$" %default-include))) + (home-page "https://github.com/rejeep/ert-runner.el") + (synopsis "Opinionated Ert testing workflow") + (description "@code{ert-runner} is a tool for Emacs projects tested using ERT. It assumes a certain test structure setup and can therefore make running tests easier.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public ert-runner (deprecated-package "ert-runner" emacs-ert-runner)) -- cgit v1.2.3 From f2c698bd3e33a2ce5ce6f683fe8a3c857d8247f6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 23 Mar 2020 00:13:23 -0400 Subject: gnu: emacs-lua-mode: Update to 20191204. * (emacs-lua-mode): Update to 20191204. --- gnu/packages/emacs-xyz.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 65ea8a7caf..7b67cc37ae 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -124,6 +124,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages linux) #:use-module (gnu packages libevent) + #:use-module (gnu packages lua) #:use-module (gnu packages music) #:use-module (gnu packages version-control) #:use-module (gnu packages imagemagick) @@ -7543,11 +7544,11 @@ using package inferred style.") (license license:gpl3+)))) (define-public emacs-lua-mode - (let ((commit "95c64bb5634035630e8c59d10d4a1d1003265743") - (revision "2")) + (let ((commit "1f596a93b3f1caadd7bba01030f8c179b029600b") + (revision "1")) (package (name "emacs-lua-mode") - (version (git-version "20151025" revision commit)) + (version (git-version "20191204" revision commit)) (home-page "https://github.com/immerrr/lua-mode/") (source (origin (method git-fetch) @@ -7557,8 +7558,14 @@ using package inferred style.") (file-name (git-file-name name version)) (sha256 (base32 - "1mra4db25ds64526dsj8m5yv0kfq3lgggjh1x6xmqypdaryddbcp")))) + "0i4adlaik3qjx1wkb7rwk2clvj7ci2g8pm0siyb3yk90r6z5mspi")))) (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("buttercup" "-l" "lua-mode.el"))) + (native-inputs + `(("emacs-buttercup" ,emacs-buttercup) + ("lua" ,lua))) (synopsis "Major mode for lua") (description "This Emacs package provides a mode for @uref{https://www.lua.org/, -- cgit v1.2.3 From a9f2c210f36ec7e0dd60324a077cb415b971a696 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:32:02 +0100 Subject: system: Export 'operating-system-kernel-loadable-modules'. * gnu/system.scm: Export 'operating-system-kernel-loadable-modules'. Signed-off-by: Mathieu Othacehe --- gnu/system.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/system.scm b/gnu/system.scm index c90d8c6cbc..d79ea23f98 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -109,6 +109,7 @@ operating-system-skeletons operating-system-sudoers-file operating-system-swap-devices + operating-system-kernel-loadable-modules operating-system-derivation operating-system-profile -- cgit v1.2.3 From 4233e74b39635d5ef4dde204ecc26dcc894d9467 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:15:01 +0100 Subject: gnu: youtube-dl: Add 'ffmpeg' as input. * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase wrap-executable. [inputs]: Add ffmpeg. Signed-off-by: Mathieu Othacehe --- gnu/packages/video.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 38e9d36307..3b64c435b7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1671,7 +1672,17 @@ To load this plugin, specify the following option when starting mpv: (string-append "'" prefix "/etc/")) (("'share/") (string-append "'" prefix "/share/"))) - #t)))))) + #t))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ffmpeg (assoc-ref inputs "ffmpeg"))) + (wrap-program (string-append out "/bin/youtube-dl") + `("PATH" ":" prefix + ,(list (string-append ffmpeg "/bin"))))) + #t))))) + (inputs + `(("ffmpeg" ,ffmpeg))) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from -- cgit v1.2.3 From 7884fc434f5d4a11b1dd566553b83fae09c44fad Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:15:02 +0100 Subject: gnu: youtube-dl: Add zsh completion. * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase install-completion. Signed-off-by: Mathieu Othacehe --- gnu/packages/video.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3b64c435b7..cb575a7375 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1673,6 +1673,15 @@ To load this plugin, specify the following option when starting mpv: (("'share/") (string-append "'" prefix "/share/"))) #t))) + (add-after 'install 'install-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (zsh (string-append out + "/share/zsh/site-functions"))) + (mkdir-p zsh) + (copy-file "youtube-dl.zsh" + (string-append zsh "/_youtube-dl")) + #t))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From 0a6f68982b950aed7444367cfe7f23123fa703e3 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Mon, 23 Mar 2020 16:51:44 +0000 Subject: gnu: sord: Add pcre to inputs. * gnu/packages/rdf.scm (sord)[inputs]: Add pcre needed for sord_validate. --- gnu/packages/rdf.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index b9abd37e40..d255815e85 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016, 2018 Ricardo Wurmus ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2019 Julien Lepiller +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -319,6 +320,8 @@ ideal (e.g. in LV2 implementations or embedded applications).") (string-append "-Wl,-rpath=" (assoc-ref outputs "out") "/lib")) #t))))) + (inputs + `(("pcre" ,pcre))) (native-inputs `(("pkg-config" ,pkg-config))) (propagated-inputs -- cgit v1.2.3 From a11237e40ac83f34fbb068135c3726c93465eae2 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Mar 2020 15:45:30 -0400 Subject: gnu: Mutt: Update to 1.13.4. * gnu/packages/mail.scm (mutt): Update to 1.13.4. [source]: Prefer HTTPS URL and replace FTP URL with HTTP. --- gnu/packages/mail.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 092bb8be0f..e36e010c3e 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -380,17 +380,17 @@ aliasing facilities to work just as they would on normal mail.") (define-public mutt (package (name "mutt") - (version "1.13.2") + (version "1.13.4") (source (origin (method url-fetch) (uri (list - (string-append "ftp://ftp.mutt.org/pub/mutt/mutt-" - version ".tar.gz") (string-append "https://bitbucket.org/mutt/mutt/downloads/" - "mutt-" version ".tar.gz"))) + "mutt-" version ".tar.gz") + (string-append "http://ftp.mutt.org/pub/mutt/mutt-" + version ".tar.gz"))) (sha256 (base32 - "0x4yfvk8415p80h9an242n6q3b43mw6mnnczh95zd3j0zwdr6wrg")) + "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm")) (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs -- cgit v1.2.3 From acd595c2375c8a9134a376eb92dec694c8fada3c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 23 Mar 2020 21:49:45 +0100 Subject: Revert "gnu: youtube-dl: Add 'ffmpeg' as input." This reverts commit 4233e74b39635d5ef4dde204ecc26dcc894d9467. --- gnu/packages/video.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cb575a7375..a97d3302de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1681,17 +1681,7 @@ To load this plugin, specify the following option when starting mpv: (mkdir-p zsh) (copy-file "youtube-dl.zsh" (string-append zsh "/_youtube-dl")) - #t))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (ffmpeg (assoc-ref inputs "ffmpeg"))) - (wrap-program (string-append out "/bin/youtube-dl") - `("PATH" ":" prefix - ,(list (string-append ffmpeg "/bin"))))) - #t))))) - (inputs - `(("ffmpeg" ,ffmpeg))) + #t)))))) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from -- cgit v1.2.3 From aae5f89db07354a96149a43e980fca2af6fce628 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 23 Mar 2020 19:40:47 -0400 Subject: gnu: Git: Update to 2.26.0. * gnu/packages/version-control.scm (git): Update to 2.26.0. [arguments]: Adjust the 'install-credential-netrc' phase to upstream changes. --- gnu/packages/version-control.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5049d45f1c..4da8e33e04 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -150,14 +150,14 @@ as well as the classic centralized workflow.") (name "git") ;; XXX When updating Git, check if the special 'git-source' input to cgit ;; needs to be updated as well. - (version "2.25.2") + (version "2.26.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "08vivrv3my8nlp40pwsf7mcc5k7dwyh34hadjszx7qj8w01p34wv")))) + "1mlmwibfgcv42c28fxmbd3iim8fc06r17dljd8vdgq550z5hvkly")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -170,7 +170,7 @@ as well as the classic centralized workflow.") version ".tar.xz")) (sha256 (base32 - "06nlw6vaqvavkr4nia9qvanqbhaig4hbg9r5f0i9lbvw1hmykfvq")))) + "09ilv5gg7167mwc0qqw2fz3lmdm360crnxc0xzkqn53wnsh4cziq")))) ;; For subtree documentation. ("asciidoc" ,asciidoc-py3) ("docbook-xsl" ,docbook-xsl) @@ -338,8 +338,10 @@ as well as the classic centralized workflow.") (add-after 'install 'install-credential-netrc (lambda* (#:key outputs #:allow-other-keys) (let* ((netrc (assoc-ref outputs "credential-netrc"))) - (install-file "contrib/credential/netrc/git-credential-netrc" + (install-file "contrib/credential/netrc/git-credential-netrc.perl" (string-append netrc "/bin")) + (rename-file (string-append netrc "/bin/git-credential-netrc.perl") + (string-append netrc "/bin/git-credential-netrc")) ;; Previously, Git.pm was automatically found by netrc. ;; Perl 5.26 changed how it locates modules so that @INC no ;; longer includes the current working directory (the Perl -- cgit v1.2.3 From 0f96fd645402f18bfe0ebeb4159e2daea8cad154 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 23 Mar 2020 22:14:00 +0100 Subject: gnu: dialog: Update to 1.3-20200228. * gnu/packages/ncurses.scm (dialog): Update to 1.3-20200228. Signed-off-by: Leo Famulari --- gnu/packages/ncurses.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm index 75ad492822..a969f3ffd6 100644 --- a/gnu/packages/ncurses.scm +++ b/gnu/packages/ncurses.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017, 2019 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -244,7 +245,7 @@ ncursesw library provides wide character support.") (define-public dialog (package (name "dialog") - (version "1.3-20191110") + (version "1.3-20200228") (source (origin (method url-fetch) (uri (string-append @@ -252,7 +253,7 @@ ncursesw library provides wide character support.") version ".tgz")) (sha256 (base32 - "0qqf3l7a3brgsz3kcrawyhicivajqr57gkp3134h4k20204psanr")))) + "1n8zbkigbzxw8gkw7qhzwzdyc7rbc7a0jcfy9z8ib7pf3qfw9y4z")))) (build-system gnu-build-system) (arguments `(#:tests? #f)) ; no test suite -- cgit v1.2.3 From 47a2306415cf19270cb398590be3d95a92a0e73b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Mon, 23 Mar 2020 18:14:45 +0100 Subject: gnu: sbcl: Increase maximum heap size to 2Gb. * gnu/packages/lisp.scm (sbcl)[arguments]: Add the "--dynamic-space-size=2Gb" option in the build phase. --- gnu/packages/lisp.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 2af0d78da3..a65eb19e0c 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -494,6 +494,7 @@ an interpreter, a compiler, a debugger, and much more.") `("clisp"))) (string-append "--prefix=" (assoc-ref outputs "out")) + "--dynamic-space-size=2Gb" "--with-sb-core-compression" "--with-sb-xref-for-internals"))) (replace 'install -- cgit v1.2.3 From e0d6a7da74f0ac4a7fedf8e0f7b074e8ebc1b666 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:18:33 +0100 Subject: gnu: Add r-randomizr. * gnu/packages/cran.scm (r-randomizr): 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 4c2ea9f130..7ebb733bd4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4931,6 +4931,28 @@ files.") environment within Shiny.") (license license:expat))) +(define-public r-randomizr + (package + (name "r-randomizr") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "randomizr" version)) + (sha256 + (base32 + "0dljyfldnardaps3fq6vi5wcs9x6qfaq5apapa78c51lnaa6fn9h")))) + (properties `((upstream-name . "randomizr"))) + (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://declaredesign.org/r/randomizr/") + (synopsis "Tools for common forms of random assignment and sampling") + (description + "This package provides tools for generating random assignments for common +experimental designs and random samples for common sampling designs.") + (license license:expat))) + (define-public r-base64url (package (name "r-base64url") -- cgit v1.2.3 From f871696911de644674c1e9c782fbfcf26bf7552b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:30:52 +0100 Subject: gnu: r-locfit: Update to 1.5-9.2. * gnu/packages/statistics.scm (r-locfit): Update to 1.5-9.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 fd34639b5e..b529619a5e 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1762,14 +1762,14 @@ side.") (define-public r-locfit (package (name "r-locfit") - (version "1.5-9.1") + (version "1.5-9.2") (source (origin (method url-fetch) (uri (cran-uri "locfit" version)) (sha256 (base32 - "0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m")))) + "00l0s6cxnv95zybkgki0380fih2kr1kbm7m88x56phklln3nx27b")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From d16a4d1f96252edffbe43cf27d53db9bedbd96be Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:07 +0100 Subject: gnu: r-dt: Update to 0.13. * gnu/packages/statistics.scm (r-dt): Update to 0.13. [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 b529619a5e..d99b3f76ee 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3134,13 +3134,13 @@ using the multicore functionality of the parallel package.") (define-public r-dt (package (name "r-dt") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (cran-uri "DT" version)) (sha256 (base32 - "0089288ma1cj9nf4jscmpbagyqlg4r90mw8bwl4zv1d4hjl0d693")))) + "1db35mi4m4q3kha4vhvh693bv04y7h9pdawhsx8f234qjvz7783r")))) (properties `((upstream-name . "DT"))) (build-system r-build-system) @@ -3151,6 +3151,8 @@ using the multicore functionality of the parallel package.") ("r-jsonlite" ,r-jsonlite) ("r-magrittr" ,r-magrittr) ("r-promises" ,r-promises))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://rstudio.github.io/DT") (synopsis "R wrapper of the DataTables JavaScript library") (description -- cgit v1.2.3 From 670cbe2c3c0bc2f7a5eb48c9eec573b24ddbb336 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:19 +0100 Subject: gnu: r-pkgmaker: Update to 0.31.1. * gnu/packages/statistics.scm (r-pkgmaker): Update to 0.31.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 d99b3f76ee..faddad77d5 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3240,14 +3240,14 @@ path-wise fashion.") (define-public r-pkgmaker (package (name "r-pkgmaker") - (version "0.31") + (version "0.31.1") (source (origin (method url-fetch) (uri (cran-uri "pkgmaker" version)) (sha256 (base32 - "0cc6v6kpwxwwh7k7zyw13wqdp0f9qzzr1a7vv02lskgii54aa4nb")))) + "0r0ga20dy25v9y5gjbds4y6kaa5a7qknh503qdkzllcpzbibh0hp")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) -- cgit v1.2.3 From 7e349066e69227d103fb51d6211af942cdb97140 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:28 +0100 Subject: gnu: r-hmisc: Update to 4.4-0. * gnu/packages/statistics.scm (r-hmisc): Update to 4.4-0. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index faddad77d5..5728d3242a 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3966,13 +3966,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "4.3-1") + (version "4.4-0") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "02ni7719acdmc8pcbx07b7x2nqsjrwq4smnx9qlzqjmx4pmp3cwc")))) + (base32 "1ivfamwghd2z408fkhs7jy5zl3q0z1a2la16yi8js872br6cyvpi")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From f7a21df523cbf4220cc06cc1cbe76a8b70dd2778 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:34 +0100 Subject: gnu: r-robustbase: Update to 0.93-6. * gnu/packages/statistics.scm (r-robustbase): Update to 0.93-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 5728d3242a..71ebe012cf 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -4759,14 +4759,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.93-5") + (version "0.93-6") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "0mkzbsjl5nihyj7mzks14p6kr3spp44xvygjz4ran11gspdn9rdx")))) + "1cr478xi4n9jwsdpbq182a7ig47rpb413q28dz6d1am08sk6657a")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From d8dc2a7c1e19b4303d08976031a7ce37469c05e2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:46 +0100 Subject: gnu: r-igraph: Update to 1.2.5. * gnu/packages/graph.scm (r-igraph): Update to 1.2.5. --- gnu/packages/graph.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index ab2bf1daf0..aa6ea16ab3 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -125,14 +125,14 @@ more.") (define-public r-igraph (package (name "r-igraph") - (version "1.2.4.2") + (version "1.2.5") (source (origin (method url-fetch) (uri (cran-uri "igraph" version)) (sha256 (base32 - "0scrbqb26pam8akblb4g9rkz888s0xffw3gcly78s4ijj67barxd")))) + "126z1ygbmi3g7hk97snf22rnx680dyi30idssm5zacba5rdngp8c")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From ff248f41cb3ceee8ca1043723d7668076e58f7bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:32:29 +0100 Subject: gnu: r-patchwork: Update to 1.0.0. * gnu/packages/cran.scm (r-patchwork): Update to 1.0.0. [source]: Fetch from CRAN. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 46 +++++++++++++++++++++------------------------- 1 file changed, 21 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ebb733bd4..07eeeb7fc7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15583,35 +15583,31 @@ guaranteeing well-connected communities.\" .") (license license:gpl3))) (define-public r-patchwork - ;; There has been no public release yet. - (let ((commit "fd7958bae3e7a1e30237c751952e412a0a1d1242") - (revision "1")) - (package - (name "r-patchwork") - (version (git-version "0.0.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thomasp85/patchwork.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "00fq520xwy1ysg4k8x48x9b0yy9wyi8y8zj6dvxjg4bwx0yyp6s4")))) - (build-system r-build-system) - (propagated-inputs - `(("r-ggplot2" ,r-ggplot2) - ("r-gtable" ,r-gtable))) - (home-page "https://github.com/thomasp85/patchwork") - (synopsis "Compose ggplot2 plots") - (description - "The @code{ggplot2} package provides a strong API for sequentially + (package + (name "r-patchwork") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "patchwork" version)) + (sha256 + (base32 + "0qrwbcswh7ylrmghi17k6wk7w51cz6mcmvcyyd41hy3m2ywmkywb")))) + (build-system r-build-system) + (propagated-inputs + `(("r-ggplot2" ,r-ggplot2) + ("r-gtable" ,r-gtable))) + (native-inputs + `(("r-knitr" ,r-knitr))) + (home-page "https://github.com/thomasp85/patchwork") + (synopsis "Compose ggplot2 plots") + (description + "The @code{ggplot2} package provides a strong API for sequentially building up a plot, but does not concern itself with composition of multiple plots. Patchwork is a package that expands the API to allow for arbitrarily complex composition of plots by providing mathmatical operators for combining multiple plots.") - (license license:expat)))) + (license license:expat))) (define-public r-liger (package -- cgit v1.2.3 From 2f445f0da3add6737dfce52736356cc9fd764cf8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:31:58 +0100 Subject: gnu: r-radiant-data: Update to 1.3.4. * gnu/packages/cran.scm (r-radiant-data): Update to 1.3.4. [propagated-inputs]: Remove r-gridextra; add r-mass, r-patchwork, and r-randomizr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 07eeeb7fc7..b1ef45877b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -4983,14 +4983,14 @@ systems.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.0.6") + (version "1.3.4") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "08x7zasxf429m021482p86lx3zc6dqz2mih0id8s34isg4gafapg")) + "19sjjb49inrfl7jzq4zpwhdslni0zrp30bl58pisin29ka3ylpzs")) (modules '((guix build utils))) (snippet '(begin @@ -5008,15 +5008,17 @@ systems.") ("r-dt" ,r-dt) ("r-glue" ,r-glue) ("r-ggplot2" ,r-ggplot2) - ("r-gridextra" ,r-gridextra) ("r-import" ,r-import) ("r-jsonlite" ,r-jsonlite) ("r-knitr" ,r-knitr) ("r-lubridate" ,r-lubridate) ("r-magrittr" ,r-magrittr) ("r-markdown" ,r-markdown) + ("r-mass" ,r-mass) + ("r-patchwork" ,r-patchwork) ("r-plotly" ,r-plotly) ("r-psych" ,r-psych) + ("r-randomizr" ,r-randomizr) ("r-readr" ,r-readr) ("r-readxl" ,r-readxl) ("r-rlang" ,r-rlang) -- cgit v1.2.3 From c5036a4f3978b920ee7086797287a35c8049b2a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:32:53 +0100 Subject: gnu: r-xgboost: Update to 1.0.0.1. * gnu/packages/cran.scm (r-xgboost): Update to 1.0.0.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 b1ef45877b..640b2ed85a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15346,20 +15346,22 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "0.90.0.2") + (version "1.0.0.1") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194")))) + "0fx5qjpjjirzhplddqmxlysyqszp79w74x00b5shp6p2lzy6yd9a")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) ("r-magrittr" ,r-magrittr) ("r-matrix" ,r-matrix) ("r-stringi" ,r-stringi))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/dmlc/xgboost") (synopsis "Extreme gradient boosting") (description -- cgit v1.2.3 From d3836473de80136d8b588aaf7f0b51f91174bb70 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:33:09 +0100 Subject: gnu: r-proc: Update to 1.16.2. * gnu/packages/cran.scm (r-proc): Update to 1.16.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 640b2ed85a..aeebdaac02 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6888,14 +6888,14 @@ containing one or more SNPs that evolved under directional selection.") (define-public r-proc (package (name "r-proc") - (version "1.16.1") + (version "1.16.2") (source (origin (method url-fetch) (uri (cran-uri "pROC" version)) (sha256 (base32 - "0qkp1byl2xspxaaf0by6mvvrhg7wlz6fxmynz2hkh0ds24w7ig9m")))) + "0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn")))) (properties `((upstream-name . "pROC"))) (build-system r-build-system) (propagated-inputs -- cgit v1.2.3 From 6005efa40f9e838a8efc470d6e0bca62d7be60f7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:33:16 +0100 Subject: gnu: r-mcmc: Update to 0.9-7. * gnu/packages/cran.scm (r-mcmc): Update to 0.9-7. --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aeebdaac02..bf71a8e4b4 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11607,14 +11607,14 @@ lasso, adaptive lasso and Ridge regression based on cross-validation.") (define-public r-mcmc (package (name "r-mcmc") - (version "0.9-6.1") + (version "0.9-7") (source (origin (method url-fetch) (uri (cran-uri "mcmc" version)) (sha256 (base32 - "1i1nhdapyijvm58zx38q28zk01ndmi6smjivxk5xs2cx9b6v2av9")))) + "0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p")))) (build-system r-build-system) (home-page "https://www.stat.umn.edu/geyer/mcmc/") (synopsis "Markov chain Monte Carlo") -- cgit v1.2.3 From 1e40a2746545a46dd813176b55d96363ccb72225 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:33:24 +0100 Subject: gnu: r-batchtools: Update to 0.9.13. * gnu/packages/cran.scm (r-batchtools): Update to 0.9.13. [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 bf71a8e4b4..633c131789 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15064,14 +15064,14 @@ extends the lme4 package.") (define-public r-batchtools (package (name "r-batchtools") - (version "0.9.12") + (version "0.9.13") (source (origin (method url-fetch) (uri (cran-uri "batchtools" version)) (sha256 (base32 - "16x524hvy9d8p7r4fi1c8mixcvzgsjbf3y0vxaa56ssbbab4p7f9")))) + "02bwfinwgn5nl638997javig61jmr0ci0qybmprz13jnvmam1yns")))) (build-system r-build-system) (propagated-inputs `(("r-backports" ,r-backports) @@ -15086,6 +15086,8 @@ extends the lme4 package.") ("r-rappdirs" ,r-rappdirs) ("r-stringi" ,r-stringi) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/mllg/batchtools") (synopsis "Tools for computation on batch systems") (description -- cgit v1.2.3 From c10bef9bd3fed0ef6bc0a16f90f6bc0888f169ef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:33:44 +0100 Subject: gnu: r-caret: Update to 6.0-86. * gnu/packages/cran.scm (r-caret): Update to 6.0-86. [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 633c131789..9d7b5aebf2 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18413,14 +18413,14 @@ it may be seen by an animal with less acute vision.") (define-public r-caret (package (name "r-caret") - (version "6.0-85") + (version "6.0-86") (source (origin (method url-fetch) (uri (cran-uri "caret" version)) (sha256 (base32 - "0jxbf2zcvbb5s2pnjzg182awjvylc57q7z5plx6gs6gm62zxjafs")))) + "0dyflixdw98lvk2x3w136sw24ij0fwx5c7l709dmqr5z7xy1qjns")))) (build-system r-build-system) (propagated-inputs `(("r-foreach" ,r-foreach) @@ -18433,6 +18433,8 @@ it may be seen by an animal with less acute vision.") ("r-recipes" ,r-recipes) ("r-reshape2" ,r-reshape2) ("r-withr" ,r-withr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/topepo/caret") (synopsis "Classification and regression training") (description -- cgit v1.2.3 From c649d319571aaccef103befc0e43711b8796922a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:33:59 +0100 Subject: gnu: r-tximport: Update to 1.14.2. * gnu/packages/bioinformatics.scm (r-tximport): Update to 1.14.2. [native-inputs]: Add r-knitr. --- gnu/packages/bioinformatics.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 33dda7ef39..d1032cba1c 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8742,14 +8742,16 @@ factors bound at the specific regions.") (define-public r-tximport (package (name "r-tximport") - (version "1.14.0") + (version "1.14.2") (source (origin (method url-fetch) (uri (bioconductor-uri "tximport" version)) (sha256 (base32 - "09r23n2812q89by0r0cz2fx1gfnmn3jb3hwbg61m52bika82pakj")))) + "1avy0zhgnszmg0dr9w74yq9ml10kwdrrgcni2wysrd48zzskc1n0")))) (build-system r-build-system) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://bioconductor.org/packages/tximport") (synopsis "Import and summarize transcript-level estimates for gene-level analysis") (description -- cgit v1.2.3 From d5951dc43ae4d12230cdd45fd6d1867062186765 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:34:15 +0100 Subject: gnu: r-gosemsim: Update to 2.12.1. * gnu/packages/bioconductor.scm (r-gosemsim): Update to 2.12.1. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 6ec74140e3..d0b363ae3c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -3393,20 +3393,22 @@ information about samples and features can be added to the plot.") (define-public r-gosemsim (package (name "r-gosemsim") - (version "2.12.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GOSemSim" version)) (sha256 (base32 - "0pqnlgdvh5szjhwc1mw1snjgpj9lrsnk44bn164cl3zwvdayccya")))) + "1r8yx6qw6d6602cp8aspzl3shi1l1zqcrc8fm9d5wg01sw1whs05")))) (properties `((upstream-name . "GOSemSim"))) (build-system r-build-system) (propagated-inputs `(("r-annotationdbi" ,r-annotationdbi) ("r-go-db" ,r-go-db) ("r-rcpp" ,r-rcpp))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://guangchuangyu.github.io/software/GOSemSim") (synopsis "GO-terms semantic similarity measures") (description -- cgit v1.2.3 From 4bcb38c801e70e2886080acd25c0f8b12f3d0fec Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:34:25 +0100 Subject: gnu: r-biosigner: Update to 1.14.4. * gnu/packages/bioconductor.scm (r-biosigner): Update to 1.14.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 d0b363ae3c..ed6912e3ab 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -5318,14 +5318,14 @@ coefficients).") (define-public r-biosigner (package (name "r-biosigner") - (version "1.14.2") + (version "1.14.4") (source (origin (method url-fetch) (uri (bioconductor-uri "biosigner" version)) (sha256 (base32 - "184vbbd010yzqv0qn1prxiazibxwiacvlpg9yzcgyhamcx9bvq73")))) + "0hypk784xcax99mp673md6kvx45chk2nxbqniww7zm9q2hj983hl")))) (build-system r-build-system) (propagated-inputs `(("r-biobase" ,r-biobase) -- cgit v1.2.3 From 1f2f01aed5e913e82ef445e3f9096455796b0c5a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:34:37 +0100 Subject: gnu: r-bigpint: Update to 1.2.2. * gnu/packages/bioconductor.scm (r-bigpint): Update to 1.2.2. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index ed6912e3ab..26722ccdd0 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -6997,14 +6997,14 @@ a file-backed matrix with factor properties.") (define-public r-bigpint (package (name "r-bigpint") - (version "1.2.0") + (version "1.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "bigPint" version)) (sha256 (base32 - "10vs0lzfyxp6sm4r9pxfwipjvzmmaqnvwn1hc5q37s5qz44fg0hk")))) + "1zkakxi1iqavzmjxnkkd02qm5jk28ldcvcdcxaafz748dz6s67fs")))) (properties `((upstream-name . "bigPint"))) (build-system r-build-system) (propagated-inputs @@ -7024,6 +7024,8 @@ a file-backed matrix with factor properties.") ("r-shinydashboard" ,r-shinydashboard) ("r-stringr" ,r-stringr) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/lindsayrutter/bigPint") (synopsis "Big multivariate data plotted interactively") (description -- cgit v1.2.3 From 5d45d7117083dafb9925bbfc220041938898274a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:34:51 +0100 Subject: gnu: r-multiassayexperiment: Update to 1.12.5. * gnu/packages/bioconductor.scm (r-multiassayexperiment): Update to 1.12.5. [native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 26722ccdd0..41e49c9b9c 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7300,14 +7300,14 @@ access.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.12.4") + (version "1.12.5") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "01cnp00y5bk551c8gqgqp5468dvccg72i0rvh5cxgbx1c42zy6xn")))) + "0a7zsq3adg8rph1w2qr75bpmrq53j99rsypmxj9w5mz9q23r2qlr")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) @@ -7319,6 +7319,8 @@ access.") ("r-s4vectors" ,r-s4vectors) ("r-summarizedexperiment" ,r-summarizedexperiment) ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://waldronlab.io/MultiAssayExperiment/") (synopsis "Integration of multi-omics experiments in Bioconductor") (description -- cgit v1.2.3 From 8ff63864916f40b5eb03a96192cb59a2e97cafe5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 10:41:02 +0100 Subject: gnu: r-shiny: Update to 1.4.0.2. * gnu/packages/cran.scm (r-shiny): Update to 1.4.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 9d7b5aebf2..39caf56a13 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -759,7 +759,7 @@ data structures in C++.") (define-public r-shiny (package (name "r-shiny") - (version "1.4.0") + (version "1.4.0.2") (source (origin (method git-fetch) @@ -769,7 +769,7 @@ data structures in C++.") (file-name (git-file-name name version)) (sha256 (base32 - "17ac48g414h9dhi0k4wrah4gyik0q5r0xw3kc01c02qfjwimqsx7")))) + "005wgcxq7f2q9g6wvfk29n2nms262w0abpz93sfvx79yv6qxppzs")))) (build-system r-build-system) (arguments `(#:modules ((guix build r-build-system) -- cgit v1.2.3 From b0d1da986b262685d092bb192feb49ab9db1dd8a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2020 11:05:01 +0100 Subject: gnu: r-harmony: Update to 0.1. * gnu/packages/cran.scm (r-harmony): Update to 0.1. [native-inputs]: Add autoconf. --- gnu/packages/cran.scm | 73 +++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 39caf56a13..fe29b9f581 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -42,6 +42,7 @@ #:use-module (guix utils) #:use-module (guix build-system r) #:use-module (gnu packages algebra) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bioinformatics) #:use-module (gnu packages c) @@ -15690,43 +15691,47 @@ dataset-specific factors.") (license license:gpl3))) (define-public r-harmony - ;; There are no tagged commits - (let ((commit "4d1653870d4dd70fff1807c182882db1fbf9af5a") - (revision "1")) - (package - (name "r-harmony") - (version (git-version "1.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/immunogenomics/harmony") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gasdldr4aalr9h2q9kmm3y4i7azkgnhdn4bmvsszs7lg9xacw85")))) - (build-system r-build-system) - (propagated-inputs - `(("r-cowplot" ,r-cowplot) - ("r-dplyr" ,r-dplyr) - ("r-ggplot2" ,r-ggplot2) - ("r-irlba" ,r-irlba) - ("r-matrix" ,r-matrix) - ("r-rcpp" ,r-rcpp) - ("r-rcpparmadillo" ,r-rcpparmadillo) - ("r-rcppprogress" ,r-rcppprogress) - ("r-rlang" ,r-rlang) - ("r-tibble" ,r-tibble) - ("r-tidyr" ,r-tidyr))) - (home-page "https://github.com/immunogenomics/harmony") - (synopsis "Integration of single cell sequencing data") - (description - "This package provides an implementation of the Harmony algorithm for + (package + (name "r-harmony") + (version "0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/immunogenomics/harmony") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "05r401q09rbr6fqhb9mbd95082cjdi3nag1cv6zn96xkr0f6imq9")) + (modules '((guix build utils))) + (snippet + '(begin + (for-each delete-file '("config.status" "configure")) + #t)))) + (build-system r-build-system) + (propagated-inputs + `(("r-cowplot" ,r-cowplot) + ("r-dplyr" ,r-dplyr) + ("r-ggplot2" ,r-ggplot2) + ("r-irlba" ,r-irlba) + ("r-matrix" ,r-matrix) + ("r-rcpp" ,r-rcpp) + ("r-rcpparmadillo" ,r-rcpparmadillo) + ("r-rcppprogress" ,r-rcppprogress) + ("r-rlang" ,r-rlang) + ("r-tibble" ,r-tibble) + ("r-tidyr" ,r-tidyr))) + (native-inputs + `(("autoconf" ,autoconf))) + (home-page "https://github.com/immunogenomics/harmony") + (synopsis "Integration of single cell sequencing data") + (description + "This package provides an implementation of the Harmony algorithm for single cell integration, described in Korsunsky et al @url{doi.org/10.1101/461954}. The package includes a standalone Harmony function and interfaces to external frameworks.") - (license license:gpl3)))) + (license license:gpl3))) (define-public r-covr (package -- cgit v1.2.3 From efcb05083f869b1d429fbad2f7bb008799ae33be Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 21 Mar 2020 19:58:43 +0100 Subject: gnu: Add python-owslib. * gnu/packages/python-xyz.scm (python-owslib): New variable. --- gnu/packages/python-xyz.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5336df0ab7..4c71546fab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -59,7 +59,7 @@ ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill -;;; Copyright © 2019 Guillaume Le Vaillant +;;; Copyright © 2019, 2020 Guillaume Le Vaillant ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald @@ -18460,3 +18460,24 @@ utility and generating summarized code coverage results. It is inspired by the Python coverage.py package, which provides a similar utility for Python.") (license license:bsd-3))) + +(define-public python-owslib + (package + (name "python-owslib") + (version "0.19.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "OWSLib" version)) + (sha256 + (base32 "0v8vg0naa9rywvd31cpq65ljbdclpsrx09788v4xj7lg10np8nk0")))) + (build-system python-build-system) + (arguments + '(#:tests? #f)) ; TODO: package dependencies required for tests. + (synopsis "Interface for Open Geospatial Consortium web service") + (description + "OWSLib is a Python package for client programming with Open Geospatial +Consortium (OGC) web service (hence OWS) interface standards, and their related +content models.") + (home-page "https://geopython.github.io/OWSLib/") + (license license:bsd-3))) -- cgit v1.2.3 From 9fce5914794782b3a1826aea0978702883820bbf Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 22 Mar 2020 00:03:41 +0100 Subject: gnu: Add grass. * gnu/packages/geo.scm (grass): New variable. --- gnu/packages/geo.scm | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index bc870f9620..b244e49a92 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -46,10 +46,13 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages astronomy) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) + #:use-module (gnu packages bash) + #:use-module (gnu packages bison) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -58,6 +61,7 @@ #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages flex) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages gettext) @@ -80,8 +84,10 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) + #:use-module (gnu packages time) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) @@ -1629,3 +1635,119 @@ track your position right from your laptop.") license:lgpl3+ license:sgifreeb2.0 license:zlib)))) + +(define-public grass + (let* ((version "7.8.2") + (majorminor (string-join (list-head (string-split version #\.) 2) "")) + (grassxx (string-append "grass" majorminor))) + (package + (name "grass") + (version version) + (source + (origin + (method url-fetch) + (uri (string-append "https://grass.osgeo.org/" grassxx + "/source/grass-" version ".tar.gz")) + (sha256 + (base32 "1fwsm99kz0bxvjk7442qq1h45ikrmhba8bqclafb61gqg1q6ymrk")))) + (build-system gnu-build-system) + (inputs + `(("bzip2", bzip2) + ("cairo" ,cairo) + ("fftw" ,fftw) + ("freetype" ,freetype) + ("gdal" ,gdal) + ("geos" ,geos) + ("glu" ,glu) + ("lapack" ,lapack) + ("libpng" ,libpng) + ("libtiff" ,libtiff) + ("mesa" ,mesa) + ("mariadb-dev" ,mariadb "dev") + ("mariadb-lib" ,mariadb "lib") + ("netcdf" ,netcdf) + ("openblas" ,openblas) + ("perl" ,perl) + ("postgresql" ,postgresql) + ("proj.4" ,proj.4) + ("python" ,python) + ("python-dateutil" ,python-dateutil) + ("python-numpy" ,python-numpy) + ("python-wxpython" ,python-wxpython) + ("readline" ,readline) + ("sqlite" ,sqlite) + ("wxwidgets" ,wxwidgets) + ("zlib" ,zlib) + ("zstd" ,zstd "lib"))) + (native-inputs + `(("bash" ,bash-minimal) + ("bison" ,bison) + ("flex" ,flex) + ("pkg-config" ,pkg-config))) + (arguments + `(#:tests? #f ; No tests + #:modules ((guix build gnu-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build python-build-system)) + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((shell (string-append (assoc-ref inputs "bash") + "/bin/bash"))) + (setenv "SHELL" shell) + (setenv "CONFIG_SHELL" shell) + (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," + (assoc-ref outputs "out") + "/" ,grassxx "/lib"))) + (invoke "./configure" + (string-append "--prefix=" + (assoc-ref outputs "out")) + "--with-blas" + "--with-bzlib" + (string-append "--with-freetype-includes=" + (assoc-ref inputs "freetype") + "/include/freetype2") + (string-append "--with-freetype-libs=" + (assoc-ref inputs "freetype") + "/lib") + "--with-geos" + "--with-lapack" + "--with-mysql" + (string-append "--with-mysql-includes=" + (assoc-ref inputs "mariadb-dev") + "/include/mysql") + (string-append "--with-mysql-libs=" + (assoc-ref inputs "mariadb-lib") + "/lib") + "--with-netcdf" + "--with-postgres" + (string-append "--with-proj-share=" + (assoc-ref inputs "proj.4") + "/share/proj") + "--with-pthread" + "--with-readline" + "--with-sqlite" + "--with-wxwidgets"))) + (add-after 'install 'install-links + (lambda* (#:key outputs #:allow-other-keys) + ;; Put links for includes and libraries in the standard places. + (let* ((out (assoc-ref outputs "out")) + (dir (string-append out "/" ,grassxx))) + (symlink (string-append dir "/include") + (string-append out "/include")) + (symlink (string-append dir "/lib") + (string-append out "/lib"))) + #t)) + (add-after 'install-links 'wrap-python + (assoc-ref python:%standard-phases 'wrap))))) + (synopsis "GRASS Geographic Information System") + (description + "GRASS (Geographic Resources Analysis Support System), is a Geographic +Information System (GIS) software suite used for geospatial data management and +analysis, image processing, graphics and maps production, spatial modeling, and +visualization.") + (home-page "https://grass.osgeo.org/") + (license license:gpl2+)))) -- cgit v1.2.3 From f7ac2fe1cef666facd2559e3166664d030daa099 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 22 Mar 2020 11:33:00 +0100 Subject: gnu: Add saga. * gnu/packages/geo.scm (saga): New variable. --- gnu/packages/geo.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index b244e49a92..fc5f473418 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -70,11 +70,13 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages image-processing) #:use-module (gnu packages icu4c) #:use-module (gnu packages java) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) + #:use-module (gnu packages pdf) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) @@ -85,6 +87,7 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages swig) #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages time) @@ -1751,3 +1754,46 @@ analysis, image processing, graphics and maps production, spatial modeling, and visualization.") (home-page "https://grass.osgeo.org/") (license license:gpl2+)))) + +(define-public saga + (package + (name "saga") + (version "7.6.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/saga-gis/SAGA%20-%20" + (version-major version) "/SAGA%20-%20" version + "/saga-" version ".tar.gz")) + (sha256 + (base32 "09j5magmayq2y620kqa490mfd1kpdp3lng2ifcgbrmssc079ybm0")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("swig" ,swig))) + (inputs + `(("curl" ,curl) + ("fftw" ,fftw) + ("gdal" ,gdal) + ("hdf5" ,hdf5) + ("jasper" ,jasper) + ("libharu" ,libharu) + ("libtiff" ,libtiff) + ("opencv" ,opencv) + ("postgresql" ,postgresql) + ("proj.4" ,proj.4) + ("python" ,python) + ("qhull" ,qhull) + ("unixodbc" ,unixodbc) + ("vigra" ,vigra) + ("wxwidgets" ,wxwidgets))) + (arguments + '(#:configure-flags '("--enable-python"))) + (synopsis "System for Automated Geoscientific Analyses") + (description + "SAGA (System for Automated Geoscientific Analyses) is a Geographic +Information System (GIS) software. It has been designed for an easy and +effective implementation of spatial algorithms and it offers a comprehensive, +growing set of geoscientific methods.") + (home-page "http://www.saga-gis.org") + (license (list license:gpl2+ license:lgpl2.1+)))) -- cgit v1.2.3 From 151f3d416cff16d7e7d57dd24756dc4357384a1f Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 24 Mar 2020 10:20:27 +0100 Subject: gnu: Add qgis. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/geo.scm (qgis): New variable. Co-authored-by: Wiktor Żelazny Co-authored-by: Arun Isaac --- gnu/packages/geo.scm | 238 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 237 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index fc5f473418..e895c064ba 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -68,11 +68,14 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gps) #:use-module (gnu packages gtk) + #:use-module (gnu packages haskell-apps) #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages icu4c) #:use-module (gnu packages java) + #:use-module (gnu packages kde) #:use-module (gnu packages lua) #:use-module (gnu packages maths) #:use-module (gnu packages pcre) @@ -94,7 +97,8 @@ #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) - #:use-module (gnu packages xml)) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg)) (define-public geos (package @@ -1797,3 +1801,235 @@ effective implementation of spatial algorithms and it offers a comprehensive, growing set of geoscientific methods.") (home-page "http://www.saga-gis.org") (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public qgis + (package + (name "qgis") + (version "3.12.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://qgis.org/downloads/qgis-" + version ".tar.bz2")) + (sha256 + (base32 "1a41525y8ac44gzcfaffjx0lyrm49hgnr83jrq40r5mqd3vpmp57")))) + (build-system cmake-build-system) + (arguments + `(#:modules ((guix build cmake-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%cmake-build-system-modules + (guix build python-build-system) + (guix build qt-utils)) + #:phases + (modify-phases %standard-phases + ;; Configure correct path to PyQt5 SIP directory + (add-after 'unpack 'configure-pyqt5-sip-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/FindPyQt5.cmake" + (("\"\\\\\\\\1\" PYQT5_SIP_DIR") + (string-append "\"" (assoc-ref inputs "python-pyqt+qscintilla") + "/share/sip\" PYQT5_SIP_DIR"))) + (substitute* (list "scripts/prepare-commit.sh" + "scripts/runtests-local-travis-config.sh" + "scripts/sip_include.sh" + "scripts/sipdiff" + "scripts/sipify_all.sh" + "scripts/spell_check/check_spelling.sh" + "scripts/spell_check/spell_test.sh" + "scripts/verify-indentation.sh" + "tests/code_layout/test_banned_keywords.sh" + "tests/code_layout/test_licenses.sh" + "tests/code_layout/test_shellcheck.sh" + "tests/code_layout/test_sip_include.sh" + "tests/code_layout/test_sipfiles_uptodate.sh" + "tests/code_layout/test_sipify.sh") + (("\\$\\(git rev-parse --show-toplevel\\)") + (getcwd))) + (substitute* "tests/code_layout/test_sip_include.sh" + (("^REV=.*") "REV=currentrev\n")) + #t)) + (replace 'check + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" "/tmp") + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") + (setenv "TRAVIS" "true") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (invoke "ctest" + "-E" (string-join + '(;; Disable tests that require network access + "qgis_filedownloader" + ;; TODO: Find why the following tests fail + "ProcessingQgisAlgorithmsTestPt1" + "ProcessingQgisAlgorithmsTestPt3" + "ProcessingQgisAlgorithmsTestPt4" + "ProcessingGdalAlgorithmsRasterTest" + "ProcessingGdalAlgorithmsVectorTest" + "ProcessingGrass7AlgorithmsImageryTest" + "ProcessingGrass7AlgorithmsRasterTest" + "ProcessingGrass7AlgorithmsVectorTest" + "ProcessingOtbAlgorithmsTest" + "qgis_authmanagertest" + "qgis_compositionconvertertest" + "qgis_coordinatereferencesystemtest" + "qgis_geometrytest" + "qgis_layouthtmltest" + "qgis_layoutmaptest" + "qgis_painteffecttest" + "qgis_pallabelingtest" + "qgis_svgmarkertest" + "qgis_taskmanagertest" + "qgis_ziplayertest" + "qgis_processingtest" + "qgis_wcsprovidertest" + "qgis_arcgisrestutilstest" + "qgis_grassprovidertest7" + "qgis_gpsinformationwidget" + "PyCoreAdittions" + "PyQgsPythonProvider" + "PyQgsAnnotation" + "PyQgsAuthenticationSystem" + "PyQgsProject" + "PyQgsFileUtils" + "PyQgsGeometryTest" + "PyQgsImageCache" + "PyQgsLayoutExporter" + "PyQgsLayoutLegend" + "PyQgsMapLayer" + "PyQgsOGRProviderGpkg" + "PyQgsPalLabelingLayout" + "PyQgsImportIntoPostGIS" + "PyQgsProviderConnectionPostgres" + "PyQgsProviderConnectionGpkg" + "PyQgsShapefileProvider" + "PyQgsSvgCache" + "PyQgsTextRenderer" + "PyQgsOGRProvider" + "PyQgsSpatialiteProvider" + "PyQgsVectorFileWriter" + "PyQgsVectorLayer" + "PyQgsVectorLayerUtils" + "PyQgsVirtualLayerProvider" + "PyQgsWFSProvider" + "PyQgsOapifProvider" + "PyQgsLayerDependencies" + "PyQgsDBManagerGpkg" + "PyQgsDBManagerSpatialite" + "PyQgsSettings" + "PyQgsAuxiliaryStorage" + "PyQgsSelectiveMasking" + "PyQgsAppStartup" + "qgis_geometrycheckstest" + "qgis_shellcheck" + "qgis_sipify" + "qgis_sip_include" + "qgis_sip_uptodate") + "|")))) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'wrap-python 'wrap-qt + (lambda* (#:key outputs #:allow-other-keys) + (wrap-qt-program (assoc-ref outputs "out") "qgis") + #t))))) + (inputs + `(("exiv2" ,exiv2) + ("expat" ,expat) + ("gdal" ,gdal) + ("geos" ,geos) + ("gpsbabel" ,gpsbabel) + ("grass" ,grass) + ("gsl" ,gsl) + ("hdf5" ,hdf5) + ("libspatialindex" ,libspatialindex) + ("libspatialite" ,libspatialite) + ("libxml2" ,libxml2) + ("libzip" ,libzip) + ("netcdf" ,netcdf) + ("postgresql" ,postgresql) + ("proj" ,proj) + ("python" ,python) + ("python-chardet" ,python-chardet) + ("python-dateutil" ,python-dateutil) + ("python-gdal" ,python-gdal) + ("python-jinja2" ,python-jinja2) + ("python-numpy" ,python-numpy) + ("python-owslib" ,python-owslib) + ("python-psycopg2" ,python-psycopg2) + ("python-pygments" ,python-pygments) + ("python-pyqt+qscintilla" ,python-pyqt+qscintilla) + ("python-pytz" ,python-pytz) + ("python-pyyaml" ,python-pyyaml) + ("python-requests" ,python-requests) + ("python-sip" ,python-sip) + ("python-six" ,python-six) + ("python-urllib3" ,python-urllib3) + ("qca" ,qca) + ("qscintilla" ,qscintilla) + ("qtbase" ,qtbase) + ("qtdeclarative" ,qtdeclarative) + ("qtkeychain" ,qtkeychain) + ("qtlocation" ,qtlocation) + ("qtserialport" ,qtserialport) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qwt" ,qwt) + ("saga" ,saga) + ("sqlite" ,sqlite-with-column-metadata))) + (native-inputs + `(("bison" ,bison) + ("flex" ,flex) + ("perl" ,perl) + ("perl-yaml-tiny" ,perl-yaml-tiny) + ("pkg-config" ,pkg-config) + ("python-mock" ,python-mock) + ("python-nose2" ,python-nose2) + ("qttools" ,qttools) + ("shellcheck" ,shellcheck) + ("xorg-server" ,xorg-server-for-tests))) + (home-page "https://qgis.org") + (synopsis "Geographical information system") + (description "QGIS is an easy to use Geographical Information +System (GIS). It is a GIS data viewer and editor. QGIS supports a number of +raster and vector data formats, with new support easily added using the plugin +architecture.") + (license + (list + license:asl1.1 + license:asl2.0 + license:bsd-2 + license:bsd-3 + license:boost1.0 + license:cc-by3.0 + license:cc-by4.0 + license:cc-by-sa3.0 + license:cc-by-sa4.0 + (license:fsdg-compatible "https://www.deviantart.com/elvensword") + (license:fsf-free "file://debian/copyright" "Go Squared") + license:expat + license:fdl1.2+ + (license:fsf-free + "https://www.deviantart.com/webgoddess/art/Reddish-Inspired-Gradients-42208824") + (license:fsf-free + "file://debian/copyright" + "QT-Commercial or LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3") + license:gpl2 + license:gpl2+ + license:gpl3 + license:gpl3+ + license:isc + license:lgpl2.0+ + license:lgpl2.1 + license:lgpl2.1+ + license:lgpl3 + (license:non-copyleft "file://debian/copyright" "BSD-like-gist") + (license:non-copyleft "file://debian/copyright" "Jim Mossman Attribution") + (license:non-copyleft + "https://www.ncl.ucar.edu/Download/NCL_source_license.shtml" + "NCL Source Code License") + license:ogl-psi1.0 + license:opl1.0+ + license:public-domain + license:qwt1.0)))) -- cgit v1.2.3 From 08d5341b1f8cc129f545ca6c62e36e06e17091bf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 24 Mar 2020 15:47:58 +0200 Subject: gnu: nano: Update to 4.9. * gnu/packages/nano.scm (nano): Update to 4.9. --- 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 ff7abfad73..bdc73a91f7 100644 --- a/gnu/packages/nano.scm +++ b/gnu/packages/nano.scm @@ -30,13 +30,13 @@ (define-public nano (package (name "nano") - (version "4.8") + (version "4.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "0qwf4ld0fl2bpnjh23z2pq7wcs6d14m2364360xmf7dbd0fgcj63")))) + (base32 "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f")))) (build-system gnu-build-system) (inputs `(("gettext" ,gettext-minimal) -- cgit v1.2.3 From b488b64a3e22dae272a41990384fc74ddafef86c Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Sun, 23 Feb 2020 04:27:42 -0500 Subject: gnu: Add guile3.0-semver. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/guile-xyz.scm (guile3.0-semver): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/guile-xyz.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index a2430b7ea3..09427da487 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019, 2020 Amar Singh ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019 Martin Becze ;;; ;;; This file is part of GNU Guix. ;;; @@ -2996,6 +2997,13 @@ comparing, and writing Semantic Versions. It also includes ranges in the style of the Node Package Manager (NPM).") (license license:gpl3+))) +(define-public guile3.0-semver + (package + (inherit guile-semver) + (name "guile3.0-semver") + (inputs + `(("guile" ,guile-3.0))))) + (define-public guile-hashing (package (name "guile-hashing") -- cgit v1.2.3 From 72a5cc53586080e75ae4ee80f3a2467ff30c4f5e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 24 Mar 2020 18:03:18 +0100 Subject: gnu: automake: Add version 1.16.2. * gnu/packages/autotools.scm (automake-1.16.2): New variable. --- gnu/packages/autotools.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 62e0b9291f..f569b0e92a 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020 Ludovic Courtès ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2014 Manolis Fragkiskos Ragkousis ;;; Copyright © 2015, 2017, 2018 Mark H Weaver @@ -324,6 +324,32 @@ intuitive format and then Automake works with Autoconf to produce a robust Makefile, simplifying the entire process for the developer.") (license gpl2+))) ; some files are under GPLv3+ +(define-public automake-1.16.2 + (package + (inherit automake) + (version "1.16.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/automake/automake-" + version ".tar.xz")) + (sha256 + (base32 + "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c")) + (patches + (search-patches "automake-skip-amhello-tests.patch")))) + (arguments + (substitute-keyword-arguments (package-arguments automake) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'skip-test + (lambda _ + ;; This test requires 'etags' and fails if it's missing. + ;; Skip it. + (substitute* "t/tags-lisp-space.sh" + (("^required.*" all) + (string-append "exit 77\n" all "\n"))) + #t)))))))) + (define-public libtool (package (name "libtool") -- cgit v1.2.3 From b14c234c0d32216f8c2f6e6d1935c469a6b947c9 Mon Sep 17 00:00:00 2001 From: Josh Marshall Date: Mon, 23 Mar 2020 10:19:43 -0400 Subject: gnu: Add Docusign API Python client. * gnu/packages/python-xyz.scm (python-docusign-esign): New variable. Signed-off-by: Leo Famulari --- 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 4c71546fab..8463fcc6c9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -71,6 +71,7 @@ ;;; Copyright © 2020 sirgazil ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020 Josh Marshall ;;; ;;; This file is part of GNU Guix. ;;; @@ -18481,3 +18482,30 @@ Consortium (OGC) web service (hence OWS) interface standards, and their related content models.") (home-page "https://geopython.github.io/OWSLib/") (license license:bsd-3))) + +(define-public python-docusign-esign + (package + (name "python-docusign-esign") + (version "3.1.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "docusign_esign" version)) + (sha256 + (base32 + "01f3h03vc97syjlmqyl7xa5j90pzgmwpspc5a0gra9saynnbkx37")))) + (build-system python-build-system) + ;; Testing requires undocumented setup changes, and so testing is disabled here. + (arguments `(#:tests? #f)) + (propagated-inputs + `(("python-certifi", python-certifi) + ("python-six", python-six) + ("python-dateutil", python-dateutil) + ("python-urllib3", python-urllib3) + ("python-pyjwt", python-pyjwt) + ("python-cryptography", python-cryptography) + ("python-nose", python-nose))) + (synopsis "DocuSign Python Client") + (description "The Official DocuSign Python Client Library used to interact + with the eSign REST API. Send, sign, and approve documents using this client.") + (home-page "https://www.docusign.com/devcenter") + (license license:expat))) -- cgit v1.2.3 From 25022bfd3a683527e7dd1644c6edc44eef03da0e Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 24 Mar 2020 18:31:27 +0000 Subject: gnu: Add perl-mail-sendmail. * gnu/packages/perl.scm (perl-mail-sendmail): New variable. --- gnu/packages/perl.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 0d4dcd6fe0..77fbc92710 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -24,6 +24,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Stephen J. Scheck ;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2020 Paul Garlick ;;; ;;; This file is part of GNU Guix. ;;; @@ -5281,6 +5282,28 @@ Build a Mail::Internet object, and then send it out using Mail::Mailer. \"Smart functions\" you should not depend on. @end table") (license perl-license))) +(define-public perl-mail-sendmail + (package + (name "perl-mail-sendmail") + (version "0.80") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://cpan/authors/id/N/NE/NEILB/Mail-Sendmail-" + version + ".tar.gz")) + (sha256 + (base32 + "1r38qbkj7jwj8cqy1rnqzkk81psxi08b1aiq392817f3bk5ri2jv")))) + (build-system perl-build-system) + (arguments `(#:tests? #f)) ;socket not available during build + (home-page "https://metacpan.org/release/Mail-Sendmail") + (synopsis "Simple platform independent mailer") + (description "Mail::Sendmail is a pure perl module that provides a +simple means to send email from a perl script. The module only +requires Perl5 and a network connection.") + (license perl-license))) (define-public perl-math-bezier (package -- cgit v1.2.3 From 5e44011bfb855f448155c2e672e82272a5a2241b Mon Sep 17 00:00:00 2001 From: Paul Garlick Date: Tue, 24 Mar 2020 20:04:39 +0000 Subject: gnu: perl-mail-sendmail: Add line above definition. * gnu/packages/perl.scm (perl-mail-sendmail): Add line. --- gnu/packages/perl.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 77fbc92710..eb02d5e05e 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -5282,6 +5282,7 @@ Build a Mail::Internet object, and then send it out using Mail::Mailer. \"Smart functions\" you should not depend on. @end table") (license perl-license))) + (define-public perl-mail-sendmail (package (name "perl-mail-sendmail") -- cgit v1.2.3 From 2c15cb589832c5c08cbfcd42f64011e2b345e335 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:16 +0100 Subject: gnu: python-pexpect: Update to 4.8.0. * gnu/packages/python-xyz.scm (python-pexpect): Update to 4.8.0. [arguments]: Disable failing test. Signed-off-by: Leo Famulari --- 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 8463fcc6c9..155ad211df 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -5339,13 +5339,13 @@ displayed.") (define-public python-pexpect (package (name "python-pexpect") - (version "4.6.0") + (version "4.8.0") (source (origin (method url-fetch) (uri (pypi-uri "pexpect" version)) (sha256 - (base32 "1fla85g47iaxxpjhp9vkxdnv4pgc7rplfy6ja491smrrk0jqi3ia")))) + (base32 "032cg337h8awydgypz6f4wx848lw8dyrj4zy988x0lyib4ws8rgw")))) (build-system python-build-system) (arguments `(#:phases @@ -5359,7 +5359,10 @@ displayed.") ;; Many tests try to use the /bin directory which ;; is not present in the build environment. ;; Use one that's non-empty and unlikely to change. - (("/bin'") "/dev'")) + (("/bin'") "/dev'") + ;; Disable failing test. See upstream bug report + ;; https://github.com/pexpect/pexpect/issues/568 + (("def test_bash") "def _test_bash")) ;; XXX: Socket connection test gets "Connection reset by peer". ;; Why does it not work? Delete for now. (delete-file "tests/test_socket.py") -- cgit v1.2.3 From a356d1b68d91f9106606989f5220c189b9c71a1a Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:17 +0100 Subject: gnu: python-jsonschema: Update to 3.2.0. * gnu/packages/python-xyz.scm (python-jsonschema): Update to 3.2.0. [propagated-inputs]: Add python-importlib-metadata. [arguments]: Use add-installed-pythonpath to make a test pass. Signed-off-by: Leo Famulari --- 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 155ad211df..98d100365e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -2271,19 +2271,20 @@ compare, diff, and patch JSON and JSON-like structures in Python.") (define-public python-jsonschema (package (name "python-jsonschema") - (version "3.0.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (pypi-uri "jsonschema" version)) (sha256 (base32 - "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc")))) + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")))) (build-system python-build-system) (arguments '(#:phases (modify-phases %standard-phases (replace 'check - (lambda _ + (lambda* (#:key inputs outputs #:allow-other-keys) + (add-installed-pythonpath inputs outputs) (setenv "PYTHONPATH" (string-append ".:" (getenv "PYTHONPATH"))) (invoke "trial" "jsonschema")))))) (native-inputs @@ -2291,6 +2292,7 @@ compare, diff, and patch JSON and JSON-like structures in Python.") ("python-twisted" ,python-twisted))) (propagated-inputs `(("python-attrs" ,python-attrs) + ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8 ("python-pyrsistent" ,python-pyrsistent) ("python-six" ,python-six))) (home-page "https://github.com/Julian/jsonschema") -- cgit v1.2.3 From 67c8b6448eccd303031a8fcc10994e9c99688aa0 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:18 +0100 Subject: gnu: python-pastel: Update to 0.2.0. * gnu/packages/graphics.scm (python-pastel): Update to 0.2.0. Signed-off-by: Leo Famulari --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f4bb62857c..1ba17c5fa3 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -834,14 +834,14 @@ rendering SVG graphics.") (define-public python-pastel (package (name "python-pastel") - (version "0.1.1") + (version "0.2.0") (source (origin (method url-fetch) (uri (pypi-uri "pastel" version)) (sha256 (base32 - "1qxcrcl8pzh66l8s6hym153mijdhwna0afcsmgca0bj4n80ijfxz")))) + "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From 66ab2f5e3a0df665f6e39203aedd2bf4812e6a71 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:19 +0100 Subject: gnu: python-msgpack: Update to 1.0.0. * gnu/packages/python-xyz.scm (python-msgpack): Update to 1.0.0. (python-msgpack-transitional)[version,source]: New fields to avoid updating this package. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 98d100365e..44a893a9d6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -7435,13 +7435,13 @@ should be stored on various operating systems.") (define-public python-msgpack (package (name "python-msgpack") - (version "0.5.6") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "msgpack" version)) (sha256 (base32 - "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) + "1h5mxh84rcw04dvxy1qbfn2hisavfqgilh9k09rgyjhd936dad4m")))) (build-system python-build-system) (arguments `(#:modules ((guix build utils) @@ -7477,6 +7477,13 @@ reading and writing MessagePack data.") (package (inherit python-msgpack) (name "python-msgpack-transitional") + (version "0.5.6") + (source (origin + (method url-fetch) + (uri (pypi-uri "msgpack" version)) + (sha256 + (base32 + "1hz2dba1nvvn52afg34liijsm7kn65cmn06dl0xbwld6bb4cis0f")))) (arguments (substitute-keyword-arguments (package-arguments python-msgpack) ((#:phases phases) -- cgit v1.2.3 From 6dcbd20afa775ba28b7e7986daa6fc4c5981fe0c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:20 +0100 Subject: gnu: python-cachecontrol: Add missing propagated-input. * gnu/packages/python-web.scm (python-cachecontrol): [propagated-inputs]: Add python-msgpack. Signed-off-by: Leo Famulari --- gnu/packages/python-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index b02ffd5f58..2cc4bc270f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2036,6 +2036,7 @@ provide an easy-to-use Python interface for building OAuth1 and OAuth2 clients." `(#:tests? #f)) (propagated-inputs `(("python-requests" ,python-requests) + ("python-msgpack" ,python-msgpack) ("python-lockfile" ,python-lockfile))) (home-page "https://github.com/ionrock/cachecontrol") (synopsis "The httplib2 caching algorithms for use with requests") -- cgit v1.2.3 From 01e30442007a5d2b0f8c443896f7d6dc850b140f Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:21 +0100 Subject: gnu: python-sortedcontainers: Add missing propagated-inputs. * gnu/packages/python-xyz.scm (python-sortedcontainers): [propagated-inputs] Add python-appdirs, python-distlib, python-filelock, python-importlib-metadata and python-six. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 44a893a9d6..ea2b14a6ec 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16748,6 +16748,12 @@ that is accessible to other projects developed in Cython.") (build-system python-build-system) (native-inputs `(("python-tox" ,python-tox))) + (propagated-inputs + `(("python-appdirs" ,python-appdirs) + ("python-distlib" ,python-distlib) + ("python-filelock" ,python-filelock) + ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8 + ("python-six" ,python-six))) (home-page "http://www.grantjenks.com/docs/sortedcontainers/") (synopsis "Sorted List, Sorted Dict, Sorted Set") (description -- cgit v1.2.3 From eac978eef875f20725c4e5f27875bc08e48ca8de Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:22 +0100 Subject: gnu: python-clikit: Update to 0.4.2. * gnu/packages/python-xyz.scm (python-clikit): Update to 0.4.2. Signed-off-by: Leo Famulari --- 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 ea2b14a6ec..e35a261ca4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11160,14 +11160,14 @@ more, possibly remote, memcached servers.") (define-public python-clikit (package (name "python-clikit") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (pypi-uri "clikit" version)) (sha256 (base32 - "10gab65pq0jdf589n33sj2513pxal2lisl4xwf1ijysdjxmpdr4a")))) + "1jnnr21hvzx4i29nbph1z96ympv0njiwyvngjq48w1q05133cwzn")))) (build-system python-build-system) (propagated-inputs `(("python-pastel" ,python-pastel) -- cgit v1.2.3 From 1655e7be7858cbe4dc1ada88a53d4efe50a5d957 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:23 +0100 Subject: gnu: python-fakeredis: Update to 1.2.1. * gnu/packages/databases.scm (python-fakeredis): Update to 1.2.1. [propagated-inputs]: Add python-sortedcontainers. Signed-off-by: Leo Famulari --- gnu/packages/databases.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0ac15c8312..9e60074dad 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 Nicolò Balzarotti +;;; Copyright © 2020 Tanguy Le Carrour ;;; ;;; This file is part of GNU Guix. ;;; @@ -2873,18 +2874,20 @@ parsing code in hiredis. It primarily speeds up parsing of multi bulk replies." (define-public python-fakeredis (package (name "python-fakeredis") - (version "0.8.2") + (version "1.2.1") (source (origin (method url-fetch) (uri (pypi-uri "fakeredis" version)) (sha256 (base32 - "0zncahj3byyasyfx9i7k991ph0n0lq8v3a21pqri5qxn9564bk9r")))) + "1s12mn4q4hz7402139khn9fx56kibj7nn0d6w81hn0zs07b90wpc")))) (build-system python-build-system) (arguments ;; no tests `(#:tests? #f)) + (propagated-inputs + `(("python-sortedcontainers" ,python-sortedcontainers))) (home-page "https://github.com/jamesls/fakeredis") (synopsis "Fake implementation of redis API for testing purposes") (description -- cgit v1.2.3 From f6c784806e130ec42784aeb2c91e62da39aa98bc Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Tue, 24 Mar 2020 15:58:17 -0400 Subject: gnu: Add python-xattr. * gnu/packages/python-xyz.scm (python-xattr): New variable. Signed-off-by: Leo Famulari --- 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 e35a261ca4..c36134a2bf 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18527,3 +18527,26 @@ content models.") with the eSign REST API. Send, sign, and approve documents using this client.") (home-page "https://www.docusign.com/devcenter") (license license:expat))) + +(define-public python-xattr + (package + (name "python-xattr") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "xattr" version)) + (sha256 + (base32 + "0i4xyiqbhjz2g16zbim17zjdbjkw79xsw8k59942vvq4is1cmfxh")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cffi" ,python-cffi))) + (home-page "https://github.com/xattr/xattr") + (synopsis + "Python wrapper for extended filesystem attributes") + (description "This package provides a Python wrapper for using extended +filesystem attributes. Extended attributes extend the basic attributes of files +and directories in the file system. They are stored as name:data pairs +associated with file system objects (files, directories, symlinks, etc).") + (license license:expat))) -- cgit v1.2.3 From 3b3edfa8e395b8bc4ea6b8427e2edaa45735e5de Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:25 +0100 Subject: gnu: Add python-json-logger. * gnu/packages/python-xyz.scm (python-json-logger): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c36134a2bf..66961c0d6b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18550,3 +18550,23 @@ filesystem attributes. Extended attributes extend the basic attributes of files and directories in the file system. They are stored as name:data pairs associated with file system objects (files, directories, symlinks, etc).") (license license:expat))) + +(define-public python-json-logger + (package + (name "python-json-logger") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-json-logger" version)) + (sha256 + (base32 + "10g2ya6nsvn5vxzvq2wb8q4d43i3d7756i5rxyjna6d0y9i138xp")))) + (build-system python-build-system) + (home-page + "https://github.com/madzak/python-json-logger") + (synopsis "JSON log formatter in Python") + (description "This library allows standard Python logging to output log data +as JSON objects. With JSON we can make our logs more readable by machines and +we can stop writing custom parsers for syslog-type records.") + (license license:bsd-3))) -- cgit v1.2.3 From 20c9df4e46a0d0cec67164ca5d896abd47670cae Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:26 +0100 Subject: gnu: Add python-daiquiri. * gnu/packages/python-xyz.scm (python-daiquiri): New variable. Signed-off-by: Leo Famulari --- 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 66961c0d6b..b4876a946c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18570,3 +18570,29 @@ associated with file system objects (files, directories, symlinks, etc).") as JSON objects. With JSON we can make our logs more readable by machines and we can stop writing custom parsers for syslog-type records.") (license license:bsd-3))) + +(define-public python-daiquiri + (package + (name "python-daiquiri") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "daiquiri" version)) + (sha256 + (base32 + "1qmank3c217ddiig3xr8ps0mqaydcp0q5a62in9a9g4zf72zjnqd")))) + (build-system python-build-system) + (propagated-inputs + `(("python-json-logger" ,python-json-logger))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-six" ,python-six))) + (home-page "https://github.com/jd/daiquiri") + (synopsis + "Library to configure Python logging easily") + (description "The daiquiri library provides an easy way to configure +logging in Python. It also provides some custom formatters and handlers.") + (license license:asl2.0))) -- cgit v1.2.3 From f5879f158c98d3082bdd64fd2c1ee2afe9f038d4 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:27 +0100 Subject: gnu: Add python-pifpaf. * gnu/packages/python-xyz.scm (python-pifpaf): New variable. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b4876a946c..0d9249c96e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18596,3 +18596,40 @@ we can stop writing custom parsers for syslog-type records.") (description "The daiquiri library provides an easy way to configure logging in Python. It also provides some custom formatters and handlers.") (license license:asl2.0))) + +(define-public python-pifpaf + (package + (name "python-pifpaf") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pifpaf" version)) + (sha256 + (base32 + "150av2pylsjy8ykrpyi0vzy2q24s9rhh2ya01zvwnvj9j5dspviz")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) + (propagated-inputs + `(("python-click" ,python-click) + ("python-daiquiri" ,python-daiquiri) + ("python-fixtures" ,python-fixtures) + ("python-jinja2" ,python-jinja2) + ("python-pbr" ,python-pbr) + ("python-psutil" ,python-psutil) + ("python-six" ,python-six) + ("python-xattr" ,python-xattr))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-os-testr" ,python-os-testr) + ("python-requests" ,python-requests) + ("python-testrepository" ,python-testrepository) + ("python-testtools" ,python-testtools))) + (home-page "https://github.com/jd/pifpaf") + (synopsis "Tools and fixtures to manage daemons for testing in Python") + (description "Pifpaf is a suite of fixtures and a command-line tool that +allows to start and stop daemons for a quick throw-away usage. This is typically +useful when needing these daemons to run integration testing. It originally +evolved from its precursor @code{overtest}.") + (license license:asl2.0))) -- cgit v1.2.3 From c298118860167fcce47a0d79442b9ee43a80e26a Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 12:26:28 +0100 Subject: gnu: python-cachy: Update to 0.3.0. * gnu/packages/python-xyz.scm (python-cachy): Update to 0.3.0. [arguments]: Replace the 'check' phase. [native-inputs]: Add memcached and python-pifpaf. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0d9249c96e..b388cb6788 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11213,18 +11213,26 @@ strings require only one extra byte in addition to the strings themselves.") (define-public python-cachy (package (name "python-cachy") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (pypi-uri "cachy" version)) (sha256 (base32 - "0v6mjyhgx6j7ya20bk69cr3gdzdkdf6psay0h090rscclgji65dp")))) + "1cb9naly8ampzlky7h74n5wj628l7jkpsh0c0jz0namlrvs82r8q")))) (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ (invoke "pifpaf" "run" "memcached" "--port" "11211" "--" + "pytest")))))) (native-inputs - `(("python-fakeredis" ,python-fakeredis) + `(("memcached" ,memcached) + ("python-fakeredis" ,python-fakeredis) ("python-flexmock" ,python-flexmock) + ("python-pifpaf" ,python-pifpaf) ("python-pytest" ,python-pytest))) (propagated-inputs `(("python-memcached" ,python-memcached) -- cgit v1.2.3 From 97b1366d49179f38a365bdfa383a8ccba779f8b8 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sat, 21 Mar 2020 15:37:16 +0100 Subject: gnu: poetry: Update to 1.0.5. * gnu/packages/python-xyz.scm (poetry): Update to 1.0.5. [propagated-inputs] Add python-clikit, python-importlib-metadata, python-keyring, and python-pexpect. Remove python-msgpack and python-glob2. [home-page] Update URL. [arguments] Remove 'patch-setup-py' phase, and adjust required versions of keyring, pyrsistent and importlib-metadata. Signed-off-by: Leo Famulari --- gnu/packages/python-xyz.scm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b388cb6788..9c9137f93f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -65,7 +65,7 @@ ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Wiktor Żelazny -;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2019, 2020 Tanguy Le Carrour ;;; Copyright © 2019 Mădălin Ionel Patrașcu ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 sirgazil @@ -11249,34 +11249,38 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "0.12.17") - ;; Poetry can only be built from source with poetry. + (version "1.0.5") + ;; Poetry can only be built from source with Poetry. (source (origin (method url-fetch) (uri (pypi-uri "poetry" version)) (sha256 (base32 - "0gxwcd65qjmzqzppf53x51sic1rbcd9py6cdzx3aprppipimslvf")))) + "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. #:phases (modify-phases %standard-phases - (replace 'build + (add-before 'build 'patch-setup-py (lambda _ - ;; Bug in poetry https://github.com/sdispater/poetry/issues/866. - (invoke "sed" "-i" "-e" "s/from distutils.core/from setuptools/" - "setup.py") + (substitute* "setup.py" + ;; poetry won't update version as 21.0.0 relies on python > 3.6 + (("keyring>=20.0.1,<21.0.0") "keyring>=21.0.0,<22.0.0") + (("pyrsistent>=0.14.2,<0.15.0") "pyrsistent>=0.14.2,<0.16.0") + (("importlib-metadata>=1.1.3,<1.2.0") "importlib-metadata>=1.1.3,<1.5.0")) #t))))) (propagated-inputs `(("python-cachecontrol" ,python-cachecontrol) ("python-cachy" ,python-cachy) ("python-cleo" ,python-cleo) - ("python-glob2" ,python-glob2) + ("python-clikit" ,python-clikit) ("python-html5lib" ,python-html5lib) + ("python-importlib-metadata" ,python-importlib-metadata) ;; python < 3.8 ("python-jsonschema" ,python-jsonschema) - ("python-msgpack" ,python-msgpack) + ("python-keyring" ,python-keyring) + ("python-pexpect" ,python-pexpect) ("python-pkginfo" ,python-pkginfo) ("python-pyparsing" ,python-pyparsing) ("python-pyrsistent" ,python-pyrsistent) @@ -11285,7 +11289,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") ("python-shellingham" ,python-shellingham) ("python-tomlkit" ,python-tomlkit) ("python-virtualenv" ,python-virtualenv))) - (home-page "https://poetry.eustace.io/") + (home-page "https://python-poetry.org") (synopsis "Python dependency management and packaging made easy") (description "Poetry is a tool for dependency management and packaging in Python. It allows you to declare the libraries your project depends on and -- cgit v1.2.3 From 51d1a7a2effd9a30bfdf8a586baa2ee40e3e50ee Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Mar 2020 09:25:11 +0100 Subject: gnu: r-mast: Add r-knitr to native inputs. * gnu/packages/bioconductor.scm (r-mast)[native-inputs]: Add r-knitr. --- gnu/packages/bioconductor.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 41e49c9b9c..b62a6188d1 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -2649,6 +2649,8 @@ interactive exploration of results.") ("r-singlecellexperiment" ,r-singlecellexperiment) ("r-stringr" ,r-stringr) ("r-summarizedexperiment" ,r-summarizedexperiment))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/RGLab/MAST/") (synopsis "Model-based analysis of single cell transcriptomics") (description -- cgit v1.2.3 From 2fcd2e1a5f482f80a7b636a8f42db4c1f79c13e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Mar 2020 09:34:31 +0100 Subject: gnu: r-shiny: Add missing inputs. * gnu/packages/cran.scm (r-shiny)[propagated-inputs]: Add r-later, r-promises, r-rlang, and r-withr. [native-inputs]: Add gfortran. --- gnu/packages/cran.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index fe29b9f581..30d2ba30d0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -838,15 +838,19 @@ data structures in C++.") #t))))) (propagated-inputs `(("r-crayon" ,r-crayon) + ("r-digest" ,r-digest) ("r-fastmap" ,r-fastmap) + ("r-htmltools" ,r-htmltools) ("r-httpuv" ,r-httpuv) - ("r-mime" ,r-mime) ("r-jsonlite" ,r-jsonlite) - ("r-xtable" ,r-xtable) - ("r-digest" ,r-digest) - ("r-htmltools" ,r-htmltools) + ("r-later" ,r-later) + ("r-mime" ,r-mime) + ("r-promises" ,r-promises) ("r-r6" ,r-r6) - ("r-sourcetools" ,r-sourcetools))) + ("r-rlang" ,r-rlang) + ("r-sourcetools" ,r-sourcetools) + ("r-withr" ,r-withr) + ("r-xtable" ,r-xtable))) (inputs `(("js-datatables" ,js-datatables) ("js-html5shiv" ,js-html5shiv) @@ -857,7 +861,8 @@ data structures in C++.") ("js-highlight" ,js-highlight) ("js-es5-shim" ,js-es5-shim))) (native-inputs - `(("uglify-js" ,uglify-js))) + `(("uglify-js" ,uglify-js) + ("gfortran" ,gfortran))) (home-page "http://shiny.rstudio.com") (synopsis "Easy interactive web applications with R") (description -- cgit v1.2.3 From 620c75644346063033ae7be19e4f7a6bdf54fa96 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 25 Mar 2020 11:09:45 +0100 Subject: gnu: electron-cash: Update to 4.0.14. * gnu/packages/finance.scm (electron-cash): Update to 4.0.14. --- 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 af75722b74..43eda97f1a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -452,7 +452,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (define-public electron-cash (package (name "electron-cash") - (version "4.0.13") + (version "4.0.14") (source (origin (method git-fetch) @@ -461,7 +461,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x9as1dn9n93vgyrixwvp9bh0aarr9vsfz5hdmw16j3wj3wj621f")))) + (base32 "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6")))) (build-system python-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From b3c083b98530448fe226399c037c0126a531b459 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Mar 2020 14:10:55 +0100 Subject: services/nfs: Mount nfsd pseudo file system. * gnu/services/nfs.scm (nfs-shepherd-services): Add shepherd-service providing /proc/fs/nfsd and make other shepherd services require it. --- gnu/services/nfs.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index c90984387e..cbaa97b2fd 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -274,9 +274,19 @@ rpcmountd-port rpcstatd-port nfsd-port nfsd-threads pipefs-directory debug) (list (shepherd-service + (documentation "Mount the nfsd pseudo file system.") + (provision '(/proc/fs/nfsd)) + (start #~(lambda () + (mount "nfsd" "/proc/fs/nfsd" "nfsd") + (member "/proc/fs/nfsd" (mount-points)))) + + (stop #~(lambda (pid . args) + (umount "/proc/fs/nfsd" MNT_DETACH) + (not (member "/proc/fs/nfsd" (mount-points)))))) + (shepherd-service (documentation "Run the NFS statd daemon.") (provision '(rpc.statd)) - (requirement '(rpcbind-daemon)) + (requirement '(/proc/fs/nfsd rpcbind-daemon)) (start #~(make-forkexec-constructor (list #$(file-append nfs-utils "/sbin/rpc.statd") @@ -295,7 +305,7 @@ (shepherd-service (documentation "Run the NFS mountd daemon.") (provision '(rpc.mountd)) - (requirement '(rpc.statd)) + (requirement '(/proc/fs/nfsd rpc.statd)) (start #~(make-forkexec-constructor (list #$(file-append nfs-utils "/sbin/rpc.mountd") @@ -310,7 +320,7 @@ (shepherd-service (documentation "Run the NFS daemon.") (provision '(rpc.nfsd)) - (requirement '(rpc.statd networking)) + (requirement '(/proc/fs/nfsd rpc.statd networking)) (start #~(lambda _ (zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") @@ -329,7 +339,7 @@ (shepherd-service (documentation "Run the NFS mountd daemon and refresh exports.") (provision '(nfs)) - (requirement '(rpc.nfsd rpc.mountd rpc.statd rpcbind-daemon)) + (requirement '(/proc/fs/nfsd rpc.nfsd rpc.mountd rpc.statd rpcbind-daemon)) (start #~(lambda _ (let ((rpcdebug #$(file-append nfs-utils "/sbin/rpcdebug"))) -- cgit v1.2.3 From eb019af8d84ad168d6cb11c011842fb0c8303f20 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Mar 2020 14:16:42 +0100 Subject: tests/nfs: Fix use of WAIT-FOR-FILE. * gnu/tests/nfs.scm ("nfs services are running"): Pass marionette to WAIT-FOR-FILE. --- gnu/tests/nfs.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 00109b752e..5e4de2783b 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -236,7 +236,7 @@ (use-modules (gnu services herd)) (start-service 'nfs)) marionette) - (wait-for-file "/var/run/rpc.statd.pid"))) + (wait-for-file "/var/run/rpc.statd.pid" marionette))) (test-assert "nfs share is advertised" (marionette-eval -- cgit v1.2.3 From 98e9ed8a3fa2841dc24030828baf1fa899a329ef Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 25 Mar 2020 15:53:54 +0100 Subject: gnu: gnu-pw-mgr: Build reproducibly. * gnu/packages/gnu-pw-mgr.scm (gnu-pw-mgr)[native-inputs]: Remove AUTOGEN so that man pages are not regenerated with a fresh date. --- gnu/packages/gnu-pw-mgr.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnu-pw-mgr.scm b/gnu/packages/gnu-pw-mgr.scm index a56bc09e61..6eb8224cef 100644 --- a/gnu/packages/gnu-pw-mgr.scm +++ b/gnu/packages/gnu-pw-mgr.scm @@ -49,8 +49,7 @@ (("/usr/bin/printf") (which "printf"))) #t))))) (native-inputs - `(("which" ,which) - ("autogen" ,autogen))) + `(("which" ,which))) (home-page "https://www.gnu.org/software/gnu-pw-mgr/") (synopsis "Retrieve login credentials without recording passwords") (description -- cgit v1.2.3 From 8b19fa51a4147e65caf56d89f1ad0a64c32ee460 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 25 Mar 2020 16:29:26 +0100 Subject: gnu: abseil-cpp: Update to 20200225.1. * gnu/packages/cpp.scm (abseil-cpp): Update to 20200225.1. --- gnu/packages/cpp.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 0c5692b125..ce816a528a 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2020 Roel Janssen +;;; Copyright © 2020 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -444,7 +445,7 @@ point and then, after each tween step, plugging back the result.") (define-public abseil-cpp (package (name "abseil-cpp") - (version "20200225") + (version "20200225.1") (source (origin (method git-fetch) (uri (git-reference @@ -453,7 +454,7 @@ point and then, after each tween step, plugging back the result.") (file-name (git-file-name name version)) (sha256 (base32 - "0wb04pszzrl39ny1pz9jvvq8lbbm355dd60jspcyqfwxnk6njgd1")))) + "035bffayslawc19q2gmlkr6n6r7k7mvriaq7352rv6gyzaplr98w")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" -- cgit v1.2.3 From 0557618dbea23afc1d2a0ee2d43d504c35e2f089 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 25 Mar 2020 17:34:38 +0100 Subject: gnu: Add emacs-chronometrist. * gnu/packages/emacs-xyz.scm (emacs-chronometrist): New variable. --- 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 7b67cc37ae..2bfa5f95e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1728,6 +1728,39 @@ searches. Unlike code@{emacs-wiki.el}, it can be combined with any format.") Emacs buffer.") (license license:gpl3+))) +(define-public emacs-chronometrist + (package + (name "emacs-chronometrist") + (version "0.4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/contrapunctus/chronometrist.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-dash" ,emacs-dash) + ("emacs-s" ,emacs-s))) + (home-page "https://framagit.org/contrapunctus/chronometrist") + (synopsis "Time tracker for Emacs") + (description "Chronometrist is a time tracker in Emacs, largely modelled +after the Android application, @emph{A Time Tracker}. + +Its features are: +@itemize +@item Simple and efficient to use, +@item Displays useful information about your time usage, +@item Support for both mouse and keyboard, +@item Human errors in tracking are easily fixed by editing a plain text file, +@item Hooks to let you perform arbitrary actions when starting/stopping tasks. +@end itemize") + ;; Software is dual-licensed. + (license (list license:unlicense license:wtfpl2)))) + (define-public emacs-direnv (package (name "emacs-direnv") -- cgit v1.2.3 From 49a8ef8ae1e43fd3a125b782bf49e1d2383ae71f Mon Sep 17 00:00:00 2001 From: Todor Kondić Date: Wed, 25 Mar 2020 15:37:55 -0400 Subject: gnu: Add r-argon2. * gnu/packages/cran.scm (r-argon2): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 30d2ba30d0..4e67c5104a 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2018, 2019 Brett Gilio ;;; Copyright © 2019 Nicolò Balzarotti ;;; Copyright © 2019 Wiktor Żelazny +;;; Copyright © 2020 Todor Kondić ;;; ;;; This file is part of GNU Guix. ;;; @@ -20946,3 +20947,23 @@ service. Functions are provided to work with the OAI-PMH verbs: @code{GetRecord}, @code{Identify}, @code{ListIdentifiers}, @code{ListMetadataFormats}, @code{ListRecords}, and @code{ListSets}.") (license license:expat))) + +(define-public r-argon2 + (package + (name "r-argon2") + (version "0.2-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "argon2" version)) + (sha256 + (base32 + "0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh")))) + (properties `((upstream-name . "argon2"))) + (build-system r-build-system) + (home-page + "https://github.com/wrathematics/argon2") + (synopsis "Secure Password Hashing based on Argon2 Algorithm") + (description + "Utilities for secure password hashing via the argon2 algorithm.") + (license license:bsd-2))) -- cgit v1.2.3 From 6ad80b2a6b25178e94f7bae194c0007215398968 Mon Sep 17 00:00:00 2001 From: Todor Kondić Date: Wed, 25 Mar 2020 15:38:50 -0400 Subject: gnu: Add r-getpass. * gnu/packages/cran.scm (r-getpass): New variable. Signed-off-by: Leo Famulari --- gnu/packages/cran.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 4e67c5104a..3447859f01 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20967,3 +20967,28 @@ service. Functions are provided to work with the OAI-PMH verbs: (description "Utilities for secure password hashing via the argon2 algorithm.") (license license:bsd-2))) + +(define-public r-getpass + (package + (name "r-getpass") + (version "0.2-2") + (source + (origin + (method url-fetch) + (uri (cran-uri "getPass" version)) + (sha256 + (base32 + "03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc")))) + (properties `((upstream-name . "getPass"))) + (build-system r-build-system) + (propagated-inputs + `(("r-rstudioapi" ,r-rstudioapi))) + (home-page + "https://github.com/wrathematics/getPass") + (synopsis "Masked User Input") + (description + "This package provides a micro-package for reading \"passwords\", i.e. +reading user input with masking, so that the input is not displayed as it is +typed. Currently, RStudio, the command line (every OS), and any platform +where tcltk is present are supported.") + (license license:bsd-2))) -- cgit v1.2.3 From 0c549393b9b9194f47fbee2bdfa1caf8f4e32b12 Mon Sep 17 00:00:00 2001 From: Todor Kondić Date: Wed, 25 Mar 2020 15:39:08 -0400 Subject: gnu: Add r-remoter. * gnu/packages/cran.scm (r-remoter): New variable. Signed-off-by: Leo Famulari --- 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 3447859f01..c0bd4bfd4f 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20992,3 +20992,30 @@ reading user input with masking, so that the input is not displayed as it is typed. Currently, RStudio, the command line (every OS), and any platform where tcltk is present are supported.") (license license:bsd-2))) + +(define-public r-remoter + (package + (name "r-remoter") + (version "0.4-0") + (source + (origin + (method url-fetch) + (uri (cran-uri "remoter" version)) + (sha256 + (base32 + "1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl")))) + (properties `((upstream-name . "remoter"))) + (build-system r-build-system) + (propagated-inputs + `(("r-argon2" ,r-argon2) + ("r-getpass" ,r-getpass) + ("r-pbdzmq" ,r-pbdzmq) + ("r-png" ,r-png))) + (home-page "https://github.com/RBigData/remoter") + (synopsis + "Control a Remote R Session from a Local One") + (description + "This package provides a set of utilities for client/server computing +with R, controlling a remote R session (the server) from a local one (the +client).") + (license license:bsd-2))) -- cgit v1.2.3 From 7d57a190f6896c04b5dad66bf4360bc48a4052ff Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 25 Mar 2020 14:25:18 -0400 Subject: gnu: icu4c: Fix CVE-2020-10531. * gnu/packages/patches/icu4c-CVE-2020-10531.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/icu4c.scm (icu4c)[replacement]: New field. (icu4c/fixed): New variable. --- gnu/local.mk | 1 + gnu/packages/icu4c.scm | 11 ++ gnu/packages/patches/icu4c-CVE-2020-10531.patch | 127 ++++++++++++++++++++++++ 3 files changed, 139 insertions(+) create mode 100644 gnu/packages/patches/icu4c-CVE-2020-10531.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 7cce60b7c0..c905bd3b37 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1033,6 +1033,7 @@ dist_patch_DATA = \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-6-hotspot-gcc-segfault-workaround.patch \ %D%/packages/patches/icedtea-7-hotspot-gcc-segfault-workaround.patch \ + %D%/packages/patches/icu4c-CVE-2020-10531.patch \ %D%/packages/patches/id3lib-CVE-2007-4460.patch \ %D%/packages/patches/id3lib-UTF16-writing-bug.patch \ %D%/packages/patches/ilmbase-fix-tests.patch \ diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index 922dfbd348..bc74da5942 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -56,6 +56,7 @@ (define-public icu4c (package (name "icu4c") + (replacement icu4c/fixed) (version "64.2") (source (origin (method url-fetch) @@ -105,6 +106,16 @@ C/C++ part.") (license x11) (home-page "http://site.icu-project.org/"))) +(define icu4c/fixed + (package + (inherit icu4c) + (source (origin + (inherit (package-source icu4c)) + (patches (append + (origin-patches (package-source icu4c)) + (search-patches + "icu4c-CVE-2020-10531.patch"))))))) + (define-public java-icu4j (package (name "java-icu4j") diff --git a/gnu/packages/patches/icu4c-CVE-2020-10531.patch b/gnu/packages/patches/icu4c-CVE-2020-10531.patch new file mode 100644 index 0000000000..c2ab923bdc --- /dev/null +++ b/gnu/packages/patches/icu4c-CVE-2020-10531.patch @@ -0,0 +1,127 @@ +Fix CVE-2020-10531: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-10531 + +Patch copied from upstream source repository (changes to the test suite +are commented out): + +https://github.com/unicode-org/icu/commit/b7d08bc04a4296982fcef8b6b8a354a9e4e7afca + +From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Sat, 1 Feb 2020 02:39:04 +0000 +Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append + +See #971 +--- + icu4c/source/common/unistr.cpp | 6 ++- + icu4c/source/test/intltest/ustrtest.cpp | 62 +++++++++++++++++++++++++ + icu4c/source/test/intltest/ustrtest.h | 1 + + 3 files changed, 68 insertions(+), 1 deletion(-) + +diff --git a/icu4c/source/common/unistr.cpp b/icu4c/source/common/unistr.cpp +index 901bb3358ba..077b4d6ef20 100644 +--- a/icu4c/source/common/unistr.cpp ++++ b/icu4c/source/common/unistr.cpp +@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLeng + } + + int32_t oldLength = length(); +- int32_t newLength = oldLength + srcLength; ++ int32_t newLength; ++ if (uprv_add32_overflow(oldLength, srcLength, &newLength)) { ++ setToBogus(); ++ return *this; ++ } + + // Check for append onto ourself + const UChar* oldArray = getArrayStart(); +#diff --git a/icu4c/source/test/intltest/ustrtest.cpp b/icu4c/source/test/intltest/ustrtest.cpp +#index b6515ea813c..ad38bdf53a3 100644 +#--- a/icu4c/source/test/intltest/ustrtest.cpp +#+++ b/icu4c/source/test/intltest/ustrtest.cpp +#@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* & +# TESTCASE_AUTO(TestWCharPointers); +# TESTCASE_AUTO(TestNullPointers); +# TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf); +#+ TESTCASE_AUTO(TestLargeAppend); +# TESTCASE_AUTO_END; +# } +# +#@@ -2310,3 +2311,64 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() { +# str.insert(2, sub); +# assertEquals("", u"abbcdcde", str); +# } +#+ +#+void UnicodeStringTest::TestLargeAppend() { +#+ if(quick) return; +#+ +#+ IcuTestErrorCode status(*this, "TestLargeAppend"); +#+ // Make a large UnicodeString +#+ int32_t len = 0xAFFFFFF; +#+ UnicodeString str; +#+ char16_t *buf = str.getBuffer(len); +#+ // A fast way to set buffer to valid Unicode. +#+ // 4E4E is a valid unicode character +#+ uprv_memset(buf, 0x4e, len * 2); +#+ str.releaseBuffer(len); +#+ UnicodeString dest; +#+ // Append it 16 times +#+ // 0xAFFFFFF times 16 is 0xA4FFFFF1, +#+ // which is greater than INT32_MAX, which is 0x7FFFFFFF. +#+ int64_t total = 0; +#+ for (int32_t i = 0; i < 16; i++) { +#+ dest.append(str); +#+ total += len; +#+ if (total <= INT32_MAX) { +#+ assertFalse("dest is not bogus", dest.isBogus()); +#+ } else { +#+ assertTrue("dest should be bogus", dest.isBogus()); +#+ } +#+ } +#+ dest.remove(); +#+ total = 0; +#+ for (int32_t i = 0; i < 16; i++) { +#+ dest.append(str); +#+ total += len; +#+ if (total + len <= INT32_MAX) { +#+ assertFalse("dest is not bogus", dest.isBogus()); +#+ } else if (total <= INT32_MAX) { +#+ // Check that a string of exactly the maximum size works +#+ UnicodeString str2; +#+ int32_t remain = INT32_MAX - total; +#+ char16_t *buf2 = str2.getBuffer(remain); +#+ if (buf2 == nullptr) { +#+ // if somehow memory allocation fail, return the test +#+ return; +#+ } +#+ uprv_memset(buf2, 0x4e, remain * 2); +#+ str2.releaseBuffer(remain); +#+ dest.append(str2); +#+ total += remain; +#+ assertEquals("When a string of exactly the maximum size works", (int64_t)INT32_MAX, total); +#+ assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length()); +#+ assertFalse("dest is not bogus", dest.isBogus()); +#+ +#+ // Check that a string size+1 goes bogus +#+ str2.truncate(1); +#+ dest.append(str2); +#+ total++; +#+ assertTrue("dest should be bogus", dest.isBogus()); +#+ } else { +#+ assertTrue("dest should be bogus", dest.isBogus()); +#+ } +#+ } +#+} +#diff --git a/icu4c/source/test/intltest/ustrtest.h b/icu4c/source/test/intltest/ustrtest.h +#index 218befdcc68..4a356a92c7a 100644 +#--- a/icu4c/source/test/intltest/ustrtest.h +#+++ b/icu4c/source/test/intltest/ustrtest.h +#@@ -97,6 +97,7 @@ class UnicodeStringTest: public IntlTest { +# void TestWCharPointers(); +# void TestNullPointers(); +# void TestUnicodeStringInsertAppendToSelf(); +#+ void TestLargeAppend(); +# }; +# +# #endif -- cgit v1.2.3 From 1d777c78379441a325652f92a8616d6f51d82b34 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 25 Mar 2020 20:36:25 -0400 Subject: gnu: linux-libre@4.19: Update to 4.19.113. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.113. (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 f2dcc325ff..15b74d8c85 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -370,10 +370,10 @@ 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.112") +(define-public linux-libre-4.19-version "4.19.113") (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0yiyqwgh6wcyshpdj98s7dc4ahyx47y6whvnww6sjmzdq0fb3hi4"))) + (hash (base32 "1rf0jz7r1f4rb4k0g3glssfa1hm2ka6vlbwjlkmsx1bybxnmg85m"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit v1.2.3 From 5cc6271d22466c2013d04976e57a807b32cd7afb Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 25 Mar 2020 20:37:38 -0400 Subject: gnu: linux-libre: Update to 5.4.28. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.28. (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 15b74d8c85..bc8300a212 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -362,10 +362,10 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." "linux-" version ".tar.xz")) (sha256 hash))) -(define-public linux-libre-5.4-version "5.4.27") +(define-public linux-libre-5.4-version "5.4.28") (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0szc1p9y6z8gs2f1nj45nrz52sxcabg2xh7zqlljazv45lvcvf8r"))) + (hash (base32 "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit v1.2.3 From 2a57b72251042b819f0822c870c3837f63957d9e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 25 Mar 2020 20:39:05 -0400 Subject: gnu: linux-libre: Update deblob scripts. * gnu/packages/linux.scm (deblob-scripts-5.4): Update to 5.4.28. --- 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 bc8300a212..db8e180dd0 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -194,9 +194,9 @@ defconfig. Return the appropriate make target if applicable, otherwise return (define deblob-scripts-5.4 (linux-libre-deblob-scripts - "5.4.19" + "5.4.28" (base32 "0ckxn7k5zgcqk30dq943bnamr6a6zjbw2aqjl3x30f4kvh5f6k25") - (base32 "1ajzwyy6vgmihxpz3sbshzfzd0w8yzj0fihv0d5rjpr4z3gm48bk"))) + (base32 "08ls4gx5vanyiq9rn0869nfq4piw4lx1dl8hh9w9xgkr4ypc1j4k"))) (define deblob-scripts-4.19 (linux-libre-deblob-scripts -- cgit v1.2.3 From 730a4b10fa49d821e0a89af59485cecf8616cd50 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 25 Mar 2020 18:59:25 -0700 Subject: gnu: linux-libre-5.4-source: Add patch to support pinebook pro. * gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch: New file. * gnu/local.mk (dist_patch_DATA): Update accordingly. * gnu/packages/linux (linux-libre-5.4-source): Add patch. --- gnu/local.mk | 1 + gnu/packages/linux.scm | 6 +- .../linux-libre-support-for-Pinebook-Pro.patch | 1135 ++++++++++++++++++++ 3 files changed, 1141 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index c905bd3b37..5a51c474ed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1159,6 +1159,7 @@ dist_patch_DATA = \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/linkchecker-tests-require-network.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 \ %D%/packages/patches/lirc-reproducible-build.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index db8e180dd0..8fec3352f3 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -433,7 +433,11 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (define-public linux-libre-5.4-source (source-with-patches linux-libre-5.4-pristine-source (list %boot-logo-patch - %linux-libre-arm-export-__sync_icache_dcache-patch))) + %linux-libre-arm-export-__sync_icache_dcache-patch + ;; Pinebook Pro patch from linux-next, + ;; can be dropped for linux-libre 5.7 + (search-patch + "linux-libre-support-for-Pinebook-Pro.patch")))) (define-public linux-libre-4.19-source (source-with-patches linux-libre-4.19-pristine-source diff --git a/gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch b/gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch new file mode 100644 index 0000000000..659e10cba6 --- /dev/null +++ b/gnu/packages/patches/linux-libre-support-for-Pinebook-Pro.patch @@ -0,0 +1,1135 @@ +From d87a8072e8129a579246d8d31a591ca2aec05275 Mon Sep 17 00:00:00 2001 +From: Tobias Schramm +Date: Wed, 4 Mar 2020 22:30:23 +0100 +Subject: [PATCH] arm64: dts: rockchip: Add initial support for Pinebook Pro + +This commit adds initial dt support for the rk3399 based Pinebook Pro. + +Signed-off-by: Tobias Schramm +Link: https://lore.kernel.org/r/20200304213023.689983-3-t.schramm@manjaro.org +Signed-off-by: Heiko Stuebner + +Taken from next-20200313 commit 5a65505a6988443b211d3bf3f5bb5b79907c33b9 +--- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1096 +++++++++++++++++ + 2 files changed, 1097 insertions(+) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts + +diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile +index 1f18a9392d15..7de9b61d6415 100644 +--- a/arch/arm64/boot/dts/rockchip/Makefile ++++ b/arch/arm64/boot/dts/rockchip/Makefile +@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb ++dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb + dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4.dtb +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +new file mode 100644 +index 000000000000..5ea281b55fe2 +--- /dev/null ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +@@ -0,0 +1,1096 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd. ++ * Copyright (c) 2018 Akash Gajjar ++ * Copyright (c) 2020 Tobias Schramm ++ */ ++ ++/dts-v1/; ++#include ++#include ++#include ++#include ++#include ++#include "rk3399.dtsi" ++#include "rk3399-opp.dtsi" ++ ++/ { ++ model = "Pine64 Pinebook Pro"; ++ compatible = "pine64,pinebook-pro", "rockchip,rk3399"; ++ ++ chosen { ++ stdout-path = "serial2:1500000n8"; ++ }; ++ ++ backlight: edp-backlight { ++ compatible = "pwm-backlight"; ++ power-supply = <&vcc_12v>; ++ pwms = <&pwm0 0 740740 0>; ++ }; ++ ++ edp_panel: edp-panel { ++ compatible = "boe,nv140fhmn49"; ++ backlight = <&backlight>; ++ enable-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&panel_en_gpio>; ++ power-supply = <&vcc3v3_panel>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ panel_in_edp: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&edp_out_panel>; ++ }; ++ }; ++ }; ++ }; ++ ++ /* ++ * Use separate nodes for gpio-keys to allow for selective deactivation ++ * of wakeup sources via sysfs without disabling the whole key ++ */ ++ gpio-key-lid { ++ compatible = "gpio-keys"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&lidbtn_gpio>; ++ ++ lid { ++ debounce-interval = <20>; ++ gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>; ++ label = "Lid"; ++ linux,code = ; ++ linux,input-type = ; ++ wakeup-event-action = ; ++ wakeup-source; ++ }; ++ }; ++ ++ gpio-key-power { ++ compatible = "gpio-keys"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwrbtn_gpio>; ++ ++ power { ++ debounce-interval = <20>; ++ gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>; ++ label = "Power"; ++ linux,code = ; ++ wakeup-source; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwrled_gpio &slpled_gpio>; ++ ++ green-led { ++ color = ; ++ default-state = "on"; ++ function = LED_FUNCTION_POWER; ++ gpios = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; ++ label = "green:power"; ++ }; ++ ++ red-led { ++ color = ; ++ default-state = "off"; ++ function = LED_FUNCTION_STANDBY; ++ gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; ++ label = "red:standby"; ++ panic-indicator; ++ retain-state-suspended; ++ }; ++ }; ++ ++ /* Power sequence for SDIO WiFi module */ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ clocks = <&rk808 1>; ++ clock-names = "ext_clock"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&wifi_enable_h_gpio>; ++ post-power-on-delay-ms = <100>; ++ power-off-delay-us = <500000>; ++ ++ /* WL_REG_ON on module */ ++ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; ++ }; ++ ++ /* Audio components */ ++ es8316-sound { ++ compatible = "simple-audio-card"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&hp_det_gpio>; ++ simple-audio-card,name = "rockchip,es8316-codec"; ++ simple-audio-card,format = "i2s"; ++ simple-audio-card,mclk-fs = <256>; ++ ++ simple-audio-card,widgets = ++ "Microphone", "Mic Jack", ++ "Headphone", "Headphones", ++ "Speaker", "Speaker"; ++ simple-audio-card,routing = ++ "MIC1", "Mic Jack", ++ "Headphones", "HPOL", ++ "Headphones", "HPOR", ++ "Speaker Amplifier INL", "HPOL", ++ "Speaker Amplifier INR", "HPOR", ++ "Speaker", "Speaker Amplifier OUTL", ++ "Speaker", "Speaker Amplifier OUTR"; ++ ++ simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; ++ simple-audio-card,aux-devs = <&speaker_amp>; ++ simple-audio-card,pin-switches = "Speaker"; ++ ++ simple-audio-card,cpu { ++ sound-dai = <&i2s1>; ++ }; ++ ++ simple-audio-card,codec { ++ sound-dai = <&es8316>; ++ }; ++ }; ++ ++ speaker_amp: speaker-amplifier { ++ compatible = "simple-audio-amplifier"; ++ enable-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>; ++ sound-name-prefix = "Speaker Amplifier"; ++ VCC-supply = <&pa_5v>; ++ }; ++ ++ /* Power tree */ ++ /* Root power source */ ++ vcc_sysin: vcc-sysin { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc_sysin"; ++ regulator-always-on; ++ regulator-boot-on; ++ }; ++ ++ /* Regulators supplied by vcc_sysin */ ++ /* LCD backlight supply */ ++ vcc_12v: vcc-12v { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc_12v"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <12000000>; ++ regulator-max-microvolt = <12000000>; ++ vin-supply = <&vcc_sysin>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* Main 3.3 V supply */ ++ vcc3v3_sys: wifi_bat: vcc3v3-sys { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3_sys"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vcc_sysin>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ /* 5 V USB power supply */ ++ vcc5v0_usb: pa_5v: vcc5v0-usb-regulator { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio1 RK_PB5 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pwr_5v_gpio>; ++ regulator-name = "vcc5v0_usb"; ++ regulator-always-on; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_sysin>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* RK3399 logic supply */ ++ vdd_log: vdd-log { ++ compatible = "pwm-regulator"; ++ pwms = <&pwm2 0 25000 1>; ++ regulator-name = "vdd_log"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <800000>; ++ regulator-max-microvolt = <1400000>; ++ vin-supply = <&vcc_sysin>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ /* Regulators supplied by vcc3v3_sys */ ++ /* 0.9 V supply, always on */ ++ vcc_0v9: vcc-0v9 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc_0v9"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <900000>; ++ regulator-max-microvolt = <900000>; ++ vin-supply = <&vcc3v3_sys>; ++ }; ++ ++ /* S3 1.8 V supply, switched by vcc1v8_s3 */ ++ vcca1v8_s3: vcc1v8-s3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcca1v8_s3"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vcc3v3_sys>; ++ }; ++ ++ /* micro SD card power */ ++ vcc3v0_sd: vcc3v0-sd { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc0_pwr_h_gpio>; ++ regulator-name = "vcc3v0_sd"; ++ regulator-always-on; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ vin-supply = <&vcc3v3_sys>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* LCD panel power, called VCC3V3_S0 in schematic */ ++ vcc3v3_panel: vcc3v3-panel { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio1 RK_PC6 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&lcdvcc_en_gpio>; ++ regulator-name = "vcc3v3_panel"; ++ regulator-always-on; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ regulator-enable-ramp-delay = <100000>; ++ vin-supply = <&vcc3v3_sys>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* M.2 adapter power, switched by vcc1v8_s3 */ ++ vcc3v3_ssd: vcc3v3-ssd { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc3v3_ssd"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vcc3v3_sys>; ++ }; ++ ++ /* Regulators supplied by vcc5v0_usb */ ++ /* USB 3 port power supply regulator */ ++ vcc5v0_otg: vcc5v0-otg { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vcc5v0_host_en_gpio>; ++ regulator-name = "vcc5v0_otg"; ++ regulator-always-on; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc5v0_usb>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* Regulators supplied by vcc5v0_usb */ ++ /* Type C port power supply regulator */ ++ vbus_5vout: vbus_typec: vbus-5vout { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vcc5v0_typec0_en_gpio>; ++ regulator-name = "vbus_5vout"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc5v0_usb>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ /* Regulators supplied by vcc_1v8 */ ++ /* Primary 0.9 V LDO */ ++ vcca0v9_s3: vcca0v9-s3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "vcc0v9_s3"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_1v8>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ mains_charger: dc-charger { ++ compatible = "gpio-charger"; ++ charger-type = "mains"; ++ gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>; ++ ++ /* Also triggered by USB charger */ ++ pinctrl-names = "default"; ++ pinctrl-0 = <&dc_det_gpio>; ++ }; ++}; ++ ++&cdn_dp { ++ status = "okay"; ++}; ++ ++&cpu_b0 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ ++&cpu_b1 { ++ cpu-supply = <&vdd_cpu_b>; ++}; ++ ++&cpu_l0 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l1 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l2 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&cpu_l3 { ++ cpu-supply = <&vdd_cpu_l>; ++}; ++ ++&edp { ++ force-hpd; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&edp_hpd>; ++ status = "okay"; ++ ++ ports { ++ edp_out: port@1 { ++ reg = <1>; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ edp_out_panel: endpoint@0 { ++ reg = <0>; ++ remote-endpoint = <&panel_in_edp>; ++ }; ++ }; ++ }; ++}; ++ ++&emmc_phy { ++ status = "okay"; ++}; ++ ++&gpu { ++ mali-supply = <&vdd_gpu>; ++ status = "okay"; ++}; ++ ++&hdmi_sound { ++ status = "okay"; ++}; ++ ++&i2c0 { ++ clock-frequency = <400000>; ++ i2c-scl-falling-time-ns = <4>; ++ i2c-scl-rising-time-ns = <168>; ++ status = "okay"; ++ ++ rk808: pmic@1b { ++ compatible = "rockchip,rk808"; ++ reg = <0x1b>; ++ #clock-cells = <1>; ++ clock-output-names = "xin32k", "rk808-clkout2"; ++ interrupt-parent = <&gpio3>; ++ interrupts = <10 IRQ_TYPE_LEVEL_LOW>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pmic_int_l_gpio>; ++ rockchip,system-power-controller; ++ wakeup-source; ++ ++ vcc1-supply = <&vcc_sysin>; ++ vcc2-supply = <&vcc_sysin>; ++ vcc3-supply = <&vcc_sysin>; ++ vcc4-supply = <&vcc_sysin>; ++ vcc6-supply = <&vcc_sysin>; ++ vcc7-supply = <&vcc_sysin>; ++ vcc8-supply = <&vcc3v3_sys>; ++ vcc9-supply = <&vcc_sysin>; ++ vcc10-supply = <&vcc_sysin>; ++ vcc11-supply = <&vcc_sysin>; ++ vcc12-supply = <&vcc3v3_sys>; ++ vcc13-supply = <&vcc_sysin>; ++ vcc14-supply = <&vcc_sysin>; ++ ++ regulators { ++ /* rk3399 center logic supply */ ++ vdd_center: DCDC_REG1 { ++ regulator-name = "vdd_center"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-ramp-delay = <6001>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_cpu_l: DCDC_REG2 { ++ regulator-name = "vdd_cpu_l"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <750000>; ++ regulator-max-microvolt = <1350000>; ++ regulator-ramp-delay = <6001>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vcc_ddr: DCDC_REG3 { ++ regulator-name = "vcc_ddr"; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ }; ++ }; ++ ++ vcc_1v8: vcc_wl: DCDC_REG4 { ++ regulator-name = "vcc_1v8"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ /* not used */ ++ LDO_REG1 { ++ }; ++ ++ /* not used */ ++ LDO_REG2 { ++ }; ++ ++ vcc1v8_pmupll: LDO_REG3 { ++ regulator-name = "vcc1v8_pmupll"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1800000>; ++ }; ++ }; ++ ++ vcc_sdio: LDO_REG4 { ++ regulator-name = "vcc_sdio"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <3000000>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3000000>; ++ }; ++ }; ++ ++ vcca3v0_codec: LDO_REG5 { ++ regulator-name = "vcca3v0_codec"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vcc_1v5: LDO_REG6 { ++ regulator-name = "vcc_1v5"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1500000>; ++ regulator-max-microvolt = <1500000>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <1500000>; ++ }; ++ }; ++ ++ vcca1v8_codec: LDO_REG7 { ++ regulator-name = "vcca1v8_codec"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vcc_3v0: LDO_REG8 { ++ regulator-name = "vcc_3v0"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <3000000>; ++ regulator-max-microvolt = <3000000>; ++ ++ regulator-state-mem { ++ regulator-on-in-suspend; ++ regulator-suspend-microvolt = <3000000>; ++ }; ++ }; ++ ++ vcc3v3_s3: SWITCH_REG1 { ++ regulator-name = "vcc3v3_s3"; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vcc3v3_s0: SWITCH_REG2 { ++ regulator-name = "vcc3v3_s0"; ++ regulator-always-on; ++ regulator-boot-on; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ }; ++ }; ++ ++ vdd_cpu_b: regulator@40 { ++ compatible = "silergy,syr827"; ++ reg = <0x40>; ++ fcs,suspend-voltage-selector = <1>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vsel1_gpio>; ++ regulator-name = "vdd_cpu_b"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <712500>; ++ regulator-max-microvolt = <1500000>; ++ regulator-ramp-delay = <1000>; ++ vin-supply = <&vcc_1v8>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++ ++ vdd_gpu: regulator@41 { ++ compatible = "silergy,syr828"; ++ reg = <0x41>; ++ fcs,suspend-voltage-selector = <1>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&vsel2_gpio>; ++ regulator-name = "vdd_gpu"; ++ regulator-always-on; ++ regulator-boot-on; ++ regulator-min-microvolt = <712500>; ++ regulator-max-microvolt = <1500000>; ++ regulator-ramp-delay = <1000>; ++ vin-supply = <&vcc_1v8>; ++ ++ regulator-state-mem { ++ regulator-off-in-suspend; ++ }; ++ }; ++}; ++ ++&i2c1 { ++ clock-frequency = <100000>; ++ i2c-scl-falling-time-ns = <4>; ++ i2c-scl-rising-time-ns = <168>; ++ status = "okay"; ++ ++ es8316: es8316@11 { ++ compatible = "everest,es8316"; ++ reg = <0x11>; ++ clocks = <&cru SCLK_I2S_8CH_OUT>; ++ clock-names = "mclk"; ++ #sound-dai-cells = <0>; ++ }; ++}; ++ ++&i2c3 { ++ i2c-scl-falling-time-ns = <15>; ++ i2c-scl-rising-time-ns = <450>; ++ status = "okay"; ++}; ++ ++&i2c4 { ++ i2c-scl-falling-time-ns = <20>; ++ i2c-scl-rising-time-ns = <600>; ++ status = "okay"; ++ ++ fusb0: fusb30x@22 { ++ compatible = "fcs,fusb302"; ++ reg = <0x22>; ++ fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&fusb0_int_gpio>; ++ vbus-supply = <&vbus_typec>; ++ ++ connector { ++ compatible = "usb-c-connector"; ++ data-role = "host"; ++ label = "USB-C"; ++ op-sink-microwatt = <1000000>; ++ power-role = "dual"; ++ sink-pdos = ++ ; ++ source-pdos = ++ ; ++ try-power-role = "sink"; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ ++ usbc_hs: endpoint { ++ remote-endpoint = ++ <&u2phy0_typec_hs>; ++ }; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ ++ usbc_ss: endpoint { ++ remote-endpoint = ++ <&tcphy0_typec_ss>; ++ }; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ ++ usbc_dp: endpoint { ++ remote-endpoint = ++ <&tcphy0_typec_dp>; ++ }; ++ }; ++ }; ++ }; ++ }; ++}; ++ ++&i2s1 { ++ #sound-dai-cells = <0>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>; ++ rockchip,capture-channels = <8>; ++ rockchip,playback-channels = <8>; ++ status = "okay"; ++}; ++ ++&io_domains { ++ audio-supply = <&vcc_3v0>; ++ gpio1830-supply = <&vcc_3v0>; ++ sdmmc-supply = <&vcc_sdio>; ++ status = "okay"; ++}; ++ ++&pcie_phy { ++ status = "okay"; ++}; ++ ++&pcie0 { ++ bus-scan-delay-ms = <1000>; ++ ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; ++ max-link-speed = <2>; ++ num-lanes = <4>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pcie_clkreqn_cpm>; ++ vpcie0v9-supply = <&vcca0v9_s3>; ++ vpcie1v8-supply = <&vcca1v8_s3>; ++ vpcie3v3-supply = <&vcc3v3_ssd>; ++ status = "okay"; ++}; ++ ++&pinctrl { ++ buttons { ++ pwrbtn_gpio: pwrbtn-gpio { ++ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ ++ lidbtn_gpio: lidbtn-gpio { ++ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ ++ dc-charger { ++ dc_det_gpio: dc-det-gpio { ++ rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ es8316 { ++ hp_det_gpio: hp-det-gpio { ++ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ }; ++ ++ fusb302x { ++ fusb0_int_gpio: fusb0-int-gpio { ++ rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ ++ i2s1 { ++ i2s_8ch_mclk_gpio: i2s-8ch-mclk-gpio { ++ rockchip,pins = <4 RK_PA0 1 &pcfg_pull_none>; ++ }; ++ }; ++ ++ lcd-panel { ++ lcdvcc_en_gpio: lcdvcc-en-gpio { ++ rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ panel_en_gpio: panel-en-gpio { ++ rockchip,pins = <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ lcd_panel_reset_gpio: lcd-panel-reset-gpio { ++ rockchip,pins = <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ ++ leds { ++ pwrled_gpio: pwrled_gpio { ++ rockchip,pins = <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ slpled_gpio: slpled_gpio { ++ rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ pmic { ++ pmic_int_l_gpio: pmic-int-l-gpio { ++ rockchip,pins = <3 RK_PB2 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ ++ vsel1_gpio: vsel1-gpio { ++ rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ ++ vsel2_gpio: vsel2-gpio { ++ rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>; ++ }; ++ }; ++ ++ sdcard { ++ sdmmc0_pwr_h_gpio: sdmmc0-pwr-h-gpio { ++ rockchip,pins = <0 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ }; ++ ++ sdio-pwrseq { ++ wifi_enable_h_gpio: wifi-enable-h-gpio { ++ rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ usb-typec { ++ vcc5v0_typec0_en_gpio: vcc5v0-typec0-en-gpio { ++ rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; ++ }; ++ }; ++ ++ usb2 { ++ pwr_5v_gpio: pwr-5v-gpio { ++ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ vcc5v0_host_en_gpio: vcc5v0-host-en-gpio { ++ rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++ ++ wireless-bluetooth { ++ bt_wake_gpio: bt-wake-gpio { ++ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_host_wake_gpio: bt-host-wake-gpio { ++ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ ++ bt_reset_gpio: bt-reset-gpio { ++ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>; ++ }; ++ }; ++}; ++ ++&pmu_io_domains { ++ pmu1830-supply = <&vcc_3v0>; ++ status = "okay"; ++}; ++ ++&pwm0 { ++ status = "okay"; ++}; ++ ++&pwm2 { ++ status = "okay"; ++}; ++ ++&saradc { ++ vref-supply = <&vcca1v8_s3>; ++ status = "okay"; ++}; ++ ++&sdmmc { ++ bus-width = <4>; ++ cap-mmc-highspeed; ++ cap-sd-highspeed; ++ cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; ++ disable-wp; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>; ++ sd-uhs-sdr104; ++ vmmc-supply = <&vcc3v0_sd>; ++ vqmmc-supply = <&vcc_sdio>; ++ status = "okay"; ++}; ++ ++&sdio0 { ++ bus-width = <4>; ++ cap-sd-highspeed; ++ cap-sdio-irq; ++ keep-power-in-suspend; ++ mmc-pwrseq = <&sdio_pwrseq>; ++ non-removable; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; ++ sd-uhs-sdr104; ++ status = "okay"; ++}; ++ ++&sdhci { ++ bus-width = <8>; ++ mmc-hs200-1_8v; ++ non-removable; ++ status = "okay"; ++}; ++ ++&spi1 { ++ max-freq = <10000000>; ++ status = "okay"; ++ ++ spiflash: flash@0 { ++ compatible = "jedec,spi-nor"; ++ reg = <0>; ++ m25p,fast-read; ++ spi-max-frequency = <10000000>; ++ }; ++}; ++ ++&tcphy0 { ++ status = "okay"; ++}; ++ ++&tcphy0_dp { ++ port { ++ tcphy0_typec_dp: endpoint { ++ remote-endpoint = <&usbc_dp>; ++ }; ++ }; ++}; ++ ++&tcphy0_usb3 { ++ port { ++ tcphy0_typec_ss: endpoint { ++ remote-endpoint = <&usbc_ss>; ++ }; ++ }; ++}; ++ ++&tcphy1 { ++ status = "okay"; ++}; ++ ++&tsadc { ++ /* tshut mode 0:CRU 1:GPIO */ ++ rockchip,hw-tshut-mode = <1>; ++ /* tshut polarity 0:LOW 1:HIGH */ ++ rockchip,hw-tshut-polarity = <1>; ++ status = "okay"; ++}; ++ ++&u2phy0 { ++ status = "okay"; ++ ++ u2phy0_otg: otg-port { ++ status = "okay"; ++ }; ++ ++ u2phy0_host: host-port { ++ phy-supply = <&vcc5v0_otg>; ++ status = "okay"; ++ }; ++ ++ port { ++ u2phy0_typec_hs: endpoint { ++ remote-endpoint = <&usbc_hs>; ++ }; ++ }; ++}; ++ ++&u2phy1 { ++ status = "okay"; ++ ++ u2phy1_otg: otg-port { ++ status = "okay"; ++ }; ++ ++ u2phy1_host: host-port { ++ phy-supply = <&vcc5v0_otg>; ++ status = "okay"; ++ }; ++}; ++ ++&uart0 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; ++ uart-has-rtscts; ++ status = "okay"; ++ ++ bluetooth { ++ compatible = "brcm,bcm4345c5"; ++ clocks = <&rk808 1>; ++ clock-names = "lpo"; ++ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; ++ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_host_wake_gpio &bt_wake_gpio &bt_reset_gpio>; ++ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; ++ vbat-supply = <&wifi_bat>; ++ vddio-supply = <&vcc_wl>; ++ }; ++}; ++ ++&uart2 { ++ status = "okay"; ++}; ++ ++&usb_host0_ehci { ++ status = "okay"; ++}; ++ ++&usb_host0_ohci { ++ status = "okay"; ++}; ++ ++&usb_host1_ehci { ++ status = "okay"; ++}; ++ ++&usb_host1_ohci { ++ status = "okay"; ++}; ++ ++&usbdrd3_0 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_0 { ++ dr_mode = "host"; ++ status = "okay"; ++}; ++ ++&usbdrd3_1 { ++ status = "okay"; ++}; ++ ++&usbdrd_dwc3_1 { ++ dr_mode = "host"; ++ status = "okay"; ++}; ++ ++&vopb { ++ status = "okay"; ++}; ++ ++&vopb_mmu { ++ status = "okay"; ++}; ++ ++&vopl { ++ status = "okay"; ++}; ++ ++&vopl_mmu { ++ status = "okay"; ++}; +-- +2.25.1 + -- cgit v1.2.3 From 9bde1b13488af896cda724d66b8f37670e10dc9d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Mar 2020 08:23:39 +0100 Subject: gnu: r-remoter: Use lower case in the synopsis. * gnu/packages/cran.scm (r-remoter)[synopsis]: Do not capitalize all words. --- gnu/packages/cran.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c0bd4bfd4f..81733f7e54 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21012,8 +21012,7 @@ where tcltk is present are supported.") ("r-pbdzmq" ,r-pbdzmq) ("r-png" ,r-png))) (home-page "https://github.com/RBigData/remoter") - (synopsis - "Control a Remote R Session from a Local One") + (synopsis "Control a remote R session from a local one") (description "This package provides a set of utilities for client/server computing with R, controlling a remote R session (the server) from a local one (the -- cgit v1.2.3 From f03e62c12d83c0117df783e5bed2bdfc3cae7ca4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Mar 2020 08:24:21 +0100 Subject: gnu: r-remoter: Fix indentation. * gnu/packages/cran.scm (r-remoter): Fix indentation. --- gnu/packages/cran.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 81733f7e54..deff8dcd8e 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20998,23 +20998,23 @@ where tcltk is present are supported.") (name "r-remoter") (version "0.4-0") (source - (origin - (method url-fetch) - (uri (cran-uri "remoter" version)) - (sha256 - (base32 - "1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl")))) + (origin + (method url-fetch) + (uri (cran-uri "remoter" version)) + (sha256 + (base32 + "1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl")))) (properties `((upstream-name . "remoter"))) (build-system r-build-system) (propagated-inputs - `(("r-argon2" ,r-argon2) - ("r-getpass" ,r-getpass) - ("r-pbdzmq" ,r-pbdzmq) - ("r-png" ,r-png))) + `(("r-argon2" ,r-argon2) + ("r-getpass" ,r-getpass) + ("r-pbdzmq" ,r-pbdzmq) + ("r-png" ,r-png))) (home-page "https://github.com/RBigData/remoter") (synopsis "Control a remote R session from a local one") (description - "This package provides a set of utilities for client/server computing + "This package provides a set of utilities for client/server computing with R, controlling a remote R session (the server) from a local one (the client).") (license license:bsd-2))) -- cgit v1.2.3 From 5c3902a7626437c2c100de634e263101e5748158 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Mar 2020 08:25:39 +0100 Subject: gnu: r-getpass: Change case in synopsis and adjust indentation. * gnu/packages/cran.scm (r-getpass): Adjust indentation. [synopsis]: Do not capitalize all words. --- gnu/packages/cran.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index deff8dcd8e..c8d1ccace6 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20973,21 +20973,20 @@ service. Functions are provided to work with the OAI-PMH verbs: (name "r-getpass") (version "0.2-2") (source - (origin - (method url-fetch) - (uri (cran-uri "getPass" version)) - (sha256 - (base32 - "03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc")))) + (origin + (method url-fetch) + (uri (cran-uri "getPass" version)) + (sha256 + (base32 + "03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc")))) (properties `((upstream-name . "getPass"))) (build-system r-build-system) (propagated-inputs - `(("r-rstudioapi" ,r-rstudioapi))) - (home-page - "https://github.com/wrathematics/getPass") - (synopsis "Masked User Input") + `(("r-rstudioapi" ,r-rstudioapi))) + (home-page "https://github.com/wrathematics/getPass") + (synopsis "Masked user input") (description - "This package provides a micro-package for reading \"passwords\", i.e. + "This package provides a micro-package for reading \"passwords\", i.e. reading user input with masking, so that the input is not displayed as it is typed. Currently, RStudio, the command line (every OS), and any platform where tcltk is present are supported.") -- cgit v1.2.3 From 90fb5923212a6b801bc4d04b2f8fdaae4e0822cf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 26 Mar 2020 08:26:56 +0100 Subject: gnu: r-argon2: Fix case in synopsis and use full sentence in description. * gnu/packages/cran.scm (r-argon2)[synopsis]: Use lower case. [description]: Use full sentence. --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c8d1ccace6..c890b38749 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -20961,11 +20961,11 @@ service. Functions are provided to work with the OAI-PMH verbs: "0kqn06rpb39jlzizjlnc5c44mfic8llrshxn7ljgmyj35lbqwxqh")))) (properties `((upstream-name . "argon2"))) (build-system r-build-system) - (home-page - "https://github.com/wrathematics/argon2") - (synopsis "Secure Password Hashing based on Argon2 Algorithm") + (home-page "https://github.com/wrathematics/argon2") + (synopsis "Secure password hashing based on the argon2 algorithm") (description - "Utilities for secure password hashing via the argon2 algorithm.") + "This package provides utilities for secure password hashing via the +argon2 algorithm.") (license license:bsd-2))) (define-public r-getpass -- cgit v1.2.3 From 62c27e09f0f9fb96291e5d9f1205f2b61cf3450b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Wed, 25 Mar 2020 12:19:09 +0100 Subject: gnu: emacs-helm-exwm: Update to 0.0.2. * gnu/packages/emacs-xyz.scm (emacs-helm-exwm): Update to 0.0.2. --- gnu/packages/emacs-xyz.scm | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2bfa5f95e5..5653796731 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15626,32 +15626,31 @@ from @code{emms-source-file-default-directory}.") (license license:gpl3+)))) (define-public emacs-helm-exwm - (let ((commit "56266f261ba3b3d2753b374b50da20eb768c06f5")) - (package - (name "emacs-helm-exwm") - (version (git-version "20180703" "2" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emacs-helm/helm-exwm.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "064ziinqa5sdv7rfjn0y278l12kld176fr88k4h78pgf2f2n7cd8")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-helm" ,emacs-helm) - ("emacs-exwm" ,emacs-exwm))) - (home-page - "https://github.com/emacs-helm/helm-exwm") - (synopsis "Helm for EXWM buffers") - (description - "@code{helm-exwm} runs a Helm session over the list of EXWM buffers. + (package + (name "emacs-helm-exwm") + (version "0.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emacs-helm/helm-exwm.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v")))) + (build-system emacs-build-system) + (propagated-inputs + `(("emacs-helm" ,emacs-helm) + ("emacs-exwm" ,emacs-exwm))) + (home-page + "https://github.com/emacs-helm/helm-exwm") + (synopsis "Helm for EXWM buffers") + (description + "@code{helm-exwm} runs a Helm session over the list of EXWM buffers. @code{helm-exwm-switch} is a convenience X application launcher using Helm to switch between the various windows of one or several specific applications. See @code{helm-exwm-switch-browser} for an example.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-helm-flycheck (let ((commit "3cf7d3bb194acacc6395f88360588013d92675d6")) -- cgit v1.2.3 From 7a1a10dbd4ef2989ea1cac111849a36c567430e3 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 24 Mar 2020 09:21:02 +0100 Subject: installer: tests: Use a filter to select desktop-environments. * gnu/installer/tests.scm (choose-services): Turn desktop-environments list into a choose-desktop-environment procedure. This way, it is easier to select all desktop-environments or none, in the same way as choose-network-service? and choose-network-management-tool? arguments. --- gnu/installer/tests.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/installer/tests.scm b/gnu/installer/tests.scm index 6f5393e3ab..8ae80e4d7e 100644 --- a/gnu/installer/tests.scm +++ b/gnu/installer/tests.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Ludovic Courtès +;;; Copyright © 2020 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -211,7 +212,7 @@ ROOT-PASSWORD, and USERS." (define* (choose-services port #:key - (desktop-environments '("GNOME")) + (choose-desktop-environment? (const #f)) (choose-network-service? (lambda (service) (or (string-contains service "SSH") @@ -220,10 +221,14 @@ ROOT-PASSWORD, and USERS." (lambda (service) (string-contains service "DHCP")))) "Converse over PORT to choose networking services." + (define desktop-environments '()) + (converse port ((checkbox-list (title "Desktop environment") (text _) - (items _)) - desktop-environments) + (items ,services)) + (let ((desktops (filter choose-desktop-environment? services))) + (set! desktop-environments desktops) + desktops)) ((checkbox-list (title "Network service") (text _) (items ,services)) (filter choose-network-service? services)) -- cgit v1.2.3 From b03ebdbc7c028f62da2b667556e6546b42e6e96f Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 24 Mar 2020 12:16:23 +0100 Subject: tests: install: Add %test-gui-installed-desktop-os-encrypted. * gnu/tests/install.scm (gui-test-program): Add a desktop? argument, and pass it to choose-services, (installation-target-os-for-gui-tests): new procedure, (installation-target-desktop-os-for-gui-tests): new procedure, (guided-installation-test): add target-os and desktop? arguments. Use target-os instead of the previous os variable. Pass desktop? argument to gui-test-program. (%test-gui-installed-os): Adapt accordingly, (%test-gui-installed-os-encrypted): ditto, (%test-gui-installed-desktop-os-encrypted): new exported variable. --- gnu/tests/install.scm | 154 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 41 deletions(-) (limited to 'gnu') diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 83988873c2..b0b40f2764 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -32,15 +32,23 @@ #:use-module (gnu packages cryptsetup) #:use-module (gnu packages linux) #:use-module (gnu packages ocr) + #:use-module (gnu packages openbox) #:use-module (gnu packages package-management) + #:use-module (gnu packages ratpoison) + #:use-module (gnu packages suckless) #:use-module (gnu packages virtualization) + #:use-module (gnu packages wm) + #:use-module (gnu packages xorg) + #:use-module (gnu services desktop) #:use-module (gnu services networking) + #:use-module (gnu services xorg) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix utils) + #:use-module (srfi srfi-1) #:export (%test-installed-os %test-installed-extlinux-os %test-iso-image-installer @@ -52,7 +60,8 @@ %test-jfs-root-os %test-gui-installed-os - %test-gui-installed-os-encrypted)) + %test-gui-installed-os-encrypted + %test-gui-installed-desktop-os-encrypted)) ;;; Commentary: ;;; @@ -203,6 +212,7 @@ reboot\n") (gnu installer tests) (guix combinators)))) (installation-disk-image-file-system-type "ext4") + (install-size 'guess) (target-size (* 2200 MiB))) "Run SCRIPT (a shell script following the system installation procedure) in OS to install TARGET-OS. Return a VM image of TARGET-SIZE bytes containing @@ -220,7 +230,7 @@ packages defined in installation-os." (image (system-disk-image (operating-system-with-gc-roots os (list target)) - #:disk-image-size 'guess + #:disk-image-size install-size #:file-system-type installation-disk-image-file-system-type))) (define install @@ -941,7 +951,10 @@ build (current-guix) and then store a couple of full system images.") (define %root-password "foo") -(define* (gui-test-program marionette #:key (encrypted? #f)) +(define* (gui-test-program marionette + #:key + (desktop? #f) + (encrypted? #f)) #~(let () (define (screenshot file) (marionette-control (string-append "screendump " file) @@ -998,7 +1011,8 @@ build (current-guix) and then store a couple of full system images.") (screenshot "installer-services.ppm") (marionette-eval* '(choose-services installer-socket - #:desktop-environments '() + #:choose-desktop-environment? + (const #$desktop?) #:choose-network-service? (const #f)) #$marionette) @@ -1038,53 +1052,111 @@ build (current-guix) and then store a couple of full system images.") (gnu installer tests) (guix combinators)))) -(define* (guided-installation-test name #:key encrypted?) - (define os - (operating-system - (inherit %minimal-os) - (users (append (list (user-account - (name "alice") - (comment "Bob's sister") - (group "users") - (supplementary-groups - '("wheel" "audio" "video"))) - (user-account - (name "bob") - (comment "Alice's brother") - (group "users") - (supplementary-groups - '("wheel" "audio" "video")))) - %base-user-accounts)) - ;; The installer does not create a swap device in guided mode with - ;; encryption support. - (swap-devices (if encrypted? '() '("/dev/vdb2"))) - (services (cons (service dhcp-client-service-type) - (operating-system-user-services %minimal-os))))) - +(define* (installation-target-os-for-gui-tests + #:key (encrypted? #f)) + (operating-system + (inherit %minimal-os) + (users (append (list (user-account + (name "alice") + (comment "Bob's sister") + (group "users") + (supplementary-groups + '("wheel" "audio" "video"))) + (user-account + (name "bob") + (comment "Alice's brother") + (group "users") + (supplementary-groups + '("wheel" "audio" "video")))) + %base-user-accounts)) + ;; The installer does not create a swap device in guided mode with + ;; encryption support. + (swap-devices (if encrypted? '() '("/dev/vdb2"))) + (services (cons (service dhcp-client-service-type) + (operating-system-user-services %minimal-os))))) + +(define* (installation-target-desktop-os-for-gui-tests + #:key (encrypted? #f)) + (operating-system + (inherit (installation-target-os-for-gui-tests + #:encrypted? encrypted?)) + (keyboard-layout (keyboard-layout "us" "altgr-intl")) + + ;; Make sure that all the packages and services that may be used by the + ;; graphical installer are available. + (packages (append + (list openbox awesome i3-wm i3status + dmenu st ratpoison xterm) + %base-packages)) + (services + (append + (list (service gnome-desktop-service-type) + (service xfce-desktop-service-type) + (service mate-desktop-service-type) + (service enlightenment-desktop-service-type) + (set-xorg-configuration + (xorg-configuration + (keyboard-layout keyboard-layout))) + (service marionette-service-type + (marionette-configuration + (imported-modules '((gnu services herd) + (guix build utils) + (guix combinators)))))) + %desktop-services)))) + +(define* (guided-installation-test name + #:key + (desktop? #f) + (encrypted? #f) + target-os + (install-size 'guess) + (target-size (* 2200 MiB))) (system-test (name name) (description "Install an OS using the graphical installer and test it.") (value - (mlet* %store-monad ((image (run-install os '(this is unused) - #:script #f - #:os installation-os-for-gui-tests - #:gui-test - (lambda (marionette) - (gui-test-program - marionette - #:encrypted? encrypted?)))) - (command (qemu-command/writable-image image))) - (run-basic-test os command name + (mlet* %store-monad + ((image (run-install target-os '(this is unused) + #:script #f + #:os installation-os-for-gui-tests + #:install-size install-size + #:target-size target-size + #:gui-test + (lambda (marionette) + (gui-test-program + marionette + #:desktop? desktop? + #:encrypted? encrypted?)))) + (command (qemu-command/writable-image image))) + (run-basic-test target-os command name #:initialization (and encrypted? enter-luks-passphrase) #:root-password %root-password))))) (define %test-gui-installed-os - (guided-installation-test "gui-installed-os" - #:encrypted? #f)) + (guided-installation-test + "gui-installed-os" + #:target-os (installation-target-os-for-gui-tests))) (define %test-gui-installed-os-encrypted - (guided-installation-test "gui-installed-os-encrypted" - #:encrypted? #t)) + (guided-installation-test + "gui-installed-os-encrypted" + #:encrypted? #t + #:target-os (installation-target-os-for-gui-tests + #:encrypted? #t))) + +;; Building a desktop image is very time and space consuming. Install all +;; desktop environments in a single test to reduce the overhead. +(define %test-gui-installed-desktop-os-encrypted + (guided-installation-test "gui-installed-desktop-os-encrypted" + #:desktop? #t + #:encrypted? #t + #:target-os + (installation-target-desktop-os-for-gui-tests + #:encrypted? #t) + ;; XXX: The disk-image size guess is too low. Use + ;; a constant value until this is fixed. + #:install-size (* 8000 MiB) + #:target-size (* 9000 MiB))) ;;; install.scm ends here -- cgit v1.2.3 From b5a26299f7801502602265e21ed85f17c03dc34e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 11:58:44 +0200 Subject: gnu: youtube-viewer: Update to 3.7.5. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.5. [inputs]: Add perl-json-xs. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a97d3302de..9d60bed682 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1827,7 +1827,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.4") + (version "3.7.5") (source (origin (method git-fetch) (uri (git-reference @@ -1836,7 +1836,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") (file-name (git-file-name name version)) (sha256 (base32 - "1plsm1sc04lwlg5h2gapxpykc3cpd4frjll14lamql89dm4a50vi")))) + "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -1845,6 +1845,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") ("perl-file-sharedir" ,perl-file-sharedir) ("perl-gtk2" ,perl-gtk2) ("perl-json" ,perl-json) + ("perl-json-xs" ,perl-json-xs) ("perl-libwww" ,perl-libwww) ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) ("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached) -- cgit v1.2.3 From 315b98b9eb71e1a56de6a49ffbfed0af3c92be7e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 12:01:50 +0200 Subject: gnu: youtube-viewer: Don't build gtk3 front-end. * gnu/packages/video.scm (youtube-viewer)[arguments]: Update module-build-flags to only build gtk2 front-end. --- 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 9d60bed682..2ca8605a1a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1860,7 +1860,7 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") `(#:modules ((guix build perl-build-system) (guix build utils) (srfi srfi-26)) - #:module-build-flags '("--gtk") + #:module-build-flags '("--gtk2") #:phases (modify-phases %standard-phases (add-after 'unpack 'refer-to-inputs -- cgit v1.2.3 From c7af9d0b5ebaa1fdb08ff5d8a56004998bcd8103 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 Mar 2020 12:16:45 +0100 Subject: gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default. Fixes . Reported by Danny Milosavljevic . * gnu/packages/patches/gnupg-default-pinentry.patch: New file. * gnu/packages/gnupg.scm (gnupg)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/gnupg.scm | 5 +++-- gnu/packages/patches/gnupg-default-pinentry.patch | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/gnupg-default-pinentry.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 5a51c474ed..07b159c4fe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -972,6 +972,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ + %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 856c01a6d8..fc5b4fbc63 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -254,7 +254,8 @@ compatible to GNU Pth.") ".tar.bz2")) (sha256 (base32 - "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")) + (patches (search-patches "gnupg-default-pinentry.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch new file mode 100644 index 0000000000..272f4b53dc --- /dev/null +++ b/gnu/packages/patches/gnupg-default-pinentry.patch @@ -0,0 +1,15 @@ +Default to the pinentry program installed in ~/.guix-profile. + +diff --git a/common/homedir.c b/common/homedir.c +index e9e75d0..74e0aaf 100644 +--- a/common/homedir.c ++++ b/common/homedir.c +@@ -968,7 +968,7 @@ get_default_pinentry_name (int reset) + } names[] = { + /* The first entry is what we return in case we found no + other pinentry. */ +- { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, ++ { gnupg_homedir, "/.guix-profile/bin/pinentry" }, + #ifdef HAVE_W32_SYSTEM + /* Try Gpg4win directory (with bin and without.) */ + { w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" }, -- cgit v1.2.3 From f87d594238fb86dab8344a411fe62681ba0715b7 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 13:42:20 +0200 Subject: gnu: boinc-server: Fix build. * gnu/packages/distributed.scm (boinc-server)[inputs]: Replace openssl with openssl-1.0, mariadb with mariadb:dev. --- gnu/packages/distributed.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index c5207aace4..a65ea72aa9 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Brant Gardner ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2020 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -88,9 +89,9 @@ 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) + (inputs `(("openssl" ,openssl-1.0) ("curl" ,curl) - ("mariadb" ,mariadb) + ("mariadb:dev" ,mariadb "dev") ("zlib" ,zlib))) (propagated-inputs `(("python" ,python-wrapper) ("perl" ,perl))))) -- cgit v1.2.3 From 50e45d8629f5cd32f768324fd6a78c2e8da2a75e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 13:50:39 +0200 Subject: gnu: boinc-client: Update to 7.16.5. * gnu/packages/distributed.scm (boinc-client): Update to 7.16.5. --- gnu/packages/distributed.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/distributed.scm b/gnu/packages/distributed.scm index a65ea72aa9..e1e6636219 100644 --- a/gnu/packages/distributed.scm +++ b/gnu/packages/distributed.scm @@ -44,7 +44,7 @@ (define-public boinc-client (package (name "boinc-client") - (version "7.16.4") + (version "7.16.5") (source (origin (method git-fetch) (uri (git-reference @@ -55,7 +55,7 @@ (file-name (git-file-name "boinc" version)) (sha256 (base32 - "08xx2kzb7c46k1zb91w74kyig3b5kilxdw5ilfs67r8p55mxk0g1")))) + "107rpw9qd5x4pyxm9jd1lqxva5nxwb01dm5h61d6msv2vgiy0r8n")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-server"))) (inputs `(("openssl" ,openssl) -- cgit v1.2.3 From db47adb0c767c373958d892411da2c89fe5503a3 Mon Sep 17 00:00:00 2001 From: Naga Malleswari Date: Thu, 26 Mar 2020 15:55:02 +0100 Subject: gnu: Add 7kaa. * gnu/packages/games.scm (7kaa): New variable. --- gnu/packages/games.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2b03a36c43..42f2230482 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2019 Josh Holland ;;; Copyright © 2017, 2019 Hartmut Goebel ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero +;;; Copyright © 2020 Naga Malleswari ;;; ;;; This file is part of GNU Guix. ;;; @@ -10319,3 +10320,35 @@ range with the objective to hit as many dummy targets as possible within soldiers, jeeps and tanks. The gameplay is simple but it is not that easy to get high scores.") (license license:gpl2+))) + +(define-public 7kaa + (package + (name "7kaa") + (version "2.15.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/the3dfxdude/7kaa/" + "releases/download/v" version "/" + "7kaa-" version ".tar.xz")) + (sha256 + (base32 "0blj47mcsfw1sn3465j6iham8m6ki07iggnq4q8nnaqnryx710jc")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("curl" ,curl) + ("enet" ,enet) + ("openal" ,openal) + ("sdl2" ,sdl2))) + (home-page "https://7kfans.com/") + (synopsis "Seven Kingdoms Ancient Adversaries: real-time strategy game") + (description + "Seven Kingdoms, designed by Trevor Chan, brings a blend of Real-Time +Strategy with the addition of trade, diplomacy, and espionage. The game +enables players to compete against up to six other kingdoms allowing players +to conquer opponents by defeating them in war (with troops or machines), +capturing their buildings with spies, or offering opponents money for their +kingdom.") + (license license:gpl2+))) -- cgit v1.2.3 From 79c395dde318605fed7d0ba429c8d82d8e77202a Mon Sep 17 00:00:00 2001 From: Roel Janssen Date: Thu, 26 Mar 2020 18:08:27 +0100 Subject: gnu: Update sambamba to 0.7.1. * gnu/packages/bioinformatics.scm (sambamba): Update to 0.7.1; Remove unneeded undead input. --- gnu/packages/bioinformatics.scm | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d1032cba1c..da3fe1d2c9 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -10977,7 +10977,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (define-public sambamba (package (name "sambamba") - (version "0.6.8") + (version "0.7.1") (source (origin (method git-fetch) @@ -10987,7 +10987,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0k0cz3qcv98p6cq09zlbgnjsggxcqbcmzxg5zikgcgbr2nfq4lry")))) + "111h05b60pj8dxbidiamy4imc92x2962b3lmb7wgysl6lx064qis")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; there is no test target @@ -11006,7 +11006,6 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (add-after 'unpack 'place-biod-and-undead (lambda* (#:key inputs #:allow-other-keys) (copy-recursively (assoc-ref inputs "biod") "BioD") - (copy-recursively (assoc-ref inputs "undead") "undeaD") #t)) (add-after 'unpack 'unbundle-prerequisites (lambda _ @@ -11020,14 +11019,15 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (mkdir-p bin) - (install-file "bin/sambamba" bin) + (copy-file (string-append "bin/sambamba-" ,version) + (string-append bin "/sambamba")) #t)))))) (native-inputs `(("ldc" ,ldc) ("rdmd" ,rdmd) ("python" ,python) ("biod" - ,(let ((commit "4f1a7d2fb7ef3dfe962aa357d672f354ebfbe42e")) + ,(let ((commit "7969eb0a847b05874e83ffddead26e193ece8101")) (origin (method git-fetch) (uri (git-reference @@ -11038,20 +11038,7 @@ droplet sequencing. It has been particularly tailored for Drop-seq.") "-checkout")) (sha256 (base32 - "1k5pdjv1qvi0a3rwd1sfq6zbj37l86i7bf710m4c0y6737lxj426"))))) - ("undead" - ,(let ((commit "9be93876982b5f14fcca60832563b3cd767dd84d")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/biod/undeaD.git") - (commit commit))) - (file-name (string-append "undead-" - (string-take commit 9) - "-checkout")) - (sha256 - (base32 - "1xfarj0nqlmi5jd1vmcmm7pabzaf9hxyvk6hp0d6jslb5k9r8r3d"))))))) + "0mjxsmbmv0jxl3pq21p8j5r829d648if8q58ka50b2956lc6qkpm"))))))) (inputs `(("lz4" ,lz4) ("htslib" ,htslib-for-sambamba))) -- cgit v1.2.3 From f8dcdf2b365118b5e46972c4c7a07b922775fb8f Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jan 2020 14:55:28 +0000 Subject: gnu: Add python-kerberos. * gnu/packages/python-crypto.scm (python-kerberos): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-crypto.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 0601799c2b..49525c099a 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2018 Nam Nguyen ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Clément Lassieur +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages crypto) + #:use-module (gnu packages kerberos) #:use-module (gnu packages libffi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages password-utils) @@ -309,6 +311,31 @@ etc.). The package is structured to make adding new modules easy.") "python" (package-inputs pycrypto))))))) +(define-public python-kerberos + (package + (name "python-kerberos") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "kerberos" version)) + (sha256 + (base32 + "19663qxmma0i8bfbjc2iwy5hgq0g4pfb75r023v5dps68zfvffgh")))) + (build-system python-build-system) + (inputs + `(("mit-krb5" ,mit-krb5))) + (home-page "https://github.com/apple/ccs-pykerberos") + (synopsis + "Python Kerberos library used by CalendarServer") + (description + "This Python package is a high-level wrapper for Kerberos (GSSAPI) +operations. The goal is to avoid having to build a module that wraps the +entire Kerberos.framework, and instead offer a limited set of functions that +do what is needed for client/server Kerberos authentication based on +.") + (license license:asl2.0))) + (define-public python-keyring (package (name "python-keyring") -- cgit v1.2.3 From 163997c9615baa1ad57b25c0ee37469e6074cce9 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jan 2020 14:56:52 +0000 Subject: gnu: Add python-ntlm-auth. * gnu/packages/python-crypto.scm (python-ntlm-auth): New variable. Signed-off-by: Christopher Baines --- gnu/packages/python-crypto.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 49525c099a..80160301dd 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1281,6 +1281,35 @@ package provides a tool to securely sign firmware images for booting by MCUboot.") (license license:expat))) +(define-public python-ntlm-auth + (package + (name "python-ntlm-auth") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ntlm-auth" version)) + (sha256 + (base32 + "16mavidki4ma5ip8srqalr19gz4f5yn3cnmmgps1fmgfr24j63rm")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cryptography" ,python-cryptography))) + (home-page "https://github.com/jborean93/ntlm-auth") + (synopsis + "Calculates NTLM Authentication codes") + (description + "This library handles the low-level details of NTLM authentication for +use in authenticating with a service that uses NTLM. It will create and parse +the 3 different message types in the order required and produce a base64 +encoded value that can be attached to the HTTP header. + +The goal of this library is to offer full NTLM support including signing and +sealing of messages as well as supporting MIC for message integrity and the +ability to customise and set limits on the messages sent. Please see Features +and Backlog for a list of what is and is not currently supported.") + (license license:expat))) + (define-public python-secretstorage (package (name "python-secretstorage") -- cgit v1.2.3 From c596359729a87a62204bde4437919f0a4fa023c1 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jan 2020 14:58:06 +0000 Subject: gnu: Add python-requests_ntlm. * gnu/packages/python-web.scm (python-requests_ntlm): New variable. Signed-off-by: Christopher Baines --- 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 2cc4bc270f..26e2fe04ec 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Evan Straw +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -1422,6 +1423,30 @@ than Python’s urllib2 library.") (define-public python2-requests (package-with-python2 python-requests)) +(define-public python-requests_ntlm + (package + (name "python-requests_ntlm") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "requests_ntlm" version)) + (sha256 + (base32 + "0wgbqzaq9w7bas16b7brdb75f91bh3275fb459093bk1ihpck2ci")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cryptography" ,python-cryptography) + ("python-ntlm-auth" ,python-ntlm-auth) + ("python-requests" ,python-requests))) + (home-page "https://github.com/requests/requests-ntlm") + (synopsis + "NTLM authentication support for Requests") + (description + "This package allows for HTTP NTLM authentication using the requests +library.") + (license license:isc))) + (define-public python-requests-mock (package (name "python-requests-mock") -- cgit v1.2.3 From 9b0c95cc6877229da0816e7b962090966a8577de Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Wed, 8 Jan 2020 14:59:27 +0000 Subject: gnu: Add python-pywinrm. * gnu/packages/python-xyz.scm (python-pywinrm): New variable. Signed-off-by: Christopher Baines --- 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 9c9137f93f..f4b50abb1d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -72,6 +72,7 @@ ;;; Copyright © 2020 Sebastian Schott ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Josh Marshall +;;; Copyright © 2020 Alexandros Theodotou ;;; ;;; This file is part of GNU Guix. ;;; @@ -112,6 +113,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages graphviz) #:use-module (gnu packages graphics) + #:use-module (gnu packages gsasl) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) @@ -5049,6 +5051,35 @@ localized only in frequency instead of in time and frequency.") (define-public python2-pywavelets (package-with-python2 python-pywavelets)) +(define-public python-pywinrm + (package + (name "python-pywinrm") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pywinrm" version)) + (sha256 + (base32 + "10gabhhg3rgacd5ahmi2r128z99fzbrbx6mz1nnq0dxmhmn5rpjf")))) + (build-system python-build-system) + (propagated-inputs + `(("python-six" ,python-six) + ("python-requests_ntlm" ,python-requests_ntlm) + ("python-xmltodict" ,python-xmltodict) + ("python-kerberos" ,python-kerberos))) + (native-inputs + `(("python-mock" ,python-mock) + ("python-pytest" ,python-pytest))) + (home-page "https://github.com/diyan/pywinrm/") + (synopsis + "Python library for Windows Remote Management (WinRM)") + (description + "pywinrm is a Python client for the Windows Remote Management (WinRM) +service. It allows you to invoke commands on target Windows machines from +any machine that can run Python.") + (license license:expat))) + (define-public python-xcffib (package (name "python-xcffib") -- cgit v1.2.3 From 9ea9ff6b0fc5670ef4dc29d628043f694a747cab Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 20:20:48 +0100 Subject: gnu: help2man: Update to 1.47.13. * gnu/packages/man.scm (help2man/latest): Update to 1.47.13. --- 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 4719777303..9f18afabde 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -227,14 +227,14 @@ automatically.") (define-public help2man/latest (package (inherit help2man) - (version "1.47.12") + (version "1.47.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/help2man/help2man-" version ".tar.xz")) (sha256 (base32 - "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx")))))) + "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p")))))) (define-public scdoc (package -- cgit v1.2.3 From 3089b70d766bd9ec70e1464867130b7b864fbe17 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 21:15:08 +0100 Subject: gnu: icu4c: Explicitly add patch flags in replacement package. This is to prevent a build failure when this gets merged to 'core-updates' which does not have any patch-flags to inherit. * gnu/packages/icu4c.scm (icu4c/fixed)[source](patch-flags): New field. --- gnu/packages/icu4c.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu') diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index bc74da5942..3869016df3 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -111,6 +111,7 @@ C/C++ part.") (inherit icu4c) (source (origin (inherit (package-source icu4c)) + (patch-flags '("-p2")) (patches (append (origin-patches (package-source icu4c)) (search-patches -- cgit v1.2.3 From eebaed2b7662d514fa93cae753bc14451ba6814f Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Sun, 22 Mar 2020 13:34:01 +0100 Subject: gnu: java-tomcat: Update to 8.5.53. This fixes CVE-2020-1938 ("Ghostcat"). * gnu/packages/web.scm (java-tomcat): Update to 8.5.53. [properties]: Add cpe-name. --- 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 10cbf6165b..6ce8b78c85 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2020 Timotej Lazar ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Pierre Neidhardt +;;; Copyright © 2018, 2019, 2020 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -6109,14 +6110,14 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (define-public java-tomcat (package (name "java-tomcat") - (version "8.5.46") + (version "8.5.53") (source (origin (method url-fetch) (uri (string-append "mirror://apache/tomcat/tomcat-8/v" version "/src/apache-tomcat-" version "-src.tar.gz")) (sha256 (base32 - "0fb49gsqa3r6jrwc54yynvsakq9qbzr2pbxr7a29c2zvja2v65iq")) + "15lwq3clf21hzk7mma70sffpxjqn8ww5mjq6zhmwcp4m17m22z26")) (modules '((guix build utils))) ;; Delete bundled jars. (snippet @@ -6194,6 +6195,7 @@ encoder/decoder based on the draft-12 specification for UBJSON.") (let ((out (assoc-ref outputs "out"))) (copy-recursively "output/build" out)) #t))))) + (properties '((cpe-name . "tomcat"))) (home-page "https://tomcat.apache.org") (synopsis "Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket") -- cgit v1.2.3 From 60eee3e6de2a11b425496bbdf90bfe1f807c8f49 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Fri, 20 Mar 2020 18:03:20 +0100 Subject: gnu: Add ROPgadget. * gnu/packages/cybersecurity.scm: New file. (ropgadget): New variable. * gnu/local.mk (GNU_SYSTEM_MODULES): Register the file. --- gnu/local.mk | 1 + gnu/packages/cybersecurity.scm | 46 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 gnu/packages/cybersecurity.scm (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 07b159c4fe..0a406dffa0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -138,6 +138,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/cups.scm \ %D%/packages/curl.scm \ %D%/packages/cvassistant.scm \ + %D%/packages/cybersecurity.scm \ %D%/packages/cyrus-sasl.scm \ %D%/packages/databases.scm \ %D%/packages/datamash.scm \ diff --git a/gnu/packages/cybersecurity.scm b/gnu/packages/cybersecurity.scm new file mode 100644 index 0000000000..aedac03b8a --- /dev/null +++ b/gnu/packages/cybersecurity.scm @@ -0,0 +1,46 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2020 Jakub Kądziołka +;;; +;;; 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 cybersecurity) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system python) + #:use-module (gnu packages engineering)) + +(define-public ropgadget + (package + (name "ropgadget") + (version "6.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ROPGadget" version)) + (sha256 + (base32 + "0idiicgpijar9l9kqmfdh865c2mkfgxg0q7lpz77jc09l6q0afjh")))) + (build-system python-build-system) + (propagated-inputs + `(("python-capstone" ,python-capstone))) + (home-page "http://shell-storm.org/project/ROPgadget/") + (synopsis "Semiautomatic return oriented programming") + (description + "This tool lets you search for @acronym{ROP, Return Oriented Programming} +gadgets in binaries. Some facilities are included for automatically generating +chains of gadgets to execute system calls.") + (license license:bsd-3))) -- cgit v1.2.3 From be6520e6a58d7f6ee58f4cab76db9d1245410113 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 26 Mar 2020 23:21:11 +0100 Subject: vm: Distinguish between success and failure of the guest code. Fixes . Reported by Tobias Geerinckx-Rice . * gnu/system/vm.scm (expression->derivation-in-linux-vm)[loader]: Produce '/xchg/.exit-status' file upon success. * gnu/build/vm.scm (load-in-linux-vm): Check for 'xchg/.exit-status' once QEMU has completed and respond accordingly. --- gnu/build/vm.scm | 11 ++++++++++- gnu/system/vm.scm | 15 +++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/build/vm.scm b/gnu/build/vm.scm index 9a9e5bd001..79eed48c1f 100644 --- a/gnu/build/vm.scm +++ b/gnu/build/vm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès ;;; Copyright © 2016 Christopher Allan Webber ;;; Copyright © 2016, 2017 Leo Famulari ;;; Copyright © 2017 Mathieu Othacehe @@ -183,6 +183,15 @@ the #:references-graphs parameter of 'derivation'." '()) arch-specific-flags)) + (unless (file-exists? "xchg/.exit-status") + (error "VM did not produce an exit code")) + + (match (call-with-input-file "xchg/.exit-status" read) + (0 #t) + (status (error "guest VM code exited with a non-zero status" status))) + + (delete-file "xchg/.exit-status") + ;; When MAKE-DISK-IMAGE? is true, the image is in OUTPUT already. (unless make-disk-image? (if single-file-output? diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index d1c131ecb4..c6ec25a895 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -186,12 +186,15 @@ made available under the /xchg CIFS share." ;; the initrd. See example at ;; . (program-file "linux-vm-loader" - ;; When USER-BUILDER succeeds, reboot (indicating a - ;; success), otherwise die, which causes a kernel panic - ;; ("Attempted to kill init!"). - #~(if (zero? (system* #$user-builder)) - (reboot) - (exit 1)))) + ;; Communicate USER-BUILDER's exit status via /xchg so that + ;; the host can distinguish between success, failure, and + ;; kernel panic. + #~(let ((status (system* #$user-builder))) + (call-with-output-file "/xchg/.exit-status" + (lambda (port) + (write status port))) + (sync) + (reboot)))) (let ((initrd (or initrd (base-initrd file-systems -- cgit v1.2.3 From aefcfecd84302ea5a3711c26d02395f8b25a354c Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 7 Feb 2020 08:38:32 +0100 Subject: gnu: Add python-pytest-check-links. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-pytest-check-links): New variable. Signed-off-by: Ludovic Courtès --- 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 f4b50abb1d..209d8563d3 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18676,3 +18676,31 @@ allows to start and stop daemons for a quick throw-away usage. This is typicall useful when needing these daemons to run integration testing. It originally evolved from its precursor @code{overtest}.") (license license:asl2.0))) + +(define-public python-pytest-check-links + (package + (name "python-pytest-check-links") + (version "0.3.0") + (source + (origin + (method url-fetch) + ;; URI uses underscores + (uri (pypi-uri "pytest_check_links" version)) + (sha256 + (base32 + "12x3wmrdzm6wgk0vz02hb769h68nr49q47w5q1pj95pc89hsa34v")))) + (build-system python-build-system) + (propagated-inputs + `(("python-docutils" ,python-docutils) + ("python-html5lib" ,python-html5lib) + ("python-nbconvert" ,python-nbconvert) + ("python-nbformat" ,python-nbformat) + ("python-pytest" ,python-pytest) + ("python-six" ,python-six))) + (native-inputs + `(("python-pbr-minimal" ,python-pbr-minimal))) + (home-page "https://github.com/minrk/pytest-check-links") + (synopsis "Check links in files") + (description "This package provides a pytest plugin that checks URLs for +HTML-containing files.") + (license license:bsd-3))) -- cgit v1.2.3 From 01d5f2c5cd68037666405af00d62bd677d5fd015 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Fri, 7 Feb 2020 08:39:55 +0100 Subject: gnu: Add python-json5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-json5): New variable. Signed-off-by: Ludovic Courtès --- 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 209d8563d3..989474ae5c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -73,6 +73,7 @@ ;;; Copyright © 2020 Alexandros Theodotou ;;; Copyright © 2020 Josh Marshall ;;; Copyright © 2020 Alexandros Theodotou +;;; Copyright © 2020 Lars-Dominik Braun ;;; ;;; This file is part of GNU Guix. ;;; @@ -18704,3 +18705,27 @@ evolved from its precursor @code{overtest}.") (description "This package provides a pytest plugin that checks URLs for HTML-containing files.") (license license:bsd-3))) + +(define-public python-json5 + (package + (name "python-json5") + (version "0.8.5") + (source + (origin + ;; sample.json5 is missing from PyPi source tarball + (method git-fetch) + (uri (git-reference + (url "https://github.com/dpranke/pyjson5.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn")))) + (build-system python-build-system) + (home-page "https://github.com/dpranke/pyjson5") + (synopsis + "Python implementation of the JSON5 data format") + (description + "JSON5 extends the JSON data interchange format to make it slightly more +usable as a configuration language. This Python package implements parsing and +dumping of JSON5 data structures.") + (license license:asl2.0))) -- cgit v1.2.3 From 0a76a4e0733741f3140fc394e98fed4febdbebca Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 20 Mar 2020 21:11:04 +0000 Subject: gnu: guix-data-service: Update to 0.0.1-19.d1c243f. These changes support the guix-data-service-backup-database and guix-data-service-create-small-backup scripts. These are shell scripts, so require coreutils from the build environment at runtime as well as binaries from postgresql, ephemeralpg and optionally util-linux (for ionice and renice). * gnu/packages/web.scm (guix-data-service): Update to 0.0.1-19.d1c243f. [arguments]: Add (ice-9 ftw) and (ice-9 match) to #:modules, change the 'install phase to wrap all bin files with some inputs as well. [inputs]: Add util-linux, include ephemeralpg from native-inputs and switch postgresql for postgresql-11. [native-inputs]: Move ephemeralpg to inputs. --- gnu/packages/web.scm | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6ce8b78c85..a553dc2150 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4382,8 +4382,8 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (package-with-python2 python-feedparser)) (define-public guix-data-service - (let ((commit "18eb9dfdcb3174bfd4bab5b9089acffa13aa1214") - (revision "18")) + (let ((commit "d1c243f7fd8902f359ff06fb78dce663cf4297ce") + (revision "19")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -4395,11 +4395,13 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") (file-name (git-file-name name version)) (sha256 (base32 - "0lb78cqzqaz0r4sspg272w2a3yhzhqah30j0kxf0z182b0qpmp37")))) + "1ji8d4vwmv7j9h7z96hvzi3zvik594yngjrdal37w13fbxy2v6sw")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build utils) (guix build gnu-build-system) + (ice-9 ftw) + (ice-9 match) (ice-9 rdelim) (ice-9 popen)) #:test-target "check-with-tmp-database" @@ -4427,20 +4429,28 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") "/site-ccache"))) (for-each (lambda (file) + (simple-format (current-error-port) + "wrapping: ~A\n" + (string-append bin "/" file)) (wrap-program (string-append bin "/" file) `("PATH" ":" prefix - (,bin)) + ,(cons* + bin + (map (lambda (input) + (string-append + (assoc-ref inputs input) + "/bin")) + '("ephemeralpg" + "util-linux" + "postgresql")))) `("GUILE_LOAD_PATH" ":" prefix (,scm ,(getenv "GUILE_LOAD_PATH"))) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH"))))) - '("guix-data-service" - "guix-data-service-process-branch-updated-email" - "guix-data-service-process-branch-updated-mbox" - "guix-data-service-process-job" - "guix-data-service-process-jobs" - "guix-data-service-manage-build-servers" - "guix-data-service-query-build-servers")) + (scandir bin + (match-lambda + ((or "." "..") #f) + (_ #t)))) #t))) (delete 'strip)))) ; As the .go files aren't compatible (inputs @@ -4449,13 +4459,14 @@ CDF, Atom 0.3, and Atom 1.0 feeds.") ("guile-json" ,guile3.0-json) ("guile-email" ,guile3.0-email) ("guile-squee" ,guile3.0-squee) - ("postgresql" ,postgresql) + ("ephemeralpg" ,ephemeralpg) + ("util-linux" ,util-linux) + ("postgresql" ,postgresql-11) ("sqitch" ,sqitch))) (native-inputs `(("guile" ,guile-3.0) ("autoconf" ,autoconf) ("automake" ,automake) - ("ephemeralpg" ,ephemeralpg) ("emacs-minimal" ,emacs-minimal) ("emacs-htmlize" ,emacs-htmlize) ("pkg-config" ,pkg-config))) -- cgit v1.2.3 From 6232a36291b56ec1f1aaeefaa721a164566b961c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:36 +0100 Subject: gnu: r-ggally: Update to 1.5.0. * gnu/packages/cran.scm (r-ggally): Update to 1.5.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 c890b38749..676ee597b7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2107,14 +2107,14 @@ package also provides a C++ API, that works with or without Rcpp.") (define-public r-ggally (package (name "r-ggally") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "GGally" version)) (sha256 (base32 - "1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws")))) + "082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6")))) (properties `((upstream-name . "GGally"))) (build-system r-build-system) (inputs -- cgit v1.2.3 From 9c189913e9f11acdf1e0300c870fd08408f0211b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:44 +0100 Subject: gnu: r-hdf5r: Update to 1.3.2. * gnu/packages/cran.scm (r-hdf5r): Update to 1.3.2. [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 676ee597b7..f32bfacbc5 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -6086,14 +6086,14 @@ results to the user.") (define-public r-hdf5r (package (name "r-hdf5r") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "hdf5r" version)) (sha256 (base32 - "0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx")))) + "0c2p06k9bp9rf0fyavnxw5d8jr2bbgx3gjblahz581cpvsfksj9i")))) (build-system r-build-system) (inputs `(("hdf5" ,hdf5) @@ -6101,6 +6101,8 @@ results to the user.") (propagated-inputs `(("r-bit64" ,r-bit64) ("r-r6" ,r-r6))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://hhoeflin.github.io/hdf5r") (synopsis "Interface to the HDF5 binary data format") (description -- cgit v1.2.3 From 498c887a96d5ab4dfc5fd292b7b28f349221e2e0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:19:56 +0100 Subject: gnu: r-bayestestr: Update to 0.5.3. * gnu/packages/cran.scm (r-bayestestr): Update to 0.5.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 f32bfacbc5..a793ed0bef 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -8514,18 +8514,20 @@ differentiation.") (define-public r-bayestestr (package (name "r-bayestestr") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "bayestestR" version)) (sha256 (base32 - "1l0kqw793d8fnk0745fllmqwjwnj9srvqzv4baq5s05ls1gbi2mw")))) + "1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz")))) (properties `((upstream-name . "bayestestR"))) (build-system r-build-system) (propagated-inputs `(("r-insight" ,r-insight))) + (native-inputs + `(("r-knitr" ,r-knitr))) (home-page "https://github.com/easystats/bayestestR") (synopsis "Describe Bayesian models and posterior distributions") (description -- cgit v1.2.3 From 84b7c4aa17f63ab24c9e356d0235200d8bfb1dd6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:11 +0100 Subject: gnu: r-sf: Update to 0.9-0. * gnu/packages/cran.scm (r-sf): Update to 0.9-0. [native-inputs]: Add r-knitr. --- gnu/packages/cran.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a793ed0bef..692adcfa41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13182,14 +13182,14 @@ tessellation.") (define-public r-sf (package (name "r-sf") - (version "0.8-1") + (version "0.9-0") (source (origin (method url-fetch) (uri (cran-uri "sf" version)) (sha256 (base32 - "17wyv74m1ppc3s5jdv60r74jj23nidxpzl46vjhfclfhnpvm7sx9")))) + "117r9l3v7nkdj9bfy6qr0yz0gd5bv0pwnkc9vk2gv3xqj0h1fpf6")))) (build-system r-build-system) (inputs `(("gdal" ,gdal) @@ -13202,7 +13202,9 @@ tessellation.") ("r-magrittr" ,r-magrittr) ("r-rcpp" ,r-rcpp) ("r-units" ,r-units))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("r-knitr" ,r-knitr))) (home-page "https://github.com/r-spatial/sf/") (synopsis "Simple features for R") (description -- cgit v1.2.3 From 76d7ce4f4552c75b550edc1f1be63daeef22485f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:22 +0100 Subject: gnu: r-rjava: Update to 0.9-12. * gnu/packages/cran.scm (r-rjava): Update to 0.9-12. --- 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 692adcfa41..5f8bb2f126 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -13854,14 +13854,14 @@ the corresponding outputs (tables and graphs).") (define-public r-rjava (package (name "r-rjava") - (version "0.9-11") + (version "0.9-12") (source (origin (method url-fetch) (uri (cran-uri "rJava" version)) (sha256 (base32 - "0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2")))) + "03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12")))) (properties `((upstream-name . "rJava"))) (build-system r-build-system) (arguments -- cgit v1.2.3 From 3345157fa670d369aa1f3ab9a537b87583b022c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:28 +0100 Subject: gnu: r-xgboost: Update to 1.0.0.2. * gnu/packages/cran.scm (r-xgboost): Update to 1.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 5f8bb2f126..573630ff69 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15361,14 +15361,14 @@ the current document.") (define-public r-xgboost (package (name "r-xgboost") - (version "1.0.0.1") + (version "1.0.0.2") (source (origin (method url-fetch) (uri (cran-uri "xgboost" version)) (sha256 (base32 - "0fx5qjpjjirzhplddqmxlysyqszp79w74x00b5shp6p2lzy6yd9a")))) + "1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd")))) (build-system r-build-system) (propagated-inputs `(("r-data-table" ,r-data-table) -- cgit v1.2.3 From c99880320d0a1526b0b681895318a08515dbb3b0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:35 +0100 Subject: gnu: r-class: Update to 7.3-16. * gnu/packages/statistics.scm (r-class): Update to 7.3-16. --- gnu/packages/statistics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 71ebe012cf..41a7687da4 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -441,14 +441,14 @@ Applied Statistics with S\" (4th edition, 2002) by Venables and Ripley.") (define-public r-class (package (name "r-class") - (version "7.3-15") + (version "7.3-16") (source (origin (method url-fetch) (uri (cran-uri "class" version)) (sha256 (base32 - "1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn")))) + "1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll")))) (build-system r-build-system) (propagated-inputs `(("r-mass" ,r-mass))) -- cgit v1.2.3 From 37732212a3090d49eb19dc54436b991508487225 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:41 +0100 Subject: gnu: r-locfit: Update to 1.5-9.4. * gnu/packages/statistics.scm (r-locfit): Update to 1.5-9.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 41a7687da4..be7c42617b 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1762,14 +1762,14 @@ side.") (define-public r-locfit (package (name "r-locfit") - (version "1.5-9.2") + (version "1.5-9.4") (source (origin (method url-fetch) (uri (cran-uri "locfit" version)) (sha256 (base32 - "00l0s6cxnv95zybkgki0380fih2kr1kbm7m88x56phklln3nx27b")))) + "1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr")))) (build-system r-build-system) (propagated-inputs `(("r-lattice" ,r-lattice))) -- cgit v1.2.3 From 2ba5253044a4c4f9b5dbdd2ce5684e43f8d43c30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 11:20:49 +0100 Subject: gnu: r-multiassayexperiment: Update to 1.12.6. * gnu/packages/bioconductor.scm (r-multiassayexperiment): Update to 1.12.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 b62a6188d1..28522e7c13 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -7302,14 +7302,14 @@ access.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.12.5") + (version "1.12.6") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "0a7zsq3adg8rph1w2qr75bpmrq53j99rsypmxj9w5mz9q23r2qlr")))) + "174vzlxsyayb5il77cb3zzgszxl3l0wkprc9w6pgz4yv5ix13adi")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) -- cgit v1.2.3 From 1a7247c629ef788a9a5b26999246efd2ff4c48da Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 12:20:35 +0100 Subject: gnu: asymptote: Update to 2.65. * gnu/packages/plotutils.scm (asymptote): Update to 2.65. --- 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 7a7f30e255..09fe2cb36e 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -194,14 +194,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.64") + (version "2.65") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "1x4nmzklzd2xfmm03mgnpg0345dwrwr5czk9gkfl5sx7x1cgx4c0")))) + (base32 "0i4qqlvzz69mhdq6kf689sa9rxfb1cwsg1nx88hryb291hddgqqm")))) (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 v1.2.3 From 444bc2ddf2903fb26bd941e789cdb97d78e5e282 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 8 Mar 2020 14:09:36 +0100 Subject: gnu: rust: Add 1.38 All packages are still built with rustc 1.37, but users will see rustc 1.38 in their profiles, and packages that require newer compiler versions will be possible to add. * gnu/packages/rust.scm (rust-1.31): Factor out the patch-command-exec-tests phase to a separate procedure. (patch-command-exec-tests-phase): New procedure. (rust): Rename to rust-1.37, make rust an alias. (rust-1.38): New variable. --- gnu/packages/rust.scm | 75 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index d0a64b134f..e0106841c8 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -909,9 +909,30 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (replace 'disable-amd64-avx-test (lambda _ (substitute* "src/test/ui/run-pass/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) + (("only-x86_64") "ignore-test")) #t))))))))) +(define (patch-command-exec-tests-phase test-path) + "The command-exec.rs test moves around between releases. We need to apply +a Guix-specific patch to it for each release. This function generates the phase +that applies said patch, parametrized by the test-path. This is done this way +because the phase is more complex than the equivalents for other tests that +move around." + `(lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* ,test-path + ;; This test suite includes some tests that the stdlib's + ;; `Command` execution properly handles situations where + ;; the environment or PATH variable are empty, but this + ;; fails since we don't have `echo` available in the usual + ;; Linux directories. + ;; NB: the leading space is so we don't fail a tidy check + ;; for trailing whitespace, and the newlines are to ensure + ;; we don't exceed the 100 chars tidy check as well + ((" Command::new\\(\"echo\"\\)") + (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) + #t))) + (define-public rust-1.31 (let ((base-rust (rust-bootstrapped-package rust-1.30 "1.31.1" @@ -923,26 +944,14 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" ((#:phases phases) `(modify-phases ,phases (add-after 'patch-tests 'patch-command-exec-tests - (lambda* (#:key inputs #:allow-other-keys) - (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "src/test/run-pass/command-exec.rs" - ;; This test suite includes some tests that the stdlib's - ;; `Command` execution properly handles situations where - ;; the environment or PATH variable are empty, but this - ;; fails since we don't have `echo` available in the usual - ;; Linux directories. - ;; NB: the leading space is so we don't fail a tidy check - ;; for trailing whitespace, and the newlines are to ensure - ;; we don't exceed the 100 chars tidy check as well - ((" Command::new\\(\"echo\"\\)") - (string-append "\nCommand::new(\"" coreutils "/bin/echo\")\n"))) - #t))) - ;; The test has been moved elsewhere. - (replace 'disable-amd64-avx-test - (lambda _ - (substitute* "src/test/ui/issues/issue-44056.rs" - (("only-x86_64") "ignore-test")) - #t)) + ,(patch-command-exec-tests-phase + "src/test/run-pass/command-exec.rs")) + ;; The test has been moved elsewhere. + (replace 'disable-amd64-avx-test + (lambda _ + (substitute* "src/test/ui/issues/issue-44056.rs" + (("only-x86_64") "ignore-test")) + #t)) (add-after 'patch-tests 'patch-process-docs-rev-cmd (lambda* _ ;; Disable some doc tests which depend on the "rev" command @@ -1084,7 +1093,7 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" `(modify-phases ,phases (delete 'patch-process-docs-rev-cmd)))))))) -(define-public rust +(define-public rust-1.37 (let ((base-rust (rust-bootstrapped-package rust-1.36 "1.37.0" "1hrqprybhkhs6d9b5pjskfnc5z9v2l2gync7nb39qjb5s0h703hj"))) @@ -1100,3 +1109,25 @@ jemalloc = \"" jemalloc "/lib/libjemalloc_pic.a" "\" (mkdir-p cargo-home) (setenv "CARGO_HOME" cargo-home) #t)))))))))) + +(define-public rust-1.38 + (let ((base-rust + (rust-bootstrapped-package rust-1.37 "1.38.0" + "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-command-exec-tests + ,(patch-command-exec-tests-phase + "src/test/ui/command-exec.rs")) + (add-after 'patch-tests 'patch-command-uid-gid-test + (lambda _ + (substitute* "src/test/ui/command-uid-gid.rs" + (("/bin/sh") (which "sh")) + (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) + #t))))))))) + +(define-public rust rust-1.37) -- cgit v1.2.3 From 9483782a617c66b8e066ac7f1898e41f99eb8456 Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 8 Mar 2020 23:32:35 +0100 Subject: gnu: rust: Add 1.39 * gnu/packages/rust.scm (rust-1.39): New variable. (%cargo-reference-hash): Add a comment explaining the role of the variable. --- gnu/packages/rust.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index e0106841c8..11522b933e 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -55,6 +55,32 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26)) +;; This is the hash for the empty file, and the reason it's relevant is not +;; the most obvious. +;; +;; The root of the problem is that Cargo keeps track of a file called +;; Cargo.lock, that contains the hash of the tarball source of each dependency. +;; +;; However, tarball sources aren't handled well by Guix because of the need to +;; patch shebangs in any helper scripts. This is why we use Cargo's vendoring +;; capabilities, where instead of the tarball, a directory is provided in its +;; place. (In the case of rustc, the source code already ships with vendored +;; dependencies, but crates built with cargo-build-system undergo vendoring +;; during the build.) +;; +;; To preserve the advantages of checksumming, vendored dependencies contain +;; a file called .cargo-checksum.json, which contains the hash of the tarball, +;; as well as the list of files in it, with the hash of each file. +;; +;; The patch-cargo-checksums phase of cargo-build-system runs after +;; any Guix-specific patches to the vendored dependencies and regenerates the +;; .cargo-checksum.json files, but it's hard to know the tarball checksum that +;; should be written to the file - and taking care of any unhandled edge case +;; would require rebuilding everything that depends on rust. This is why we lie, +;; and say that the tarball has the hash of an empty file. It's not a problem +;; because cargo-build-system removes the Cargo.lock file. We can't do that +;; for rustc because of a quirk of its build system, so we modify the lock file +;; to substitute the hash. (define %cargo-reference-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855") @@ -1130,4 +1156,24 @@ move around." (("ignore-sgx") "ignore-sgx\n// ignore-tidy-linelength")) #t))))))))) +(define-public rust-1.39 + (let ((base-rust + (rust-bootstrapped-package rust-1.38 "1.39.0" + "0mwkc1bnil2cfyf6nglpvbn2y0zfbv44zfhsd5qg4c9rm6vgd8dl"))) + (package + (inherit base-rust) + (arguments + (substitute-keyword-arguments (package-arguments base-rust) + ((#:phases phases) + `(modify-phases ,phases + (replace 'patch-cargo-checksums + ;; The Cargo.lock format changed. + (lambda* _ + (use-modules (guix build cargo-utils)) + (substitute* "Cargo.lock" + (("(checksum = )\".*\"" all name) + (string-append name "\"" ,%cargo-reference-hash "\""))) + (generate-all-checksums "vendor") + #t))))))))) + (define-public rust rust-1.37) -- cgit v1.2.3 From bc3fda5d2b97526cee7d1b127e95067521dfb99e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 15:24:54 +0100 Subject: services/nfs: Replace nfs-version with nfs-versions. Instead of accepting a string for just one protocol version accept a list of supported versions. * gnu/services/nfs.scm ()[nfs-version]: Remove field and replace... [nfs-versions]: ...with this new field. (nfs-shepherd-services): Pass as many "--nfs-version" options as there are supported versions. * doc/guix.texi (Network File System): Document nfs-versions. --- doc/guix.texi | 6 +++--- gnu/services/nfs.scm | 25 +++++++++++++------------ 2 files changed, 16 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/doc/guix.texi b/doc/guix.texi index af87d76087..8cb85fe62c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -22233,9 +22233,9 @@ It has the following parameters: @item @code{nfs-utils} (default: @code{nfs-utils}) The nfs-utils package to use. -@item @code{nfs-version} (default: @code{#f}) -If a string value is provided, the @command{rpc.nfsd} daemon will be -limited to supporting the given version of the NFS protocol. +@item @code{nfs-versions} (default: @code{'("4.2" "4.1" "4.0")}) +If a list of string values is provided, the @command{rpc.nfsd} daemon +will be limited to supporting the given versions of the NFS protocol. @item @code{exports} (default: @code{'()}) This is a list of directories the NFS server should export. Each entry diff --git a/gnu/services/nfs.scm b/gnu/services/nfs.scm index cbaa97b2fd..4e358197e2 100644 --- a/gnu/services/nfs.scm +++ b/gnu/services/nfs.scm @@ -245,8 +245,8 @@ nfs-configuration? (nfs-utils nfs-configuration-nfs-utils (default nfs-utils)) - (nfs-version nfs-configuration-nfs-version - (default #f)) ; string + (nfs-versions nfs-configuration-nfs-versions + (default '("4.2" "4.1" "4.0"))) (exports nfs-configuration-exports (default '())) (rpcmountd-port nfs-configuration-rpcmountd-port @@ -270,7 +270,7 @@ (define (nfs-shepherd-services config) "Return a list of for the NFS daemons with CONFIG." (match-record config - (nfs-utils nfs-version exports + (nfs-utils nfs-versions exports rpcmountd-port rpcstatd-port nfsd-port nfsd-threads pipefs-directory debug) (list (shepherd-service @@ -323,15 +323,16 @@ (requirement '(/proc/fs/nfsd rpc.statd networking)) (start #~(lambda _ - (zero? (system* #$(file-append nfs-utils "/sbin/rpc.nfsd") - #$@(if (member 'nfsd debug) - '("--debug") - '()) - "--port" #$(number->string nfsd-port) - #$@(if nfs-version - '("--nfs-version" nfs-version) - '()) - #$(number->string nfsd-threads))))) + (zero? (apply system* #$(file-append nfs-utils "/sbin/rpc.nfsd") + (list + #$@(if (member 'nfsd debug) + '("--debug") + '()) + "--port" #$(number->string nfsd-port) + #$@(map (lambda (version) + (string-append "--nfs-version=" version)) + nfs-versions) + #$(number->string nfsd-threads)))))) (stop #~(lambda _ (zero? -- cgit v1.2.3 From eb5341c2353ef54ef8b227ae8e50aa5736a40ddc Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 27 Mar 2020 18:39:28 +0100 Subject: gnu: Add trivial-package-local-nicknames. * gnu/packages/lisp-xyz.scm (cl-trivial-package-local-nicknames, sbcl-trivial-package-local-nicknames): New variables. --- gnu/packages/lisp-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 043c219e5e..f39dd170a9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -11250,3 +11250,28 @@ If features: (define-public cl-sycamore (sbcl-package->cl-source-package sbcl-sycamore)) + +(define-public sbcl-trivial-package-local-nicknames + (package + (name "sbcl-trivial-package-local-nicknames") + (version "0.2") + (home-page "https://github.com/phoe/trivial-package-local-nicknames") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit "16b7ad4c2b120f50da65154191f468ea5598460e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18qc27xkjzdcqrilpk3pm7djldwq5rm3ggd5h9cr8hqcd54i2fqg")))) + (build-system asdf-build-system/sbcl) + (synopsis "Common Lisp compatibility library for package local nicknames") + (description + "This library is a portable compatibility layer around package local nicknames (PLN). +This was done so there is a portability library for the PLN API not included +in DEFPACKAGE.") + (license license:unlicense))) + +(define-public cl-trivial-package-local-nicknames + (sbcl-package->cl-source-package sbcl-trivial-package-local-nicknames)) -- cgit v1.2.3 From 313973980215a50ac0b40b44ab995254eff1dae5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Mar 2020 18:12:31 +0100 Subject: gnu: guile-next: Update to 3.0.2. * gnu/packages/guile.scm (guile-3.0): Update to 3.0.2. * gnu/packages/patches/guile-3.0-crash.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/local.mk | 1 - gnu/packages/guile.scm | 7 ++----- gnu/packages/patches/guile-3.0-crash.patch | 17 ----------------- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/guile-3.0-crash.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0a406dffa0..60d6d912f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -991,7 +991,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-default-utf8.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ - %D%/packages/patches/guile-3.0-crash.patch \ %D%/packages/patches/guile-default-utf8.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-linux-syscalls.patch \ diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 80ac9ea706..9c707d4cde 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -292,17 +292,14 @@ without requiring the source code to be rewritten.") (package (inherit guile-2.2) (name "guile-next") ;to be renamed to "guile" - (version "3.0.1") + (version "3.0.2") (source (origin (inherit (package-source guile-2.2)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "1jakps3127h8g69ixgb4zwc8v2g29dmwql1vi3pwg30kzp8fm5nn")) - (patches - (append (search-patches "guile-3.0-crash.patch") - (origin-patches (package-source guile-2.2)))))) + "12lziar4j27j9whqp2n18427q45y9ghq7gdd8lqhmj1k0lr7vi2k")))) (native-search-paths (list (search-path-specification (variable "GUILE_LOAD_PATH") diff --git a/gnu/packages/patches/guile-3.0-crash.patch b/gnu/packages/patches/guile-3.0-crash.patch deleted file mode 100644 index 510834ab57..0000000000 --- a/gnu/packages/patches/guile-3.0-crash.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix crash due to: . - -diff --git a/libguile/struct.c b/libguile/struct.c -index 3dbcc71d4..ddcbe46d2 100644 ---- a/libguile/struct.c -+++ b/libguile/struct.c -@@ -139,7 +139,9 @@ set_vtable_access_fields (SCM vtable) - nfields = len / 2; - - bitmask_size = (nfields + 31U) / 32U; -- unboxed_fields = scm_gc_malloc_pointerless (bitmask_size, "unboxed fields"); -+ unboxed_fields = -+ scm_gc_malloc_pointerless (bitmask_size * sizeof (*unboxed_fields), -+ "unboxed fields"); - memset (unboxed_fields, 0, bitmask_size * sizeof(*unboxed_fields)); - - /* Update FLAGS according to LAYOUT. */ -- cgit v1.2.3 From 7cb77b789614fbf3cd21b6c2c086e6bbbad262b4 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Mar 2020 18:53:05 +0100 Subject: gnu: mailutils: Update to 3.9. * gnu/packages/mail.scm (mailutils): Update to 3.9. [arguments]: In 'prepare-test-suite' phase, adjust name of the mda 'testsuite' files. --- 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 e36e010c3e..1b69f32aa4 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -144,14 +144,14 @@ (define-public mailutils (package (name "mailutils") - (version "3.8") + (version "3.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mailutils/mailutils-" version ".tar.xz")) (sha256 (base32 - "1wkn9ch664477r4d8jk9153w5msljsbj99907k7zgzpmywbs6ba7")))) + "1g1xf2lal04nsnf1iym9n9n0wxjpqbcr9nysxpm98v4pniinqwsz")))) (build-system gnu-build-system) (arguments `(#:phases @@ -166,7 +166,8 @@ ;; Tests try to invoke 'mda' such that it looks up the ;; 'root' user, which does not exist in the build ;; environment. - (substitute* "mda/tests/testsuite" + (substitute* '("mda/mda/tests/testsuite" + "mda/lmtpd/tests/testsuite") (("root <") "nobody <") (("spool/root") "spool/nobody") (("root@localhost") "nobody@localhost")) -- cgit v1.2.3 From 816bce684c2fd5cc1908e27fde2891ecdf25e378 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 27 Mar 2020 16:46:40 +0100 Subject: gnu: Neofetch: Update to 7.0.0. * gnu/packages/admin.scm (neofetch): Update to 7.0.0. Signed-off-by: Leo Famulari --- gnu/packages/admin.scm | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 4d3425d039..b2b5111458 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2019 Guillaume Le Vaillant ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Oleg Pykhalov +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -2927,35 +2928,34 @@ tool for remote execution and deployment.") (license license:bsd-2))) (define-public neofetch - (let ((commit "501d6b7594296d9eac8943140f8581daf555873d")) - (package - (name "neofetch") - (version (git-version "6.1.0" "1" commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dylanaraps/neofetch") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1h5md9jimyc6z4d7w66j27hn8qghzyxgpkh5h9dclzxpp5cs8whb")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; there are no tests - #:make-flags - (list (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) ; no configure script - (home-page "https://github.com/dylanaraps/neofetch") - (synopsis "System information script") - (description "Neofetch is a command-line system information tool written in + (package + (name "neofetch") + (version "7.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dylanaraps/neofetch") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0xc0fdc7n5bhqirh83agqiy8r14l14zwca07czvj8vgnsnfybslr")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; there are no tests + #:make-flags + (list (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure)))) ; no configure script + (home-page "https://github.com/dylanaraps/neofetch") + (synopsis "System information script") + (description "Neofetch is a command-line system information tool written in Bash. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what operating system or distribution you are running, what theme or icon set you are using, etc.") - (license license:expat)))) + (license license:expat))) (define-public screenfetch (package -- cgit v1.2.3 From f71bce9bb23c04a88baa0cc2f7271fe0be685f1f Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Fri, 27 Mar 2020 01:51:13 +0100 Subject: gnu: tmate: Update to 2.4.0. * gnu/packages/terminals.scm (tmate): Update to 2.4.0. Signed-off-by: Leo Famulari --- gnu/packages/terminals.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 83eed3e036..9cb004e36a 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Valentin Ignatev +;;; Copyright © 2020 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -906,7 +907,7 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.") (define-public tmate (package (name "tmate") - (version "2.2.1") + (version "2.4.0") (source (origin (method git-fetch) @@ -916,7 +917,7 @@ per-line fullscreen terminal rendering, and keyboard input event reporting.") (file-name (git-file-name name version)) (sha256 (base32 - "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r")))) + "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi")))) (build-system gnu-build-system) (inputs `(("libevent" ,libevent) -- cgit v1.2.3 From 57be2cadf83fffbbc58a1c9baedb73763298dd6b Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:32:11 +0100 Subject: gnu: emacs-flycheck-grammalecte: Update to 1.0. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Update to 1.0. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5653796731..86033fd200 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3367,15 +3367,15 @@ for Flow files.") (define-public emacs-flycheck-grammalecte (package (name "emacs-flycheck-grammalecte") - (version "0.9") - (source (origin - (method url-fetch) - (uri (string-append "https://git.deparis.io/" - "flycheck-grammalecte/snapshot/" - "flycheck-grammalecte-" version ".tar.xz")) - (sha256 - (base32 - "0wjm9xyra870pci4bcrbnc9x66x18mi7iz08rkxa4clxv28xzryb")))) + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://git.deparis.io/" + "flycheck-grammalecte/snapshot/" + "flycheck-grammalecte-" version ".tar.xz")) + (sha256 + (base32 "02wxaw228dia8cps0v02327hrrribfqb4601qggjpi4l4ms1lf8b")))) (build-system emacs-build-system) (arguments `(#:include '("\\.(el|py)$") @@ -3397,7 +3397,7 @@ for Flow files.") (out (assoc-ref outputs "out")) (version ,(version-major+minor (package-version python)))) (with-directory-excursion - (string-append out "/share/emacs/site-lisp") + (string-append out "/share/emacs/site-lisp") (symlink (string-append grammalecte "/lib/" "python" version "/site-packages/" "grammalecte") -- cgit v1.2.3 From 734eb7d79e08a1c4d4fea42453d0a821b41ad9c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:34:37 +0100 Subject: gnu: fet: Update to 5.44.0. * gnu/packages/education.scm (fet): Update to 5.44.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 7c84d832c0..836fc2b525 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -602,14 +602,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.43.2") + (version "5.44.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "111ijwdpdnavi2jjp8jqnwkgi1b9n79svkfw68fmga0z7d3nd62g")))) + (base32 "13q3b0g1zz885g15gir8fbalvix8sy42v1p429h0751490wq5c3h")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 9fad055023c4b6f54432d7490e6cd1f1151c16e6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 27 Mar 2020 23:37:20 +0100 Subject: gnu: grammalecte: Update to 1.8.0. * gnu/packages/dictionaries.scm (grammalecte): Update to 1.8.0. --- 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 d8e30a5524..d481b139a5 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -205,14 +205,14 @@ It comes with a German-English dictionary with approximately 270,000 entries.") (define-public grammalecte (package (name "grammalecte") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch/zipbomb) (uri (string-append "https://grammalecte.net/grammalecte/zip/" "Grammalecte-fr-v" version ".zip")) (sha256 - (base32 "0wb126mqnq9ns6gzmhzljc6iqywdkpzvr8xny5s3khd10ki4lxl3")))) + (base32 "06z2na1zs5q6vla45q5b8fzjwpckanmwh42r8in8vhb7a8v2fkyp")))) (build-system python-build-system) (home-page "https://grammalecte.net") (synopsis "French spelling and grammar checker") -- cgit v1.2.3 From 27c3afa940693376fd1a2a55602f4af9f53798b6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 27 Mar 2020 23:36:33 +0100 Subject: gnu: r-curl: Fix patch to respect CURL_CA_BUNDLE. Fixes . * gnu/packages/cran.scm (r-curl)[arguments]: Ensure CURLOPT_CAINFO actually gets set. --- gnu/packages/cran.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 573630ff69..759b9263f3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -677,7 +677,11 @@ LaTeX.") (("if \\(!grepl\\(\"mingw\".*") "if (FALSE)\n")) (substitute* "src/handle.c" - (("#ifdef _WIN32") "#if 1")) + (("/\\* Only set" m) + (string-append "\ +const char *_ca_bundle = getenv(\"CURL_CA_BUNDLE\"); +if(_ca_bundle != NULL) { curl_easy_setopt(handle, CURLOPT_CAINFO, _ca_bundle); } +" m))) #t))))) (inputs `(("libcurl" ,curl) -- cgit v1.2.3 From 24b5d8f745d383c427a729c930a1ae0c0901c360 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 28 Mar 2020 09:17:59 +0000 Subject: gnu: lollypop: Update to 1.2.32. * gnu/packages/gnome.scm (lollypop): Update to 1.2.32. --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc78910c64..f636a0f1f8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8880,15 +8880,14 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (define-public lollypop (package (name "lollypop") - (version "1.2.7") + (version "1.2.32") (source (origin (method url-fetch) - (uri (string-append "https://gitlab.gnome.org/World/lollypop/uploads/" - "08f973788c7ca46d9285eec2ac818edb/" + (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "0hvq6m4i62i0m63bg4gzpfb9rv1fk6vq5jl2g3ppcgm4srmfm77j")))) + (base32 "1ng9492k8754vlqggbfsyzbmfdx4w17fzc4ad21fr92710na0w5a")))) (build-system meson-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3 From aa7f3ec0e0d84a2d46925639f1c62b033b4339a3 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 28 Mar 2020 10:38:52 +0100 Subject: gnu: sbcl-cl-containers: Update to 20200212. * gnu/packages/lisp-xyz.scm (sbcl-cl-containers): Update to 20200212. --- 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 f39dd170a9..939ed153d9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -6643,8 +6643,8 @@ which implements a set of utilities.") (sbcl-package->ecl-package sbcl-metatilities-base)) (define-public sbcl-cl-containers - (let ((commit "810927e19d933bcf38ffeb7a23ce521efc432d45") - (revision "1")) + (let ((commit "b2980bac9ac87ad32b63b722ce520fa26cb36ee6") + (revision "2")) (package (name "sbcl-cl-containers") (version (git-version "0.12.1" revision commit)) @@ -6657,7 +6657,7 @@ which implements a set of utilities.") (file-name (git-file-name name version)) (sha256 (base32 - "1s9faxw7svhbjpkhfrz2qxgjm3cvyjb8wpyb4m8dx4i5g7vvprkv")))) + "19hmlax19hq0xjaqr8za90vwf06ymxw1m29sj053a309k3hm84gx")))) (build-system asdf-build-system/sbcl) (native-inputs `(("lift" ,sbcl-lift))) -- cgit v1.2.3 From 27d8b9d9767ec015b965af75f6ed6b32e496c9b4 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 28 Mar 2020 09:07:06 -0500 Subject: gnu: python-socksipychain: Update to 2.1.1-1.eb5ee87. * gnu/packages/python-xyz.scm (python-socksipychain): Update to 2.1.1-1.eb5ee87. --- gnu/packages/python-xyz.scm | 47 ++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 989474ae5c..d63b71c14e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -60,7 +60,7 @@ ;;; Copyright © 2019 Sam ;;; Copyright © 2019 Jack Hill ;;; Copyright © 2019, 2020 Guillaume Le Vaillant -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019 Pierre Langlois ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2019 Giacomo Leidi @@ -4642,30 +4642,33 @@ as the original project seems to have been abandoned circa 2007.") (package-with-python2 python-socksipy-branch)) (define-public python-socksipychain - (package - (name "python-socksipychain") - (version "2.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pagekite/PySocksipyChain.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0idm9a050rd2kbgbz2sk9ib9589kj4xh1xdnggs6xbq2v2y8f6zn")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Tests try to access the network. - (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") - (synopsis "Python SOCKS module with chained proxies support") - (description - "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which + (let ((commit "eb5ee8741ce006ac0c5c3e2e83204062c348c155") + (revision "1") + (version "2.1.1")) + (package + (name "python-socksipychain") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pagekite/PySocksipyChain.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fpphn6xnpm7qk8a914s4abycsbq9w6qkci07my632v0fylnm5n7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; Tests try to access the network. + (home-page "http://pagekite.net/wiki/Floss/PySocksipyChain/") + (synopsis "Python SOCKS module with chained proxies support") + (description + "SocksiPyChain is a modified version of the SocksiPy SOCKS module, which adds support for arbitrary chaining of proxy servers and various modes of TLS/SSL encryption. It was developed for use in PageKite, and also includes a simple netcat replacement with chaining support.") - (license license:bsd-3))) + (license license:bsd-3)))) (define-public python-pycodestyle (package -- cgit v1.2.3 From 54cf5e2a35dece248d6c427d69a79bce90d09a70 Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 28 Mar 2020 09:08:16 -0500 Subject: gnu: pagekite: Update to 1.5.0.200327. * gnu/packages/networking.scm (pagekite): Update to 1.5.0.200327. --- gnu/packages/networking.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 7d81b449c1..6a7b0739dd 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -32,7 +32,7 @@ ;;; Copyright © 2019 Timotej Lazar ;;; Copyright © 2019 Brice Waegeneire ;;; Copyright © 2019 Tonton -;;; Copyright © 2019 Alex Griffin +;;; Copyright © 2019, 2020 Alex Griffin ;;; Copyright © 2019 Jan Wielkiewicz ;;; Copyright © 2019 Daniel Schaefer ;;; Copyright © 2019 Diego N. Barbato @@ -2790,7 +2790,7 @@ module @code{batman-adv}, for Layer 2.") (define-public pagekite (package (name "pagekite") - (version "1.5.0.191126") + (version "1.5.0.200327") (source (origin (method git-fetch) @@ -2799,7 +2799,7 @@ module @code{batman-adv}, for Layer 2.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0mncfjfrr13sm84g5z49qxg5cy791h5qxphjsl77x91zs3m36c8l")))) + (base32 "1vw7kjwxqd3qvm7kpxgjzl6797y0i1f16yfkfad84qpx2ij0gvdm")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From e4257138fe1d924c56c9979b75319585b9251fb7 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 28 Mar 2020 11:34:54 -0400 Subject: Revert "gnu: gnupg: Use ~/.guix-profile/bin/pinentry by default." This commit didn't work: https://issues.guix.gnu.org/issue/24076#13 This reverts commit c7af9d0b5ebaa1fdb08ff5d8a56004998bcd8103. --- gnu/local.mk | 1 - gnu/packages/gnupg.scm | 5 ++--- gnu/packages/patches/gnupg-default-pinentry.patch | 15 --------------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 gnu/packages/patches/gnupg-default-pinentry.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 60d6d912f5..52c65f0c31 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -973,7 +973,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ - %D%/packages/patches/gnupg-default-pinentry.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index fc5b4fbc63..856c01a6d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.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 Ludovic Courtès ;;; Copyright © 2013, 2015, 2018 Andreas Enge ;;; Copyright © 2014, 2018 Eric Bavier ;;; Copyright © 2014, 2015, 2016 Mark H Weaver @@ -254,8 +254,7 @@ compatible to GNU Pth.") ".tar.bz2")) (sha256 (base32 - "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")) - (patches (search-patches "gnupg-default-pinentry.patch")))) + "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch deleted file mode 100644 index 272f4b53dc..0000000000 --- a/gnu/packages/patches/gnupg-default-pinentry.patch +++ /dev/null @@ -1,15 +0,0 @@ -Default to the pinentry program installed in ~/.guix-profile. - -diff --git a/common/homedir.c b/common/homedir.c -index e9e75d0..74e0aaf 100644 ---- a/common/homedir.c -+++ b/common/homedir.c -@@ -968,7 +968,7 @@ get_default_pinentry_name (int reset) - } names[] = { - /* The first entry is what we return in case we found no - other pinentry. */ -- { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, -+ { gnupg_homedir, "/.guix-profile/bin/pinentry" }, - #ifdef HAVE_W32_SYSTEM - /* Try Gpg4win directory (with bin and without.) */ - { w32_rootdir, "\\..\\Gpg4win\\bin\\pinentry.exe" }, -- cgit v1.2.3 From 619edce5cd3e84b7a8012955039cbac0c4e24c21 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 28 Mar 2020 21:07:08 +0300 Subject: gnu: youtube-viewer: Add missing comment. This is a follow-up to 315b98b9eb71e1a56de6a49ffbfed0af3c92be7e. * gnu/packages/video.scm (youtube-viewer)[arguments]: Add comment explaining why we don't install the gtk3 variant. --- gnu/packages/video.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ca8605a1a..227c11d1fa 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1860,6 +1860,8 @@ audio, images) from the Web. It can use either mpv or vlc for playback.") `(#:modules ((guix build perl-build-system) (guix build utils) (srfi srfi-26)) + ;; gtk-2/3 variants are both installed by default but the gtk3 variant + ;; is broken without perl-gtk3. #:module-build-flags '("--gtk2") #:phases (modify-phases %standard-phases -- cgit v1.2.3 From 043c3d64994b00701ba43d4d799e2cedd88eac8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 28 Mar 2020 20:03:50 +0100 Subject: gnu: KOrganizer: Fix typo in description. * gnu/packages/kde-pim.scm (korganizer)[description]: clanedaring -> calendaring. --- gnu/packages/kde-pim.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index bf962859b9..1b99ae1de4 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1571,7 +1571,7 @@ functionality to help you organize your life.") Kontact. It provides management of events and tasks, alarm notification, web export, network transparent handling of data, group scheduling, import and export of calendar files and more. It is able to work together with a wide -variety of clanedaring services, including NextCloud, Kolab, Google Calendar +variety of calendaring services, including NextCloud, Kolab, Google Calendar and others. KOrganizer is fully customizable to your needs and is an integral part of the Kontact suite, which aims to be a complete solution for organizing your personal data. KOrganizer supports the two dominant standards for storing -- cgit v1.2.3 From 255fb17b25f57be01cea246f8ec8a9989a13ea5a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Mar 2020 21:27:33 +0100 Subject: gnu: armadillo: Fix typo in description. * gnu/packages/maths.scm (armadillo): Fix spaces after "eg.". --- 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 51dcc1b1ee..bd52fbc2ed 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3125,7 +3125,7 @@ directly in C++, or quick conversion of research code into production environments. It can be used for machine learning, pattern recognition, signal processing, bioinformatics, statistics, econometrics, etc. The library provides efficient classes for vectors, matrices and cubes, as well as 150+ -associated functions (eg. contiguous and non-contiguous submatrix views).") +associated functions (e.g., contiguous and non-contiguous submatrix views).") (license license:asl2.0))) (define-public muparser -- cgit v1.2.3 From c2cf286c62933d2806ae17b8287520820bf87c7e Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Sat, 28 Mar 2020 16:23:32 -0400 Subject: Update email address and Savannah handle for Amin Bandali. * .mailmap, gnu/local.mk, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/fonts.scm, gnu/packages/fpga.scm, gnu/packages/lean.scm, gnu/packages/maths.scm, gnu/packages/pulseaudio.scm: Update my email address. * build-aux/git-authenticate.scm: Update my Savannah handle. --- .mailmap | 2 +- build-aux/git-authenticate.scm | 6 +++--- gnu/local.mk | 2 +- gnu/packages/emacs-xyz.scm | 2 +- gnu/packages/emacs.scm | 2 +- gnu/packages/fonts.scm | 2 +- gnu/packages/fpga.scm | 2 +- gnu/packages/lean.scm | 2 +- gnu/packages/maths.scm | 2 +- gnu/packages/pulseaudio.scm | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/.mailmap b/.mailmap index a1cbf02030..97018775f6 100644 --- a/.mailmap +++ b/.mailmap @@ -6,7 +6,7 @@ Al McElrath Alex Sassmannshausen Alexander I. Grafov Alírio Eyng -Amin Bandali +Amin Bandali Amirouche Boubekki Andreas Enge Andreas Enge diff --git a/build-aux/git-authenticate.scm b/build-aux/git-authenticate.scm index 514d201c80..37e0c6800c 100644 --- a/build-aux/git-authenticate.scm +++ b/build-aux/git-authenticate.scm @@ -61,6 +61,9 @@ ("atheia" ;; primary: "3B12 9196 AE30 0C3C 0E90 A26F A715 5567 3271 9948" "9A2B 401E D001 0650 1584 BAAC 8BC4 F447 6E8A 8E00") + ("bandali" + ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" + "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("bavier" ;; primary: "34FF 38BC D151 25A6 E340 A0B5 3453 2F9F AFCA 8B8E" "A0C5 E352 2EF8 EF5C 64CD B7F0 FD73 CAC7 19D3 2566") @@ -133,9 +136,6 @@ "B051 5948 F1E7 D3C1 B980 38A0 2646 FA30 BACA 7F08") ("lsl88" "2AE3 1395 932B E642 FC0E D99C 9BED 6EDA 32E5 B0BC") - ("mab" - ;; primary: "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103" - "39B3 3C8D 9448 0D2D DCC2 A498 8B44 A0CD C7B9 56F2") ("marusich" "CBF5 9755 CBE7 E7EF EF18 3FB1 DD40 9A15 D822 469D") ("mbakke" diff --git a/gnu/local.mk b/gnu/local.mk index 52c65f0c31..b8649b39b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -25,7 +25,7 @@ # Copyright © 2019 Jonathan Brielmaier # Copyright © 2019 Evan Straw # Copyright © 2019 Brett Gilio -# Copyright © 2019 Amin Bandali +# Copyright © 2019 Amin Bandali # Copyright © 2020 Brendan Tildesley # Copyright © 2020 Vincent Legoll # diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 86033fd200..8324ad6d71 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2019 Baptiste Strazzulla ;;; Copyright © 2019 Giacomo Leidi ;;; Copyright © 2019 Jens Mølgaard -;;; Copyright © 2019, 2020 Amin Bandali +;;; Copyright © 2019, 2020 Amin Bandali ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index de19998a41..ec8de7373b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2019 Jesse John Gildersleve ;;; Copyright © 2019 Valentin Ignatev ;;; Copyright © 2019 Leo Prikler -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 5fb6bbbe18..8eb4b689d9 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2019 Alva ;;; Copyright © 2019 Alexandros Theodotou ;;; Copyright © 2020 Damien Cassou -;;; Copyright © 2020 Amin Bandali +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 8f34ef8282..f01681024f 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 Danny Milosavljevic ;;; Copyright © 2016, 2017 Theodoros Foradis ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/lean.scm b/gnu/packages/lean.scm index e71b4c93ae..235113d475 100644 --- a/gnu/packages/lean.scm +++ b/gnu/packages/lean.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019 Amin Bandali +;;; Copyright © 2019 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bd52fbc2ed..028f0e6ef9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -29,7 +29,7 @@ ;;; Copyright © 2018 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller -;;; Copyright © 2018 Amin Bandali +;;; Copyright © 2018 Amin Bandali ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019 Steve Sprang ;;; Copyright © 2019 Robert Smith diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 0c09b51744..c2853dcd82 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2018 Pierre Langlois ;;; Copyright © 2019 Alex Griffin -;;; Copyright © 2020 Amin Bandali +;;; Copyright © 2020 Amin Bandali ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 735a8d997a92518d7d19926e1c8a1e385a98fdce Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sat, 28 Mar 2020 21:33:16 +0100 Subject: gnu: emacs-csv: Use proper Texinfo markup in description. * gnu/packages/emacs-xyz.scm (emacs-csv)[description]: Use proper Texinfo markup. --- gnu/packages/emacs-xyz.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 8324ad6d71..9d40b8019e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21652,9 +21652,11 @@ supports generation of phonetic and numeric passwords.") "1vmazjrfcsa9aa9aw8bq5sazdhqvhxyj837dyw5lmh8gk7z0xdaa")))) (build-system emacs-build-system) (synopsis "Elisp functions for reading and parsing CSV files") - (description "@code{csv.el} provides functions for reading and parsing CSV (Comma -Separated Value) files. It follows the format as defined in RFC 4180 \"Common -Format and MIME Type for CSV Files\" (@url{http://tools.ietf.org/html/rfc4180}).") + (description + "@code{csv.el} provides functions for reading and parsing @acronym{CSV, +Comma-Separated Values} files. It follows the format as defined in RFC 4180 +@emph{Common Format and MIME Type for CSV +Files} (@url{http://tools.ietf.org/html/rfc4180}).") (license license:gpl3+))) (define-public emacs-org-journal -- cgit v1.2.3 From 62b9ad19e3a6638f8e077753454fdf08ba586146 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Tue, 17 Mar 2020 16:04:51 +0100 Subject: gnu: Add wol. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/networking.scm (wol): New public variable. Signed-off-by: Jakub Kądziołka --- gnu/packages/networking.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 6a7b0739dd..ec2f0b64bd 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2908,6 +2908,24 @@ Such interfaces are useful for VPN software, virtualization, emulation, simulation, and a number of other applications.") (license license:gpl2))) +(define-public wol + (package + (name "wol") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/wake-on-lan/wol/" + version "/wol-" version ".tar.gz")) + (sha256 + (base32 "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270")))) + (build-system gnu-build-system) + (home-page "https://sourceforge.net/projects/wake-on-lan/") + (synopsis "Implements Wake On LAN functionality in a small program") + (description "Tool to send a magic packet to wake another host on the +network. This must be enabled on the target host, usually in the BIOS.") + (license license:gpl2))) + (define-public vde2 (package (name "vde2") -- cgit v1.2.3