From 7de409c2b51d4999abe9fdea8114649395962d93 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Nov 2021 09:20:56 +0200 Subject: gnu: ffmpeg: Update to 4.4.1. * gnu/packages/video.scm (ffmpeg): Update to 4.4.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1aed38a81e..f97d358156 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1510,14 +1510,14 @@ operate properly.") (define-public ffmpeg (package (name "ffmpeg") - (version "4.4") + (version "4.4.1") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "02fr8mvf2agwmyb9q2bmh9p09gpz3xxmpcbbbj8iydz57hc0mc86")))) + "00hfwd8ld6jnd26pl9f0wcd2mag4zacxxgqgabsja2xkkagavnza")))) (build-system gnu-build-system) (inputs `(("dav1d" ,dav1d) -- cgit 1.4.1 From aa58fb5cf39f29f0bde1f91b4fcdd3832231a93d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Nov 2021 09:20:59 +0200 Subject: gnu: ffmpeg-3.4: Update to 3.4.9. * gnu/packages/video.scm (ffmpeg-3.4): Update to 3.4.9. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f97d358156..95028be075 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1704,14 +1704,14 @@ audio/video codec library.") (define-public ffmpeg-3.4 (package (inherit ffmpeg) - (version "3.4.7") + (version "3.4.9") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "1j7mdk9szrljgv4sdx69bm1pnbb3cldbdxbkr42jbdi9zn11gl7g")))) + "0d8nkd9c85rkjlgsq1hidmykkrksi883ygqzhhj6wh4nqflv8vs9")))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg) ((#:modules modules %gnu-build-system-modules) -- cgit 1.4.1 From e53e0d08f775dc7f8eee687d099a8843bc702dd9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Nov 2021 09:21:00 +0200 Subject: gnu: ffmpeg-2.8: Update to 2.8.18. * gnu/packages/video.scm (ffmpeg-2.8): Update to 2.8.18. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 95028be075..d37654a109 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1731,14 +1731,14 @@ audio/video codec library.") (define-public ffmpeg-2.8 (package (inherit ffmpeg) - (version "2.8.16") + (version "2.8.18") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "14n0xg22yz1r4apif2idm91s3avcmkz4sl8gyj5763gcy415k2bb")))) + "0k6dq7b8rpjvdl5ncf1135qwc36x0x9va8v83aggvbfhy5d97vwn")))) (arguments `(#:tests? #f ; XXX: Enable them later, if required #:configure-flags -- cgit 1.4.1 From e6a9e7d3c3b9580d8f041482a4bd2401be77335a Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 7 Nov 2021 23:38:14 -0500 Subject: gnu: stagit: Update to 0.9.6. * gnu/packages/version-control.scm (stagit): Update to 0.9.6. [source]: Update fetch method and location of source repository. [home-page]: Update home page. Signed-off-by: Efraim Flashner --- gnu/packages/version-control.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 064212db9f..04b4c5ec0a 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2643,14 +2643,16 @@ a built-in wiki, built-in file browsing, built-in tickets system, etc.") (define-public stagit (package (name "stagit") - (version "0.7.2") + (version "0.9.6") (source (origin - (method url-fetch) - (uri (string-append "https://dl.2f30.org/releases/" - name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "git://git.codemadness.org/stagit") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "1m3s9g1z9szbjrhm8sic91xh6f2bfpi56rskdkqd5wc4wdycpyi5")))) + "0hcf1rmsp9s6jjg1dypq7sa3dqmqg2q3x1kj23rb5gwrsb31vyfj")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests @@ -2661,7 +2663,7 @@ a built-in wiki, built-in file browsing, built-in tickets system, etc.") (delete 'configure)))) ; No configure script (inputs `(("libgit2" ,libgit2))) - (home-page "https://2f30.org/") + (home-page "https://git.codemadness.org/stagit/") (synopsis "Static git page generator") (description "Stagit creates static pages for git repositories, the results can be served with a HTTP file server of your choice.") -- cgit 1.4.1 From 56dcaff82733149697047f05836f0498b1fde17a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Nov 2021 09:28:56 +0200 Subject: gnu: stagit: Prepare for cross-compiling. * gnu/packages/version-control.scm (stagit)[arguments]: Use cc-for-target. --- gnu/packages/version-control.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 04b4c5ec0a..6c4b74f9d2 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2656,7 +2656,7 @@ a built-in wiki, built-in file browsing, built-in tickets system, etc.") (build-system gnu-build-system) (arguments `(#:tests? #f ; No tests - #:make-flags (list "CC=gcc" + #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases -- cgit 1.4.1 From 27b0e71ecdfb747fe42b9d0708e5c8f2f3ed4c17 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Oct 2021 02:51:31 +0000 Subject: gnu: python-pytest-astropy: Adjust inputs. * gnu/packages/python-check.scm (python-pytest-astropy)[arguments]: Add new phase to skip a version check bug. [native-inputs]: Remove python-pytest. Move python-hypothesis, python-pytest-arraydiff, python-pytest-astropy-header, python-pytest-cov, python-pytest-filter-subpackage, python-pytest-openfiles, python-pytest-remotedata to ... [propagated-inputs]: ... here. Signed-off-by: Efraim Flashner --- gnu/packages/python-check.scm | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index a13bd0baa4..5b230934a5 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -341,21 +341,28 @@ Astropy project, but is optimized for use with astropy-related projects.") (base32 "18j6z6y2fvykmcs5z0mldhhaxxn6wzpnhlm2ps7m8r5z5kmh1631")))) (build-system python-build-system) (arguments - ;; No tests provided - '(#:tests? #f)) + `(#:tests? #f ; there are no tests + #:phases + (modify-phases %standard-phases + ;; There is a bug somewhere that makes pytest-filter-subpackage appear + ;; as version 0.0.0 to setup.py. Remove it from the requirements. + (add-after 'unpack 'remove-requirement + (lambda _ + (substitute* "setup.cfg" + ((".*pytest-filter-subpackage.*") ""))))))) (native-inputs - `(("attrs" ,python-attrs) - ("hypothesis" ,python-hypothesis) - ("pytest" ,python-pytest) - ("pytest-arraydiff" ,python-pytest-arraydiff) - ("pytest-astropy-header" ,python-pytest-astropy-header) - ("pytest-cov" ,python-pytest-cov) - ("pytest-doctestplus" ,python-pytest-doctestplus) - ("pytest-filter-subpackage" ,python-pytest-filter-subpackage) - ("pytest-mock" ,python-pytest-mock) - ("pytest-openfiles" ,python-pytest-openfiles) - ("pytest-remotedata" ,python-pytest-remotedata) - ("setuptools-scm" ,python-setuptools-scm))) + `(("python-attrs" ,python-attrs) + ("python-pytest-mock" ,python-pytest-mock) + ("python-setuptools-scm" ,python-setuptools-scm))) + (propagated-inputs + `(("python-hypothesis" ,python-hypothesis) + ("python-pytest-arraydiff" ,python-pytest-arraydiff) + ("python-pytest-astropy-header" ,python-pytest-astropy-header) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pytest-doctestplus" ,python-pytest-doctestplus) + ("python-pytest-filter-subpackage" ,python-pytest-filter-subpackage) + ("python-pytest-openfiles" ,python-pytest-openfiles) + ("python-pytest-remotedata" ,python-pytest-remotedata))) (home-page "https://github.com/astropy/pytest-astropy") (synopsis "Metapackage for all the testing machinery used by the Astropy Project") -- cgit 1.4.1 From a16867950994a16b6d5b0d4f9e64c4738e7de654 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Oct 2021 02:51:32 +0000 Subject: gnu: python-pyerfa: Adjust inputs. * gnu/packages/astronomy.scm (python-pyerfa)[inputs]: Move python-numpy to ... [propagated-inputs]: ... here. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 1fb6f5a38b..e5f14ba740 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 R Veera Kumar ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sharlatan Hellseher +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -1005,12 +1006,13 @@ JPL ephemerides use to predict raw (x,y,z) planetary positions.") (setenv "PYERFA_USE_SYSTEM_LIBERFA" "1") #t))))) (native-inputs - `(("pytest" ,python-pytest) - ("setuptools-scm" ,python-setuptools-scm) - ("pytest-doctestplus" ,python-pytest-doctestplus))) + `(("pytest-doctestplus" ,python-pytest-doctestplus) + ("python-pytest" ,python-pytest) + ("python-setuptools-scm" ,python-setuptools-scm))) (inputs - `(("liberfa" ,erfa) - ("numpy" ,python-numpy))) + `(("liberfa" ,erfa))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) (home-page "https://github.com/liberfa/pyerfa") (synopsis "Python bindings for ERFA") (description -- cgit 1.4.1 From 9371cf2138711ea7305951d82c5cf0b36ac4d6f1 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 30 Oct 2021 02:51:33 +0000 Subject: gnu: Add python-astropy. This patch was co-authored with Vinicius Monego. * gnu/packages/astronomy.scm (python-astropy): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/astronomy.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index e5f14ba740..51fe9faff9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages video) #:use-module (gnu packages xiph) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -613,6 +614,100 @@ accurately in real time at any rate desired.") `(#:configure-flags '("-DENABLE_GTK=ON" "-DENABLE_QT=OFF") #:tests? #f)))) +(define-public python-astropy + (package + (name "python-astropy") + (version "4.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "astropy" version)) + (sha256 + (base32 "0lfd6n7v7kas4wvacddnwgccax3ks908735dzilg7dsf7ci52f9d")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove Python bundles. + (with-directory-excursion "astropy/extern" + (for-each delete-file-recursively '("ply" "configobj"))) + ;; Remove cextern bundles and leave the wcslib bundle. Astropy + ;; upgrades to different versions of wcslib every few releases + ;; and tests break every upgrade. + ;; TODO: unbundle wcslib. + (with-directory-excursion "cextern" + (for-each delete-file-recursively '("cfitsio" "expat"))) + #t)))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'preparations + (lambda _ + ;; Use our own libraries in place of bundles, with the + ;; exception of wcslib. + (setenv "ASTROPY_USE_SYSTEM_CFITSIO" "1") + (setenv "ASTROPY_USE_SYSTEM_EXPAT" "1") + ;; Some tests require a writable home. + (setenv "HOME" "/tmp") + ;; Relax xfail tests. + (substitute* "setup.cfg" + (("xfail_strict = true") "xfail_strict = false")) + ;; Replace all references to external ply. + (let ((ply-files '("coordinates/angle_formats.py" + "utils/parsing.py"))) + (with-directory-excursion "astropy" + (map (lambda (file) + (substitute* file (("astropy.extern.ply") + "ply"))) + ply-files))) + ;; Replace reference to external configobj. + (with-directory-excursion "astropy/config" + (substitute* "configuration.py" + (("from astropy.extern.configobj ") ""))))) + ;; This file is opened in both install and check phases. + (add-before 'install 'writable-compiler + (lambda _ (make-file-writable "astropy/_compiler.c"))) + (add-before 'check 'writable-compiler + (lambda _ (make-file-writable "astropy/_compiler.c"))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + ;; Extensions have to be rebuilt before running the tests. + (invoke "python" "setup.py" "build_ext" "--inplace") + (invoke "python" "-m" "pytest" "--pyargs" "astropy" + ;; Skip tests that need remote data. + "-m" "not remote_data"))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("python-coverage" ,python-coverage) + ("python-cython" ,python-cython) + ("python-extension-helpers" ,python-extension-helpers) + ("python-ipython" ,python-ipython) + ("python-jplephem" ,python-jplephem) + ("python-objgraph" ,python-objgraph) + ("python-pytest" ,python-pytest) + ("python-pytest-astropy" ,python-pytest-astropy) + ("python-pytest-xdist" ,python-pytest-xdist) + ("python-setuptools-scm" ,python-setuptools-scm) + ("python-sgp4" ,python-sgp4) + ("python-skyfield" ,python-skyfield))) + (inputs + `(("cfitsio" ,cfitsio) + ("expat" ,expat))) + (propagated-inputs + `(("python-configobj" ,python-configobj) + ("python-numpy" ,python-numpy) + ("python-ply" ,python-ply) + ("python-pyerfa" ,python-pyerfa))) + (home-page "https://www.astropy.org/") + (synopsis "Core package for Astronomy in Python") + (description + "Astropy is a single core package for Astronomy in Python. It contains +much of the core functionality and some common tools needed for performing +astronomy and astrophysics.") + (license license:bsd-3))) + (define-public libnova (package (name "libnova") -- cgit 1.4.1 From 6ec0c6c7678234ff5ab4c892903e0b682cbd876d Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Nov 2021 18:50:57 +0000 Subject: gnu: Add cl-alloy. * gnu/packages/lisp-xyz.scm (sbcl-alloy, cl-alloy, ecl-alloy): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 53911487ac..778b48995d 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -17575,6 +17575,44 @@ fit together as required by any particular game.") (define-public cl-trial (sbcl-package->cl-source-package sbcl-trial)) +(define-public sbcl-alloy + (let ((commit "e86e22c2887836ec31cd97e039f0bca5248d8f1c") + (revision "1")) + (package + (name "sbcl-alloy") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Shirakumo/alloy") + (commit commit))) + (file-name (git-file-name "alloy" version)) + (sha256 + (base32 "1jsqjr6sf86hcdvnjp4gd10qv0r7kfkr9hmda85irb5lha4q9n7w")))) + (build-system asdf-build-system/sbcl) + (native-inputs + `(("alexandria" ,sbcl-alexandria) + ("parachute" ,sbcl-parachute))) + (inputs + `(("array-utils" ,sbcl-array-utils) + ("closer-mop" ,sbcl-closer-mop) + ("documentation-utils" ,sbcl-documentation-utils))) + (home-page "https://shirakumo.github.io/alloy/") + (synopsis + "Common Lisp user interface protocol and toolkit implementation") + (description + "Alloy is a user interface toolkit. It is defined through a set of +protocols that allow for a clear interface, as well as a standardised way to +integrate Alloy into a target backend.") + (license license:zlib)))) + +(define-public ecl-alloy + (sbcl-package->ecl-package sbcl-alloy)) + +(define-public cl-alloy + (sbcl-package->cl-source-package sbcl-alloy)) + (define-public sbcl-org-sampler (let ((commit "ee135a417750e5b1d810bb9574eb85223cb3038a") (revision "1")) -- cgit 1.4.1 From 07a68587b0e00a7b7c231d1360bbc5fb47fc51bf Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Nov 2021 19:40:06 +0000 Subject: gnu: Add cl-kaputt. * gnu/packages/lisp-check.scm: (sbcl-kaputt, cl-kaputt, ecl-kaputt): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-check.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index ca00e5054e..dda0705e60 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -396,6 +396,47 @@ with a focus on interactive development.") (define-public ecl-hu.dwim.stefil (sbcl-package->ecl-package sbcl-hu.dwim.stefil)) +(define-public sbcl-kaputt + (let ((commit "f26c9b0f8219fe61d86249198ef85174eecafc10") + (revision "1")) + (package + (name "sbcl-kaputt") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/foretspaisibles/cl-kaputt") + (commit commit))) + (file-name (git-file-name "kaputt" version)) + (sha256 + (base32 "10a78032vnf12kjjpfmq9ign38cad237ycyq37dwnx922nxjjaj4")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-ppcre" ,sbcl-cl-ppcre))) + (home-page "https://github.com/foretspaisibles/cl-kaputt") + (synopsis "Simple interactive test framework for Common Lisp") + (description + "KAPUTT is a test framework for Common Lisp that focuses on the +following features: + +@itemize +@item KAPUTT is simple, it only defines three abstractions testcase, assertion +and protocol and does not add any artefact on the backtrace when errors occur. + +@item KAPUTT is extensible, it is possible to add problem-specific assertions +to make test code more informative. + +@item KAPUTT fits well interactive development. +@end itemize\n") + (license license:cecill-b)))) + +(define-public ecl-kaputt + (sbcl-package->ecl-package sbcl-kaputt)) + +(define-public cl-kaputt + (sbcl-package->cl-source-package sbcl-kaputt)) + (define-public sbcl-lift (let ((commit "2594160d6ca3a77d8750110dfa63214256aab852") (revision "2")) -- cgit 1.4.1 From 0502be5bafc7fa1b65fa4aaaf417c5653a89bb6a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sun, 7 Nov 2021 19:53:40 +0000 Subject: gnu: cl-fiasco: Update to 0.0.1-2.bb47d2f. * gnu/packages/lisp-check.scm: (sbcl-fiasco): Update to 0.0.1-2.bb47d2f. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-check.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-check.scm b/gnu/packages/lisp-check.scm index dda0705e60..a66a7ba47e 100644 --- a/gnu/packages/lisp-check.scm +++ b/gnu/packages/lisp-check.scm @@ -298,8 +298,8 @@ that of Eos has not. Thus, Eos is now deprecated in favor of FiveAM.") (sbcl-package->ecl-package sbcl-eos)) (define-public sbcl-fiasco - (let ((commit "d62f7558b21addc89f87e306f65d7f760632655f") - (revision "1")) + (let ((commit "bb47d2fef4eb24cc16badc1c9a73d73c3a7e18f5") + (revision "2")) (package (name "sbcl-fiasco") (version (git-version "0.0.1" revision commit)) @@ -312,7 +312,7 @@ that of Eos has not. Thus, Eos is now deprecated in favor of FiveAM.") (file-name (git-file-name "fiasco" version)) (sha256 (base32 - "1zwxs3d6iswayavcmb49z2892xhym7n556d8dnmvalc32pm9bkjh")))) + "1k8i2kq57201bvy3zfpsxld530hd104dgbglxigqb6i408c1a7aw")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit 1.4.1 From f52719dfad7b7d3beb2b1211b6846196f3590823 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 13 Oct 2021 00:36:36 -0400 Subject: gnu: Add python-giturlparse. * gnu/packages/python-web.scm (python-giturlparse): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6887944d21..d181046ac4 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -6049,6 +6049,23 @@ over IMAP: @end itemize") (license license:asl2.0))) +(define-public python-giturlparse + (package + (name "python-giturlparse") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "giturlparse" version)) + (sha256 + (base32 "0dxk7sqy8ibaqdl6jzxd0ac1p7shzp4p9f3lhkd7qw9h3llsp595")))) + (build-system python-build-system) + (home-page "https://github.com/nephila/giturlparse") + (synopsis "Git URL parsing module") + (description "This package provides a git URL parsing module which supports +parsing and rewriting of remote git URLs from various hosting providers.") + (license license:asl2.0))) + (define-public python-hstspreload (package (name "python-hstspreload") -- cgit 1.4.1 From a7c0698c888c2fb8ccc61cc6bc088524ef41828a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Nov 2021 20:10:36 -0500 Subject: gnu: linux-libre 5.14: Update to 5.14.17. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.17. (linux-libre-5.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 949d415db1..aec8551275 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -347,7 +347,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.14-version "5.14.16") +(define-public linux-libre-5.14-version "5.14.17") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -357,7 +357,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "005wis2y5dhksb6n0r4p3xjldppmdnd360dhxa04rfc4z2qwn3f3"))) + (hash (base32 "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) -- cgit 1.4.1 From 66250eabf64666b39466ab5e4984f4534d358a7e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Nov 2021 21:34:34 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.78. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.78. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aec8551275..03bfb98811 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,7 +365,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.77") +(define-public linux-libre-5.10-version "5.10.78") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -375,7 +375,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1hwgbcfv9wfx9ka25lsqjrnzskynfgmswcyp5vk14wnxq7glxdnk"))) + (hash (base32 "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From 6b2d9fa9c440a1e890cd195ed661fdf466dd720f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Nov 2021 21:34:58 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.158. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.158. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 03bfb98811..b51440f301 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,7 +380,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.157") +(define-public linux-libre-5.4-version "5.4.158") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0jl62j22vs59bc90mvzavv0ii9hvk436pbnrpqf3x9f8nfybngwz"))) + (hash (base32 "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From 2d2f50b30c4f9a8afd1279a6b97d400802086b04 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 7 Nov 2021 21:35:17 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.216. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.216. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b51440f301..f61092037d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.215") +(define-public linux-libre-4.19-version "4.19.216") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -405,7 +405,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1czjqa5wbsmzgl7wwqlp9qbdig45ibq11m9pcykrjaclrgwn884y"))) + (hash (base32 "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From b6e1ba61042c14c9391514472e436e29b2a5167d Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 8 Nov 2021 04:26:04 +0000 Subject: gnu: libavif: Restrict dependency on rav1e to x86_64. * gnu/packages/image.scm (libavif)[arguments]<#:configure-flags>: Pass "-DAVIF_CODEC_RAV1E=ON" only on x84_64. <#:phases>: Don't return #t. [inputs]: Add rav1e only on x86_64. Signed-off-by: Leo Famulari --- gnu/packages/image.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index fc021dd2db..ff3963e6f5 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -2182,7 +2182,11 @@ This package can be used to create @code{favicon.ico} files for web sites.") (build-system cmake-build-system) (arguments `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON" - "-DAVIF_CODEC_RAV1E=ON" + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '("-DAVIF_CODEC_RAV1E=ON") + '()) "-DAVIF_BUILD_TESTS=ON") #:phases (modify-phases %standard-phases @@ -2193,12 +2197,16 @@ This package can be used to create @code{favicon.ico} files for web sites.") (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/libavif-" ,version))) - (install-file "../source/README.md" doc) - #t)))))) + (install-file "../source/README.md" doc))))))) (inputs `(("dav1d" ,dav1d) ("libaom" ,libaom) - ("rav1e" ,rav1e))) + ;; XXX: rav1e depends on rust, which currently only works on x86_64. + ;; See also the related configure flag when changing this. + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("rav1e" ,rav1e)) + '()))) (synopsis "Encode and decode AVIF files") (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image File Format}. It can encode and decode all YUV formats and bit depths supported -- cgit 1.4.1 From 782ec059266548fe11da3a5704441a6118d0c762 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Oct 2021 17:30:46 +0000 Subject: gnu: python-hypercorn: Remove "python-" prefix from name. Hypercorn is mainly a CLI application but also supports a module interface. * gnu/packages/python-web.scm (python-hypercorn): New deprecated variable. (hypercorn): Renamed from the respective above. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index d181046ac4..e230408299 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1635,9 +1635,9 @@ choose to use, ensuring that you can communicate via WebSockets, as defined in RFC6455, regardless of your programming paradigm.") (license license:expat))) -(define-public python-hypercorn +(define-public hypercorn (package - (name "python-hypercorn") + (name "hypercorn") (version "0.10.2") (source (origin @@ -1653,6 +1653,7 @@ RFC6455, regardless of your programming paradigm.") (lambda* (#:key inputs outputs #:allow-other-keys) (add-installed-pythonpath inputs outputs) (invoke "pytest" "-vv")))))) + ;; Propagate because Hypercorn also exposes functionality over a module. (propagated-inputs `(("python-h11" ,python-h11) ("python-h2" ,python-h2) @@ -1677,6 +1678,9 @@ WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications. It can utilise asyncio, uvloop, or trio worker types.") (license license:expat))) +(define-public python-hypercorn + (deprecated-package "python-hypercorn" hypercorn)) + (define-public python-querystring-parser (package (name "python-querystring-parser") -- cgit 1.4.1 From 556a3ac3aff85d0737d5934f7567af388ae9ecba Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Oct 2021 17:30:47 +0000 Subject: gnu: hypercorn: Update to 0.11.2. * gnu/packages/python-web.scm (hypercorn): Update to 0.11.2. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index e230408299..70f740bc76 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1638,13 +1638,13 @@ RFC6455, regardless of your programming paradigm.") (define-public hypercorn (package (name "hypercorn") - (version "0.10.2") + (version "0.11.2") (source (origin (method url-fetch) (uri (pypi-uri "Hypercorn" version)) (sha256 - (base32 "15dgy47a18w2ls3hwykra1cyf7yzxmfjqnsqml482p12cxr2xwqr")))) + (base32 "16kai5d12f05jr89mj611zslxqri4cd7ixcgd6yhl211qlcyg8av")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From a6dc9f783f9da7beb0d93a761149b36d263ed6ce Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 30 Oct 2021 17:30:48 +0000 Subject: gnu: hypercorn: Honor #:tests? in 'check' phase. * gnu/packages/python-web.scm (hypercorn)[arguments]: Honor #:tests? in 'check' phase. Signed-off-by: Efraim Flashner --- gnu/packages/python-web.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 70f740bc76..608276325f 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1650,9 +1650,10 @@ RFC6455, regardless of your programming paradigm.") `(#:phases (modify-phases %standard-phases (replace 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-vv")))))) + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) ;; Propagate because Hypercorn also exposes functionality over a module. (propagated-inputs `(("python-h11" ,python-h11) -- cgit 1.4.1 From b43ad8400a7e25edbf5435c9f450fbf32366c880 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 21 Oct 2021 03:52:46 +0000 Subject: gnu: Add python-filetype. * gnu/packages/python-xyz.scm (python-filetype): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 8ba72170c0..c4c2fe2651 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11071,6 +11071,39 @@ your package is installed, via @code{pkg_resources} (part of @code{setuptools}).") (license license:gpl3+))) +(define-public python-filetype + (package + (name "python-filetype") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (pypi-uri "filetype" version)) + (sha256 + (base32 "05mkinkcn36v1cnb5hzay3zxmv7jmmflckxxp08rgzbkkf3i9pvp")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest" "-k" + (string-append + ;; Both tests fail with FileNotFoundError. + "not test_infer_zip_from_disk" + " and not test_infer_tar_from_disk")))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-benchmark" ,python-pytest-benchmark))) + (home-page "https://github.com/h2non/filetype.py") + (synopsis "Infer file type and MIME type of any file/buffer") + (description "@code{filetype} is a small and dependency free Python +package to infer file type and MIME type checking the magic numbers +signature of a file or buffer.") + (license license:expat))) + (define-public python-legacy-api-wrap (package (name "python-legacy-api-wrap") -- cgit 1.4.1 From 3a4107b28686ef256e0158f545f26b1d852ecb7b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 21 Oct 2021 03:52:47 +0000 Subject: gnu: Add python-immutabledict. * gnu/packages/python-xyz.scm (python-immutabledict): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c4c2fe2651..2ea157ad28 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9693,6 +9693,29 @@ applications.") "PyZMQ is the official Python binding for the ZeroMQ messaging library.") (license license:bsd-4))) +(define-public python-immutabledict + (package + (name "python-immutabledict") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "immutabledict" version)) + (sha256 + (base32 "0fpc4gbk7inpfbgdypsg6c18bmdjw8gwx47bjw0hvixn3gghxnqx")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ; no tests in PyPI release and no setup.py in GitHub + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/corenting/immutabledict") + (synopsis "Immutable wrapper around dictionaries") + (description + "@dfn{immutabledict} is an immutable wrapper around dictionaries. +It implements the complete mapping interface and can be used as a drop-in +replacement for dictionaries where immutability is desired.") + (license license:expat))) + (define-public python-pep8 ;; This package has been renamed to ‘pycodestyle’ and is no longer updated. ;; Its last release (1.7.1) adds only a scary warning to this effect, breaking -- cgit 1.4.1 From 2181133eed4d392db5ad533f5e22b0dbb1951f35 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 21 Oct 2021 03:52:48 +0000 Subject: gnu: Add python-emoji. * gnu/packages/python-xyz.scm (python-emoji): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2ea157ad28..2836cf799c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -9716,6 +9716,33 @@ It implements the complete mapping interface and can be used as a drop-in replacement for dictionaries where immutability is desired.") (license license:expat))) +(define-public python-emoji + (package + (name "python-emoji") + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "emoji" version)) + (sha256 + (base32 "0923mpixwq6hdpkgvi4r46alfvf608iq975rb8lnqpq29j71mmjk")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (home-page "https://github.com/carpedm20/emoji/") + (synopsis "Emoji terminal output for Python") + (description "This package provides Emoji terminal output for Python. The +entire set of Emoji codes as defined by the Unicode Consortium is supported in +addition to a bunch of aliases.") + (license license:bsd-3))) + (define-public python-pep8 ;; This package has been renamed to ‘pycodestyle’ and is no longer updated. ;; Its last release (1.7.1) adds only a scary warning to this effect, breaking -- cgit 1.4.1 From 71dc19d9cba0c8d03540ab62cf5390442c0f8948 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 21 Oct 2021 03:52:49 +0000 Subject: gnu: Add python-cachelib. * gnu/packages/python-xyz.scm (python-cachelib): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2836cf799c..6cf42f1109 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11154,6 +11154,25 @@ package to infer file type and MIME type checking the magic numbers signature of a file or buffer.") (license license:expat))) +(define-public python-cachelib + (package + (name "python-cachelib") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cachelib" version)) + (sha256 + (base32 "0vs7nimlbhqy9kjcc90nswkhs3kgl28ag19jssx9qwlcsrkmmsa7")))) + (build-system python-build-system) + (arguments + `(#:tests? #f)) ;no tests + (home-page "https://github.com/pallets/cachelib") + (synopsis "Collection of cache libraries") + (description "Cachelib is a library extracted from @code{werkzeug} which +provides a collection of cache libraries in the same API interface.") + (license license:bsd-3))) + (define-public python-legacy-api-wrap (package (name "python-legacy-api-wrap") -- cgit 1.4.1 From 590074a74973277599e848b59ad4089169d3a125 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Nov 2021 16:45:48 +0200 Subject: gnu: python-cachelib: Update to 0.4.1. * gnu/packages/python-xyz.scm (python-cachelib): Update to 0.4.1. [arguments]: Enable tests. [native-inputs]: Add python-pytest and python-pytest-xprocess. --- gnu/packages/python-xyz.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6cf42f1109..dfa2bb090c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11157,16 +11157,25 @@ signature of a file or buffer.") (define-public python-cachelib (package (name "python-cachelib") - (version "0.1.1") + (version "0.4.1") (source (origin (method url-fetch) (uri (pypi-uri "cachelib" version)) (sha256 - (base32 "0vs7nimlbhqy9kjcc90nswkhs3kgl28ag19jssx9qwlcsrkmmsa7")))) + (base32 "0p4chkvbvffcllsny5rpzmsq2vyr24ql3kzif4ha0fxp3fp7vqk8")))) (build-system python-build-system) (arguments - `(#:tests? #f)) ;no tests + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "pytest"))))))) + (native-inputs + `(("python-pytest" ,python-pytest) + ("python-pytest-xprocess" ,python-pytest-xprocess))) (home-page "https://github.com/pallets/cachelib") (synopsis "Collection of cache libraries") (description "Cachelib is a library extracted from @code{werkzeug} which -- cgit 1.4.1 From 9b14b26f0a04175ff33950a2ae4410149e52c470 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 20:56:21 +0100 Subject: gnu: packages: Remove last year's deprecations. * gnu/packages/admin.scm (guile3.0-shepherd): Remove variable. * gnu/packages/benchmark.scm (imb-openmpi): Likewise. * gnu/packages/boost.scm (boost-with-python3): Likewise. * gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly. * gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise. * gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly. * gnu/packages/cups.scm (escpr): Likewise. * gnu/packages/django.scm (python-django-jsonfield): Likewise. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme) (emacs-modus-vivendi-theme): Likewise. * gnu/packages/engineering.scm (kicad-i18l): Likewise. * gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise. * gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u): Likewise. * gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic): Likewise. * gnu/packages/game-development.scm (guile3.0-chickadee) (python-sge-pygame): Likewise. * gnu/packages/games.scm (retux)[inputs]: Adjust accordingly. * gnu/packages/gnome-xyz.scm (numix-theme): Likewise. * gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise. * gnu/packages/gstreamer.scm (gst-transcoder): Likewise. * gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg): Likewise. * gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark) (guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi) (guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics) (guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren) (guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted) (guile3.0-pfds, guile3.0-picture-language, guile3.0-semver) (guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight) (guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise. * gnu/packages/guile.scm (define-deprecated-guile3.0-package) (guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3) (guile3.0-bytestructures, guile3.0-git): Likewise. * gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise. * gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise. * gnu/packages/mail.scm (guile3.0-mailutils): Likewise. * gnu/packages/monitoring.scm (python2-graphite-web): Likewise. * gnu/packages/package-management.scm (guile3.0-guix): Likewise. * gnu/packages/package-management.scm (python-conda): Likewise. * gnu/packages/phabricator.scm (libphutil): Likewise. * gnu/packages/plotutils.scm (guile3.0-charting): Likewise. * gnu/packages/python-xyz.scm (python2-smmap2, python-glances) (python-smmap2): Likewise. * gnu/packages/shells.scm (oil-shell): Likewise. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise. * gnu/packages/ssh.scm (guile3.0-ssh): Likewise. * gnu/packages/terminals.scm (et): Likewise. * gnu/packages/tls.scm (guile3.0-gnutls): Likewise. * gnu/packages/vlang.scm (v): Likewise. * gnu/packages/vpn.scm (wireguard): Likewise. * gnu/packages/web-browsers.scm (next, sbcl-next): Likewise. * gnu/packages/xorg.scm (transset-df): Likewise. --- gnu/packages/admin.scm | 3 -- gnu/packages/benchmark.scm | 3 -- gnu/packages/boost.scm | 3 -- gnu/packages/cpp.scm | 3 -- gnu/packages/cups.scm | 3 -- gnu/packages/django.scm | 4 -- gnu/packages/emacs-xyz.scm | 6 --- gnu/packages/engineering.scm | 3 -- gnu/packages/enlightenment.scm | 3 -- gnu/packages/firmware.scm | 8 ---- gnu/packages/fonts.scm | 6 --- gnu/packages/game-development.scm | 6 --- gnu/packages/games.scm | 4 +- gnu/packages/gnome-xyz.scm | 3 -- gnu/packages/gnupg.scm | 3 -- gnu/packages/gstreamer.scm | 7 --- gnu/packages/gtk.scm | 9 ---- gnu/packages/guile-xyz.scm | 86 ------------------------------------- gnu/packages/guile.scm | 44 ------------------- gnu/packages/haskell-apps.scm | 3 -- gnu/packages/linux.scm | 3 -- gnu/packages/mail.scm | 3 -- gnu/packages/monitoring.scm | 3 -- gnu/packages/package-management.scm | 6 --- gnu/packages/pep.scm | 2 +- gnu/packages/phabricator.scm | 3 -- gnu/packages/plotutils.scm | 3 -- gnu/packages/python-xyz.scm | 9 ---- gnu/packages/shells.scm | 3 -- gnu/packages/sqlite.scm | 5 --- gnu/packages/ssh.scm | 3 -- gnu/packages/terminals.scm | 3 -- gnu/packages/tls.scm | 3 -- gnu/packages/vlang.scm | 4 -- gnu/packages/vpn.scm | 3 -- gnu/packages/web-browsers.scm | 6 --- gnu/packages/xorg.scm | 3 -- 37 files changed, 3 insertions(+), 272 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 7e560834b4..d24b068bd7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -313,9 +313,6 @@ interface and is based on GNU Guile.") `(("guile" ,guile-2.2) ("guile2.2-readline" ,guile2.2-readline))))) -(define-public guile3.0-shepherd - (deprecated-package "guile3.0-shepherd" shepherd)) - (define-public guile2.0-shepherd (package (inherit shepherd) diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 9741814c82..fdb00ca538 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -172,9 +172,6 @@ Efficiency of the MPI implementation. @end itemize") (license license:cpl1.0))) -(define-public imb-openmpi - (deprecated-package "imb-openmpi" intel-mpi-benchmarks/openmpi)) - (define-public multitime (package (name "multitime") diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index e05a3c32fe..19556dfdf9 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -295,9 +295,6 @@ across a broad spectrum of applications.") `(("python" ,python-2) ,@(alist-delete "python" (package-native-inputs boost)))))) -(define-public boost-with-python3 - (deprecated-package "boost-with-python3" boost)) - (define-public boost-static (package (inherit boost) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 643b85a8db..d7a83ae727 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -448,9 +448,6 @@ as ordering relation.") intuitive syntax and trivial integration.") (license license:expat))) -(define-public nlohmann-json-cpp - (deprecated-package "nlohmann-json-cpp" json-modern-cxx)) - (define-public xtl (package (name "xtl") diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 1c86ef561c..76958efe8a 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -926,9 +926,6 @@ language.") (home-page "http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX") (license license:gpl2+))) -(define-public escpr - (deprecated-package "escpr" epson-inkjet-printer-escpr)) - (define-public splix ;; Last released in 2009 . ;; Last SVN commit was 2013 . diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 544f0114ac..9fe0e8d3d1 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -663,10 +663,6 @@ provides certain advantages over the builtin Jinja2 backend in Django, for example, explicit calls to callables from templates and better performance.") (license license:bsd-3))) -;; JSONField is now built-in to Django, obsoleting this package. -(define-public python-django-jsonfield - (deprecated-package "python-django-jsonfield" python-django)) - (define-public python-dj-database-url (package (name "python-dj-database-url") diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 17638cc801..1c2ab1e92e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26653,12 +26653,6 @@ meet the needs of the numerous interfaces that are possible in the Emacs computing environment.") (license license:gpl3+))) -(define-public emacs-modus-operandi-theme - (deprecated-package "emacs-modus-operandi-theme" emacs-modus-themes)) - -(define-public emacs-modus-vivendi-theme - (deprecated-package "emacs-modus-vivendi-theme" emacs-modus-themes)) - (define-public emacs-punpun-theme (let ((commit "2f78125609277b2478abdebd8f9d5ee10a823b65") (revision "0")) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6abc4cd410..50f265f085 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1018,9 +1018,6 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") translations for KiCad.") (license license:gpl3+))) -(define-public kicad-i18l - (deprecated-package "kicad-i18l" kicad-i18n)) - (define-public kicad-doc (package (name "kicad-doc") diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 2fe6437ba1..5cbda66de1 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -384,9 +384,6 @@ unload unused functionality, with support for touchscreen and suitable for embedded systems.") (license license:bsd-2))) -(define-public enlightenment-wayland - (deprecated-package "enlightenment-wayland" enlightenment)) - (define-public python-efl (package (name "python-efl") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index e9083bc1c4..aefc0a8b69 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -245,17 +245,9 @@ for platform-specific firmwares executing in M-mode.") (define-public opensbi-qemu-generic (make-opensbi-package "generic" "opensbi-qemu-generic")) -(define-public opensbi-qemu-virt - (deprecated-package "opensbi-qemu-virt" opensbi-qemu-generic)) - (define-public opensbi-sifive-fu540 (make-opensbi-package "sifive/fu540" "opensbi-sifive-fu540")) -(define-public opensbi-qemu-sifive-u - ;; Dropped upstream, as all functionality is present in the sifive-fu540 - ;; target for recent versions of qemu, u-boot and linux. - (deprecated-package "opensbi-qemu-sifive-u" opensbi-sifive-fu540)) - (define-public seabios (package (name "seabios") diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 793b86ced8..3f36a71bdd 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -331,9 +331,6 @@ The Lato 2.010 family supports more than 100 Latin-based languages, over (properties '((upstream-name . "freefont") (ftp-directory . "/gnu/freefont"))))) -(define-public font-gnu-freefont-ttf - (deprecated-package "font-gnu-freefont-ttf" font-gnu-freefont)) - (define-public font-liberation (package (name "font-liberation") @@ -1593,9 +1590,6 @@ swapping. The italic style for OpenDyslexic has been crafted to be used for emphasis while still being readable.") (license license:silofl1.1))) -(define-public font-open-dyslexic - (deprecated-package "font-open-dyslexic" font-opendyslexic)) - (define-public font-openmoji (package (name "font-openmoji") diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index c92d505ddb..51ec4a5fc2 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -375,9 +375,6 @@ you can focus on the game itself. This makes more rapid game development possible, and it also makes the SGE easy to learn.") (license license:lgpl3+))) -(define-public python-sge-pygame - (deprecated-package "python-sge-pygame" python-sge)) - (define-public python-tmx (package (name "python-tmx") @@ -2075,9 +2072,6 @@ that parenthetically inclined game developers need to make 2D (and eventually @end enumerate\n") (license license:gpl3+))) -(define-public guile3.0-chickadee - (deprecated-package "guile3.0-chickadee" guile-chickadee)) - (define-public bennu-game-development (package (name "bennu-game-development") diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index a474933c93..78e9f17146 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2258,7 +2258,7 @@ Every puzzle has a complete solution, although there may be more than one.") (native-inputs `(("unzip" ,unzip))) (inputs - `(("python-sge-pygame" ,python-sge-pygame) + `(("python-sge" ,python-sge) ("python-six" ,python-six) ("python-xsge" ,python-xsge))) (home-page "https://retux-game.github.io/") @@ -4631,10 +4631,10 @@ Transport Tycoon Deluxe.") ("freetype" ,freetype) ("icu4c" ,icu4c) ("jansson" ,jansson) + ("json-modern-cxx" ,json-modern-cxx) ("libpng" ,libpng) ("libzip" ,libzip) ("mesa" ,mesa) - ("nlohmann-json-cpp" ,nlohmann-json-cpp) ("openrct2-objects" ,openrct2-objects) ("openrct2-title-sequences" ,openrct2-title-sequences) ("openssl" ,openssl) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 208b560317..6d8d02fb9c 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -779,9 +779,6 @@ dark elements. It supports GNOME, Unity, Xfce, and Openbox.") (home-page "https://numixproject.github.io") (license license:gpl3+))) -(define-public numix-theme - (deprecated-package "numix-theme" numix-gtk-theme)) - (define-public orchis-theme (package (name "orchis-theme") diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 8c8f491a18..451b61a28e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -492,9 +492,6 @@ interface (FFI) of Guile.") `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) -(define-public guile3.0-gcrypt - (deprecated-package "guile3.0-gcrypt" guile-gcrypt)) - (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index bb991789da..2927055240 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -939,13 +939,6 @@ given, also pass them to the build system instead of the ones used by PKG." (("'auto'") "'disabled'")) #t))))))))) -(define-public gst-transcoder - (deprecated-package - "gst-transcoder" - (gst-plugins/selection gst-plugins-bad - #:plugins '("transcoder") - #:configure-flags '("-Dintrospection=enabled")))) - (define-public python-gst (package (name "python-gst") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 243a7de08c..4e427deaef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1035,9 +1035,6 @@ exceptions, macros, and a dynamic programming environment.") ,@(fold alist-delete (package-inputs guile-cairo) '("guile" "guile-lib")))))) -(define-public guile3.0-cairo - (deprecated-package "guile3.0-cairo" guile-cairo)) - (define-public guile-rsvg ;; Use a recent snapshot that supports Guile 2.2 and beyond. (let ((commit "05c6a2fd67e4fea1a7c3ff776729dc931bae6678") @@ -1122,9 +1119,6 @@ images onto Cairo surfaces.") '("guile" "guile-lib")))) (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) -(define-public guile3.0-rsvg - (deprecated-package "guile3.0-rsvg" guile-rsvg)) - (define-public guile-present (package (name "guile-present") @@ -1195,9 +1189,6 @@ documents.") ("guile-cairo" ,guile2.2-cairo) ("guile-rsvg" ,guile2.2-rsvg))))) -(define-public guile3.0-present - (deprecated-package "guile3.0-present" guile-present)) - (define-public guile-gnome (package (name "guile-gnome") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index e3c36ff60e..56d6d2565d 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -706,9 +706,6 @@ is not available for Guile 2.0.") (name "guile2.2-fibers") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-fibers - (deprecated-package "guile3.0-fibers" guile-fibers)) - (define-public guile-filesystem (package (name "guile-filesystem") @@ -811,9 +808,6 @@ HTML (via SXML) or any other format for rendering.") (name "guile2.2-syntax-highlight") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-syntax-highlight - (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight)) - (define-public guile-sjson (package (name "guile-sjson") @@ -899,9 +893,6 @@ using Guile's foreign function interface.") ,@(alist-delete "guile" (package-native-inputs guile-squee)))))) -(define-public guile3.0-squee - (deprecated-package "guile3.0-squee" guile-squee)) - (define-public guile-colorized (package (name "guile-colorized") @@ -930,9 +921,6 @@ using Guile's foreign function interface.") (name "guile2.2-colorized") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-colorized - (deprecated-package "guile3.0-colorized" guile-colorized)) - (define-public guile-pfds (package (name "guile-pfds") @@ -1094,9 +1082,6 @@ types are supported.") (find-files "." "\\.sls$")) #t)))))))) -(define-public guile3.0-pfds - (deprecated-package "guile3.0-pfds" guile-pfds)) - (define-public guile-aa-tree (package (name "guile-aa-tree") @@ -1162,9 +1147,6 @@ messaging library.") (name "guile2.2-simple-zmq") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-simple-zmq - (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) - (define-public jupyter-guile-kernel (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304") (revision "2")) @@ -1361,9 +1343,6 @@ format.") (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-email)))))) -(define-public guile3.0-email - (deprecated-package "guile3.0-email" guile-email)) - (define-public guile-newt (package (name "guile-newt") @@ -1403,9 +1382,6 @@ Scheme by using Guile’s foreign function interface.") (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-newt)))))) -(define-public guile3.0-newt - (deprecated-package "guile3.0-newt" guile-newt)) - (define-public guile-mastodon (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392") (revision "1")) @@ -1483,9 +1459,6 @@ written in pure Scheme by using Guile's foreign function interface.") (propagated-inputs `(("guile-bytestructures" ,guile2.2-bytestructures))))) -(define-public guile3.0-parted - (deprecated-package "guile3.0-parted" guile-parted)) - (define-public guile-xosd (package (name "guile-xosd") @@ -1706,9 +1679,6 @@ above command-line parameters.") (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-config)))))) -(define-public guile3.0-config - (deprecated-package "guile3.0-config" guile-config)) - (define-public guile-hall (package (name "guile-hall") @@ -1798,9 +1768,6 @@ provides tight coupling to Guix.") ,@(alist-delete "guile-config" (package-propagated-inputs guile-hall)))))) -(define-public guile3.0-hall - (deprecated-package "guile3.0-hall" guile-hall)) - (define-public guile-ics (package (name "guile-ics") @@ -1849,9 +1816,6 @@ The library is shipped with documentation in Info format and usage examples.") ,@(alist-delete "guile" (package-inputs guile-ics)))) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile3.0-ics - (deprecated-package "guile3.0-ics" guile-ics)) - (define-public guile-imanifest (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0") (revision "0")) @@ -1969,9 +1933,6 @@ users and in some situations.") (name "guile2.2-wisp") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-wisp - (deprecated-package "guile3.0-wisp" guile-wisp)) - (define-public guile-udev (package (name "guile-udev") @@ -2335,9 +2296,6 @@ library.") (inputs `(("ncurses" ,ncurses) ("guile" ,guile-2.2))))) -(define-public guile3.0-ncurses - (deprecated-package "guile3.0-ncurses" guile-ncurses)) - (define-public guile-ncurses/gpm (package (inherit guile-ncurses) @@ -2345,13 +2303,6 @@ library.") (inputs `(("ncurses" ,ncurses/gpm) ("guile" ,guile-3.0))))) -(define-public guile3.0-ncurses/gpm - (package - (inherit guile3.0-ncurses) - (name "guile3.0-ncurses-with-gpm") - (inputs `(("ncurses" ,ncurses/gpm) - ("guile" ,guile-3.0))))) - (define-public guile-lib (package (name "guile-lib") @@ -2447,9 +2398,6 @@ for Guile\". It provides the following modules: (alist-replace "guile" (list guile-2.2) (package-inputs guile-lib))))) -(define-public guile3.0-lib - (deprecated-package "guile3.0-lib" guile-lib)) - (define-public guile-minikanren (package (name "guile-minikanren") @@ -2492,9 +2440,6 @@ See http://minikanren.org/ for more on miniKanren generally.") (name "guile2.2-minikanren") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-minikanren - (deprecated-package "guile3.0-minikanren" guile-minikanren)) - (define-public guile-irregex (package (name "guile-irregex") @@ -2547,9 +2492,6 @@ inspired by the SCSH regular expression system.") (name "guile2.2-irregex") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-irregex - (deprecated-package "guile3.0-irregex" guile-irregex)) - (define-public haunt (package (name "haunt") @@ -2634,9 +2576,6 @@ interface for reading articles in any format.") (name "guile2.0-haunt") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-haunt - (deprecated-package "guile3.0-haunt" haunt)) - (define-public guile-redis (package (name "guile-redis") @@ -2752,9 +2691,6 @@ is no support for parsing block and inline level HTML.") (name "guile2.0-commonmark") (inputs `(("guile" ,guile-2.0))))) -(define-public guile3.0-commonmark - (deprecated-package "guile3.0-commonmark" guile-commonmark)) - (define-public mcron (package (name "mcron") @@ -2805,9 +2741,6 @@ format is also supported.") (name "guile2.2-mcron") (inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-mcron - (deprecated-package "guile3.0-mcron" mcron)) - (define-public guile-picture-language (let ((commit "a1322bf11945465241ca5b742a70893f24156d12") (revision "5")) @@ -2853,10 +2786,6 @@ The picture values can directly be displayed in Geiser.") `(("guile-cairo" ,guile2.2-cairo) ("guile-rsvg" ,guile2.2-rsvg))))) -(define-public guile3.0-picture-language - (deprecated-package "guile3.0-picture-language" - guile-picture-language)) - (define-public guile-studio (let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842") (revision "1")) @@ -3208,9 +3137,6 @@ pre-alpha code.") `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-gi)))))) -(define-public guile3.0-gi - (deprecated-package "guile3.0-gi" guile-gi)) - (define-public guile-srfi-89 (package (name "guile-srfi-89") @@ -3794,9 +3720,6 @@ 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 - (deprecated-package "guile3.0-semver" guile-semver)) - (define-public guile2.2-semver (package (inherit guile-semver) @@ -3862,9 +3785,6 @@ SHA-512).") (native-inputs `(("guile" ,guile-2.2))))) -(define-public guile3.0-hashing - (deprecated-package "guile3.0-hashing" guile-hashing)) - (define-public guile-packrat (package (name "guile-packrat") @@ -4107,9 +4027,6 @@ models and also supports a rich set of boolean query operators.") `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-xapian)))))) -(define-public guile3.0-xapian - (deprecated-package "guile3.0-xapian" guile-xapian)) - (define-public guile-torrent (package (name "guile-torrent") @@ -4204,9 +4121,6 @@ WebSocket protocol as defined by RFC 6455.") (home-page "https://git.dthompson.us/guile-websocket.git") (license license:lgpl3+)))) -(define-public guile3.0-websocket - (deprecated-package "guile3.0-websocket" guile-websocket)) - (define-public guile-rdf (package (name "guile-rdf") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 99372c4668..2108b9f9d3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -479,39 +479,6 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its (guile-variant-package-name "guile2.2") #:deep? #f)) -(define-syntax define-deprecated-guile3.0-package - (lambda (s) - "Define a deprecated package alias for \"guile3.0-something\"." - (syntax-case s () - ((_ name) - (and (identifier? #'name) - (string-prefix? "guile3.0-" (symbol->string (syntax->datum - #'name)))) - (let ((->guile (lambda (str) - (let ((base (string-drop str - (string-length "guile3.0-")))) - (string-append "guile-" base))))) - (with-syntax ((package-name (symbol->string (syntax->datum #'name))) - (package - (datum->syntax - #'name - (string->symbol - (->guile (symbol->string (syntax->datum - #'name)))))) - (old-name - ;; XXX: This is the name generated by - ;; 'define-deprecated'. - (datum->syntax - #'name - (symbol-append '% (syntax->datum #'name) - '/deprecated)))) - #'(begin - (define-deprecated name package - (deprecated-package package-name package)) - (export old-name)))))))) - -(define-deprecated-guile3.0-package guile3.0-readline) - (define-public guile-for-guile-emacs (let ((commit "15ca78482ac0dd2e3eb36dcb31765d8652d7106d") (revision "1")) @@ -622,9 +589,6 @@ specification. These are the main features: ("guile" ,guile-3.0))) (inputs `(("guile" ,guile-3.0))))) -(define-public guile3.0-json - (deprecated-package "guile3.0-json" guile-json-3)) - (define-public guile-json-4 (package (inherit guile-json-3) @@ -696,8 +660,6 @@ Guile's foreign function interface.") (define-public guile2.2-gdbm-ffi (package-for-guile-2.2 guile-gdbm-ffi)) -(define-deprecated-guile3.0-package guile3.0-gdbm-ffi) - (define-public guile-sqlite3 (package (name "guile-sqlite3") @@ -732,8 +694,6 @@ Guile's foreign function interface.") (define-public guile2.2-sqlite3 (package-for-guile-2.2 guile-sqlite3)) -(define-deprecated-guile3.0-package guile3.0-sqlite3) - (define-public guile-bytestructures (package (name "guile-bytestructures") @@ -783,8 +743,6 @@ type system, elevating types to first-class status.") (define-public guile2.2-bytestructures (package-for-guile-2.2 guile-bytestructures)) -(define-deprecated-guile3.0-package guile3.0-bytestructures) - (define-public guile-git (package (name "guile-git") @@ -826,8 +784,6 @@ manipulate repositories of the Git version control system.") (define-public guile2.0-git (package-for-guile-2.0 guile-git)) -(define-deprecated-guile3.0-package guile3.0-git) - (define-public guile-zlib (package (name "guile-zlib") diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index faa3b52c5c..fe7dd853b2 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -982,6 +982,3 @@ Replace some ASCII sequences by their Unicode equivalent (turned off by default) @end itemize") (license license:bsd-3))) - -(define-public ghc-stylish-haskell - (deprecated-package "ghc-stylish-haskell" stylish-haskell)) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f61092037d..e02a383355 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -993,9 +993,6 @@ It has been modified to remove all non-free binary blobs.") ("CONFIG_RTC_DRV_RK808" . #t)) %default-extra-linux-options))) -(define-public linux-libre-arm-veyron - (deprecated-package "linux-libre-arm-veyron" linux-libre-arm-generic)) - (define-public linux-libre-arm-generic-5.10 (make-linux-libre* linux-libre-5.10-version linux-libre-5.10-gnu-revision diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6a9a69c410..b2d69e2064 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -434,9 +434,6 @@ messages) using IDLE. Implemented in Go.") `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs mailutils)))))) -(define-public guile3.0-mailutils - (deprecated-package "guile3.0-mailutils" mailutils)) - (define-public nullmailer (package (name "nullmailer") diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 999cfcb8b0..f71daaee8a 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -451,9 +451,6 @@ two things: store numeric time-series data, and render graphs of this data on demand.") (license license:asl2.0))) -(define-public python2-graphite-web - (deprecated-package "python2-graphite-web" graphite-web)) - (define-public python-prometheus-client (package (name "python-prometheus-client") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3c9d4da941..12c689e9e2 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -528,9 +528,6 @@ the Nix package manager.") (invoke "make" "install-binPROGRAMS"))) (delete 'wrap-program))))))) -(define-public guile3.0-guix - (deprecated-package "guile3.0-guix" guix)) - (define-public guix-minimal ;; A version of Guix which is built with the minimal set of dependencies, as ;; outlined in the README "Requirements" section. Intended as a CI job, so @@ -980,9 +977,6 @@ it easy to create independent environments even for C libraries. Conda is written entirely in Python.") (license license:bsd-3))) -(define-public python-conda - (deprecated-package "python-conda" conda)) - (define-public conan (package (name "conan") diff --git a/gnu/packages/pep.scm b/gnu/packages/pep.scm index aa0d786d87..6685691285 100644 --- a/gnu/packages/pep.scm +++ b/gnu/packages/pep.scm @@ -241,7 +241,7 @@ ENGINE_INC_PATH=~a/include `(("python-pytest" ,python-pytest) ("python-pytest-forked" ,python-pytest-forked))) (inputs - `(("boost-python" ,boost-with-python3) + `(("boost" ,boost) ("libpepadapter" ,libpepadapter) ("pep-engine" ,pep-engine) ("python-setuptools-scm" ,python-setuptools-scm/next) diff --git a/gnu/packages/phabricator.scm b/gnu/packages/phabricator.scm index af95cd93d2..ef8a1a7475 100644 --- a/gnu/packages/phabricator.scm +++ b/gnu/packages/phabricator.scm @@ -83,6 +83,3 @@ send code for review, download patches, transfer files, view status, make API calls, and various other things.") ;; Bundled libraries are expat-licensed. (license (list license:asl2.0 license:expat))))) - -(define-public libphutil - (deprecated-package "libphutil" arcanist)) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 4b89ddafd1..7a26c632f7 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -137,9 +137,6 @@ using the Cairo drawing library.") (inputs `(("guile" ,guile-2.2))) (propagated-inputs `(("guile-cairo" ,guile2.2-cairo))))) -(define-public guile3.0-charting - (deprecated-package "guile3.0-charting" guile-charting)) - (define-public ploticus (package (name "ploticus") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index dfa2bb090c..495d7faa87 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16828,9 +16828,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 python-glances - (deprecated-package "python-glances" glances)) - (define-public python-graphql-core (package (name "python-graphql-core") @@ -19498,15 +19495,9 @@ many of the popular cloud service providers using a unified API.") window memory map manager.") (license license:bsd-3))) -(define-public python-smmap2 - (deprecated-package "python-smmap2" python-smmap)) - (define-public python2-smmap (package-with-python2 python-smmap)) -(define-public python2-smmap2 - (deprecated-package "python2-smmap2" python2-smmap)) - (define-public python-regex (package (name "python-regex") diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 642682ec8e..0d93a1b5cc 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -869,9 +869,6 @@ scripts.") (license (list license:psfl ; tarball includes python2.7 license:asl2.0)))) -(define-public oil-shell - (deprecated-package "oil-shell" oil)) - (define-public gash (package (name "gash") diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index a48d724488..007b8f94f1 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -143,8 +143,3 @@ is in the public domain.") (sha256 (base32 "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3")))))) - -;; Column metadata support was added to the regular 'sqlite' package with -;; commit fad5b1a6d8d9c36bea5785ae4fbc1beb37e644d7. -(define-public sqlite-with-column-metadata - (deprecated-package "sqlite-with-column-metadata" sqlite)) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 4e217888fd..00bcdb63ab 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -397,9 +397,6 @@ libssh library.") (inputs `(("guile" ,guile-2.2) ,@(alist-delete "guile" (package-inputs guile-ssh)))))) -(define-public guile3.0-ssh - (deprecated-package "guile3.0-ssh" guile-ssh)) - (define-public corkscrew ;; The last 2.0 release hails from 2009. Use a fork (submitted upstream as ;; ) that adds now-essential diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 8d751f6cce..daecc95837 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1225,9 +1225,6 @@ while also supporting native scrolling and @command{tmux} control mode (@code{tmux -CC}).") (license license:asl2.0))) -(define-public et - (deprecated-package "et" eternalterminal)) - (define-public wterm (package (name "wterm") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index f3fce5ffe1..029bce451e 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -368,9 +368,6 @@ required structures.") ,@(alist-delete "guile" (package-inputs gnutls)))))) -(define-public guile3.0-gnutls - (deprecated-package "guile3.0-gnutls" gnutls)) - (define-public openssl (package (name "openssl") diff --git a/gnu/packages/vlang.scm b/gnu/packages/vlang.scm index e0b2e7bcfc..def858da17 100644 --- a/gnu/packages/vlang.scm +++ b/gnu/packages/vlang.scm @@ -134,7 +134,3 @@ "V is a systems programming language. It provides memory safety and thread safety guarantees with minimal abstraction.") (license license:expat))) - -(define-public v - ;; We used to provide 'vlang' under the name 'v'. - (deprecated-package "v" vlang)) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 4624e2be3f..7b30fe3fec 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -1085,9 +1085,6 @@ public keys and can roam across IP addresses.") (list license:lgpl2.1+ ; src/netlink.h & contrib/embeddable-wg-library license:gpl2)))) ; everything else -(define-public wireguard - (deprecated-package "wireguard" wireguard-tools)) - (define-public xl2tpd (package (name "xl2tpd") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 35e8db7e91..a6d2d9106b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -690,12 +690,6 @@ for power users. Conceptually inspired by Emacs and Vim, it has familiar key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.") (license license:bsd-3))) -(define-public next - (deprecated-package "next" nyxt)) - -(define-public sbcl-next - (deprecated-package "sbcl-next" nyxt)) - (define-public lagrange (package (name "lagrange") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 2e10f29ba9..c553ae1eae 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6639,9 +6639,6 @@ user set the transparency on a window.") (home-page "https://gitlab.freedesktop.org/xorg/app/transset") (license license:x11))) -(define-public transset-df - (deprecated-package "transset-df" transset)) - (define-public bdfresize (package (name "bdfresize") -- cgit 1.4.1 From f40526c608785690ccee90509cd053c7c43d6882 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:31:03 +0100 Subject: gnu: qjackctl: Update to 0.9.5. * gnu/packages/audio.scm (qjackctl): Update to 0.9.5. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 5e274f36d8..9d69fe0216 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2906,14 +2906,14 @@ different audio devices such as ALSA or PulseAudio.") (define-public qjackctl (package (name "qjackctl") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qjackctl/qjackctl/" version "/qjackctl-" version ".tar.gz")) (sha256 (base32 - "186rg3j67rac9ds1r7gnrib2d0smgv15cmr5gwb7v83mywcp1gzy")))) + "1g61xwsxsndwlnh4547vl7jfcf4kqlbb4394jq2m8qbbzk51b6rv")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no check target -- cgit 1.4.1 From c3e70aac9c44ec218214a48b2409899aa11ce412 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:31:18 +0100 Subject: gnu: patchage: Update to 1.0.4. * gnu/packages/audio.scm (patchage): Update to 1.0.4. --- gnu/packages/audio.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9d69fe0216..9b071e5a8c 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2840,7 +2840,7 @@ buffers, and audio capture.") (define-public patchage (package (name "patchage") - (version "1.0.2") + (version "1.0.4") (source (origin (method url-fetch) (uri (string-append "https://download.drobilla.net/patchage-" @@ -2848,7 +2848,7 @@ buffers, and audio capture.") ".tar.bz2")) (sha256 (base32 - "0dk3fiac10m83mwss3026yz7ygc47c2iw924cwwnh2fyydc9bsy6")))) + "0gbakiw3mikgbvy3pssrmqmn7z5c7kp4vyaxj5rs4jnkscxgw9vw")))) (build-system waf-build-system) (arguments `(#:tests? #f ; no check target -- cgit 1.4.1 From 41cb043a3ba61a71a0f9fd243a5ca45f55472997 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:33:56 +0100 Subject: gnu: patchage: Fix home page URL. * gnu/packages/audio.scm (patchage)[home-page]: Fix 404. --- gnu/packages/audio.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 9b071e5a8c..62198ac7ce 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2863,7 +2863,7 @@ buffers, and audio capture.") ("dbus-glib" ,dbus-glib))) (native-inputs `(("pkg-config" ,pkg-config))) - (home-page "https://drobilla.net/software/patchage/") + (home-page "https://drobilla.net/software/patchage.html") (synopsis "Modular patch bay for audio and MIDI systems") (description "Patchage is a modular patch bay for audio and MIDI systems based on JACK -- cgit 1.4.1 From 2a40b19953fabe5fef0caa9338b7bfe2dceec32c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:37:06 +0100 Subject: gnu: patchage: Build with Python 3. * gnu/packages/audio.scm (patchage)[arguments]: Run WAF with the default Python. --- gnu/packages/audio.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 62198ac7ce..4b1a602804 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2851,8 +2851,7 @@ buffers, and audio capture.") "0gbakiw3mikgbvy3pssrmqmn7z5c7kp4vyaxj5rs4jnkscxgw9vw")))) (build-system waf-build-system) (arguments - `(#:tests? #f ; no check target - #:python ,python-2)) + `(#:tests? #f)) ; no check target (inputs `(("alsa-lib" ,alsa-lib) ("boost" ,boost) -- cgit 1.4.1 From d71bd56a8c071b681e4a5d2dad7b136ebd658244 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:37:26 +0100 Subject: gnu: python-jplephem: Update to 2.16. * gnu/packages/astronomy.scm (python-jplephem): Update to 2.16. --- gnu/packages/astronomy.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 51fe9faff9..fc8959faad 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1047,13 +1047,13 @@ more.") (define-public python-jplephem (package (name "python-jplephem") - (version "2.15") + (version "2.16") (source (origin (method url-fetch) (uri (pypi-uri "jplephem" version)) (sha256 - (base32 "1ca3dswsslij79qg6dcijjz4l0fj6nzmxld8z93v45ahlkhps0g0")))) + (base32 "1xvivnsywjaf5lxn3kyg2jhhq393gcwkjrl634m8dn52ypidrcdb")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 8fc7803f54c58320869557cc2cc221ad9b05f65c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 21:49:08 +0100 Subject: gnu: minixml: Update to 3.3. * gnu/packages/xml.scm (minixml): Update to 3.3. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 8c87760323..a5d124601c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1222,7 +1222,7 @@ Libxml2).") (define-public minixml (package (name "minixml") - (version "3.2") + (version "3.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/michaelrsweet/mxml/" @@ -1230,7 +1230,7 @@ Libxml2).") "/mxml-" version ".tar.gz")) (sha256 (base32 - "0x698ayv00vrjg0yfm20lakpgl7m02x1fk2n09wygwk4973gd55q")))) + "1n1xzvhnsjsgsqaq1rg9zilwf0b2rydsadbxzy64z3lydwv7dybw")))) (build-system gnu-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 7b89818d00db96a5bb8fe7ed19b3b4e64bcda12b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 22:08:18 +0100 Subject: gnu: plocate: Update to 1.1.13. * gnu/packages/search.scm (plocate): Update to 1.1.13. --- gnu/packages/search.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 14b21e644f..8c5e5f7cdf 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -444,14 +444,14 @@ conflict with slocate compatibility.") (define-public plocate (package (name "plocate") - (version "1.1.12") + (version "1.1.13") (source (origin (method url-fetch) (uri (string-append "https://plocate.sesse.net/download/" "plocate-" version ".tar.gz")) (sha256 - (base32 "1damwm8kqf797kgr1cify521i6icz5khc5brq16m6nlg26nja7d1")))) + (base32 "16lpiirjmj4mrdj5kkjv7rikkgjx3i64ac0sl3lz1rshflhxgqww")))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From f5ab35f9f9338ac838ebe0e896f74cdc1063dabc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 22:14:07 +0100 Subject: gnu: nbd: Update to 3.22. * gnu/packages/networking.scm (nbd): Update to 3.22. [native-inputs]: Add bison. --- gnu/packages/networking.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index f67241e1bf..0a25aad6d2 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4061,19 +4061,20 @@ stamps.") (define-public nbd (package (name "nbd") - (version "3.21") + (version "3.22") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/nbd/nbd/" version "/nbd-" version ".tar.xz")) (sha256 - (base32 "1ydylvvayi4w2d08flji9q03sl7y8hn0c26vsay3nwwikprqls77")))) + (base32 "1ljx6vb3lja5p0lr28vmjp27n9d6krlvq49bhqbcm2ns8vxd1vh6")))) (build-system gnu-build-system) (inputs `(("glib" ,glib))) (native-inputs - `(("pkg-config" ,pkg-config) + `(("bison" ,bison) + ("pkg-config" ,pkg-config) ("which" ,which))) (home-page "https://nbd.sourceforge.io/") (synopsis "NBD client and server") -- cgit 1.4.1 From a2d0bee323d35ccffb07c753bb2cfa564431c034 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 22:22:32 +0100 Subject: gnu: mbuffer: Update to 20211018. * gnu/packages/networking.scm (mbuffer): Update to 20211018. [native-inputs]: Add which. --- gnu/packages/networking.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 0a25aad6d2..4c0c87115f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -932,7 +932,7 @@ or server shell scripts with network connections.") (define-public mbuffer (package (name "mbuffer") - (version "20210328") + (version "20211018") (source (origin (method url-fetch) (uri (string-append @@ -940,8 +940,10 @@ or server shell scripts with network connections.") version ".tgz")) (sha256 (base32 - "0pfw9xw4ph18yss07fl6w8fbqiwy1w9r1knzw5gsb4c993cbidai")))) + "1qxnbpyly00kml3sjan9iqg6pqacsi3yqq66x25w455cwkjc2h72")))) (build-system gnu-build-system) + (native-inputs + `(("which" ,which))) (inputs `(("openssl" ,openssl))) (home-page "http://www.maier-komor.de/mbuffer.html") (synopsis -- cgit 1.4.1 From 704c23cbef2628591f23883b26781202d46302ab Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 22:45:16 +0100 Subject: gnu: libx86emu: Update to 3.4. * gnu/packages/virtualization.scm (libx86emu): Update to 3.4. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/virtualization.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 7da6345c63..1817f6dc22 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -441,7 +441,7 @@ server and embedded PowerPC, and S390 guests.") (define-public libx86emu (package (name "libx86emu") - (version "3.1") + (version "3.4") (home-page "https://github.com/wfeldt/libx86emu") (source (origin @@ -461,10 +461,9 @@ server and embedded PowerPC, and S390 guests.") (substitute* "Makefile" (("GIT2LOG.*=.*$") "") (("GITDEPS.*=.*$") "") - (("BRANCH.*=.*$") "")) - #t)) + (("BRANCH.*=.*$") "")))) (sha256 - (base32 "104xqc6nj9rpi7knl3dfqvasf087hlz2n5yndb1iycw35a6j509b")))) + (base32 "0f8mwpgfyid26i9q77n2rlcr4zzc75jnjzmy2hc38gk3q71ijmwh")))) (build-system gnu-build-system) (arguments `(#:test-target "test" -- cgit 1.4.1 From 17263b3011812880dff552991505e86cd6a5adbc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 8 Nov 2021 22:58:42 +0100 Subject: gnu: libseccomp: Update to 2.5.3. * gnu/packages/linux.scm (libseccomp): Update to 2.5.3. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e02a383355..f386139638 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -6459,7 +6459,7 @@ of flash storage.") (define-public libseccomp (package (name "libseccomp") - (version "2.5.2") + (version "2.5.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/seccomp/libseccomp/" @@ -6467,7 +6467,7 @@ of flash storage.") "/libseccomp-" version ".tar.gz")) (sha256 (base32 - "1pw7rd4gwqpmraipgdqkdkhnx4ql35wrn3lnjgl6pncinkgm59hp")))) + "0xhan73zn4p0n7s8vx6s47wjmidvk4x8r90vfbljairn6f3mq1jr")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static") -- cgit 1.4.1 From 1b95a7b2b187dd8b8b996628c7651c8c08593249 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Nov 2021 08:48:35 +0200 Subject: gnu: debootstrap: Update to 1.0.126. * gnu/packages/debian.scm (debootstrap): Update to 1.0.126. --- gnu/packages/debian.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index 42b0fc8c7b..ddc90ef46c 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -190,7 +190,7 @@ contains the archive keys used for that.") (define-public debootstrap (package (name "debootstrap") - (version "1.0.124") + (version "1.0.126") (source (origin (method git-fetch) @@ -199,7 +199,7 @@ contains the archive keys used for that.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0pbvrp7gb87pwmjika5hy97342mdfvm0gmy23ag8xz1nnpmn160j")))) + (base32 "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 4d03acbb02a1f8bdb03dd986f34ddfe7de3d827c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 9 Nov 2021 08:48:38 +0200 Subject: gnu: debianutils: Update to 5.5-1. * gnu/packages/debian.scm (debianutils): Update to 5.5-1. [arguments]: Remove custom 'create-translations phase. --- gnu/packages/debian.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gnu/packages/debian.scm b/gnu/packages/debian.scm index ddc90ef46c..be2f8cc62b 100644 --- a/gnu/packages/debian.scm +++ b/gnu/packages/debian.scm @@ -271,7 +271,7 @@ unpacking them into a directory which can eventually be chrooted into.") (define-public debianutils (package (name "debianutils") - (version "4.11.1") + (version "5.5-1") (source (origin (method git-fetch) (uri (git-reference @@ -280,15 +280,8 @@ unpacking them into a directory which can eventually be chrooted into.") (file-name (git-file-name "debianutils" version)) (sha256 (base32 - "18ypb7fivch53wwrdf73yhf1fhkwn9kvw1kfdc1m450241d6191w")))) + "1sbdjcb44g2s1zxjf9kxrp9drf9mmh6b49a9z3k428gmc6zsci4r")))) (build-system gnu-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'bootstrap 'create-translations - (lambda _ - (with-directory-excursion "po4a" - (invoke "po4a" "--no-backups" "po4a.conf")) - #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From c07198430023e15f90e415a883b6bb01ea878823 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 9 Nov 2021 12:41:46 +0100 Subject: gnu: emacs-vertico: Update to 0.15. * gnu/packages/emacs-xyz.scm (emacs-vertico): Update to 0.15. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1c2ab1e92e..27493d4661 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -29630,7 +29630,7 @@ and preferred services can easily be configured.") (define-public emacs-vertico (package (name "emacs-vertico") - (version "0.14") + (version "0.15") (source (origin (method git-fetch) @@ -29639,7 +29639,7 @@ and preferred services can easily be configured.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0rddk76ih44b574lsr6d6r9wa2l7c9zlb9kcyw5xvly17ciiq16h")))) + (base32 "059mj7x9iisjl2cdc1ggqd3racfs42yf0qqk0va9c857qgscrn26")))) (build-system emacs-build-system) (arguments `(#:phases -- cgit 1.4.1 From 9934ea4e8b5b3ed3c4d1263da1519567ac12a738 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 21 Feb 2021 21:41:34 +0000 Subject: gnu: mozjs-78: Update to 78.6.1. * gnu/packages/gnuzilla.scm (mozjs-78): Update to 78.6.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnuzilla.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 2b176f1dfe..9edfcaa2ab 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -421,7 +421,7 @@ in C/C++.") (define-public mozjs-78 (package (inherit mozjs-60) - (version "78.5.0") + (version "78.6.1") (source (origin (method url-fetch) ;; TODO: Switch to IceCat source once available on ftp.gnu.org. @@ -430,7 +430,7 @@ in C/C++.") version "esr.source.tar.xz")) (sha256 (base32 - "1442yjmwz69hkfcvh8kkb60jf4c9ms0pac04nc3xw2da13v4zxai")))) + "1kp75838a38x4h0w98qn01g9asn7jlgm64bz7n70353bnr6bf1qd")))) (arguments `(#:imported-modules ,%cargo-utils-modules ;for `generate-all-checksums' #:modules ((guix build cargo-utils) @@ -457,6 +457,12 @@ in C/C++.") "--with-intl-api") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-StructuredClone.h + (lambda _ + (substitute* "js/public/StructuredClone.h" + (("class SharedArrayRawBufferRefs \\{") + "class JS_PUBLIC_API SharedArrayRawBufferRefs {")) + #t)) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ (let ((null-hash -- cgit 1.4.1 From 7c5db47730b7f4c64d364db70c73af6ba3d7f6c7 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 9 Nov 2021 12:48:42 +0100 Subject: gnu: emacs-doom-modeline: Update to 3.2.1. * gnu/packages/emacs-xyz.scm (emacs-doom-modeline): Update to 3.2.1. --- gnu/packages/emacs-xyz.scm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 27493d4661..1c87c8694d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27083,16 +27083,16 @@ contributed packages to Telega."))) (define-public emacs-doom-modeline (package (name "emacs-doom-modeline") - (version "3.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/seagle0128/doom-modeline") - (commit (string-append "v" version)))) - (sha256 - (base32 - "1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0")) - (file-name (git-file-name name version)))) + (version "3.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/seagle0128/doom-modeline") + (commit (string-append "v" version)))) + (sha256 + (base32 "1ji15n2rdp7bjg5iq9im6c4m12k24kqp85i3n1m9npihrb4arh54")) + (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments `(#:test-command '("ert-runner"))) -- cgit 1.4.1 From e5667edf5027ae7efd78eb5abaf0b0b5150454a9 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 9 Nov 2021 13:13:15 +0100 Subject: doc: Fix typo. * doc/guix.texi (Invoking guix shell): Fix a typo. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 3355a535ad..e6980bd060 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -5650,7 +5650,7 @@ spawning a @dfn{container} isolated from the rest of the system: guix shell --container emacs gcc-toolchain @end example -The command above spawns an interactive shell in a container when +The command above spawns an interactive shell in a container where nothing but @code{emacs}, @code{gcc-toolchain}, and their dependencies is available. The container lacks network access and shares no files other than the current working directory with the surrounding -- cgit 1.4.1 From f8ac788b9584b07b53d16e9b6903f63d939eb9b1 Mon Sep 17 00:00:00 2001 From: phodina Date: Mon, 8 Nov 2021 18:45:09 +0000 Subject: gnu: sdlpop: Fix executable location. * gnu/packages/games.scm (sdlpop)[arguments]: Substitute location of executable. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 78e9f17146..cad9200a7f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12642,7 +12642,7 @@ get attention, so you get found.") "1yy5r1r0hv0xggk8qd8bwk2zy7abpv89nikq4flqgi53fc5q9xl7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests provided + `(#:tests? #f ; no tests provided #:phases (modify-phases %standard-phases (delete 'configure) @@ -12666,6 +12666,8 @@ get attention, so you get found.") (chdir "..") (install-file "prince" bin) (substitute* template (("\\$ROOT") out)) + (substitute* "src/seg009.c" + (("g_argv[0]") (string-append "\"" out "\""))) (install-file template app) (rename-file (string-append app "/SDLPoP.desktop.template") (string-append app "/SDLPoP.desktop")) -- cgit 1.4.1 From 510a591b16ac3faf6316237b3a410c455ddfef93 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 8 Nov 2021 18:00:30 -0500 Subject: gnu: libaom: Update to 3.2.0. * gnu/packages/video.scm (libaom): Update to 3.2.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d37654a109..3bfdde7184 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -824,7 +824,7 @@ television and DVD. It is also known as AC-3.") (define-public libaom (package (name "libaom") - (version "3.1.3") + (version "3.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -833,7 +833,7 @@ television and DVD. It is also known as AC-3.") (file-name (git-file-name name version)) (sha256 (base32 - "08rk31d2cp9k9nj37s6a4n7klpfqfbj62anwyiggzsz7b68psjq3")))) + "0fmnbzpl481i7kchx4hbvb507r5pfgyrzfrlrs7jk3bicycm75qv")))) (build-system cmake-build-system) (native-inputs `(("perl" ,perl) -- cgit 1.4.1 From 9e48ac29eb66ebbd1191528553ab0fbcb7bb9c6e Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Tue, 9 Nov 2021 17:38:54 +0100 Subject: gnu: dunst: Update to 1.7.1. * gnu/packages/dunst.scm (dunst): Update to 1.7.1. --- gnu/packages/dunst.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dunst.scm b/gnu/packages/dunst.scm index 19f18dbc91..908999eb04 100644 --- a/gnu/packages/dunst.scm +++ b/gnu/packages/dunst.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Efraim Flashner ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2021 Alexandru-Sergiu Marton +;;; Copyright © 2021 Guillaume Le Vaillant ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,7 +39,7 @@ (define-public dunst (package (name "dunst") - (version "1.7.0") + (version "1.7.1") (source (origin (method git-fetch) (uri (git-reference @@ -47,7 +48,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0bc8f8h7qvxfx742jb8ggycw3z0il3pgln7lgkdjap2pxccyyrh5")))) + "0v15fhwzcg7zfn092sry0f4qb6dccz9bb312y9dadg745wf3n9qw")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target -- cgit 1.4.1 From 721f3eda74bab016767530c475ef7e969cbd0362 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 9 Nov 2021 20:45:20 +0100 Subject: gnu: emacs-corfu: Update to 0.14. * gnu/packages/emacs-xyz.scm (emacs-corfu): Update to 0.14. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1c87c8694d..b6855a7687 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2921,7 +2921,7 @@ of bibliographic references.") (define-public emacs-corfu (package (name "emacs-corfu") - (version "0.13") + (version "0.14") (source (origin (method git-fetch) @@ -2930,7 +2930,7 @@ of bibliographic references.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0b1mv6pbcawwfsn3f3hqmy6s8p9frp2320jvlk2z4dp6aw5qyx2j")))) + (base32 "0y40vnd227xjzds6zh85gplkiqa387b9y0925g5l01gz7hk2z17r")))) (build-system emacs-build-system) (home-page "https://github.com/minad/corfu") (synopsis "Completion overlay region function") -- cgit 1.4.1 From 42eb5b67e32b1a2f4dfc0ec841fad4d0afacf9c3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Nov 2021 00:09:40 +0200 Subject: gnu: samba: Update to 4.13.14. * gnu/packages/samba.scm (samba): Update to 4.13.14. --- gnu/packages/samba.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index fad2888f03..966ccc8c17 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -184,14 +184,14 @@ external dependencies.") (define-public samba (package (name "samba") - (version "4.13.10") + (version "4.13.14") (source (origin (method url-fetch) (uri (string-append "https://download.samba.org/pub/samba/stable/" "samba-" version ".tar.gz")) (sha256 - (base32 "00q5hf2r71dyma785dckcyksv3082mqfgyy9q6k6rc6kqjwkirzh")) + (base32 "103zy09mszjlfrsnm2vzrw5d9ph5jckddb9cxsrhrslkzblah4b6")) (modules '((guix build utils))) (snippet '(begin -- cgit 1.4.1 From a7e7385202e50393aea07000d3799dd73140e928 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Nov 2021 02:17:53 +0100 Subject: gnu: libhx: Update to 4.2. * gnu/packages/c.scm (libhx): Update to 4.2. --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 93d829391c..97c6818bfd 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -252,14 +252,14 @@ whose behaviour is inconsistent across *NIX flavours.") (define-public libhx (package (name "libhx") - (version "4.1") + (version "4.2") (source (origin (method url-fetch) (uri (string-append "https://inai.de/files/libhx/" "libHX-" version ".tar.xz")) (sha256 - (base32 "1mifpzxr5kma7gawhv1vbga8j5qi8jgka0axr48v08bdpb83pya2")))) + (base32 "1ri3sxiw5a8br27j7f20s40kihfvq6mmxzcrx68zydiwyxjvf5jj")))) (build-system gnu-build-system) (home-page "https://inai.de/projects/libhx/") (synopsis "C library with common data structures and functions") -- cgit 1.4.1 From 3b7619b2445d0b87fb228d1c6ff461f714fa9a6f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 10 Nov 2021 02:18:57 +0100 Subject: gnu: di: Update to 4.51. * gnu/packages/admin.scm (di): Update to 4.51. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/admin.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index d24b068bd7..2a7b0f310d 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -3205,13 +3205,13 @@ a new command using the matched rule, and runs it.") (define-public di (package (name "di") - (version "4.50") + (version "4.51") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/diskinfo-di/di-" version ".tar.gz")) (sha256 - (base32 "0aj9ldkvmj8fmrk685vd2gagz0q8lwsn2nfbx6r6mza94mn8pw42")))) + (base32 "1fv12j9b9sw6p38lcbzcw87zl5qp1aa7a4a4jn3449zz9af15ckr")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; obscure test failures @@ -3221,8 +3221,7 @@ a new command using the matched rule, and runs it.") (add-before 'build 'setup-environment (lambda* (#:key outputs #:allow-other-keys) (setenv "CC" ,(cc-for-target)) - (setenv "prefix" (assoc-ref outputs "out")) - #t))) + (setenv "prefix" (assoc-ref outputs "out"))))) #:make-flags (list "--environment-overrides"))) (home-page "https://gentoo.com/di/") (synopsis "Advanced df like disk information utility") -- cgit 1.4.1 From 7a4a77e05ac0ff29f7769bb689358dc76e2f58f4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 10 Nov 2021 01:01:59 -0500 Subject: gnu: certbot, python-acme: Update to 1.18.0. * gnu/packages/tls.scm (certbot, python-acme): Update to 1.18.0. --- gnu/packages/tls.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 029bce451e..b0a0128140 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -676,13 +676,13 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "1.17.0") + (version "1.18.0") (source (origin (method url-fetch) (uri (pypi-uri "acme" version)) (sha256 (base32 - "03ij1wp7jwvppv70qbjkgdg7w824yh6j4gfb68jj20wicx08xx1a")))) + "1bv2swaqmzpcx2nq1nbhrc6b825d5sxkdv0al972sjfcpcqn1q4s")))) (build-system python-build-system) (arguments `(#:phases @@ -730,7 +730,7 @@ netcat implementation that supports TLS.") (uri (pypi-uri "certbot" version)) (sha256 (base32 - "0wyipx6q78fmvngf1i6g50s01qpjqh07qlk1b5vyxwgl3080lhgg")))) + "0yr8sxfg5zspal04l9lpd9xis6gp8il20bhka54xr9bb4hc6xrgk")))) (build-system python-build-system) (arguments `(,@(substitute-keyword-arguments (package-arguments python-acme) -- cgit 1.4.1 From 4e45e89a7b9b79fc3ec527cb3ad243f9f266660a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Nov 2021 12:24:27 +0200 Subject: gnu: rust-regex-1: Fix building. * gnu/packages/crates-io.scm (rust-regex-1)[cargo-development-inputs]: Replace rust-quickcheck-0.8 with 1, rust-rand-0.6 with 0.8. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 4ccf463e23..087465186f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40294,8 +40294,8 @@ memory to speed up reallocation.") ("rust-regex-syntax" ,rust-regex-syntax-0.6)) #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-rand" ,rust-rand-0.6)))) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/rust-lang/regex") (synopsis "Regular expressions for Rust") (description -- cgit 1.4.1 From fcc4d62d3390a2465a0fcaf29f989f5733a910d6 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 7 Nov 2021 22:02:31 +0800 Subject: gnu: fcitx5: Update to 5.0.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fcitx5.scm (fcitx5): Update to 5.0.10. Signed-off-by: 宋文武 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 737f47f20f..91868e9961 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -87,7 +87,7 @@ client.") (define-public fcitx5 (package (name "fcitx5") - (version "5.0.8") + (version "5.0.10") (source (origin (method url-fetch) @@ -95,7 +95,7 @@ client.") "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-" version "_dict.tar.xz")) (sha256 - (base32 "0536sjpgjlg0bf8imz4jf9bdsp7fhm09bkssddji56cc9mgdxx82")))) + (base32 "0i23skr49n6b30ybm66bkv07dcr0dan5mzxch7x83znfnrpk8z3h")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From d16650c05d2d418fc4218d5e08f715ca3d1a5b54 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 7 Nov 2021 22:05:08 +0800 Subject: gnu: fcitx5-gtk: Update to 5.0.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fcitx5.scm (fcitx5-gtk): Update to 5.0.9. Signed-off-by: 宋文武 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 91868e9961..bd939d9f23 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -198,7 +198,7 @@ editors.") (define-public fcitx5-gtk (package (name "fcitx5-gtk") - (version "5.0.7") + (version "5.0.9") (source (origin (method url-fetch) @@ -206,7 +206,7 @@ editors.") "/fcitx5-gtk/fcitx5-gtk-" version ".tar.xz")) (sha256 - (base32 "0x9xwyb3hnb2xl47jkj8zs34fhyf7gshy3bv3jxd66sfkjrscr5v")))) + (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;No test -- cgit 1.4.1 From dcf48a178f309e61e7fdfced685cfbfa7cb3f772 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 7 Nov 2021 22:06:56 +0800 Subject: gnu: fcitx5-qt: Update to 5.0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fcitx5.scm (fcitx5-qt): Update to 5.0.7. Signed-off-by: 宋文武 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index bd939d9f23..01c9d62154 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -252,7 +252,7 @@ for GTK+2/GTK+3 application.") (define-public fcitx5-qt (package (name "fcitx5-qt") - (version "5.0.6") + (version "5.0.7") (source (origin (method url-fetch) @@ -260,7 +260,7 @@ for GTK+2/GTK+3 application.") "/fcitx5-qt/fcitx5-qt-" version ".tar.xz")) (sha256 - (base32 "0wp88cmy0gn15gkfzl5z4q4qd9j1ssdmgp1rfsbw0cp3qh5x4m69")))) + (base32 "1gspj3s1nz6mqbp3z6js5zf7mqicwm32isxlqh6whhwawr9w7vrk")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 159ee051308125ad90d6e9205ccf3defd0c39082 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 7 Nov 2021 22:08:37 +0800 Subject: gnu: fcitx5-configtool: Update to 5.0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/fcitx5.scm (fcitx5-configtool): Update to 5.0.8. Signed-off-by: 宋文武 --- gnu/packages/fcitx5.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 01c9d62154..0c4980aba2 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -348,7 +348,7 @@ including input methods previous bundled inside Fcitx 4: (define-public fcitx5-configtool (package (name "fcitx5-configtool") - (version "5.0.5") + (version "5.0.8") (source (origin (method url-fetch) @@ -356,7 +356,7 @@ including input methods previous bundled inside Fcitx 4: "https://download.fcitx-im.org/fcitx5" "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz")) (sha256 - (base32 "1diwiniqvsvcdwzcx1dqxbvwsr6ajbxs67my0cpn8n22asd5mx8i")))) + (base32 "0rajrw914mbl0x7h08cal0sszwyvqg6v3w0vs0c9acs6m438xbw4")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 6492e6cfe88ceb309fba6dc819e64998b1287c39 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Nov 2021 13:48:10 +0100 Subject: gnu: emacs-minions: Update to 0.3.7. * gnu/packages/emacs-xyz.scm (emacs-minions): Update to 0.3.7. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b6855a7687..a9b1f52c4e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -944,7 +944,7 @@ process, passing on the arguments as command line arguments.") (define-public emacs-minions (package (name "emacs-minions") - (version "0.3.6") + (version "0.3.7") (source (origin (method git-fetch) @@ -953,7 +953,7 @@ process, passing on the arguments as command line arguments.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8")))) + (base32 "1bzxxs8mxaihpjkbxgynhsi39lbbnij28grdc3sk9sq09j9752vw")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash))) -- cgit 1.4.1 From e46991159692b3273e6d3109b44867a7f5bf4e48 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 10 Nov 2021 13:50:45 +0100 Subject: gnu: emacs-posframe: Update to 1.1.1. * gnu/packages/emacs-xyz.scm (emacs-posframe): Update to 1.1.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a9b1f52c4e..a60992bcf5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13942,14 +13942,14 @@ methods from a given list.") (define-public emacs-posframe (package (name "emacs-posframe") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "posframe-" version ".tar")) (sha256 - (base32 "0ddm149dz71nksbpz7rwa8cax1nisf6wklv5iq4zrcbf5ghpagkg")))) + (base32 "13bx8vd3dw4jvwrys1vyq3a65rjjsbsvi6jxiffp647aclwwfcjs")))) (build-system emacs-build-system) ;; emacs-minimal does not include the function font-info. (arguments -- cgit 1.4.1 From e7655205101cbe2f2656d923ec0bdadb4681610a Mon Sep 17 00:00:00 2001 From: phodina Date: Wed, 10 Nov 2021 13:21:13 +0000 Subject: gnu: Add emacs-plz. * gnu/packages/emacs-xyz.scm (emacs-plz): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a60992bcf5..84da527147 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15072,6 +15072,31 @@ fragment in a dedicated buffer just like editing a source block.") multiplexer.") (license license:gpl3+))) +(define-public emacs-plz + (let ((commit "7e456638a651bab3a814e3ea81742dd917509cbb") + (revision "1")) + (package + (name "emacs-plz") + (version (git-version "0.1-pre" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/plz.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05kgxrps1s20im5hhq799nrs3615bvssm4r0ysgmwm203mmzsjgj")))) + (build-system emacs-build-system) + (inputs `(("curl" ,curl))) + (home-page "https://github.com/alphapapa/plz.el") + (synopsis "HTTP library for Emacs") + (description + "This package provides HTTP library for Emacs. It uses curl as +a backend, which avoids some of the issues with using Emacs’s built-in url +library.") + (license license:gpl3+)))) + (define-public emacs-rpm-spec-mode (package (name "emacs-rpm-spec-mode") -- cgit 1.4.1 From 4c6f9450a5006d4edcc39fa77c04bf05c12fb00b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 10 Nov 2021 14:21:02 +0200 Subject: gnu: rust-speculate-0.1: Fix build. * gnu/packages/crates-io.scm (rust-speculate-0.1)[arguments]: Don't skip build, skip tests. [cargo-inputs]: Replace rust-quote-1 with 0.6, rust-syn-0.15 with 0.14. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 087465186f..fe2e89bbf9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48172,11 +48172,11 @@ track of where each new file and line starts.") "0ph01n3fqkmnfr1wd13dqsi4znv06xy6p4h3hqqdzk81r0r5vd1w")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-0.15) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.14) ("rust-unicode-xid" ,rust-unicode-xid-0.1)))) (home-page "https://github.com/utkarshkukreti/speculate.rs") (synopsis "RSpec inspired testing framework for Rust") -- cgit 1.4.1 From 140b486437670ce95cb24a935b58cba52a9dac31 Mon Sep 17 00:00:00 2001 From: phodina Date: Wed, 10 Nov 2021 14:58:21 +0100 Subject: gnu: Add emacs-ement. * gnu/packages/emacs-xyz.scm (emacs-ement): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 84da527147..4281371f10 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15097,6 +15097,32 @@ a backend, which avoids some of the issues with using Emacs’s built-in url library.") (license license:gpl3+)))) +(define-public emacs-ement + (let ((commit "c951737dc855604aba389166bb0e7366afadc533") + (revision "1")) + (package + (name "emacs-ement") + (version (git-version "0.1-pre" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alphapapa/ement.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00iwwz4hzg4g59wrb5df6snqz3ppvrsadhfp61w1pa8gvg2z9bvy")))) + (build-system emacs-build-system) + (arguments + `(#:emacs ,emacs)) ;need libxml support + (inputs + `(("emacs-plz" ,emacs-plz) + ("emacs-ts" ,emacs-ts))) + (home-page "https://github.com/alphapapa/ement.el") + (synopsis "Matrix client for Emacs") + (description "Ement.el is a Matrix client for Emacs.") + (license license:gpl3+)))) + (define-public emacs-rpm-spec-mode (package (name "emacs-rpm-spec-mode") -- cgit 1.4.1 From ee7c96a6a4dfed3bef91e64dc8dd83eaabf563b3 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Oct 2021 11:12:02 -0400 Subject: gnu: rust-os-pipe: Update to 0.9.2. * gnu/packages/crates-io.scm (rust-os-pipe-0.8): Replace with ... (rust-os-pipe-0.9): ... new variable. (arguments)<#:cargo-inputs>: Replace rust-nix-0.15 with rust-libc-0.2. --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fe2e89bbf9..7764911e96 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -33462,10 +33462,10 @@ under its new name.") "This library detects the operating system type and version.") (license license:expat))) -(define-public rust-os-pipe-0.8 +(define-public rust-os-pipe-0.9 (package (name "rust-os-pipe") - (version "0.8.2") + (version "0.9.2") (source (origin (method url-fetch) @@ -33474,12 +33474,12 @@ under its new name.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "049ax8shxik7mm68r2nf7xnrcq3z3p7hz54sbrcxwywxqsjdzs41")))) + "04yjs1hf88jjm17g8a2lr7ibxyyg460rzbgcw9f1yzihq833y8zv")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-nix" ,rust-nix-0.15) + (("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/oconnor663/os_pipe.rs") -- cgit 1.4.1 From 43618fe3e1e89d7b9f6514cfc1f65aafdcc184e8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 4 Nov 2021 11:50:11 -0400 Subject: gnu: rust-duct-0.13: Update to 0.13.5. * gnu/packages/crates-io.scm (rust-duct-0.13): Update to 0.13.5. [arguments]: Use rust-os-pipe-0.9 instead of rust-os-pipe-0.8. --- gnu/packages/crates-io.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7764911e96..48cf77f1f0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15305,7 +15305,7 @@ Rust.") (define-public rust-duct-0.13 (package (name "rust-duct") - (version "0.13.0") + (version "0.13.5") (source (origin (method url-fetch) @@ -15314,14 +15314,14 @@ Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ir3884i1yznkfdccqqbcb9v5sdpcgxlv41hgzncrqaljv18r0wj")))) + "13bxiy0y1dck3xz28rqw5ylf2ykv6mk8ww6g8408x26hksjs1ihg")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) - ("rust-os-pipe" ,rust-os-pipe-0.8) + ("rust-os-pipe" ,rust-os-pipe-0.9) ("rust-shared-child" ,rust-shared-child-0.3)) #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))) -- cgit 1.4.1 From f7019cc8becac77908b9e477bb0fe462f81be5c6 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Oct 2021 11:23:30 -0400 Subject: gnu: Add BLAKE3 Rust implementation. * gnu/packages/crypto.scm (rust-blake3-0.3): New variable. --- gnu/packages/crypto.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index f48fc23c1f..a2b67fd332 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1537,3 +1537,37 @@ via FUSE without root permissions. It is similar to EncFS, but provides additional security and privacy measures such as hiding file sizes and directory structure. However CryFS is not considered stable yet by the developers.") (license license:lgpl3+))) + +(define-public rust-blake3-0.3 + (package + (name "rust-blake3") + ;; Version 1 requires Rust >= 1.51. + ;; + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "blake3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cr5l5szgxm632px41kavl6cgils8h6yhdfkm6jsc5jgiivqai5n")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-arrayref" ,rust-arrayref-0.3) + ("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.1) + ("rust-crypto-mac" ,rust-crypto-mac-0.8) + ("rust-digest" ,rust-digest-0.9) + ("rust-rayon" ,rust-rayon-1)))) + (home-page "https://github.com/BLAKE3-team/BLAKE3") + (synopsis "BLAKE3 hash function Rust implementation") + (description "This crate provides the official Rust implementation of the +BLAKE3 cryptographic hash function. BLAKE3 is faster than MD5, SHA-1, SHA-2, +SHA-3, and BLAKE2.") + ;; Users may choose between these two licenses when redistributing the + ;; program provided by this package. + (license (list license:cc0 license:asl2.0)))) -- cgit 1.4.1 From 650dcc18e7f840a789a6aa06533b4a4ffc06af59 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 19 Oct 2021 11:33:28 -0400 Subject: gnu: Add BLAKE3 command line tool. * gnu/packages/crypto.scm (b3sum): New variable. --- gnu/packages/crypto.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index a2b67fd332..b6f2010a80 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1571,3 +1571,52 @@ SHA-3, and BLAKE2.") ;; Users may choose between these two licenses when redistributing the ;; program provided by this package. (license (list license:cc0 license:asl2.0)))) + +(define-public b3sum + (package + (name "b3sum") + ;; Version 1 requires Rust >= 1.51. + ;; + (version "0.3.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "b3sum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h3fz16q5lk6mg7r8kjkjrq5hd4injngn5m7pswjbf2pyzjmg4b4")))) + (build-system cargo-build-system) + (arguments + `(;; Install the source so that Cargo.toml is installed, because that is + ;; the only reference to the license information. + #:install-source? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'patch-tests + (lambda _ + (substitute* "tests/cli_tests.rs" + (("/bin/sh") (which "sh"))))) + (add-after 'install 'install-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" ,name "-" + ,(package-version this-package)))) + (install-file "README.md" doc))))) + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-blake3" ,rust-blake3-0.3) + ("rust-clap" ,rust-clap-2) + ("rust-hex" ,rust-hex-0.4) + ("rust-memmap" ,rust-memmap-0.7) + ("rust-rayon" ,rust-rayon-1) + ("rust-wild" ,rust-wild-2)) + #:cargo-development-inputs + (("rust-duct" ,rust-duct-0.13) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/BLAKE3-team/BLAKE3") + (synopsis "Command line BLAKE3 checksum tool") + (description "This package provides @code{b3sum}, a command line +checksum tool based on the BLAKE3 cryptographic hash function.") + ;; Users may choose between these two licenses when redistributing the + ;; program provided by this package. + (license (list license:cc0 license:asl2.0)))) -- cgit 1.4.1 From b20cd80ff1f3c9eb988a0cc27ed9538b68914608 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 28 Oct 2021 22:14:40 +0200 Subject: import: pypi: Allow imports of a specific version. * guix/import/pypi.scm (latest-version): New procedure. (latest-source-release): Rename to... (source-release): ... this. Add 'version' parameter. (latest-wheel-release): Rename to... (wheel-release): ... this. Add 'version' parameter. (pypi->guix-package): Honor 'version' parameter. (pypi-recursive-import): Add 'version' parameter and honor it. * guix/scripts/import/pypi.scm (guix-import-pypi): Expect a spec. Pass it to 'package-name->name+version'. Pass the 'version' parameter. * tests/pypi.scm ("pypi->guix-package, no wheel"): Exercise the #:version parameter. * doc/guix.texi (Invoking guix import): Document it. --- doc/guix.texi | 10 ++++++++-- guix/import/pypi.scm | 47 +++++++++++++++++++++++--------------------- guix/scripts/import/pypi.scm | 32 ++++++++++++++++-------------- tests/pypi.scm | 12 ++++++++--- 4 files changed, 59 insertions(+), 42 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index e6980bd060..c748a572ea 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11723,13 +11723,19 @@ information, including package dependencies. For maximum efficiency, it is recommended to install the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them. -The command below imports metadata for the @code{itsdangerous} Python -package: +The command below imports metadata for the latest version of the +@code{itsdangerous} Python package: @example guix import pypi itsdangerous @end example +You can also ask for a specific version: + +@example +guix import pypi itsdangerous@@1.1.0 +@end example + @table @code @item --recursive @itemx -r diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index f908136481..418a3556ec 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -128,27 +128,30 @@ missing-source-error? (package missing-source-error-package)) -(define (latest-source-release pypi-package) - "Return the latest source release for PYPI-PACKAGE." - (let ((releases (assoc-ref (pypi-project-releases pypi-package) - (project-info-version - (pypi-project-info pypi-package))))) +(define (latest-version project) + "Return the latest version of PROJECT, a record." + (project-info-version (pypi-project-info project))) + +(define* (source-release pypi-package + #:optional (version (latest-version pypi-package))) + "Return the source release of VERSION for PYPI-PACKAGE, a +record, by default the latest version." + (let ((releases (or (assoc-ref (pypi-project-releases pypi-package) version) + '()))) (or (find (lambda (release) (string=? "sdist" (distribution-package-type release))) releases) (raise (condition (&missing-source-error (package pypi-package))))))) -(define (latest-wheel-release pypi-package) +(define* (wheel-release pypi-package + #:optional (version (latest-version pypi-package))) "Return the url of the wheel for the latest release of pypi-package, or #f if there isn't any." - (let ((releases (assoc-ref (pypi-project-releases pypi-package) - (project-info-version - (pypi-project-info pypi-package))))) - (or (find (lambda (release) - (string=? "bdist_wheel" (distribution-package-type release))) - releases) - #f))) + (let ((releases (assoc-ref (pypi-project-releases pypi-package) version))) + (find (lambda (release) + (string=? "bdist_wheel" (distribution-package-type release))) + releases))) (define (python->package-name name) "Given the NAME of a package on PyPI, return a Guix-compliant name for the @@ -484,18 +487,17 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." "Fetch the metadata for PACKAGE-NAME from pypi.org, and return the `package' s-expression corresponding to that package, or #f on failure." (let* ((project (pypi-fetch package-name)) - (info (and project (pypi-project-info project)))) + (info (and=> project pypi-project-info)) + (version (or version (and=> project latest-version)))) (and project (guard (c ((missing-source-error? c) (let ((package (missing-source-error-package c))) (leave (G_ "no source release for pypi package ~a ~a~%") - (project-info-name info) - (project-info-version info))))) - (make-pypi-sexp (project-info-name info) - (project-info-version info) - (and=> (latest-source-release project) + (project-info-name info) version)))) + (make-pypi-sexp (project-info-name info) version + (and=> (source-release project version) distribution-url) - (and=> (latest-wheel-release project) + (and=> (wheel-release project version) distribution-url) (project-info-home-page info) (project-info-summary info) @@ -503,8 +505,9 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (string->license (project-info-license info))))))))) -(define (pypi-recursive-import package-name) +(define* (pypi-recursive-import package-name #:optional version) (recursive-import package-name + #:version version #:repo->guix-package pypi->guix-package #:guix-name python->package-name)) @@ -538,7 +541,7 @@ VERSION, SOURCE-URL, HOME-PAGE, SYNOPSIS, DESCRIPTION, and LICENSE." (let* ((info (pypi-project-info pypi-package)) (version (project-info-version info)) (url (distribution-url - (latest-source-release pypi-package)))) + (source-release pypi-package)))) (upstream-source (urls (list url)) (input-changes diff --git a/guix/scripts/import/pypi.scm b/guix/scripts/import/pypi.scm index 9170a0b359..a52cd95c93 100644 --- a/guix/scripts/import/pypi.scm +++ b/guix/scripts/import/pypi.scm @@ -27,6 +27,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-pypi)) @@ -83,21 +84,22 @@ Import and convert the PyPI package for PACKAGE-NAME.\n")) (_ #f)) (reverse opts)))) (match args - ((package-name) - (if (assoc-ref opts 'recursive) - ;; Recursive import - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) - (pypi-recursive-import package-name)) - ;; Single import - (let ((sexp (pypi->guix-package package-name))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - package-name)) - sexp))) + ((spec) + (let ((name version (package-name->name+version spec))) + (if (assoc-ref opts 'recursive) + ;; Recursive import + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (pypi-recursive-import name version)) + ;; Single import + (let ((sexp (pypi->guix-package name #:version version))) + (unless sexp + (leave (G_ "failed to download meta-data for package '~a'~%") + name)) + sexp)))) (() (leave (G_ "too few arguments~%"))) ((many ...) diff --git a/tests/pypi.scm b/tests/pypi.scm index 70f4298a90..ad869ac31f 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -260,9 +260,15 @@ Requires-Dist: pytest (>=3.1.0); extra == 'testing' ('synopsis "summary") ('description "summary") ('license 'license:lgpl2.0)) - (string=? (bytevector->nix-base32-string - test-source-hash) - hash)) + (and (string=? (bytevector->nix-base32-string + test-source-hash) + hash) + (equal? (pypi->guix-package "foo" #:version "1.0.0") + (pypi->guix-package "foo")) + (catch 'quit + (lambda () + (pypi->guix-package "foo" #:version "42")) + (const #t)))) (x (pk 'fail x #f)))))) -- cgit 1.4.1 From 450e1dd52e0a34bb00fcb655956e40d69d50a331 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 Oct 2021 21:26:16 +0200 Subject: import: cran: Allow imports of a specific version. * guix/import/cran.scm (download): Handle the case where URL is a list. (fetch-description-from-tarball): New procedure. (fetch-description): Add #:version parameter. Honor it when REPOSITORY is 'cran. Use 'fetch-description-from-tarball' when REPOSITORY is 'bioconductor. (description->package): SOURCE-URL may now be a list. (cran->guix-package): Pass VERSION to 'fetch-description'. (cran-recursive-import): Add #:version parameter. * guix/scripts/import/cran.scm (guix-import-cran): Expect a spec rather than a mere package name. * doc/guix.texi (Invoking guix import): Document it. --- doc/guix.texi | 6 +++ guix/import/cran.scm | 91 ++++++++++++++++++++++++++++---------------- guix/scripts/import/cran.scm | 35 +++++++++-------- 3 files changed, 84 insertions(+), 48 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index c748a572ea..29a6665540 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11833,6 +11833,12 @@ The command command below imports metadata for the Cairo R package: guix import cran Cairo @end example +You can also ask for a specific version: + +@example +guix import cran rasterVis@@0.50.3 +@end example + When @option{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix. diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 07a5656cf1..7478866515 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -229,26 +229,61 @@ bioconductor package NAME, or #F if the package is unknown." (let ((store-directory (add-to-store store (basename url) #t "sha256" dir))) (values store-directory changeset))))))) - (else (download-to-store store url))))))) - -(define (fetch-description repository name) + (else + (match url + ((? string?) + (download-to-store store url)) + ((urls ...) + ;; Try all the URLs. A use case where this is useful is when one + ;; of the URLs is the /Archive CRAN URL. + (any (cut download-to-store store <>) urls))))))))) + +(define (fetch-description-from-tarball url) + "Fetch the tarball at URL, extra its 'DESCRIPTION' file, parse it, and +return the resulting alist." + (match (download url) + (#f #f) + (tarball + (call-with-temporary-directory + (lambda (dir) + (parameterize ((current-error-port (%make-void-port "rw+")) + (current-output-port (%make-void-port "rw+"))) + (and (zero? (system* "tar" "--wildcards" "-x" + "--strip-components=1" + "-C" dir + "-f" tarball "*/DESCRIPTION")) + (description->alist + (call-with-input-file (string-append dir "/DESCRIPTION") + read-string))))))))) + +(define* (fetch-description repository name #:optional version) "Return an alist of the contents of the DESCRIPTION file for the R package -NAME in the given REPOSITORY, or #f in case of failure. NAME is +NAME at VERSION in the given REPOSITORY, or #f in case of failure. NAME is case-sensitive." (case repository ((cran) - (let ((url (string-append %cran-url name "/DESCRIPTION"))) - (guard (c ((http-get-error? c) - (warning (G_ "failed to retrieve package information \ + (guard (c ((http-get-error? c) + (warning (G_ "failed to retrieve package information \ from ~a: ~a (~a)~%") - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason c)) - #f)) - (let* ((port (http-fetch url)) - (result (description->alist (read-string port)))) - (close-port port) - result)))) + (uri->string (http-get-error-uri c)) + (http-get-error-code c) + (http-get-error-reason c)) + #f)) + ;; When VERSION is true, we have to download the tarball to get at its + ;; 'DESCRIPTION' file; only the latest one is directly accessible over + ;; HTTP. + (if version + (let ((urls (list (string-append "mirror://cran/src/contrib/" + name "_" version ".tar.gz") + (string-append "mirror://cran/src/contrib/Archive/" + name "/" + name "_" version ".tar.gz")))) + (fetch-description-from-tarball urls)) + (let* ((url (string-append %cran-url name "/DESCRIPTION")) + (port (http-fetch url)) + (result (description->alist (read-string port)))) + (close-port port) + result)))) ((bioconductor) ;; Currently, the bioconductor project does not offer a way to access a ;; package's DESCRIPTION file over HTTP, so we determine the version, @@ -257,22 +292,13 @@ from ~a: ~a (~a)~%") (and (latest-bioconductor-package-version name) #t) (and (latest-bioconductor-package-version name 'annotation) 'annotation) (and (latest-bioconductor-package-version name 'experiment) 'experiment))) + ;; TODO: Honor VERSION. (version (latest-bioconductor-package-version name type)) (url (car (bioconductor-uri name version type))) - (tarball (download url))) - (call-with-temporary-directory - (lambda (dir) - (parameterize ((current-error-port (%make-void-port "rw+")) - (current-output-port (%make-void-port "rw+"))) - (and (zero? (system* "tar" "--wildcards" "-x" - "--strip-components=1" - "-C" dir - "-f" tarball "*/DESCRIPTION")) - (and=> (description->alist (with-input-from-file - (string-append dir "/DESCRIPTION") read-string)) - (lambda (meta) - (if (boolean? type) meta - (cons `(bioconductor-type . ,type) meta)))))))))) + (meta (fetch-description-from-tarball url))) + (if (boolean? type) + meta + (cons `(bioconductor-type . ,type) meta)))) ((git) (and (string-prefix? "http" name) ;; Download the git repository at "NAME" @@ -485,7 +511,7 @@ from the alist META, which was derived from the R package's DESCRIPTION file." ((bioconductor) (list (assoc-ref meta 'bioconductor-type))) (else '()))) - ((url rest ...) url) + ((urls ...) urls) ((? string? url) url) (_ #f))))) (git? (assoc-ref meta 'git)) @@ -592,7 +618,7 @@ from the alist META, which was derived from the R package's DESCRIPTION file." (lambda* (package-name #:key (repo 'cran) version) "Fetch the metadata for PACKAGE-NAME from REPO and return the `package' s-expression corresponding to that package, or #f on failure." - (let ((description (fetch-description repo package-name))) + (let ((description (fetch-description repo package-name version))) (if description (description->package repo description) (case repo @@ -610,8 +636,9 @@ s-expression corresponding to that package, or #f on failure." (&message (message "couldn't find meta-data for R package"))))))))))) -(define* (cran-recursive-import package-name #:key (repo 'cran)) +(define* (cran-recursive-import package-name #:key (repo 'cran) version) (recursive-import package-name + #:version version #:repo repo #:repo->guix-package cran->guix-package #:guix-name cran-guix-name)) diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index 3e4b038cc4..2934d4300a 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -27,8 +27,8 @@ #:use-module (guix import utils) #:use-module (guix scripts import) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-71) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-cran)) @@ -98,21 +98,24 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) (reverse opts)))) (parameterize ((%input-style (assoc-ref opts 'style))) (match args - ((package-name) - (if (assoc-ref opts 'recursive) - ;; Recursive import - (with-error-handling - (map package->definition - (filter identity - (cran-recursive-import package-name - #:repo (or (assoc-ref opts 'repo) 'cran))))) - ;; Single import - (let ((sexp (cran->guix-package package-name - #:repo (or (assoc-ref opts 'repo) 'cran)))) - (unless sexp - (leave (G_ "failed to download description for package '~a'~%") - package-name)) - sexp))) + ((spec) + (let ((name version (package-name->name+version spec))) + (if (assoc-ref opts 'recursive) + ;; Recursive import + (with-error-handling + (map package->definition + (filter identity + (cran-recursive-import name + #:version version + #:repo (or (assoc-ref opts 'repo) 'cran))))) + ;; Single import + (let ((sexp (cran->guix-package name + #:version version + #:repo (or (assoc-ref opts 'repo) 'cran)))) + (unless sexp + (leave (G_ "failed to download description for package '~a'~%") + name)) + sexp)))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- cgit 1.4.1 From 04d929570ad816793d7e0024a11314124ce87f98 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 Oct 2021 21:51:39 +0200 Subject: import: print: Properly render packages with origins as inputs. * guix/import/print.scm (package->code)[source->code]: Check whether VERSION is true before calling 'factorize-uri'. [package-lists->code]: Add clause for inputs that are origins. * tests/print.scm (pkg-with-origin-input, pkg-with-origin-input-source): New variables. ("package with origin input"): New test. --- guix/import/print.scm | 14 +++++++++----- tests/print.scm | 28 ++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 0310739b3a..8acf5d52f6 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -89,9 +89,11 @@ when evaluated." (guix hg-download) (guix svn-download))) (procedure-name method))) - (uri (string-append ,@(match (factorize-uri uri version) - ((? string? uri) (list uri)) - (factorized factorized)))) + (uri ,(if version + `(string-append ,@(match (factorize-uri uri version) + ((? string? uri) (list uri)) + (factorized factorized))) + uri)) ,(if (equal? (content-hash-algorithm hash) 'sha256) `(sha256 (base32 ,(bytevector->nix-base32-string (content-hash-value hash)))) @@ -109,7 +111,7 @@ when evaluated." (map (match-lambda ((? symbol? s) (list (symbol->string s) (list 'unquote s))) - ((label pkg . out) + ((label (? package? pkg) . out) (let ((mod (package-module-name pkg))) (cons* label ;; FIXME: using '@ certainly isn't pretty, but it @@ -117,7 +119,9 @@ when evaluated." ;; modules. (list 'unquote (list '@ mod (variable-name pkg mod))) - out)))) + out))) + ((label (? origin? origin)) + (list label (list 'unquote (source->code origin #f))))) lsts))) (let ((name (package-name package)) diff --git a/tests/print.scm b/tests/print.scm index 3386590d3a..ad19f4573a 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -67,6 +67,30 @@ (description "This is a dummy package.") (license license:gpl3+))) +(define-with-source pkg-with-origin-input pkg-with-origin-input-source + (package + (name "test") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (string-append "file:///tmp/test-" + version ".tar.gz")) + (sha256 + (base32 + "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) + (build-system (@ (guix build-system gnu) gnu-build-system)) + (inputs + `(("o" ,(origin + (method url-fetch) + (uri "http://example.org/somefile.txt") + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000")))))) + (home-page "http://gnu.org") + (synopsis "Dummy") + (description "This is a dummy package.") + (license license:gpl3+))) + (test-equal "simple package" `(define-public test ,pkg-source) (package->code pkg)) @@ -75,4 +99,8 @@ `(define-public test ,pkg-with-inputs-source) (package->code pkg-with-inputs)) +(test-equal "package with origin input" + `(define-public test ,pkg-with-origin-input-source) + (package->code pkg-with-origin-input)) + (test-end "print") -- cgit 1.4.1 From b3240ae846cb1ace2322a68eca3497f11d0be6f1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 Oct 2021 22:23:21 +0200 Subject: import: print: Correctly handle URI lists. * guix/import/print.scm (package->code)[factorized-uri-code]: New procedure. [source->code]: Use it, and factorize URI when it's a list. * tests/print.scm (pkg-with-origin-input): Check origin URI to a list. --- guix/import/print.scm | 15 ++++++++++++--- tests/print.scm | 6 ++++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 8acf5d52f6..4e65d18bc3 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system) #:use-module (gnu packages) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) #:use-module (guix import utils) #:use-module (ice-9 control) #:use-module (ice-9 match) @@ -72,6 +73,11 @@ when evaluated." (file-type (quote ,(search-path-specification-file-type spec))) (file-pattern ,(search-path-specification-file-pattern spec)))) + (define (factorized-uri-code uri version) + (match (factorize-uri uri version) + ((? string? uri) uri) + ((factorized ...) `(string-append ,@factorized)))) + (define (source->code source version) (let ((uri (origin-uri source)) (method (origin-method source)) @@ -90,9 +96,12 @@ when evaluated." (guix svn-download))) (procedure-name method))) (uri ,(if version - `(string-append ,@(match (factorize-uri uri version) - ((? string? uri) (list uri)) - (factorized factorized))) + (match uri + ((? string? uri) + (factorized-uri-code uri version)) + ((lst ...) + `(list + ,@(map (cut factorized-uri-code <> version) uri)))) uri)) ,(if (equal? (content-hash-algorithm hash) 'sha256) `(sha256 (base32 ,(bytevector->nix-base32-string diff --git a/tests/print.scm b/tests/print.scm index ad19f4573a..7f4c8ccdd1 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -73,8 +73,10 @@ (version "1.2.3") (source (origin (method url-fetch) - (uri (string-append "file:///tmp/test-" - version ".tar.gz")) + (uri (list (string-append "file:///tmp/test-" + version ".tar.gz") + (string-append "http://example.org/test-" + version ".tar.gz"))) (sha256 (base32 "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) -- cgit 1.4.1 From b2ed40c29f578d46d42cb1c5e99bd797cea3aba0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 29 Oct 2021 22:29:05 +0200 Subject: import: print: Handle patches that are origins. * guix/import/print.scm (package->code)[source->code]: Handle patches that are origins. * tests/print.scm (pkg-with-origin-input): Add 'patches' field. (pkg-with-origin-patch, pkg-with-origin-patch-source): New variables. ("package with origin patch"): New test. --- guix/import/print.scm | 13 +++++++++++-- tests/print.scm | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index 4e65d18bc3..e04a6647b4 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -112,8 +112,17 @@ when evaluated." ;; FIXME: in order to be able to throw away the directory prefix, ;; we just assume that the patch files can be found with ;; "search-patches". - ,@(if (null? patches) '() - `((patches (search-patches ,@(map basename patches)))))))) + ,@(cond ((null? patches) + '()) + ((every string? patches) + `((patches (search-patches ,@(map basename patches))))) + (else + `((patches (list ,@(map (match-lambda + ((? string? file) + `(search-patch ,file)) + ((? origin? origin) + (source->code origin #f))) + patches))))))))) (define (package-lists->code lsts) (list 'quasiquote diff --git a/tests/print.scm b/tests/print.scm index 7f4c8ccdd1..ff0db469ab 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -22,6 +22,7 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module ((gnu packages) #:select (search-patches)) #:use-module (srfi srfi-64)) (define-syntax-rule (define-with-source object source expr) @@ -79,7 +80,9 @@ version ".tar.gz"))) (sha256 (base32 - "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) + "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")) + (patches (search-patches "guile-linux-syscalls.patch" + "guile-relocatable.patch")))) (build-system (@ (guix build-system gnu) gnu-build-system)) (inputs `(("o" ,(origin @@ -93,6 +96,30 @@ (description "This is a dummy package.") (license license:gpl3+))) +(define-with-source pkg-with-origin-patch pkg-with-origin-patch-source + (package + (name "test") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (string-append "file:///tmp/test-" + version ".tar.gz")) + (sha256 + (base32 + "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")) + (patches + (list (origin + (method url-fetch) + (uri "http://example.org/x.patch") + (sha256 + (base32 + "0000000000000000000000000000000000000000000000000000"))))))) + (build-system (@ (guix build-system gnu) gnu-build-system)) + (home-page "http://gnu.org") + (synopsis "Dummy") + (description "This is a dummy package.") + (license license:gpl3+))) + (test-equal "simple package" `(define-public test ,pkg-source) (package->code pkg)) @@ -105,4 +132,8 @@ `(define-public test ,pkg-with-origin-input-source) (package->code pkg-with-origin-input)) +(test-equal "package with origin patch" + `(define-public test ,pkg-with-origin-patch-source) + (package->code pkg-with-origin-patch)) + (test-end "print") -- cgit 1.4.1 From 3756ce32674139376bcf11dac96bc562582088f7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 11 Nov 2021 00:10:44 +0100 Subject: import: print: Replace packages and origins in 'arguments'. * guix/import/print.scm (package->code)[variable-reference] [object->code]: New procedures. [package-lists->code]: Rewrite in terms of 'object->code'. Pass the 'arguments' field through 'object->code'. * tests/print.scm (pkg-with-arguments, pkg-with-arguments-source): New variables. ("package with arguments"): New test. --- guix/import/print.scm | 50 ++++++++++++++++++++++++++++++-------------------- tests/print.scm | 23 +++++++++++++++++++++++ 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/guix/import/print.scm b/guix/import/print.scm index e04a6647b4..767b0528d5 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2020 Ricardo Wurmus +;;; Copyright © 2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,9 +32,6 @@ #:use-module (ice-9 match) #:export (package->code)) -;; FIXME: the quasiquoted arguments field may contain embedded package -;; objects, e.g. in #:disallowed-references; they will just be printed with -;; their usual # representation, not as variable names. (define (package->code package) "Return an S-expression representing the source code that produces PACKAGE when evaluated." @@ -124,23 +122,34 @@ when evaluated." (source->code origin #f))) patches))))))))) + (define (variable-reference module name) + ;; FIXME: using '@ certainly isn't pretty, but it avoids having to import + ;; the individual package modules. + (list '@ module name)) + + (define (object->code obj quoted?) + (match obj + ((? package? package) + (let* ((module (package-module-name package)) + (name (variable-name package module))) + (if quoted? + (list 'unquote (variable-reference module name)) + (variable-reference module name)))) + ((? origin? origin) + (let ((code (source->code origin #f))) + (if quoted? + (list 'unquote code) + code))) + ((lst ...) + (let ((lst (map (cut object->code <> #t) lst))) + (if quoted? + lst + (list 'quasiquote lst)))) + (obj + obj))) + (define (package-lists->code lsts) - (list 'quasiquote - (map (match-lambda - ((? symbol? s) - (list (symbol->string s) (list 'unquote s))) - ((label (? package? pkg) . out) - (let ((mod (package-module-name pkg))) - (cons* label - ;; FIXME: using '@ certainly isn't pretty, but it - ;; avoids having to import the individual package - ;; modules. - (list 'unquote - (list '@ mod (variable-name pkg mod))) - out))) - ((label (? origin? origin)) - (list label (list 'unquote (source->code origin #f))))) - lsts))) + (list 'quasiquote (object->code lsts #t))) (let ((name (package-name package)) (version (package-version package)) @@ -176,7 +185,8 @@ when evaluated." '-build-system))) ,@(match arguments (() '()) - (args `((arguments ,(list 'quasiquote args))))) + (_ `((arguments + ,(list 'quasiquote (object->code arguments #t)))))) ,@(match outputs (("out") '()) (outs `((outputs (list ,@outs))))) diff --git a/tests/print.scm b/tests/print.scm index ff0db469ab..1527251b01 100644 --- a/tests/print.scm +++ b/tests/print.scm @@ -120,6 +120,25 @@ (description "This is a dummy package.") (license license:gpl3+))) +(define-with-source pkg-with-arguments pkg-with-arguments-source + (package + (name "test") + (version "1.2.3") + (source (origin + (method url-fetch) + (uri (string-append "file:///tmp/test-" + version ".tar.gz")) + (sha256 + (base32 + "070pwb7brdcn1mfvplkd56vjc7lbz4iznzkqvfsakvgbv68k71ah")))) + (build-system (@ (guix build-system gnu) gnu-build-system)) + (arguments + `(#:disallowed-references (,(@ (gnu packages base) coreutils)))) + (home-page "http://gnu.org") + (synopsis "Dummy") + (description "This is a dummy package.") + (license license:gpl3+))) + (test-equal "simple package" `(define-public test ,pkg-source) (package->code pkg)) @@ -136,4 +155,8 @@ `(define-public test ,pkg-with-origin-patch-source) (package->code pkg-with-origin-patch)) +(test-equal "package with arguments" + `(define-public test ,pkg-with-arguments-source) + (package->code pkg-with-arguments)) + (test-end "print") -- cgit 1.4.1 From ac2bd4a319ae33c59c76720c3ac9786bd8eb4fbe Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 28 Oct 2021 09:06:00 +0200 Subject: gnu: python-poetry-core: Update to 1.0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-poetry-core): Update to 1.0.7. Signed-off-by: Ludovic Courtès --- gnu/packages/python-build.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index ace80382bb..61105d12ab 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -160,13 +160,13 @@ order to make bootstrapping easier.") (define-public python-poetry-core (package (name "python-poetry-core") - (version "1.0.3") + (version "1.0.7") (source (origin (method url-fetch) (uri (pypi-uri "poetry-core" version)) (sha256 - (base32 "1ichii48zkywcnj8v3bcn9vk09v69jv6h65805w21hwz4hlcj593")))) + (base32 "01n2rbsvks7snrq3m1d08r3xz9q2715ajb62fdb6rvqnb9sirhcq")))) (build-system python-build-system) (home-page "https://github.com/python-poetry/poetry-core") (synopsis "Poetry PEP 517 build back-end") -- cgit 1.4.1 From 800afd26f43803417db5373c905dfbc7ed4d6f92 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Thu, 28 Oct 2021 09:06:01 +0200 Subject: gnu: poetry: Update to 1.1.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-build.scm (poetry): Update to 1.1.11. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 495d7faa87..f33046985a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -15695,7 +15695,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (define-public poetry (package (name "poetry") - (version "1.1.5") + (version "1.1.11") ;; Poetry can only be built from source with Poetry. (source (origin @@ -15703,7 +15703,7 @@ database, file, dict stores. Cachy supports python versions 2.7+ and 3.2+.") (uri (pypi-uri "poetry" version)) (sha256 (base32 - "1dvx08ksv5wnsj45db23921rj136akmcnxa0kmlsddf3wbh6wcka")))) + "17pnf2j4adlm9fhyg5jkkvs8bzcigb6nj72vr0687fxybzsj4zbx")))) (build-system python-build-system) (arguments `(#:tests? #f ;; Pypi does not have tests. -- cgit 1.4.1 From 5592058e9d72e1960bfde52dc9744f51518ebb74 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Thu, 28 Oct 2021 05:01:56 +0000 Subject: gnu: Add python-wand. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-wand): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f33046985a..a01a14f29b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1553,6 +1553,35 @@ and simplified. It supports SPDX license expressions as well as other naming conventions and aliases in the same expression.") (license license:gpl2+))) +(define-public python-wand + (package + (name "python-wand") + (version "0.6.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Wand" version)) + (sha256 + (base32 "1nxn7zvbnfgk4kkxajbzglcjpbgr84ilhnxm990nifjxqb61ph7b")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-magickwand + (lambda* (#:key inputs #:allow-other-keys) + (setenv "MAGICK_HOME" (assoc-ref inputs "imagemagick")) + (setenv "WAND_MAGICK_LIBRARY_SUFFIX" ".Q16")))))) + (native-inputs + `(("python-pytest" ,python-pytest))) + (inputs + `(("imagemagick" ,imagemagick))) + (home-page "https://docs.wand-py.org/") + (synopsis "MagickWand API binding for Python") + (description + "Wand is a ctypes-based binding for the C API of ImageMagick's MagickWand +library.") + (license license:expat))) + (define-public python-lockfile (package (name "python-lockfile") -- cgit 1.4.1 From 3d1c984ad857d9fd56b1ae068adf81cd8e05f83b Mon Sep 17 00:00:00 2001 From: Michael Ford Date: Tue, 26 Oct 2021 08:26:44 +0800 Subject: gnu: bitcoin-core-0.20: Update to 0.20.2. * gnu/packages/finance.scm (bitcoin-core-0.20): Update to 0.20.2. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 1427735a9e..c9732f936e 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -193,7 +193,7 @@ line client and a client based on Qt.") (define-public bitcoin-core-0.20 (package (inherit bitcoin-core-0.21) - (version "0.20.1") + (version "0.20.2") (source (origin (method url-fetch) (uri @@ -201,7 +201,7 @@ line client and a client based on Qt.") version "/bitcoin-" version ".tar.gz")) (sha256 (base32 - "0y5rad68b398arh0abr2wgiwybdw0i5a4dxz9s3fk9fgdbyn5gab")))))) + "14smp5vmh7baabl856wlg7w7y5910jhx6c02mlkm4hkywf3yylky")))))) ;; The support lifetimes for bitcoin-core versions can be found in ;; . -- cgit 1.4.1 From f20e0f6ba7a69e1dcc5cc9ef2015a8ad115cc822 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:02:30 +0000 Subject: gnu: Add rust-safe-arch-0.5. * gnu/packages/crates-io.scm (rust-safe-arch-0.5): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 48cf77f1f0..9cc885d104 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43858,6 +43858,28 @@ quickly convert floating point numbers to decimal strings.") computation (experimental)") (license (list license:asl2.0 license:expat)))) +(define-public rust-safe-arch-0.5 + (package + (name "rust-safe-arch") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "safe_arch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01ffy9aw9v1n4bcwl525zw3gnh18jk7aq38iqcn51bwnjrnkvzy1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1)))) + (home-page "https://github.com/Lokathor/safe_arch") + (synopsis "Access core::arch safely") + (description "This package exposes @code{core::arch} safely via +@code{#[cfg()]}.") + (license (list license:zlib license:asl2.0 license:expat)))) + (define-public rust-safemem-0.3 (package (name "rust-safemem") -- cgit 1.4.1 From 3cd3703b36a782634e9fb4c1be2c3dfa372e36c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:12:44 +0000 Subject: gnu: Add rust-rkyv-derive-0.6. * gnu/packages/crates-io.scm (rust-rkyv-derive-0.6): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9cc885d104..70654f696d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43632,6 +43632,30 @@ sub-processes using a fork-like interface.") (base32 "1n3iw9kaq70dw1rvvma0gjwydbj0f2mvvqvrva69f5cl6yv1dnd0")))))) +(define-public rust-rkyv-derive-0.6 + (package + (name "rust-rkyv-derive") + (version "0.6.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "rkyv_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mc7rnps41gdywahsffqlypsp9jqmp0r6hlh2nxm31bddfgli3xs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rkyv/rkyv") + (synopsis "Derive macro for zero-copy deserialization framework") + (description "This package provides a Derive macro for the rkyv +deserialization framework.") + (license license:expat))) + (define-public rust-ryu-1 (package (name "rust-ryu") -- cgit 1.4.1 From f2cbee9238585e98b04ce7b667d0e676fa8893db Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:12:59 +0000 Subject: gnu: Add rust-seahash-4. * gnu/packages/crates-io.scm (rust-seahash-4): New variable. --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 70654f696d..459c1a58c8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44521,6 +44521,26 @@ Pwrite traits from the scroll crate.") proven statistical guarantees.") (license license:expat))) +(define-public rust-seahash-4 + (package + (name "rust-seahash") + (version "4.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "seahash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sxsb64np6bvnppjz5hg4rqpnkczhsl8w8kf2a5lr1c08xppn40w")))) + (build-system cargo-build-system) + (arguments '(#:skip-build? #t)) + (home-page "https://gitlab.redox-os.org/redox-os/seahash") + (synopsis "Hash function with proven statistical guarantees") + (description + "This package provides a fast, portable hash function with proven +statistical guarantees.") + (license license:expat))) + (define-public rust-seccomp-sys-0.1 (package (name "rust-seccomp-sys") -- cgit 1.4.1 From 40cf0ddc2983eb93c5d31fefd75dc9907318d2c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:13:30 +0000 Subject: gnu: Add rust-triple-accel-0.4. * gnu/packages/crates-io.scm (rust-triple-accel-0.4): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 459c1a58c8..57aa34b2a7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -55425,6 +55425,27 @@ recycle bin.") "This package provides a library for visualizing tree structured data.") (license license:expat))) +(define-public rust-triple-accel-0.4 + (package + (name "rust-triple-accel") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "triple_accel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qqyhl1pdvmfbx9fgw5jc15j42d0j1i7b6pzn42zsbzvbp4qn112")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/Daniel-Liu-c0deb0t/triple_accel") + (synopsis "Edit distance routines accelerated using SIMD") + (description + "This package provides Rust edit distance routines accelerated using +SIMD. It supports fast Hamming, Levenshtein, restricted Damerau-Levenshtein, +etc. distance calculations and string search.") + (license license:expat))) + (define-public rust-trust-dns-https-0.20 (package (name "rust-trust-dns-https") -- cgit 1.4.1 From 1a3f3879b3caf6a2e28abe4f26b71f435bd923a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:13:48 +0000 Subject: gnu: Add rust-wide-0.6. * gnu/packages/crates-io.scm (rust-wide-0.6): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 57aa34b2a7..09855398f8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -59516,6 +59516,25 @@ hardware of various targets. Both in terms of explicit SIMD usage and also in terms of allowing LLVM's auto-vectorizer to do its job.") (license license:zlib))) +(define-public rust-wide-0.6 + (package + (inherit rust-wide-0.4) + (name "rust-wide") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "wide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16yqf8xsvns21clg3rk8nljq4qnsfqg240smbjqa0z520k3fgfs6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-safe-arch" ,rust-safe-arch-0.5)))) + (license (list license:zlib license:asl2.0 license:expat)))) + (define-public rust-widestring-0.4 (package (name "rust-widestring") -- cgit 1.4.1 From 723ff70e21e9bb54d57ec623156441bad652dacf Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 13:39:18 +0000 Subject: gnu: Add rust-approx-0.5. * gnu/packages/crates-io.scm (rust-approx-0.5): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 09855398f8..f9a295dd3c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2035,6 +2035,30 @@ type.") on every platform.") (license license:expat))) +(define-public rust-approx-0.5 + (package + (name "rust-approx") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "approx" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17p9g3yl061zdlrqj10npybmng81jz71dzmcanmjgcb35qhgfb87")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-traits" ,rust-num-traits-0.2)))) + (home-page "https://github.com/brendanzab/approx") + (synopsis "Approximate floating point equality comparisons and assertions") + (description + "This crate provides facilities for testing the approximate equality of +floating-point based types, using either relative difference, or units in the +last place (ULPs) comparisons.") + (license license:asl2.0))) + (define-public rust-approx-0.4 (package (name "rust-approx") -- cgit 1.4.1 From 97ead3fbf377c865544beaaba46f8389832b29ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 10:14:01 +0000 Subject: gnu: Add rust-simba-0.5. * gnu/packages/crates-io.scm (rust-simba-0.5): New variable. --- gnu/packages/crates-io.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9a295dd3c..c8e6d6c1f1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47193,6 +47193,36 @@ facilitate the use of SIMD-based @dfn{Array of Struct of Array} (AoSoA) storage pattern in Rust.") (license license:bsd-3))) +(define-public rust-simba-0.5 + (package + (inherit rust-simba-0.1) + (name "rust-simba") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simba" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p1x1ndajy4j3dr9zbh79cz5k0hbj4p9bagd7cj00gc5aws0d0lf")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-cordic" ,rust-cordic-0.1) + ("rust-decimal" ,rust-decimal-2) + ("rust-fixed" ,rust-fixed-1) + ("rust-libm" ,rust-libm-0.2) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-wide" ,rust-wide-0.6)))) + (license license:asl2.0))) + (define-public rust-simd-0.2 (package (name "rust-simd") -- cgit 1.4.1 From 8ef352a773e61a10f17c411615412791ad9990b5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 14:48:21 +0000 Subject: gnu: Add rust-bytecheck-derive-0.5. * gnu/packages/crates-io.scm (rust-bytecheck-derive-0.5): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c8e6d6c1f1..e6566eeb78 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Vinicius Monego ;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2021 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -6830,6 +6831,29 @@ memory usage.") "This package provides a library for interaction with units of bytes.") (license license:expat))) +(define-public rust-bytecheck-derive-0.5 + (package + (name "rust-bytecheck-derive") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytecheck_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0grbkwwv5j91n7zrimci6fh4k79flxga3mkjg50jysnyraizi088")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rkyv/bytecheck") + (synopsis "Derive macro for bytecheck") + (description "This package provides a Derive macro for bytecheck, the type +validation framework for Rust.") + (license license:expat))) + (define-public rust-bytecount-0.6 (package (name "rust-bytecount") -- cgit 1.4.1 From 574647b855afd9237a1a0d80f179dd7a0a09880b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 14:48:38 +0000 Subject: gnu: Add rust-ptr-meta-derive-0.1. * gnu/packages/crates-io.scm (rust-ptr-meta-derive-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e6566eeb78..ac999ce251 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60953,6 +60953,29 @@ formatters with per-field documentation generated for each structure. "This package provides Rust bindings to OpenBSD's pledge(2) interface.") (license license:expat))) +(define-public rust-ptr-meta-derive-0.1 + (package + (name "rust-ptr-meta-derive") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "ptr_meta_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b69cav9wn67cixshizii0q5mlbl0lihx706vcrzm259zkdlbf0n")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/djkoloski/ptr_meta") + (synopsis "Macros for the ptr_meta fat pointer metadata API") + (description "This package provides macros for the ptr_meta API.") + (license license:expat))) + (define-public rust-ptree-0.3 (package (name "rust-ptree") -- cgit 1.4.1 From 11fb842ae958bf1149f9e25b09c29ae3ca8fac51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 14:48:44 +0000 Subject: gnu: Add rust-ptr-meta-0.1. * gnu/packages/crates-io.scm (rust-ptr-meta-0.1): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ac999ce251..f82980d140 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -60976,6 +60976,37 @@ formatters with per-field documentation generated for each structure. (description "This package provides macros for the ptr_meta API.") (license license:expat))) +(define-public rust-ptr-meta-0.1 + (package + (name "rust-ptr-meta") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "ptr_meta" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wd4wy0wxrcays4f1gy8gwcmxg7mskmivcv40p0hidh6xbvwqf07")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-ptr-meta-derive" ,rust-ptr-meta-derive-0.1)))) + (home-page "https://github.com/djkoloski/ptr_meta") + (synopsis "Manipulate metadata of fat pointers") + (description "This package allows manipulating the metadata of fat +pointers: + +@itemize +@item Naming the metadata’s type (as an associated type) +@item Extracting metadata from a pointer +@item Reconstructing a pointer from a data pointer and metadata +@item Representing vtables, the metadata for trait objects, as a type with + some limited API. +@end itemize +") + (license license:expat))) + (define-public rust-ptree-0.3 (package (name "rust-ptree") -- cgit 1.4.1 From 5b6a5506902ac3ae15eea49cc440416ab916139a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 14:53:07 +0000 Subject: gnu: Add rust-bytecheck-0.5. * gnu/packages/crates-io.scm (rust-bytecheck-0.5): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f82980d140..700915b17c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6831,6 +6831,31 @@ memory usage.") "This package provides a library for interaction with units of bytes.") (license license:expat))) +(define-public rust-bytecheck-0.5 + (package + (name "rust-bytecheck") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytecheck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0q11ap6nqj0rsc8ypwjh918916zlrcrzdgqm175gnpb2yn9axyh1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytecheck-derive" ,rust-bytecheck-derive-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-ptr-meta" ,rust-ptr-meta-0.1) + ("rust-simdutf8" ,rust-simdutf8-0.1)))) + (home-page "https://github.com/rkyv/bytecheck") + (synopsis "Type validation framework") + (description "This package provides a type validation framework for +Rust.") + (license license:expat))) + (define-public rust-bytecheck-derive-0.5 (package (name "rust-bytecheck-derive") -- cgit 1.4.1 From d487e125766b6ac162ac435685d96ed0e90b1ffb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 14:57:18 +0000 Subject: gnu: Add rust-rkyv-0.6. * gnu/packages/crates-io.scm (rust-rkyv-0.6): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 700915b17c..3ba755805b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43705,6 +43705,31 @@ sub-processes using a fork-like interface.") (base32 "1n3iw9kaq70dw1rvvma0gjwydbj0f2mvvqvrva69f5cl6yv1dnd0")))))) +(define-public rust-rkyv-0.6 + (package + (name "rust-rkyv") + (version "0.6.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "rkyv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01wsn0i8gsw958j892w8i4fyzjdsyhrh7c5zajig049kbqz5n4yb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytecheck" ,rust-bytecheck-0.5) + ("rust-memoffset" ,rust-memoffset-0.6) + ("rust-ptr-meta" ,rust-ptr-meta-0.1) + ("rust-rkyv-derive" ,rust-rkyv-derive-0.6) + ("rust-seahash" ,rust-seahash-4)))) + (home-page "https://github.com/rkyv/rkyv") + (synopsis "Zero-copy deserialization framework for Rust") + (description "Rkyv is a zero-copy deserialization framework for Rust.") + (license license:expat))) + (define-public rust-rkyv-derive-0.6 (package (name "rust-rkyv-derive") -- cgit 1.4.1 From 87a1ca383aa771b46150a1cca4ebe9091f0b7192 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 15:10:29 +0000 Subject: gnu: Add rust-rand-xoshiro-0.6. * gnu/packages/crates-io.scm (rust-rand-xoshiro-0.6): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 3ba755805b..28dbc37e50 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39647,6 +39647,30 @@ generator based on timing jitter.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rand-xoshiro-0.6 + (package + (name "rust-rand-xoshiro") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_xoshiro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ajsic84rzwz5qr0mzlay8vi17swqi684bqvwqyiim3flfrcv5vg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1)))) + (home-page "https://rust-random.github.io/book/") + (synopsis "Xoshiro, xoroshiro and splitmix64 random number generators") + (description "This package provides the xoshiro, xoroshiro and splitmix64 +random number generators.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-xoshiro-0.4 (package (name "rust-rand-xoshiro") -- cgit 1.4.1 From bb8a0af29204d80e9d6296128202e1def2af2ed0 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 9 Nov 2021 15:16:20 +0000 Subject: gnu: Add rust-serde-big-array-0.3. * gnu/packages/crates-io.scm (rust-serde-big-array-0.3): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 28dbc37e50..1644cb056d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45366,6 +45366,29 @@ rules are rather complex. This crate implements the whole grammar." ) `(#:skip-build? #t #:cargo-inputs (("rust-num" ,rust-num-0.2)))))) +(define-public rust-serde-big-array-0.3 + (package + (name "rust-serde-big-array") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-big-array" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qpy3nk3dpxrrmcfmcnsijad10yi0jxy1x6gc6bbwywma9vhxchq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/est31/serde-big-array") + (synopsis "Big array helper for serde") + (description "This package provides a big array helper for serde.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-big-array-0.2 (package (name "rust-serde-big-array") -- cgit 1.4.1 From e326a4fbe348d40a4f24e388f19a2f493dc710b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 00:05:44 +0000 Subject: gnu: Add rust-float-ord-0.3. * gnu/packages/crates-io.scm (rust-float-ord-0.3): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1644cb056d..df231eda66 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17976,6 +17976,27 @@ streams.") (arguments `(#:cargo-inputs (("rust-num" ,rust-num-0.1)))))) +(define-public rust-float-ord-0.3 + (package + (name "rust-float-ord") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "float-ord" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gbvx6dzz8xvj38bj02cajpqd9p5syxjx9jyqpj8414amr4izs4c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/notriddle/rust-float-ord") + (synopsis "Total ordering for floating-point numbers") + (description + "This package provides a total ordering for floating-point numbers") + (license (list license:expat license:asl2.0)))) + (define-public rust-float-ord-0.2 (package (name "rust-float-ord") -- cgit 1.4.1 From de772f8bf4720167076243f464a643258759fc30 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 00:41:29 +0000 Subject: gnu: Add rust-easy-cast-0.4. * gnu/packages/crates-io.scm (rust-easy-cast-0.4): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index df231eda66..08a77d689f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -15499,6 +15499,27 @@ programs.") ;("rust-wio" ,rust-wio-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-easy-cast-0.4 + (package + (name "rust-easy-cast") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "easy-cast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13ilmaplp2s4vw1vjh4pwbzk7jdxrn0kpf0rk5sli0s1ikp05lab")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-libm" ,rust-libm-0.2)))) + (home-page "https://github.com/kas-gui/easy-cast") + (synopsis "Type conversions which are expected to succeed") + (description "This library is written to make numeric type conversions +easy.") + (license license:asl2.0))) + (define-public rust-easy-parallel-3 (package (name "rust-easy-parallel") -- cgit 1.4.1 From 88319040c1e2223bb4f12deaa02d227d3d4de77e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 00:41:42 +0000 Subject: gnu: Add rust-average-0.13. * gnu/packages/crates-io.scm (rust-average-0.13): New variable. --- gnu/packages/crates-io.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 08a77d689f..9409c9f5d7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4026,6 +4026,53 @@ methods.") (description "Pull in every source file in a directory as a module.") (license (list license:expat license:asl2.0)))) +(define-public rust-average-0.13 + (package + (name "rust-average") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "average" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1c97m8yagvq8r6qgd3harm5vnkdbld4mxg9byyxh6igjsf8wfgl4")))) + (build-system cargo-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Cargo.toml + (lambda _ + (substitute* '("guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml" + "Cargo.toml") + ;; The resolver feature is not supported by this version of Cargo. + (("resolver = \"2\".*") "") + ;; Relax! + (("1.3") ,(package-version rust-byteorder-1)))))) + #:cargo-inputs + (("rust-easy-cast" ,rust-easy-cast-0.4) + ("rust-float-ord" ,rust-float-ord-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-big-array" ,rust-serde-big-array-0.3) + ("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-quantiles" ,rust-quantiles-0.7) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) + (home-page "https://github.com/vks/average") + (synopsis "Calculate statistics iteratively") + (description "This crate provides tools for calculating statistics +iteratively in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-average-0.10 (package (name "rust-average") -- cgit 1.4.1 From 458b1c22bfc957638be4b69b1f00b113c8bac048 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 00:52:25 +0000 Subject: gnu: Add rust-rand-pcg-0.3. * gnu/packages/crates-io.scm (rust-rand-pcg-0.3): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9409c9f5d7..aad62bf3ca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39613,6 +39613,33 @@ generator based on timing jitter.") ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-rand-pcg-0.3 + (package + (name "rust-rand-pcg") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_pcg" version)) + (file-name (string-append name "-" version ".crate")) + (sha256 + (base32 + "1w47awndfhgcc31zbji66pwndqmc6lsyairqi9b17f82f19riqbx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1)))) + (home-page "https://crates.io/crates/rand_pcg") + (synopsis + "Selected PCG random number generators") + (description + "This package implements a selection of PCG random number generators.") + (license (list license:asl2.0 + license:expat)))) + (define-public rust-rand-pcg-0.2 (package (name "rust-rand-pcg") -- cgit 1.4.1 From 8be33436db1715a18f2b569f1b19d6f11f6f739d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 06:58:50 +0000 Subject: gnu: Add rust-assert-0.7. * gnu/packages/crates-io.scm (rust-assert-0.7): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aad62bf3ca..6fe18413c8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2835,6 +2835,24 @@ standard library.") "This library provides utilities to handle ASCII characters.") (license license:mpl2.0))) +(define-public rust-assert-0.7 + (package + (name "rust-assert") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hnph97yz3hpf71s4rdzcrgd492d1m7rj0k48ymxl1w5d2g8v450")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/stainless-steel/assert") + (synopsis "Assertions for testing") + (description "This package provides assertions for testing.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-assert-cli-0.6 (package (name "rust-assert-cli") -- cgit 1.4.1 From 935d53537c996e60d0af8ec2d79bb172b0b904d1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 06:59:14 +0000 Subject: gnu: Add rust-random-0.12. * gnu/packages/crates-io.scm (rust-random-0.12): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fe18413c8..1e357d7952 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39875,6 +39875,24 @@ random number generators.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) +(define-public rust-random-0.12 + (package + (name "rust-random") + (version "0.12.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "random" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03s2c59vzcr5fmxbhlhxvrsnwgic488jl4br1k4q369lhls3mlcp")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/stainless-steel/random") + (synopsis "Sources of randomness") + (description "The package provides sources of randomness.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-random-fast-rng-0.1 (package (name "rust-random-fast-rng") -- cgit 1.4.1 From 0cd5039345f6a937b1d28413d0b8bcca63236041 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 06:59:23 +0000 Subject: gnu: Add rust-special-0.8. * gnu/packages/crates-io.scm (rust-special-0.8): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1e357d7952..26fd44d097 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48550,6 +48550,29 @@ track of where each new file and line starts.") (description "This package provides basic sourcemap handling for Rust.") (license license:bsd-3))) +(define-public rust-special-0.8 + (package + (name "rust-special") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "special" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dknpky1bbl7xp4qwp3vjqjarfl846mk6irs2z7mvdsr843mx9i4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-assert" ,rust-assert-0.7) + ("rust-random" ,rust-random-0.12)))) + (home-page "https://github.com/stainless-steel/special") + (synopsis "Special functions") + (description "The package provides so-called special functions.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-speculate-0.1 (package (name "rust-speculate") -- cgit 1.4.1 From c7ffcdea70cfdb4504767cac66e65d65a696ed28 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 06:59:29 +0000 Subject: gnu: Add rust-rand-distr-0.4. * gnu/packages/crates-io.scm (rust-rand-distr-0.4): New variable. --- gnu/packages/crates-io.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 26fd44d097..16b11c9b83 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39405,6 +39405,41 @@ tools for implementation.") #:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) +(define-public rust-rand-distr-0.4 + (package + (name "rust-rand-distr") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_distr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0brd2946xfapm2bmhmczfbwck041x7khsfhqxw1f24kxis7m8kcn")))) + (build-system cargo-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Cargo.toml + (lambda _ + (substitute* '("Cargo.toml" + "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + ;; The resolver feature is not supported by this version of Cargo. + (("resolver = \"2\".*") ""))))) + #:cargo-inputs + (("rust-average" ,rust-average-0.13) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-special" ,rust-special-0.8)) + #:cargo-development-inputs + (("rust-rand-pcg" ,rust-rand-pcg-0.3)))) + (home-page "https://rust-random.github.io/book/") + (synopsis "Sampling from random number distributions") + (description "This package provides tool for sampling from random number +distributions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-distr-0.3 (package (name "rust-rand-distr") -- cgit 1.4.1 From d29fa445e5d48043187dd9ac5bb61d033bdb58ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 07:52:03 +0000 Subject: gnu: Add rust-bytemuck-1.5. * gnu/packages/crates-io.scm (rust-bytemuck-1.5): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16b11c9b83..d5777a6669 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -7016,6 +7016,29 @@ in a byte slice, fast.") ("rust-quickcheck" ,rust-quickcheck-0.6) ("rust-rand" ,rust-rand-0.4)))))) +(define-public rust-bytemuck-1.5 + (package + (name "rust-bytemuck") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytemuck" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "18355qn3r9yp7ibg00r688sjx58g2qsjylwyq15w5b41b46asjss")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck-derive" ,rust-bytemuck-derive-1)))) + (home-page "https://github.com/Lokathor/bytemuck") + (synopsis "Crate for mucking around with piles of bytes") + (description + "This package provides a crate for mucking around with piles of bytes.") + (license license:zlib))) + (define-public rust-bytemuck-1 (package (name "rust-bytemuck") -- cgit 1.4.1 From e182b691ea03eec7e69b2fd18c03f9feeba5edfe Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:31:04 +0000 Subject: gnu: rust-heck-0.3: Update to 0.3.2. * gnu/packages/crates-io.scm (rust-heck-0.3): Update to 0.3.2. --- gnu/packages/crates-io.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index d5777a6669..c0d703b78a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -22035,7 +22035,7 @@ total runtime size of an object on the heap") (define-public rust-heck-0.3 (package (name "rust-heck") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) @@ -22043,7 +22043,7 @@ total runtime size of an object on the heap") (file-name (string-append name "-" version ".crate")) (sha256 (base32 - "01a2v7yvkiqxakdqz4hw3w3g4sm52ivz9cs3qcsv2arxsmw4wmi0")))) + "1b56s2c1ymdd0qmy31bw0ndhm31hcdamnhg3npp7ssrmc1ag9jw7")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t -- cgit 1.4.1 From 2f06d1bb51aea0e224803bb0a6a44de6d295b8ce Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:32:20 +0000 Subject: gnu: Add rust-rand-isaac-0.3. * gnu/packages/crates-io.scm (rust-rand-isaac-0.3): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c0d703b78a..605d93d377 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -39566,6 +39566,32 @@ generator that uses the HC-128 algorithm.") (arguments `(#:cargo-inputs (("rust-rand-core" ,rust-rand-core-0.3)))))) +(define-public rust-rand-isaac-0.3 + (package + (name "rust-rand-isaac") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_isaac" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0a0b188s960qknwwgvpn7zpq3fzdhvrb0gsm5ir5akqvv4y3gi7s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1)))) + (home-page "https://rust-random.github.io/book/") + (synopsis "ISAAC random number generator") + (description "This package implements the @code{ISAAC} and @code{ISAAC-64} +random number generators. ISAAC stands for \"Indirection, Shift, Accumulate, +Add, and Count\" which are the principal bitwise operations employed.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rand-isaac-0.2 (package (name "rust-rand-isaac") -- cgit 1.4.1 From bcbd0fc8dadb9d1eadce1a57e1a981c45d51da75 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:32:34 +0000 Subject: gnu: Add rust-simba-0.4. * gnu/packages/crates-io.scm (rust-simba-0.4): New variable. --- gnu/packages/crates-io.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 605d93d377..25eefae1d9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -47580,6 +47580,35 @@ pattern in Rust.") ("rust-wide" ,rust-wide-0.6)))) (license license:asl2.0))) +(define-public rust-simba-0.4 + (package + (inherit rust-simba-0.1) + (name "rust-simba") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "simba" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k2zp645jby5s070agvqha3xqbc0gkkk3a4v7k8z724iamasjcji")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-cordic" ,rust-cordic-0.1) + ("rust-decimal" ,rust-decimal-2) + ("rust-fixed" ,rust-fixed-1) + ("rust-libm" ,rust-libm-0.2) + ("rust-num-complex" ,rust-num-complex-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-wide" ,rust-wide-0.6)))) + (license license:asl2.0))) + (define-public rust-simd-0.2 (package (name "rust-simd") -- cgit 1.4.1 From e80093153aec7aa15fc01fbd61c9a375dbb6e4d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:33:42 +0000 Subject: gnu: Add rust-spirv-types-0.4. * gnu/packages/crates-io.scm (rust-spirv-types-0.4): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 25eefae1d9..6b944bd2a0 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48795,6 +48795,25 @@ ready. This will probably use a lot of CPU, so be careful when you use it.") provided by @code{lock_api}.") (license (list license:expat license:asl2.0)))) +(define-public rust-spirv-types-0.4 + (package + (name "rust-spirv-types") + (version "0.4.0-alpha.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "spirv-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sxcic2n04xzywww3c7mj9ah8iwr20vz3d6xvsgla1y7gs7lpk3i")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/EmbarkStudios/rust-gpu") + (synopsis "SPIR-V types shared between spirv-std and spirv-std-macros") + (description "This package provides SPIR-V types shared between spirv-std +and spirv-std-macros.") + (license (list license:expat license:asl2.0)))) + (define-public rust-spmc-0.3 (package (name "rust-spmc") -- cgit 1.4.1 From 3cd8964a8096c209192c9c1b55e03fbec4180192 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:33:53 +0000 Subject: gnu: Add rust-spirv-std-macros-0.4. * gnu/packages/crates-io.scm (rust-spirv-std-macros-0.4): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6b944bd2a0..a534a04eee 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48814,6 +48814,31 @@ provided by @code{lock_api}.") and spirv-std-macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-spirv-std-macros-0.4 + (package + (name "rust-spirv-std-macros") + (version "0.4.0-alpha.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "spirv-std-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19cc15vq9ybdap39qxpf4vsz5q6li21mzgv47zqbyj5vvwaqazi0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-heck" ,rust-heck-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-spirv-types" ,rust-spirv-types-0.4) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/EmbarkStudios/rust-gpu") + (synopsis "Macros for spirv-std") + (description "This package provides macros for spirv-std.") + (license (list license:expat license:asl2.0)))) + (define-public rust-spmc-0.3 (package (name "rust-spmc") -- cgit 1.4.1 From fb4340e1eeb7624828c8112020924883bcf049f2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:34:02 +0000 Subject: gnu: Add rust-spirv-std-0.4. * gnu/packages/crates-io.scm (rust-spirv-std-0.4): New variable. --- gnu/packages/crates-io.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a534a04eee..a95f3adead 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -48839,6 +48839,33 @@ and spirv-std-macros.") (description "This package provides macros for spirv-std.") (license (list license:expat license:asl2.0)))) +(define-public rust-spirv-std-0.4 + (package + (name "rust-spirv-std") + ;; We use a slightly older version here, because of problems building glam + ;; 0.13.1 with more recent versions. + (version "0.4.0-alpha.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "spirv-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14npd838bqnw09iab0zq94xs4yl69m6c0cdfzxa9fal0zxqlqv3j")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-spirv-std-macros" ,rust-spirv-std-macros-0.4) + ("rust-spirv-types" ,rust-spirv-types-0.4)))) + (home-page "https://github.com/EmbarkStudios/rust-gpu") + (synopsis "Standard functions and types for SPIR-V") + (description "This package provides standard functions and types for +SPIR-V.") + (license (list license:expat license:asl2.0)))) + (define-public rust-spmc-0.3 (package (name "rust-spmc") -- cgit 1.4.1 From 8f8863026ee672162248e9e980b3306eaf28ac89 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:34:15 +0000 Subject: gnu: Add rust-matrixcompare-core-0.1. * gnu/packages/crates-io.scm (rust-matrixcompare-core-0.1): New variable. --- gnu/packages/crates-io.scm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a95f3adead..28bde6fae7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28097,6 +28097,24 @@ grammars. It provides the subset of the regex crate that only deals with matching, not parsing substrings.") (license license:expat))) +(define-public rust-matrixcompare-core-0.1 + (package + (name "rust-matrixcompare-core") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixcompare-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wqaj028ws2x2h16rf10arwvmpfbmk7afg8b57ahb25i1nrspgdh")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/Andlon/matrixcompare") + (synopsis "Core traits for matrixcompare") + (description "This package provides core traits for matrixcompare.") + (license license:expat))) + (define-public rust-matrixmultiply-0.3 (package (name "rust-matrixmultiply") -- cgit 1.4.1 From 9886c012deade5753a4d0b723d7f626c4de8659f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:34:24 +0000 Subject: gnu: Add rust-matrixcompare-0.2. * gnu/packages/crates-io.scm (rust-matrixcompare-0.2): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 28bde6fae7..1fc0fc3e3b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28115,6 +28115,30 @@ matching, not parsing substrings.") (description "This package provides core traits for matrixcompare.") (license license:expat))) +(define-public rust-matrixcompare-0.2 + (package + (name "rust-matrixcompare") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixcompare" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "046x25j9v42syns6g8sp3lv4kad55cr4p2bvvs6kyj85dbcz8hiv")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-0.10)))) + (home-page "https://github.com/Andlon/matrixcompare") + (synopsis "Tools for convenient comparison of matrices") + (description "This package provides tools for convenient comparison of +matrices.") + (license license:expat))) + (define-public rust-matrixmultiply-0.3 (package (name "rust-matrixmultiply") -- cgit 1.4.1 From c285cb7ebefdb21cb3eb8345b802ae303f3072c3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 10:34:36 +0000 Subject: gnu: Add rust-glam-0.13. * gnu/packages/crates-io.scm (rust-glam-0.13): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1fc0fc3e3b..9c7e5f489a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20797,6 +20797,37 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) +(define-public rust-glam-0.13 + (package + (name "rust-glam") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ps7f44844ydj7cjr7wk1hn2d83ds1ilq7p9b2vvhr0711b5n5bh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-spirv-std" ,rust-spirv-std-0.4)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.4) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/bitshifter/glam-rs") + (synopsis "3D math library for games and graphics") + (description + "This package provides a simple and fast 3D math library for games and +graphics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-glium-0.25 (package (name "rust-glium") -- cgit 1.4.1 From 94abd4b740c8736c194e5c56e73bf432d2023ca3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 12:48:30 +0000 Subject: gnu: Add rust-triple-accel-0.3. * gnu/packages/crates-io.scm (rust-triple-accel-0.3): New variable. --- gnu/packages/crates-io.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9c7e5f489a..194d8af285 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -56053,6 +56053,19 @@ SIMD. It supports fast Hamming, Levenshtein, restricted Damerau-Levenshtein, etc. distance calculations and string search.") (license license:expat))) +(define-public rust-triple-accel-0.3 + (package + (inherit rust-triple-accel-0.4) + (name "rust-triple-accel") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "triple_accel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v795l496crk3h6yff9zh1cjyrh5s9v23fbgccc4dpz25z70jav2")))))) + (define-public rust-trust-dns-https-0.20 (package (name "rust-trust-dns-https") -- cgit 1.4.1 From 6a4b4d3c1d73191964bfd5ec7bcc5a855a83e5c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 12:55:14 +0000 Subject: gnu: Add rust-bio-types-0.12. * gnu/packages/crates-io.scm (rust-bio-types-0.12): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 194d8af285..2059062e97 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5317,6 +5317,34 @@ bindings to C and C++ libraries.") ("rust-diff" ,rust-diff-0.1) ("rust-shlex" ,rust-shlex-0.1)))))) +(define-public rust-bio-types-0.12 + (package + (name "rust-bio-types") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bio-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qww2l3hbxyayhpv16yxzayxxxmvq7wk3j64xsx9rigzzfbdjy9z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-derive-new" ,rust-derive-new-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-strum-macros" ,rust-strum-macros-0.20) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://rust-bio.github.io") + (synopsis "Common biomedical types for use in rust-bio and rust-htslib") + (description + "This package provides a collection of common biomedical types for use in +rust-bio and rust-htslib.") + (license license:expat))) + (define-public rust-bit-field-0.10 (package (name "rust-bit-field") -- cgit 1.4.1 From 4ef9ef0aa3756d53e9848132c2b525d3d5bdaec1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 17:39:10 +0000 Subject: gnu: Add rust-feature-probe-0.1. * gnu/packages/crates-io.scm (rust-feature-probe-0.1): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2059062e97..ecf7eadbc7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17482,6 +17482,28 @@ it.") descriptors limit.") (license license:asl2.0))) +(define-public rust-feature-probe-0.1 + (package + (name "rust-feature-probe") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "feature-probe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nhif9zpr2f17gagf0qb0v914wc3jr9sfjzvnpi7b7pcs73ksnl3")))) + (build-system cargo-build-system) + (home-page "https://github.com/tov/feature-probe-rs") + (synopsis "Probe for rustc features from build.rs") + (description "To support multiple versions of Rust, it's often necessary +to conditionally compile parts of our libraries or programs. It's possible to +allow users to specify what features to enable, but detection is better, +because users get all the features that their version of Rust supports. And +while we could check the rustc version, it's better to probe for individual +features. This package probes for rustc features from build.rs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-feed-rs-0.6 (package (name "rust-feed-rs") -- cgit 1.4.1 From 0885604727f574a621897be06c3faa65629491b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 17:39:26 +0000 Subject: gnu: Add rust-bv-0.11. * gnu/packages/crates-io.scm (rust-bv-0.11): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ecf7eadbc7..e0cd0dd826 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -6846,6 +6846,31 @@ constants from build.rs or a script.") (("rust-criterion" ,rust-criterion-0.2) ("rust-quickcheck" ,rust-quickcheck-0.8)))))) +(define-public rust-bv-0.11 + (package + (name "rust-bv") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h5kbl54fsccznfixw83xndbripw39y2qkqjwf709p75iqfvnd48")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-feature-probe" ,rust-feature-probe-0.1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-quickcheck" ,rust-quickcheck-0.6)))) + (home-page "https://github.com/tov/bv-rs") + (synopsis "Bit-vectors and bit-slices") + (description "The main type exported by this library, @code{BitVec}, is a +packed, growable bit-vector. Its API mirrors that of @code{Vec} where +reasonable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-byte-pool-0.2 (package (name "rust-byte-pool") -- cgit 1.4.1 From 9a6b269b814a230191e82632e8c5c1979fdbf276 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 17:49:56 +0000 Subject: gnu: Add rust-multimap-0.8. * gnu/packages/crates-io.scm (rust-multimap-0.8): New variable. --- gnu/packages/crates-io.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e0cd0dd826..6fc2626d8e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29959,6 +29959,28 @@ which defines a default trait implementation, and @code{trait_impl} which uses a default trait implementation you've defined.") (license license:lgpl2.1+))) +(define-public rust-multimap-0.8 + (package + (name "rust-multimap") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "multimap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sicyz4n500vdhgcxn4g8jz97cp1ijir1rnbgph3pmx9ckz4dkp5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/havarnov/multimap") + (synopsis "Multimap implementation") + (description "This package provides a multimap implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-multipart-0.18 (package (name "rust-multipart") -- cgit 1.4.1 From e7d743489542667e3a709bfba91ca47be50aafd9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 18:41:31 +0000 Subject: gnu: Add rust-semver-0.1. * gnu/packages/crates-io.scm (rust-semver-0.1): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 6fc2626d8e..573f3d2d2e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45494,6 +45494,25 @@ macOS and iOS.") "Semantic version parsing and comparison.") (license (list license:expat license:asl2.0)))) +(define-public rust-semver-0.1 + (package + (name "rust-semver") + (version "0.1.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "semver" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b10m0hxrr947gp41lj9vnmgl5ddwx3d41vnblsg06ppvkz11x6l")))) + (build-system cargo-build-system) + (home-page "https://github.com/dtolnay/semver") + (synopsis "Parser and evaluator for Cargo's flavor of Semantic Versioning") + (description + "This package provides a parser and evaluator for Cargo's flavor of +Semantic Versioning.") + (license (list license:expat license:asl2.0)))) + (define-public rust-semver-parser-0.10 (package (name "rust-semver-parser") -- cgit 1.4.1 From 3f6fd2d0daf7d8323ed5c9366980bc84a3f9de24 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 22:18:53 +0000 Subject: gnu: Add rust-rustc-version-0.1. * gnu/packages/crates-io.scm (rust-rustc-version-0.1): New variable. --- gnu/packages/crates-io.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 573f3d2d2e..413fb0bc0a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43427,6 +43427,22 @@ rustc compiler.") `(#:skip-build? #t #:cargo-inputs (("rust-semver" ,rust-semver-0.9)))))) +(define-public rust-rustc-version-0.1 + (package + (inherit rust-rustc-version-0.3) + (name "rust-rustc-version") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustc_version" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1160jjsqhqr25cvhr48hmpp8v61bjvjcnxzb0cyf4373lmp3gxf5")))) + (arguments + `(#:cargo-inputs + (("rust-semver" ,rust-semver-0.1)))))) + (define-public rust-rustdoc-stripper-0.1 (package (name "rust-rustdoc-stripper") -- cgit 1.4.1 From 0c90fd7856840a20c86794485e3dc294b4b530f9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 10 Nov 2021 22:34:03 +0000 Subject: gnu: Add rust-newtype-derive-0.1. * gnu/packages/crates-io.scm (rust-newtype-derive-0.1): New variable. --- gnu/packages/crates-io.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 413fb0bc0a..ba25a5d0f2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -31114,6 +31114,31 @@ feed reader.") ;; No copyright headers in the source code. LICENSE indicates gpl3. (license license:gpl3))) +(define-public rust-newtype-derive-0.1 + (package + (name "rust-newtype-derive") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "newtype-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v3170xscs65gjx5vl1zjnqp86wngbzw3n2q74ibfnqqkx6x535c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rustc-version" ,rust-rustc-version-0.1)) + #:cargo-development-inputs + (("rust-custom-derive" ,rust-custom-derive-0.1)))) + (home-page "https://github.com/DanielKeep/rust-custom-derive") + (synopsis "Macros for deriving common traits for newtype structures") + (description + "This crate provides macros for deriving common traits for newtype +structures.") + (license (list license:expat + license:asl2.0)))) + (define-public rust-nibble-vec-0.1 (package (name "rust-nibble-vec") -- cgit 1.4.1 From 15b51023f2fbbe6b7a22aca3b6b00a5bd96ca3c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 07:17:23 +0000 Subject: gnu: Add rust-getset-0.0.9. * gnu/packages/crates-io.scm (rust-getset-0.0.9): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ba25a5d0f2..820032b03d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20344,6 +20344,30 @@ retrieving random data from system source.") getters and setters on fields.") (license license:expat))) +(define-public rust-getset-0.0.9 + (package + (name "rust-getset") + (version "0.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "getset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0aaldwfs2690rjqg2ygan27l2qa614w2p6zj7k99n36pv2vzbcsv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Hoverbear/getset") + (synopsis "Getters and setters for Rust") + (description + "This package provides a procedural macro for generating the most basic +getters and setters on fields.") + (license license:expat))) + (define-public rust-gettext-rs-0.7 (package (name "rust-gettext-rs") -- cgit 1.4.1 From 0be2f293e4e3d5f84ed761133678a4283cb69591 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 07:51:08 +0000 Subject: gnu: Add rust-matrixcompare-mock-0.1. * gnu/packages/crates-io.scm (rust-matrixcompare-mock-0.1): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 820032b03d..2862663cda 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28269,6 +28269,29 @@ matching, not parsing substrings.") matrices.") (license license:expat))) +(define-public rust-matrixcompare-mock-0.1 + (package + (name "rust-matrixcompare-mock") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixcompare-mock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1iqk7p9a3y057qzjjz4hfc1kq48vb76bf1lljqcm5r6xxmlz785y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-num" ,rust-num-0.3) + ("rust-proptest" ,rust-proptest-0.10)))) + (home-page "https://github.com/Andlon/matrixcompare") + (synopsis "Internal mock data structures for testing of matrixcompare") + (description "This package provides internal mock data structures for +testing of matrixcompare.") + (license license:expat))) + (define-public rust-matrixmultiply-0.3 (package (name "rust-matrixmultiply") -- cgit 1.4.1 From 6e73186849f3166bf5421ff2e5e2c0236efe9f19 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 07:51:21 +0000 Subject: gnu: Add rust-matrixcompare-0.3. * gnu/packages/crates-io.scm (rust-matrixcompare-0.3): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2862663cda..e3dba3a3e5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -28245,6 +28245,32 @@ matching, not parsing substrings.") (description "This package provides core traits for matrixcompare.") (license license:expat))) +(define-public rust-matrixcompare-0.3 + (package + (name "rust-matrixcompare") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "matrixcompare" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i84m1jlxmgyw4farhxbfhyb815hrj6ijq23dgb96z7442l2p0rp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-1)) + #:cargo-development-inputs + (("rust-matrixcompare-mock" ,rust-matrixcompare-mock-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + (home-page "https://github.com/Andlon/matrixcompare") + (synopsis "Tools for convenient comparison of matrices") + (description "This package provides tools for convenient comparison of +matrices.") + (license license:expat))) + (define-public rust-matrixcompare-0.2 (package (name "rust-matrixcompare") -- cgit 1.4.1 From 4089e0df25ae68ca4bce4cf5ad739afcff9ab7cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 08:38:00 +0000 Subject: gnu: Add rust-array-macro-1. * gnu/packages/crates-io.scm (rust-array-macro-1): New variable. --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e3dba3a3e5..5e2e5b0629 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2325,6 +2325,25 @@ coverage-guided, mutation-based fuzzers.") that runs on Argon2.") (license license:expat))) +(define-public rust-array-macro-1 + (package + (name "rust-array-macro") + (version "1.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "array-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19mdx2xlppnqwl6rhsbzylx61a0kkp2ql8q16195b7iga977ps86")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://gitlab.com/KonradBorowski/array-macro") + (synopsis "Array multiple elements constructor syntax") + (description "This package implements constructor syntax for arrays with +multiple elements.") + (license (list license:expat license:asl2.0)))) + (define-public rust-array-ops-0.1 (package (name "rust-array-ops") -- cgit 1.4.1 From d75a5c5d89d8ec7a4c9b451f82ccc905aeb0bbef Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 08:40:07 +0000 Subject: gnu: Add rust-glam-0.14. * gnu/packages/crates-io.scm (rust-glam-0.14): New variable. --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5e2e5b0629..ed4cf8747a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20915,6 +20915,37 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) +(define-public rust-glam-0.14 + (package + (name "rust-glam") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1njk0cskaspc62ywxlzpiszbcb9hhh1yqg2ka105sg0hxgajhf9k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-spirv-std" ,rust-spirv-std-0.4)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/bitshifter/glam-rs") + (synopsis "3D math library for games and graphics") + (description + "This package provides a simple and fast 3D math library for games and +graphics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-glam-0.13 (package (name "rust-glam") -- cgit 1.4.1 From dba9c7d7e02c6d79fe1d561074bf4f52109c9276 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 08:51:23 +0000 Subject: gnu: Add rust-statrs-0.13. * gnu/packages/crates-io.scm (rust-statrs-0.13): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index ed4cf8747a..5b5650d060 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49514,6 +49514,30 @@ map.") (description "This package provides a simple statistics library.") (license license:expat))) +(define-public rust-statrs-0.13 + (package + (name "rust-statrs") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "statrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0r00b60zlsn6srb6m6bzbw3w5cyihcy4w2rfjav64x4viy5bad0y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nalgebra" ,rust-nalgebra-0.19) + ("rust-rand" ,rust-rand-0.7)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3)))) + (home-page "https://github.com/statrs-dev/statrs") + (synopsis "Statistical computing library for Rust") + (description "This package provides a statistical computing library for +Rust.") + (license license:expat))) + (define-public rust-stb-truetype-0.3 (package (name "rust-stb-truetype") -- cgit 1.4.1 From 7c4a6245c71bbb6eafb245b58b71991f9877fc0e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:43:08 +0000 Subject: gnu: Add rust-enum-map-derive-0.4. * gnu/packages/crates-io.scm (rust-enum-map-derive-0.4): New variable. --- gnu/packages/crates-io.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5b5650d060..552f678438 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16448,6 +16448,30 @@ accessor functions on enums.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-enum-map-derive-0.4 + (package + (name "rust-enum-map-derive") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "enum-map-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mg43p1x90cz604zddk9qzss077v2id04qmmbpa1i7jc637m1i75")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://gitlab.com/KonradBorowski/enum-map") + (synopsis "Macros 1.1 implementation of #[derive(Enum)]") + (description "This package provides a macros 1.1 implementation of +@code{#[derive(Enum)]}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-enum-primitive-0.1 (package (name "rust-enum-primitive") -- cgit 1.4.1 From 5f42641ba73e680eb60f606bb7da969531d260cd Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:43:35 +0000 Subject: gnu: Add rust-enum-map-0.6. * gnu/packages/crates-io.scm (rust-enum-map-0.6): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 552f678438..16ae864a5b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -16472,6 +16472,34 @@ accessor functions on enums.") @code{#[derive(Enum)]}.") (license (list license:expat license:asl2.0)))) +(define-public rust-enum-map-0.6 + (package + (name "rust-enum-map") + (version "0.6.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "enum-map" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0m8qg32fnjdf6z64j4wmyp935p5838wd31gibkiqpbpl76c9k1s1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-array-macro" ,rust-array-macro-1) + ("rust-enum-map-derive" ,rust-enum-map-derive-0.4) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://gitlab.com/KonradBorowski/enum-map") + (synopsis "Map with C-like enum keys represented internally as an array") + (description + "This package provides a map with C-like enum keys represented internally +as an array.") + (license (list license:expat license:asl2.0)))) + (define-public rust-enum-primitive-0.1 (package (name "rust-enum-primitive") -- cgit 1.4.1 From 02bf5e143162f8c28725db7523452043701871e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:44:24 +0000 Subject: gnu: Add rust-nalgebra-0.26. * gnu/packages/crates-io.scm (rust-nalgebra-0.26): New variable. --- gnu/packages/crates-io.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 16ae864a5b..a6d98a0fc9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30423,6 +30423,64 @@ quick compile time, and minimal dependencies.") #:cargo-inputs (("rust-rayon" ,rust-rayon-1)))))) +(define-public rust-nalgebra-0.26 + (package + (name "rust-nalgebra") + (version "0.26.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01hxksmgg17c4k2rzjx1h8kkjbw9rm81dsancg459zh2zrcisva7")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Cargo.toml + (lambda _ + (substitute* '("Cargo.toml" + "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml" + "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + ;; The resolver feature is not supported by this version of Cargo. + (("resolver = \"2\".*") ""))))) + #:cargo-inputs + (("rust-abomonation" ,rust-abomonation-0.7) + ("rust-alga" ,rust-alga-0.9) + ("rust-approx" ,rust-approx-0.4) + ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-glam" ,rust-glam-0.13) + ("rust-matrixcompare-core" ,rust-matrixcompare-core-0.1) + ("rust-matrixmultiply" ,rust-matrixmultiply-0.3) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-complex" ,rust-num-complex-0.3) + ("rust-num-rational" ,rust-num-rational-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-proptest" ,rust-proptest-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-simba" ,rust-simba-0.4) + ("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.2) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-matrixcompare" ,rust-matrixcompare-0.2) + ("rust-rand-isaac" ,rust-rand-isaac-0.3) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://nalgebra.org") + (synopsis "Linear algebra library") + (description + "This package provides a general-purpose linear algebra library with +transformations and statically-sized or dynamically-sized matrices.") + (license license:bsd-3))) + (define-public rust-nalgebra-0.21 (package (name "rust-nalgebra") -- cgit 1.4.1 From 7af81d8c7f588c71d179839dfd280a29382ef0b8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:44:41 +0000 Subject: gnu: Add rust-nalgebra-macros-0.1. * gnu/packages/crates-io.scm (rust-nalgebra-macros-0.1): New variable. --- gnu/packages/crates-io.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a6d98a0fc9..e29f3c501a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -30599,6 +30599,42 @@ statically-sized or dynamically-sized matrices.") (("rust-rand-xorshift" ,rust-rand-xorshift-0.1) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-nalgebra-macros-0.1 + (package + (name "rust-nalgebra-macros") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nalgebra-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "063jvvvlwmzzxfr4wyiil2cn1yqj3arvghwsr2nk4ilv2jwc1z01")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Cargo.toml + (lambda _ + (substitute* '("Cargo.toml" + "guix-vendor/rust-nalgebra-macros-0.1.0.tar.gz/Cargo.toml" + "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml" + "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + ;; The resolver feature is not supported by this version of Cargo. + (("resolver = \"2\".*") ""))))) + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-nalgebra" ,rust-nalgebra-0.26)))) + (home-page "https://nalgebra.org") + (synopsis "Procedural macros for nalgebra") + (description "This package provides procedural macros for the nalgebra +linear algebra library.") + (license license:asl2.0))) + (define-public rust-named-pipe-0.4 (package (name "rust-named-pipe") -- cgit 1.4.1 From d44ae04cfd0f3e5422a4befd1eed21a89dd54d3b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:44:55 +0000 Subject: gnu: Add rust-statrs-0.14. * gnu/packages/crates-io.scm (rust-statrs-0.14): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index e29f3c501a..bbf4b87824 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49660,6 +49660,43 @@ map.") (description "This package provides a simple statistics library.") (license license:expat))) +(define-public rust-statrs-0.14 + (package + (name "rust-statrs") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "statrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bdff4rsghp9hj5i5ynl6iw3pyzprd65cbf8ihmgvyv190a1y30y")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:phases + (modify-phases %standard-phases + (add-after 'configure 'patch-Cargo.toml + (lambda _ + (substitute* '("Cargo.toml" + "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml" + "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") + ;; The resolver feature is not supported by this version of Cargo. + (("resolver = \"2\".*") ""))))) + #:cargo-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nalgebra" ,rust-nalgebra-0.26) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3)))) + (home-page "https://github.com/statrs-dev/statrs") + (synopsis "Statistical computing library for Rust") + (description "This package provides a statistical computing library for +Rust.") + (license license:expat))) + (define-public rust-statrs-0.13 (package (name "rust-statrs") -- cgit 1.4.1 From 15abac14acb82023a01b737ba514f2e2bf16a2d5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:45:13 +0000 Subject: gnu: Add rust-glam-0.15. * gnu/packages/crates-io.scm (rust-glam-0.15): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bbf4b87824..a078d71243 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20967,6 +20967,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) +(define-public rust-glam-0.15 + (package + (name "rust-glam") + (version "0.15.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jx587lxz9v9m0ph4dlshfgy0abax1zhlbjj5nvkchz4ir7mbfrs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; TODO: we need a more recent criterion + #:cargo-inputs + (("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-spirv-std" ,rust-spirv-std-0.4)))) + (home-page "https://github.com/bitshifter/glam-rs") + (synopsis "3D math library for games and graphics") + (description + "This package provides a simple and fast 3D math library for games and +graphics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-glam-0.14 (package (name "rust-glam") -- cgit 1.4.1 From 43260f681bf1dfdc1f424f009a00097ebd8e1449 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:45:28 +0000 Subject: gnu: Add rust-glam-0.16. * gnu/packages/crates-io.scm (rust-glam-0.16): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a078d71243..06fe722bf8 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20967,6 +20967,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) +(define-public rust-glam-0.16 + (package + (name "rust-glam") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05izbgx93hnjk200144h9yxhy51cbygp2bbaqdj8czngki3w09j1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; TODO: we need a more recent criterion + #:cargo-inputs + (("rust-approx" ,rust-approx-0.4) + ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/bitshifter/glam-rs") + (synopsis "3D math library for games and graphics") + (description + "This package provides a simple and fast 3D math library for games and +graphics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-glam-0.15 (package (name "rust-glam") -- cgit 1.4.1 From 60d2566e053e9ec8dd514d43dc5f40871c0aa3d3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:45:37 +0000 Subject: gnu: Add rust-glam-0.17. * gnu/packages/crates-io.scm (rust-glam-0.17): New variable. --- gnu/packages/crates-io.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 06fe722bf8..9a76efd2ae 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -20967,6 +20967,34 @@ libcurl, which is intended to be used with the @code{git2} crate.") (description "Gjson is a JSON parser for Rust.") (license license:expat))) +(define-public rust-glam-0.17 + (package + (name "rust-glam") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "glam" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xm7jdygbxchdvk6k1l1pdag843nkwdm8fikwgp0i1gxgawk45z0")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-approx" ,rust-approx-0.5) + ("rust-bytemuck" ,rust-bytemuck-1.5) + ("rust-mint" ,rust-mint-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/bitshifter/glam-rs") + (synopsis "3D math library for games and graphics") + (description + "This package provides a simple and fast 3D math library for games and +graphics.") + (license (list license:expat license:asl2.0)))) + (define-public rust-glam-0.16 (package (name "rust-glam") -- cgit 1.4.1 From 067de0230e32b2894c8c2f3d393bedff2ebcdd0d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 09:45:49 +0000 Subject: gnu: Add rust-bio-0.33. * gnu/packages/crates-io.scm (rust-bio-0.33): New variable. --- gnu/packages/crates-io.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9a76efd2ae..486ea19a44 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5364,6 +5364,64 @@ bindings to C and C++ libraries.") rust-bio and rust-htslib.") (license license:expat))) +(define-public rust-bio-0.33 + (package + (name "rust-bio") + (version "0.33.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zaghvazh243x2pg866hjx1zwwpp9qzwkf45iz2fs9af5y661gz5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-approx" ,rust-approx-0.3) + ("rust-bio-types" ,rust-bio-types-0.12) + ("rust-bit-set" ,rust-bit-set-0.5) + ("rust-bv" ,rust-bv-0.11) + ("rust-bytecount" ,rust-bytecount-0.6) + ("rust-csv" ,rust-csv-1) + ("rust-custom-derive" ,rust-custom-derive-0.1) + ("rust-enum-map" ,rust-enum-map-0.6) + ("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-getset" ,rust-getset-0.0.9) + ("rust-itertools" ,rust-itertools-0.9) + ("rust-itertools-num" ,rust-itertools-num-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-ndarray" ,rust-ndarray-0.13) + ("rust-newtype-derive" ,rust-newtype-derive-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-ordered-float" ,rust-ordered-float-1) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-statrs" ,rust-statrs-0.13) + ("rust-strum" ,rust-strum-0.19) + ("rust-strum-macros" ,rust-strum-macros-0.19) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-triple-accel" ,rust-triple-accel-0.3) + ("rust-vec-map" ,rust-vec-map-0.8)) + #:cargo-development-inputs + (("rust-proptest" ,rust-proptest-0.10) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://rust-bio.github.io") + (synopsis "Bioinformatics library for Rust") + (description + "This package provides a bioinformatics library for Rust. This library +provides implementations of many algorithms and data structures that are +useful for bioinformatics, but also in other fields.") + (license license:expat))) + (define-public rust-bit-field-0.10 (package (name "rust-bit-field") -- cgit 1.4.1 From c576b3b36998e9e52324d9674984ae6ce6191767 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 11:58:04 +0000 Subject: gnu: Add rust-parasail-sys-0.2. * gnu/packages/crates-io.scm (rust-parasail-sys-0.2): New variable. --- gnu/packages/crates-io.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 486ea19a44..fbc9139f83 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45,6 +45,7 @@ #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -34615,6 +34616,39 @@ normally prevent moving a type that has been borrowed from.") (description "@code{pancurses} is a @code{curses} library for Rust.") (license license:expat))) +(define-public rust-parasail-sys-0.2 + (package + (name "rust-parasail-sys") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "parasail-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "156fwfdbcfpzmx4k274jqdp8jzmllmdnhd1ibnh7kgd9cp7ni6ac")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-build-flags '("-vv") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-shell-for-configure-script + (lambda _ + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh"))))) + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2)))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://github.com/anp/parasailors") + (synopsis "Bindings to the parasail pairwise genetic sequence alignment library") + (description + "This packgae provides native bindings to the parasail pairwise genetic +sequence alignment library.") + (license license:expat))) + (define-public rust-parity-tokio-ipc-0.4 (package (name "rust-parity-tokio-ipc") -- cgit 1.4.1 From 86fa7a70d8c005ab3108acdd0a29228c2ffef295 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 11:58:19 +0000 Subject: gnu: Add rust-parasailors-0.3. * gnu/packages/crates-io.scm (rust-parasailors-0.3): New variable. --- gnu/packages/crates-io.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index fbc9139f83..2459164fff 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -34649,6 +34649,39 @@ normally prevent moving a type that has been borrowed from.") sequence alignment library.") (license license:expat))) +(define-public rust-parasailors-0.3 + (package + (name "rust-parasailors") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "parasailors" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qr1qwzrq289njc3aawih15n9a8yy169wyb1gzgwzga0r25dxi3g")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-build-flags '("-vv") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-shell-for-configure-script + (lambda _ + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh"))))) + #:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-parasail-sys" ,rust-parasail-sys-0.2)))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://github.com/anp/parasailors") + (synopsis "SIMD accelerated pairwise genetic sequence alignment") + (description "This package provides SIMD accelerated pairwise genetic +sequence alignment tools.") + (license license:expat))) + (define-public rust-parity-tokio-ipc-0.4 (package (name "rust-parity-tokio-ipc") -- cgit 1.4.1 From 01da92eef3bc43553674fdb83750fc19e4735cea Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 11:58:37 +0000 Subject: gnu: Add rust-fastq-0.6. * gnu/packages/crates-io.scm (rust-fastq-0.6): New variable. --- gnu/packages/crates-io.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2459164fff..40fd4e3107 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17545,6 +17545,43 @@ is defined in the HTML specification.") floats.") (license (list license:expat license:asl2.0)))) +(define-public rust-fastq-0.6 + (package + (name "rust-fastq") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fastq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "177jsfabnk3zl5zml6qvidzjpk53dp62rqjbdhbhr8cg7ms59p60")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-build-flags '("-vv") + #:phases + (modify-phases %standard-phases + ;; This is needed for the parasail-sys package. + (add-after 'unpack 'set-shell-for-configure-script + (lambda _ + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh"))))) + #:cargo-inputs + (("rust-flate2" ,rust-flate2-1) + ("rust-lz4" ,rust-lz4-1) + ("rust-memchr" ,rust-memchr-2)) + #:cargo-development-inputs + (("rust-bio" ,rust-bio-0.33) + ("rust-parasailors" ,rust-parasailors-0.3)))) + (inputs + `(("zlib" ,zlib))) + (native-inputs + `(("libtool" ,libtool))) + (home-page "https://github.com/aseyboldt/fastq-rs") + (synopsis "Parser for fastq files") + (description "This package provides a parser for fastq files.") + (license license:expat))) + (define-public rust-fastrand-1 (package (name "rust-fastrand") -- cgit 1.4.1 From 7d00ffc8fc3bbe8d83cf370587fc6f623c37bcb4 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:02:00 +0000 Subject: gnu: Add rust-snafu-derive-0.6. * gnu/packages/crates-io.scm (rust-snafu-derive-0.6): New variable. --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 40fd4e3107..a9363f8c2e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49183,6 +49183,29 @@ control on the fields.") clone.") (license (list license:expat license:asl2.0)))) +(define-public rust-snafu-derive-0.6 + (package + (name "rust-snafu-derive") + (version "0.6.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "snafu-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nri7ma06g5kimpcdcm8359a55nmps5f3kcngy0j6bin7jhfy20m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/shepmaster/snafu") + (synopsis "Ergonomic error handling library") + (description "Snafu aims to be an ergonomic error handling library. This +package provides derive macros.") + (license (list license:expat license:asl2.0)))) + (define-public rust-snailquote-0.3 (package (name "rust-snailquote") -- cgit 1.4.1 From 0e5127c0aa934c9e90b09ca20de6b6dd6f23a942 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:02:31 +0000 Subject: gnu: Add rust-statrs-0.12. * gnu/packages/crates-io.scm (rust-statrs-0.12): New variable. --- gnu/packages/crates-io.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a9363f8c2e..0509dddcc1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49990,6 +49990,27 @@ Rust.") Rust.") (license license:expat))) +(define-public rust-statrs-0.12 + (package + (name "rust-statrs") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "statrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10hk9194ig21w08947yavf4l97g0106ph4xxlzn8ps2kwrnnzqfc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-rand" ,rust-rand-0.7)))) + (home-page "https://github.com/statrs-dev/statrs") + (synopsis "Statistical computing library for Rust") + (description "This package provides a statistical computing library for +Rust.") + (license license:expat))) + (define-public rust-stb-truetype-0.3 (package (name "rust-stb-truetype") -- cgit 1.4.1 From 33802ba09e7b187d6e6b7ba87e37ea3807cc899a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:04:02 +0000 Subject: gnu: Add rust-snafu-0.6. * gnu/packages/crates-io.scm (rust-snafu-0.6): New variable. --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0509dddcc1..f9dfdd87ad 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -49206,6 +49206,32 @@ clone.") package provides derive macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-snafu-0.6 + (package + (name "rust-snafu") + (version "0.6.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "snafu" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19wwqxwb85pl040qk5xylj0vlznib3xzy9hcv2q0h8qv4qy2vcga")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures" ,rust-futures-0.1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-pin-project" ,rust-pin-project-0.4) + ("rust-snafu-derive" ,rust-snafu-derive-0.6)))) + (home-page "https://github.com/shepmaster/snafu") + (synopsis "Ergonomic error handling library") + (description "Snafu aims to be an ergonomic error handling library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-snailquote-0.3 (package (name "rust-snailquote") -- cgit 1.4.1 From e624622cfd4c810680e832a5442b9fc66425a8e1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:19:34 +0000 Subject: gnu: Add rust-bio-0.32. * gnu/packages/crates-io.scm (rust-bio-0.32): New variable. --- gnu/packages/crates-io.scm | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9dfdd87ad..a4870254a1 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5365,6 +5365,61 @@ bindings to C and C++ libraries.") rust-bio and rust-htslib.") (license license:expat))) +(define-public rust-bio-0.32 + (package + (name "rust-bio") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wj6s3hzpx5xhajcnvdabbgpalgghdni7gmlhjl6i9pfh1xiq5pi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-approx" ,rust-approx-0.3) + ("rust-bio-types" ,rust-bio-types-0.12) + ("rust-bit-set" ,rust-bit-set-0.5) + ("rust-bv" ,rust-bv-0.11) + ("rust-bytecount" ,rust-bytecount-0.6) + ("rust-csv" ,rust-csv-1) + ("rust-custom-derive" ,rust-custom-derive-0.1) + ("rust-enum-map" ,rust-enum-map-0.6) + ("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-getset" ,rust-getset-0.0.9) + ("rust-itertools" ,rust-itertools-0.9) + ("rust-itertools-num" ,rust-itertools-num-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-ndarray" ,rust-ndarray-0.13) + ("rust-newtype-derive" ,rust-newtype-derive-0.1) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-ordered-float" ,rust-ordered-float-1) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-quick-error" ,rust-quick-error-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-snafu" ,rust-snafu-0.6) + ("rust-statrs" ,rust-statrs-0.12) + ("rust-strum" ,rust-strum-0.18) + ("rust-strum-macros" ,rust-strum-macros-0.18) + ("rust-triple-accel" ,rust-triple-accel-0.3) + ("rust-vec-map" ,rust-vec-map-0.8)) + #:cargo-development-inputs + (("rust-proptest" ,rust-proptest-0.10)))) + (home-page "https://rust-bio.github.io") + (synopsis "Bioinformatics library for Rust") + (description + "This package provides a bioinformatics library for Rust. This library +provides implementations of many algorithms and data structures that are +useful for bioinformatics, but also in other fields.") + (license license:expat))) + (define-public rust-bio-0.33 (package (name "rust-bio") -- cgit 1.4.1 From b905d7c1d6b5ab6dc8363b142ae46069838bc200 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:19:49 +0000 Subject: gnu: Add rust-seq-io-0.3. * gnu/packages/crates-io.scm (rust-seq-io-0.3): New variable. --- gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a4870254a1..c56a419821 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46198,6 +46198,49 @@ also have to make sure that the wrapper is dropped from within the original thread. If any of these constraints is violated, a panic occurs.") (license (list license:expat license:asl2.0)))) +(define-public rust-seq-io-0.3 + (package + (name "rust-seq-io") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "seq_io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r643ihyba62vbr5l085mzz3gzfy4iba33nm2l981smvwcb8rzf6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-buf-redux" ,rust-buf-redux-0.8) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-memchr" ,rust-memchr-2) + ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1)) + #:cargo-development-inputs + (("rust-bio" ,rust-bio-0.32) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-fastq" ,rust-fastq-0.6) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-matches" ,rust-matches-0.1) + ("rust-rand" ,rust-rand-0.7) + ("rust-rand-isaac" ,rust-rand-isaac-0.2)))) + (inputs + `(("zlib" ,zlib))) + (home-page "https://github.com/markschl/seq_io") + (synopsis "Fast FASTA, FASTQ and FASTX parsing") + (description "This library provides readers for the the following sequence +formats: + +@itemize +@item FASTA, +@item FASTQ (including multi-line FASTQ), +@item FASTX: Automatic recognition of the sequence format (either FASTA or FASTQ). +@end itemize +") + (license license:expat))) + (define-public rust-seq-macro-0.2 (package (name "rust-seq-macro") -- cgit 1.4.1 From 4052310e91456530f0b5362f5895255e36d53055 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:49:12 +0000 Subject: gnu: Add biosoup. * gnu/packages/bioinformatics.scm (biosoup): New variable. --- gnu/packages/bioinformatics.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index a731b9af06..8139ce43de 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1323,6 +1323,37 @@ relying on a complex dependency tree.") (define-public python2-fastalite (package-with-python2 python-fastalite)) +(define-public biosoup + (package + (name "biosoup") + (version "0.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rvaser/biosoup") + ;; Corresponds to version 0.10.0 + (commit "38181f09854ff42cbd9632200a2ec9fb37a4b7b6"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "02hvyka703zagx0nvv2yx3dkc748zc8g6qbrpya7r8kfkcl7y8hw")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./bin/biosoup_test"))))))) + (native-inputs + `(("googletest" ,googletest))) + (home-page "https://github.com/rvaser/biosoup") + (synopsis "C++ support library for bioinformatics tools") + (description "Biosoup is a C++ collection of header-only data structures +used for storage and logging in bioinformatics tools.") + (license license:expat))) + (define-public ciri-long (package (name "ciri-long") -- cgit 1.4.1 From b8c9f061e100949f081157eb4c9a7a2299ce9187 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 13:53:59 +0000 Subject: gnu: Add bioparser. * gnu/packages/bioinformatics.scm (bioparser): New variable. --- gnu/packages/bioinformatics.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8139ce43de..ae3cf01c87 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1354,6 +1354,42 @@ relying on a complex dependency tree.") used for storage and logging in bioinformatics tools.") (license license:expat))) +(define-public bioparser + (package + (name "bioparser") + (version "3.0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rvaser/bioparser") + ;; Corresponds to tag 3.0.13 + (commit "13341e6e0855c6b358ffcea6dad216e1009e1287"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c5p2dl8jb12ci9f427jzrmmm9cgvc1k4fxsn2ggkfsin6r1r82i")))) + (build-system cmake-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./bin/bioparser_test"))))))) + (inputs + `(("biosoup" ,biosoup))) + (propagated-inputs + `(("zlib" ,zlib))) + (native-inputs + `(("googletest" ,googletest))) + (home-page "https://github.com/rvaser/bioparser") + (synopsis "C++ library for parsing several formats in bioinformatics") + (description "Bioparser is a C++ header only parsing library for several +bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib +compressed files.") + (license license:expat))) + (define-public ciri-long (package (name "ciri-long") -- cgit 1.4.1 From 6be47c5bc56b4a2d3183a58d1c9fb2e0846c7f0f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 14:44:28 +0000 Subject: gnu: Add circtools. * gnu/packages/bioinformatics.scm (circtools): New variable. --- gnu/packages/bioinformatics.scm | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index ae3cf01c87..13bd7b5997 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -48,6 +48,7 @@ #:use-module (guix hg-download) #:use-module (guix build-system ant) #:use-module (guix build-system gnu) + #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system go) #:use-module (guix build-system haskell) @@ -77,6 +78,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpio) #:use-module (gnu packages cran) + #:use-module (gnu packages crates-io) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) #:use-module (gnu packages databases) @@ -1390,6 +1392,61 @@ bioinformatics formats (FASTA/Q, MHAP/PAF/SAM), with support for zlib compressed files.") (license license:expat))) +(define-public circtools + (package + (name "circtools") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Kevinzjy/circtools") + ;; Corresponds to tag v1.0.0 + (commit "79380de59013601021ca3b1352d6f64d2fb89646") + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wg1s927g32k25j967kfr8l30nmr4c0p4zvy5igvy7cs6chd60lh")))) + (build-system cargo-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-writable + (lambda _ + (for-each make-file-writable (find-files ".")))) + (add-after 'unpack 'prepare-spoa-dependencies + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "vendor/spoa/CMakeLists.txt" + (("find_package\\(bioparser 3.0.13 QUIET\\)") + "find_package(bioparser 3.0.13 CONFIG)") + (("find_package\\(biosoup 0.10.0 QUIET\\)") + "find_package(biosoup 0.10.0 CONFIG)") + (("GTest_FOUND") "TRUE"))))) + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-bio" ,rust-bio-0.33) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-docopt" ,rust-docopt-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-indicatif" ,rust-indicatif-0.15) + ("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-seq-io" ,rust-seq-io-0.3)))) + (inputs + `(("bioparser" ,bioparser) + ("biosoup" ,biosoup))) + (native-inputs + `(("cmake" ,cmake) + ("pkg-config" ,pkg-config) + ("googletest" ,googletest))) + (home-page "https://github.com/Kevinzjy/circtools") + (synopsis "Accelerating functions in CIRI toolkit") + (description "This package provides accelerated functions for the CIRI +toolkit. It also provides the @code{ccs} executable to scan for circular +consensus sequences.") + (license license:expat))) + (define-public ciri-long (package (name "ciri-long") -- cgit 1.4.1 From c4e5fabb6ef1a07967960f9b585847503cca0613 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 14:44:37 +0000 Subject: gnu: ciri-long: Fix reference to ccs. * gnu/packages/bioinformatics.scm (ciri-long)[arguments]: Add build phase "fix-reference-to-ccs". [inputs]: Add circtools. --- gnu/packages/bioinformatics.scm | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 13bd7b5997..3455029ed1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1475,9 +1475,20 @@ consensus sequences.") (add-before 'build 'build-libssw (lambda _ (with-directory-excursion "libs/striped_smith_waterman" - (invoke "make" "libssw.so"))))))) - (inputs - `(("python-biopython" ,python-biopython) + (invoke "make" "libssw.so")))) + (add-before 'build 'fix-reference-to-ccs + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CIRI_long/pipeline.py" + (("'ccs -i") + (string-append "'" + (assoc-ref inputs "circtools") "/bin/ccs" + " -i"))) + ;; yuck! + (substitute* "CIRI_long/main.py" + (("os.chmod\\(lib_path.*") ""))))))) + (inputs + `(("circtools" ,circtools) + ("python-biopython" ,python-biopython) ("python-bwapy" ,python-bwapy) ("python-cython" ,python-cython) ("python-levenshtein" ,python-levenshtein) -- cgit 1.4.1 From a0fc9e38fa7dfa11a19f608e2d1da37495938035 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 15:04:47 +0000 Subject: gnu: ciri-long: Move Cython to native inputs. * gnu/packages/bioinformatics.scm (ciri-long)[inputs]: Move python-cython from here... [native-inputs]: ...to here. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 3455029ed1..c5a1215442 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1490,7 +1490,6 @@ consensus sequences.") `(("circtools" ,circtools) ("python-biopython" ,python-biopython) ("python-bwapy" ,python-bwapy) - ("python-cython" ,python-cython) ("python-levenshtein" ,python-levenshtein) ("python-mappy" ,python-mappy) ("python-numpy" ,python-numpy) @@ -1500,7 +1499,8 @@ consensus sequences.") ("python-scikit-learn" ,python-scikit-learn) ("python-scipy" ,python-scipy))) (native-inputs - `(("python-nose" ,python-nose) + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) ("python-setuptools" ,python-setuptools))) (home-page "https://ciri-cookbook.readthedocs.io/") (synopsis "Circular RNA identification for Nanopore sequencing") -- cgit 1.4.1 From 893a31ec20f47b979c1be9fb8b942809228ba4c9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 11 Nov 2021 15:22:20 +0000 Subject: gnu: rust-rustc-version-0.3: Update home page. * gnu/packages/crates-io.scm (rust-rustc-version-0.3)[home-page]: Update it. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c56a419821..aa5cdef1e2 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -43997,7 +43997,7 @@ require unstable language features.") `(#:skip-build? #t #:cargo-inputs (("rust-semver" ,rust-semver-0.11)))) - (home-page "https://github.com/Kimundi/rustc-version-rs") + (home-page "https://github.com/djc/rustc-version-rs") (synopsis "Library for querying the version of an installed rustc compiler") (description "This package provides a library for querying the version of an installed -- cgit 1.4.1 From 33a80e111096b05af3d60576dfcb2d67099dc60e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 6 Nov 2021 05:52:51 -0400 Subject: gnu: tar: Replace with 1.34 [fixes CVE-2021-20193]. * gnu/packages/base.scm (tar)[replacement]: New field. (tar-1.34): New variable. --- gnu/packages/base.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index ea2e102c15..77731d3720 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -180,6 +180,7 @@ implementation offers several extensions over the standard utility.") (package (name "tar") (version "1.32") + (replacement tar-1.34) (source (origin (method url-fetch) (uri (string-append "mirror://gnu/tar/tar-" @@ -234,6 +235,21 @@ standard utility.") (license gpl3+) (home-page "https://www.gnu.org/software/tar/"))) +(define-public tar-1.34 ; fixes CVE-2021-20193 + (package + (inherit tar) + (version "1.34") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/tar/tar-" + version ".tar.xz")) + (sha256 + (base32 + "0a0x87anh9chbi2cgcyy7pmnm5hzk4yd1w2j8gm1wplwhwkbvgk3")) + (patches + (search-patches "tar-skip-unreliable-tests.patch" + "tar-remove-wholesparse-check.patch")))))) + (define-public patch (package (name "patch") -- cgit 1.4.1 From 6e67c701a88064babd1aef93b58890aed2dcd0aa Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 12 Nov 2021 10:30:59 +0000 Subject: gnu: cuirass: Update to 1.1.0-5.ea09658. * gnu/packages/ci.scm (cuirass): Update to 1.1.0-5.ea09658. --- gnu/packages/ci.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 6bcf7711a5..82038e4f52 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -73,8 +73,8 @@ (file-name (string-append name "-" version "-checkout"))))))) (define-public cuirass - (let ((commit "60190401ce4ccc890629ec3cb22a84a8ab8c2645") - (revision "4")) + (let ((commit "ea09658f13b3f440c2c755882fdfc7459a5d90fa") + (revision "5")) (package (name "cuirass") (version (git-version "1.1.0" revision commit)) @@ -87,7 +87,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0b0bs32lzk5ck7lw8ac9dj2h70sqc5y430vhi7rcnwj48mdrchma")))) + "18w46v46rbibrkhp4ias1ns636f1dds0vv143x7fcchrw01hk71y")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build utils) -- cgit 1.4.1 From 39754503e83f5f50ee25a2bcbac41d5bc436f7aa Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Thu, 4 Nov 2021 01:35:10 -0700 Subject: gnu: genimage: Update to 14. Update genimage from version 11 to 14. A patch is required for the tests due to differences in ext tooling. * gnu/local.mk (dist_patch_DATA): Replace patch reference. * gnu/packages/genimage.scm: Update package source. * gnu/packages/patches/genimage-mke2fs-test.patch: New patch file. * gnu/packages/patches/genimage-signedness.patch: Delete obsolete patch. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 2 +- gnu/packages/genimage.scm | 8 ++--- gnu/packages/patches/genimage-mke2fs-test.patch | 40 +++++++++++++++++++++++++ gnu/packages/patches/genimage-signedness.patch | 24 --------------- 4 files changed, 45 insertions(+), 29 deletions(-) create mode 100644 gnu/packages/patches/genimage-mke2fs-test.patch delete mode 100644 gnu/packages/patches/genimage-signedness.patch diff --git a/gnu/local.mk b/gnu/local.mk index 05258ac054..208875754b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1128,7 +1128,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdk-pixbuf-CVE-2020-29385.patch \ %D%/packages/patches/gdm-default-session.patch \ %D%/packages/patches/geary-CVE-2020-24661.patch \ - %D%/packages/patches/genimage-signedness.patch \ + %D%/packages/patches/genimage-mke2fs-test.patch \ %D%/packages/patches/geoclue-config.patch \ %D%/packages/patches/ghc-8.0-fall-back-to-madv_dontneed.patch \ %D%/packages/patches/ghc-testsuite-dlopen-pie.patch \ diff --git a/gnu/packages/genimage.scm b/gnu/packages/genimage.scm index fb994231dd..f5574b04ee 100644 --- a/gnu/packages/genimage.scm +++ b/gnu/packages/genimage.scm @@ -43,7 +43,7 @@ (define-public genimage (package (name "genimage") - (version "11") + (version "14") (source (origin (method git-fetch) (uri (git-reference @@ -52,9 +52,9 @@ (file-name (git-file-name name version)) (sha256 (base32 - "15jmh17lvm3jw9c92bjarly7iwhmnfl322d91mprfv10ppb9ip54")) - ;; will be shipped with release 14 - (patches (search-patches "genimage-signedness.patch")))) + "1l45djpbaffhyw0allq3mgzwrdilk05iyj0nvp8l3s47vnp5bnbs")) + (patches + (search-patches "genimage-mke2fs-test.patch")))) (build-system gnu-build-system) (arguments `(#:modules diff --git a/gnu/packages/patches/genimage-mke2fs-test.patch b/gnu/packages/patches/genimage-mke2fs-test.patch new file mode 100644 index 0000000000..c4a17590f2 --- /dev/null +++ b/gnu/packages/patches/genimage-mke2fs-test.patch @@ -0,0 +1,40 @@ +diff --git a/test/mke2fs.dump b/test/mke2fs.dump +index 8e63662..0c25798 100644 +--- a/test/mke2fs.dump ++++ b/test/mke2fs.dump +@@ -11,7 +11,7 @@ Filesystem OS type: Linux + Inode count: 8192 + Block count: 32768 + Reserved block count: 1638 +-Free blocks: 26568 ++Free blocks: 26566 + Free inodes: 8141 + First block: 1 + Block size: 1024 +@@ -29,7 +29,7 @@ Mount count: 0 + Maximum mount count: -1 + Last checked: Sat Jan 1 00:00:00 2000 + Check interval: 0 () +-Lifetime writes: 141 kB ++Lifetime writes: 143 kB + Reserved blocks uid: 0 (user root) + Reserved blocks gid: 0 (group root) + First inode: 11 +@@ -49,13 +49,13 @@ Journal sequence: 0x00000001 + Journal start: 0 + + +-Group 0: (Blocks 1-8192) csum 0x74a0 [ITABLE_ZEROED] ++Group 0: (Blocks 1-8192) csum 0x3f30 [ITABLE_ZEROED] + Primary superblock at 1, Group descriptors at 2-2 +- Block bitmap at 3 (+2), csum 0x16cec4db ++ Block bitmap at 3 (+2), csum 0x8d67cdef + Inode bitmap at 7 (+6), csum 0xb1052088 + Inode table at 11-522 (+10) +- 6093 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes +- Free blocks: 2100-8192 ++ 6091 free blocks, 1997 free inodes, 18 directories, 1997 unused inodes ++ Free blocks: 2102-8192 + Free inodes: 52-2048 + Group 1: (Blocks 8193-16384) csum 0x8fde [INODE_UNINIT, BLOCK_UNINIT, ITABLE_ZEROED] + Backup superblock at 8193, Group descriptors at 8194-8194 diff --git a/gnu/packages/patches/genimage-signedness.patch b/gnu/packages/patches/genimage-signedness.patch deleted file mode 100644 index 2204dfb545..0000000000 --- a/gnu/packages/patches/genimage-signedness.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6574665f9d6c0757e8f55ccb465afbcaa90bf019 -Author: Timotej Lazar -Date: Wed Aug 19 19:36:02 2020 +0200 - - test: normalize flags reported by dumpe2fs - - Filesystem flags depend on the system – usually signed_directory_hash, - but unsigned_directory_hash at least on arm64. - - Signed-off-by: Timotej Lazar - -diff --git a/test/basic-images.test b/test/basic-images.test -index f6685e1..cb104c3 100755 ---- a/test/basic-images.test -+++ b/test/basic-images.test -@@ -158,6 +158,8 @@ check_ext() { - # format change - csum2="Group 0: (Blocks 1-4095) \\[ITABLE_ZEROED\\]\| Checksum .*, unused inodes 205" - dumpe2fs "${1}" | grep -v "^\($uuid\|$seed\|$csum1\|$csum2\)" > "dump" && -+ # some architectures (including arm64) use unsigned char -+ sed -i 's/un\(signed_directory_hash\)/\1/' "dump" && - # fixup for ext3 journal size with old tune2fs - sed -i 's/^\(Journal size: \)1029k$/\11024k/' "dump" && - # output format changed with some version -- cgit 1.4.1 From 096a2bf8c59a955c634cc838e7f7111941c07b37 Mon Sep 17 00:00:00 2001 From: Ryan Sundberg Date: Thu, 4 Nov 2021 01:35:11 -0700 Subject: image: Support generating GPT images via `partition-table-type`. * gnu/image.scm ()[partition-table-type]: New field. * gnu/system/image.scm: Implement partition-table-type logic for genimage. Signed-off-by: Mathieu Othacehe --- gnu/image.scm | 3 +++ gnu/system/image.scm | 61 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 17 deletions(-) diff --git a/gnu/image.scm b/gnu/image.scm index 2381efa208..1c954af8cf 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -38,6 +38,7 @@ image-platform image-size image-operating-system + image-partition-table-type image-partitions image-compression? image-volatile-root? @@ -86,6 +87,8 @@ (default 'guess)) (operating-system image-operating-system ; (default #f)) + (partition-table-type image-partition-table-type ; 'mbr or 'gpt + (default 'mbr)) (partitions image-partitions ;list of (default '())) (compression? image-compression? ;boolean diff --git a/gnu/system/image.scm b/gnu/system/image.scm index 7a807b8226..4b6aaf2e32 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -298,6 +298,14 @@ used in the image." ((member 'esp flags) "0xEF") (else "0x83")))) + (define (partition->gpt-type partition) + ;; Return the genimage GPT partition type code corresponding to PARTITION. + ;; See https://github.com/pengutronix/genimage/blob/master/README.rst + (let ((flags (partition-flags partition))) + (cond + ((member 'esp flags) "U") + (else "L")))) + (define (partition-image partition) ;; Return as a file-like object, an image of the given PARTITION. A ;; directory, filled by calling the PARTITION initializer procedure, is @@ -347,26 +355,44 @@ used in the image." #:local-build? #f #:options `(#:references-graphs ,inputs)))) - (define (partition->config partition) + (define (gpt-image? image) + (eq? 'gpt (image-partition-table-type image))) + + (define (partition-type-values image partition) + (if (gpt-image? image) + (values "partition-type-uuid" (partition->gpt-type partition)) + (values "partition-type" (partition->dos-type partition)))) + + (define (partition->config image partition) ;; Return the genimage partition configuration for PARTITION. - (let ((label (partition-label partition)) - (dos-type (partition->dos-type partition)) - (image (partition-image partition)) - (offset (partition-offset partition))) - #~(format #f "~/partition ~a { -~/~/partition-type = ~a -~/~/image = \"~a\" -~/~/offset = \"~a\" -~/}" - #$label - #$dos-type - #$image - #$offset))) + (let-values (((partition-type-attribute partition-type-value) + (partition-type-values image partition))) + (let ((label (partition-label partition)) + (image (partition-image partition)) + (offset (partition-offset partition))) + #~(format #f "~/partition ~a { + ~/~/~a = ~a + ~/~/image = \"~a\" + ~/~/offset = \"~a\" + ~/}" + #$label + #$partition-type-attribute + #$partition-type-value + #$image + #$offset)))) + + (define (genimage-type-options image-type image) + (cond + ((equal? image-type "hdimage") + (format #f "~%~/~/gpt = ~a~%~/" + (if (gpt-image? image) "true" "false"))) + (else ""))) (let* ((format (image-format image)) (image-type (format->image-type format)) + (image-type-options (genimage-type-options image-type image)) (partitions (image-partitions image)) - (partitions-config (map partition->config partitions)) + (partitions-config (map (cut partition->config image <>) partitions)) (builder #~(begin (let ((format (@ (ice-9 format) format))) @@ -375,9 +401,10 @@ used in the image." (format port "\ image ~a { -~/~a {} +~/~a {~a} ~{~a~^~%~} -}~%" #$genimage-name #$image-type (list #$@partitions-config)))))))) +}~%" #$genimage-name #$image-type #$image-type-options + (list #$@partitions-config)))))))) (computed-file "genimage.cfg" builder))) (let* ((image-name (image-name image)) -- cgit 1.4.1 From fb3df2011692b2a6fea9f4fefd71dd788453fbae Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 12 Nov 2021 13:26:52 +0000 Subject: build: bootloader: Add GPT support. * gnu/build/bootloader.scm (install-efi-loader): Add GPT support. --- gnu/build/bootloader.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/build/bootloader.scm b/gnu/build/bootloader.scm index 3916930c89..9a89fe55cb 100644 --- a/gnu/build/bootloader.scm +++ b/gnu/build/bootloader.scm @@ -94,6 +94,7 @@ load the Grub bootloader located in the 'Guix_image' root partition." ;; (not eliminate it). (format port "insmod part_msdos~@ + insmod part_gpt~@ search --set=root --label Guix_image~@ configfile /boot/grub/grub.cfg~%"))) (install-efi grub-efi grub-config esp) -- cgit 1.4.1 From da73727f1a1c49bd0b834d2d4da48d578062b0ae Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Fri, 12 Nov 2021 12:24:16 +0100 Subject: gnu: Add texlive-latex-bussproofs. * gnu/packages/tex.scm (texlive-latex-bussproofs): New variable. --- gnu/packages/tex.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index bc077b954f..5231840b26 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8724,6 +8724,32 @@ an arbitrary point. Various options allow complete control over spacing, styles of inference rules, placement of labels, etc.") (license license:lppl1.3+))) +(define-public texlive-latex-bussproofs + (let ((template (simple-texlive-package + "texlive-latex-bussproofs" + (list "/doc/latex/bussproofs/" + "/tex/latex/bussproofs/") + (base32 + "1gb8y9g89fqw1kix4d2vb7mj440vlb8hnpsa3jqpk9yicndwcyk6")))) + (package + (inherit template) + (arguments + (substitute-keyword-arguments (package-arguments template) + ((#:tex-directory _ '()) + "latex/bussproofs") + ((#:build-targets _ '()) + ''()) ; "bussproofs.sty" + ((#:phases phases) + `(modify-phases ,phases + (add-after 'unpack 'chdir + (lambda _ (chdir "tex/latex/bussproofs"))))))) + (home-page "https://www.math.ucsd.edu/~sbuss/ResearchWeb/bussproofs/index.html") + (synopsis "Formal proofs in the style of sequent calculus") + (description + "This package provides commands to typeset proof trees in the style of +sequent calculus and related systems.") + (license license:lppl1.3+)))) + (define-public texlive-eurosym (let ((template (simple-texlive-package "texlive-eurosym" -- cgit 1.4.1 From 0c21ec1c7915bdc08c68c66eba411cf533d4e503 Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Tue, 2 Nov 2021 11:57:29 +0100 Subject: import: utils: Add more licenses and extend their detection. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * guix/import/utils.scm (spdx-string->license): Identify more licenses (CC-BY-4.0, Freetype, HPND). * guix/licenses.scm: Add a comment that mentions "MIT" so that people who grep for MIT end up there. Signed-off-by: Ludovic Courtès --- guix/import/utils.scm | 3 +++ guix/licenses.scm | 2 ++ 2 files changed, 5 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index a180742ca3..dc89386ddb 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -152,6 +152,7 @@ of the string VERSION is replaced by the symbol 'version." ("CC0-1.0" 'license:cc0) ("CC-BY-2.0" 'license:cc-by2.0) ("CC-BY-3.0" 'license:cc-by3.0) + ("CC-BY-4.0" 'license:cc-by4.0) ("CC-BY-SA-2.0" 'license:cc-by-sa2.0) ("CC-BY-SA-3.0" 'license:cc-by-sa3.0) ("CC-BY-SA-4.0" 'license:cc-by-sa4.0) @@ -163,6 +164,7 @@ of the string VERSION is replaced by the symbol 'version." ("EPL-1.0" 'license:epl1.0) ("MIT" 'license:expat) ("FTL" 'license:freetype) + ("Freetype" 'license:freetype) ("GFDL-1.1" 'license:fdl1.1+) ("GFDL-1.2" 'license:fdl1.2+) ("GFDL-1.3" 'license:fdl1.3+) @@ -179,6 +181,7 @@ of the string VERSION is replaced by the symbol 'version." ("GPL-3.0-only" 'license:gpl3) ("GPL-3.0+" 'license:gpl3+) ("GPL-3.0-or-later" 'license:gpl3+) + ("HPND" 'license:hpnd) ("ISC" 'license:isc) ("IJG" 'license:ijg) ("Imlib2" 'license:imlib2) diff --git a/guix/licenses.scm b/guix/licenses.scm index c071aae4a9..82ca44f42e 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -308,6 +308,8 @@ at URI, which may be a file:// URI pointing the package's tree." "https://directory.fsf.org/wiki/License:EUPL-1.2" "https://www.gnu.org/licenses/license-list#EUPL-1.2")) +;; Some people call it the MIT license. For clarification see: +;; https://www.gnu.org/licenses/license-list.html#Expat (define expat (license "Expat" "http://directory.fsf.org/wiki/License:Expat" -- cgit 1.4.1 From f634a0baab85454a6feac25e29905f564b276c9e Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 2 Nov 2021 20:06:32 +0100 Subject: services: Add qemu-guest-agent service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/virtualization.scm (): New record. (qemu-guest-agent-shepherd-service): New procedure. (qemu-guest-agent-service-type): New variable. * doc/guix.texi (Virtualization Services): Document it. Signed-off-by: Ludovic Courtès --- doc/guix.texi | 47 ++++++++++++++++++++++++++++++++++++++++ gnu/services/virtualization.scm | 48 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 94 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 29a6665540..7e54b5f75e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -30060,6 +30060,53 @@ Return the name of @var{platform}---a string such as @code{"arm"}. @end deffn +@subsubheading QEMU Guest Agent + +@cindex emulation + +The QEMU guest agent provides control over the emulated system to the +host. The @code{qemu-guest-agent} service runs the agent on Guix +guests. To control the agent from the host, open a socket by invoking +QEMU with the following arguments: + +@example +qemu-system-x86_64 \ + -chardev socket,path=/tmp/qga.sock,server=on,wait=off,id=qga0 \ + -device virtio-serial \ + -device virtserialport,chardev=qga0,name=org.qemu.guest_agent.0 \ + ... +@end example + +This creates a socket at @file{/tmp/qga.sock} on the host. Once the +guest agent is running, you can issue commands with @code{socat}: + +@example +$ guix shell socat -- socat unix-connect:/tmp/qga.sock stdio +@{"execute": "guest-get-host-name"@} +@{"return": @{"host-name": "guix"@}@} +@end example + +See @url{https://wiki.qemu.org/Features/GuestAgent,QEMU guest agent +documentation} for more options and commands. + +@defvr {Scheme Variable} qemu-guest-agent-service-type +Service type for the QEMU guest agent service. +@end defvr + +@deftp {Data Type} qemu-guest-agent-configuration +Configuration for the @code{qemu-guest-agent} service. + +@table @asis +@item @code{qemu} (default: @code{qemu-minimal}) +The QEMU package to use. + +@item @code{device} (default: @code{""}) +File name of the device or socket the agent uses to communicate with the +host. If empty, QEMU uses a default file name. +@end table +@end deftp + + @subsubheading The Hurd in a Virtual Machine @cindex @code{hurd} diff --git a/gnu/services/virtualization.scm b/gnu/services/virtualization.scm index bca5f56b87..1a5744ffbf 100644 --- a/gnu/services/virtualization.scm +++ b/gnu/services/virtualization.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2017 Ryan Moe ;;; Copyright © 2018, 2020, 2021 Ludovic Courtès ;;; Copyright © 2020,2021 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2021 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,7 +83,11 @@ qemu-binfmt-configuration qemu-binfmt-configuration? - qemu-binfmt-service-type)) + qemu-binfmt-service-type + + qemu-guest-agent-configuration + qemu-guest-agent-configuration? + qemu-guest-agent-service-type)) (define (uglify-field-name field-name) (let ((str (symbol->string field-name))) @@ -847,6 +852,47 @@ given QEMU package." compiled for other architectures using QEMU and the @code{binfmt_misc} functionality of the kernel Linux."))) + +;;; +;;; QEMU guest agent service. +;;; + +(define-configuration qemu-guest-agent-configuration + (qemu + (package qemu-minimal) + "QEMU package.") + (device + (string "") + "Path to device or socket used to communicate with the host. If not +specified, the QEMU default path is used.")) + +(define qemu-guest-agent-shepherd-service + (match-lambda + (($ qemu device) + (list + (shepherd-service + (provision '(qemu-guest-agent)) + (documentation "Run the QEMU guest agent.") + (start #~(make-forkexec-constructor + `(,(string-append #$qemu "/bin/qemu-ga") "--daemon" + "--pidfile=/var/run/qemu-ga.pid" + "--statedir=/var/run" + ,@(if #$device + (list (string-append "--path=" #$device)) + '())) + #:pid-file "/var/run/qemu-ga.pid" + #:log-file "/var/log/qemu-ga.log")) + (stop #~(make-kill-destructor))))))) + +(define qemu-guest-agent-service-type + (service-type + (name 'qemu-guest-agent) + (extensions + (list (service-extension shepherd-root-service-type + qemu-guest-agent-shepherd-service))) + (default-value (qemu-guest-agent-configuration)) + (description "Run the QEMU guest agent."))) + ;;; ;;; Secrets for guest VMs. -- cgit 1.4.1 From 18cf347a64fc0b4fe20fd4d172cefe198cbb190c Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Thu, 4 Nov 2021 01:02:22 +1100 Subject: gnu: Add emacs-flymake-flycheck. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-flymake-flycheck): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4281371f10..b305bb5386 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1587,6 +1587,27 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+)))) ;+GFDLv1.3+ for the manual +(define-public emacs-flymake-flycheck + (package + (name "emacs-flymake-flycheck") + (version "20210404.2128") + (source + (origin + (method url-fetch) + (uri (string-append "https://melpa.org/packages/flymake-flycheck-" + version ".el")) + (sha256 + (base32 "1m59ahd5gjlfwf328labwdlpcxh8ywywkwgfrlsy5jyxfc9ss4nv")))) + (build-system emacs-build-system) + (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck))) + (home-page "https://github.com/purcell/flymake-flycheck") + (synopsis "Use Flycheck checkers as Flymake backends") + (description + "This package provides support for running any Flycheck checker as a +Flymake diagnostic backend. The effect is that Flymake will control when the +checker runs, and Flymake will receive its errors.") + (license license:gpl3+))) + (define-public emacs-flymake-quickdef ;; This particular commit includes bug fixes on top of 1.0.0 release. (let ((version "1.0.0") -- cgit 1.4.1 From 729936cfa4766787218c9e5cf683723544f996f0 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 11 Nov 2021 10:30:03 -0500 Subject: gnu: Add python-sgmllib3k. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-sgmllib3k): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a01a14f29b..e5cdaadb3b 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27815,3 +27815,27 @@ simple mock/record and a complete capture/replay framework.") "Ijson is an iterative JSON parser with standard Python iterator interfaces.") (license license:bsd-3))) + +(define-public python-sgmllib3k + (package + (name "python-sgmllib3k") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sgmllib3k" version)) + (sha256 + (base32 "1s8jm3dgqabgf8x96931scji679qkhvczlv3qld4qxpsicfgns3q")))) + (build-system python-build-system) + ;; Requires a test.html input that is not supplied + (arguments + `(#:tests? #f)) + (home-page "https://pypi.org/project/sgmllib3k/") + ;; Actual homepage seems to be down + ;; (home-page "https://hg.hardcoded.net/sgmllib") + (synopsis "Python 3 port of sgmllib") + (description + "This packages provides an unmaintained port of sgmllib to Python 3. +It is used to parse text files formatted in @acronym{SGML,Standard Generalized +Mark-up Language}.") + (license license:bsd-3))) -- cgit 1.4.1 From d40234062552ed5f058410e6565ee231cb5bfe52 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 11 Nov 2021 10:30:04 -0500 Subject: gnu: python-feedparser: Add input MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/web.scm (python-feedparser) [propagated-inputs]: Add python-sgmllib3k Signed-off-by: Ludovic Courtès --- gnu/packages/web.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index fb0ca7646a..a4c47f92d8 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4773,6 +4773,8 @@ their web site.") (base32 "0x0hm9brh3j71645pydvlkrwxaaca9dnwd7xahwjyjaz882s200v")))) (build-system python-build-system) + (propagated-inputs + `(("python-sgmllib3k" ,python-sgmllib3k))) (arguments '(#:tests? #f)) (home-page -- cgit 1.4.1 From 337489478639db6177813b8966c68f8ce4be39d8 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Thu, 11 Nov 2021 10:30:05 -0500 Subject: gnu: Add rss2email. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (rss2email): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b2d69e2064..04d4a91795 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -42,6 +42,7 @@ ;;; Copyright © 2020 divoplade ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Benoit Joly +;;; Copyright © 2021 Morgan Smith ;;; ;;; This file is part of GNU Guix. ;;; @@ -4564,3 +4565,41 @@ regexes, approximate regexes, a Hidden Markov Model, Orthogonal Sparse Bigrams, WINNOW, Correlation, KNN/Hyperspace, or Bit Entropy (or by other means--it's all programmable).") (license license:gpl3))) + +(define-public rss2email + (package + (name "rss2email") + (version "3.13.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rss2email/rss2email") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0g1yr3v3ibdh2jqil64fbdbplx5m2yzxr893fqfkwcc5c7fbwl4d")))) + (build-system python-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "test" + ;; Skip networking tests + (substitute* "test.py" + (("( *)class (:?TestSend|TestFetch).*" match indent) + (string-append indent "@unittest.skip(\"Networking stuff skipped\")\n" + indent match))) + (invoke "python" "-m" "unittest")))))))) + (inputs + `(("python-feedparser" ,python-feedparser) + ("python-html2text" ,python-html2text))) + (home-page "https://github.com/rss2email/rss2email") + (synopsis "Converts RSS/Atom newsfeeds to email") + (description "The RSS2email program (@command{r2e}) fetches RSS/Atom news +feeds, converts them into emails, and sends them.") + ;; GPL version 2 or 3. NOT 2+. + (license (list license:gpl2 + license:gpl3)))) -- cgit 1.4.1 From dc05fea1db2e868212048c3d94c0e30e2768f2c1 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 12 Nov 2021 15:07:16 -0800 Subject: gnu: diffoscope: Update to 192. * gnu/packages/diffoscope.scm (diffoscope): Update to 192. --- gnu/packages/diffoscope.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index 3f5928d23b..6498a5e63e 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -73,7 +73,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "190") + (version "192") (source (origin (method git-fetch) @@ -82,7 +82,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "10q93qybwqf2nzj3iakw1pxhccq10ixm9fn7xgdr4p88qb0wchb5")) + (base32 "1anj90r7nvdd7vscx27xnh7vivhq16gxg9cffpwb4w7i02ij5w6b")) (patches (search-patches "diffoscope-fix-llvm-test.patch")))) (build-system python-build-system) -- cgit 1.4.1 From f116b4764baa2eaaad4c83e1aa6de45a6bf412a6 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 12 Nov 2021 23:08:36 -0600 Subject: gnu: Add Breezy. * gnu/packages/version-control.scm (breezy): New variable. --- gnu/packages/version-control.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 6c4b74f9d2..c57deff686 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2013, 2014 Andreas Enge ;;; Copyright © 2015, 2016 Mathieu Lirzin ;;; Copyright © 2014, 2015, 2016 Mark H Weaver -;;; Copyright © 2014, 2016, 2019 Eric Bavier +;;; Copyright © 2014, 2016, 2019, 2021 Eric Bavier ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2015, 2018, 2020, 2021 Kyle Meyer ;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus @@ -112,6 +112,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -171,6 +172,43 @@ changes to project files over time. It supports both a distributed workflow as well as the classic centralized workflow.") (license license:gpl2+))) +(define-public breezy + (package + (name "breezy") + (version "3.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://launchpad.net/brz/" + (version-major+minor version) "/" version + "/+download/breezy-" version ".tar.gz")) + (sha256 + (base32 + "0p6q545xpmxa6fgvkjglfpqpybg33817vhw0a82az8i83bmnicp0")))) + (build-system python-build-system) + ;; TODO: Maybe regenerate C files with Cython? + (inputs + `(("gettext" ,gettext-minimal) + ("python-configobj" ,python-configobj) + ("python-dulwich" ,python-dulwich) + ("python-fastimport" ,python-fastimport) + ("python-paramiko" ,python-paramiko) + ("python-patiencediff" ,python-patiencediff) + ("python-pycryptodome" ,python-pycryptodome) + ("python-pygpgme" ,python-pygpgme))) + (arguments + `(#:tests? #f)) ; no tests in release tarball + (home-page "https://www.breezy-vcs.org/") + (synopsis "Decentralized revision control system") + (description + "Breezy (@command{brz}) is a decentralized revision control system. By +default, Breezy provides support for both the +@uref{https://www.bazaar-vcs.org, Bazaar} and @uref{https://www.git-scm.com, +Git} file formats. Breezy is backwards compatible with Bazaar's disk format +and protocols. One of the key differences with Bazaar is that Breezy runs on +Python 3.3 and later, rather than on Python 2.") + (license license:gpl2+))) + (define git-cross-configure-flags '("ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" -- cgit 1.4.1 From 193d7b5b450d2004c26720e488a9cce930542e9e Mon Sep 17 00:00:00 2001 From: jgart Date: Sat, 13 Nov 2021 01:27:15 -0500 Subject: guix: packages: Clarify that list is a list of records. * guix/packages/packages.scm (): Clarify that the license field takes a list of licenses rather than a generic list. Signed-off-by: Liliana Marie Prikler --- guix/packages.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index 4b6098bb8d..a3602a3d7a 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -520,7 +520,7 @@ Texinfo. Otherwise, return the string." (sanitize validate-texinfo)) ; one-line description (description package-description (sanitize validate-texinfo)) ; one or two paragraphs - (license package-license) ; instance or list + (license package-license) ; (list of) (home-page package-home-page) (supported-systems package-supported-systems ; list of strings (default %supported-systems)) -- cgit 1.4.1 From e9e162784985611a0700cf7d0f16096762467a70 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 13 Nov 2021 19:10:55 +0100 Subject: gnu: duplicity: Update to 0.8.21. * gnu/packages/backup.scm (duplicity): Update to 0.8.21. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/backup.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 61d330e861..1dca6fd9b1 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -88,7 +88,7 @@ (define-public duplicity (package (name "duplicity") - (version "0.8.20") + (version "0.8.21") (source (origin (method url-fetch) @@ -97,7 +97,7 @@ "-series/" version "/+download/duplicity-" version ".tar.gz")) (sha256 - (base32 "0d125mxknpn44xwgqzzak9y5ydigscrpjv9d63126mfc6yfngr5v")))) + (base32 "0ld4bhsi6iv4bvy99pblbr7vlwy9jbgfd6flyvb8qwbl8rvadzjp")))) (build-system python-build-system) (native-inputs `(("gettext" ,gettext-minimal) ; for msgfmt @@ -138,8 +138,7 @@ "/bin/dbus-launch']"))) (substitute* '("testing/functional/__init__.py" "testing/overrides/bin/lftp") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-before 'check 'set-up-tests (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) ; gpg needs to write to $HOME @@ -148,8 +147,7 @@ "/share/zoneinfo")) ;; Some things respect TMPDIR, others hard-code /tmp, and the ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp") - #t))))) + (setenv "TMPDIR" "/tmp")))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description -- cgit 1.4.1 From 114005bea61efcd5f7d768e2d6503e873f654c16 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Nov 2021 23:02:18 +0100 Subject: tests: Adjust tests/egg.scm to latest API changes. This is a followup to b999c80c2e71bd4b3f26a18a321b7e7e7b580103. * tests/egg.scm (eval-test-with-egg-file): Pass 'version' argument to 'egg->guix-package'. --- tests/egg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/egg.scm b/tests/egg.scm index 0884d8d429..99dd0a3fc7 100644 --- a/tests/egg.scm +++ b/tests/egg.scm @@ -72,7 +72,7 @@ (call-with-output-file egg-file (lambda (port) (write egg-test port))) - (matcher (egg->guix-package egg-name + (matcher (egg->guix-package egg-name #f #:file egg-file #:source (plain-file (string-append egg-name "-egg") -- cgit 1.4.1 From c899566b2f13b57ab4c9a91e150f0cad27059d31 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Oct 2021 19:06:56 +0000 Subject: gnu: spdlog: Update to 1.9.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/logging.scm (spdlog): Update to 1.9.2. Signed-off-by: Ludovic Courtès --- gnu/packages/logging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 6a4975e435..06a1905479 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -190,7 +190,7 @@ output in multiple windows in a terminal.") (define-public spdlog (package (name "spdlog") - (version "1.8.5") + (version "1.9.2") (source (origin (method git-fetch) @@ -199,7 +199,7 @@ output in multiple windows in a terminal.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "179krvg5sad6dviqpcjwg6czzknnilqszrg1d0fgp12h6sy66vqg")))) + (base32 "1img03ka63hf3sb62v5f02ax5jc9mlpz5cijr38xxzymvcg1s98r")))) (build-system cmake-build-system) ;; TODO run benchmark. Currently not possible, as adding ;; (gnu packages benchmark) forms a dependency cycle -- cgit 1.4.1 From 357ecb777ea22d444ae4cec1705ad940b926ecc7 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Oct 2021 19:06:42 +0000 Subject: gnu: waybar: Update to 0.9.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/wm.scm (waybar): Update to 0.9.8. [inputs]: Add libxml2. Signed-off-by: Ludovic Courtès --- gnu/packages/wm.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index fc229e0753..6874b591f2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1685,7 +1685,7 @@ display a clock or apply image manipulation techniques to the background image." (define-public waybar (package (name "waybar") - (version "0.9.7") + (version "0.9.8") (source (origin (method git-fetch) @@ -1694,7 +1694,7 @@ display a clock or apply image manipulation techniques to the background image." (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17cn4d3dx92v40jd9vl41smp8hh3gf5chd1j2f7l1lrpfpnllg5x")))) + (base32 "109a49f064ma5js2d7maribmfalswbmmhq2fraa7hfz5pf2jxs2w")))) (build-system meson-build-system) (inputs `(("date" ,date) ("fmt" ,fmt) @@ -1705,6 +1705,7 @@ display a clock or apply image manipulation techniques to the background image." ("libinput" ,libinput) ("libmpdclent" ,libmpdclient) ("libnl" ,libnl) + ("libxml2" ,libxml2) ("pulseaudio" ,pulseaudio) ("spdlog" ,spdlog) ("wayland" ,wayland))) -- cgit 1.4.1 From 459d7cfbc4f4821b645e93149717d38b7a80135e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 24 Jun 2021 13:23:21 +0000 Subject: gnu: fmt: Update to 8.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pretty-print.scm (fmt): Update to 8.0.1, (fmt-7): New variable. * gnu/packages/astronomy.scm (celestia)[inputs], gnu/packages/kodi.scm (kodi)[inputs], gnu/packages/lua.scm (emilua)[inputs]: Change to fmt-7. Signed-off-by: Ludovic Courtès --- gnu/packages/astronomy.scm | 3 ++- gnu/packages/kodi.scm | 3 ++- gnu/packages/lua.scm | 3 ++- gnu/packages/pretty-print.scm | 15 +++++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index fc8959faad..f50276e5b0 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -582,7 +583,7 @@ any arbitrary astrometric projection defined in the WCS standard.") ;; maybe required? ("mesa" ,mesa) ;; optional: fmtlib, Eigen3; - ("fmt" ,fmt) + ("fmt" ,fmt-7) ("eigen" ,eigen) ;; glut: for glut interface ("freeglut" ,freeglut))) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index b3dc96f925..1e50624696 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020 Efraim Flashner ;;; Copyright © 2020 Michael Rohleder +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -404,7 +405,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.") ("ffmpeg" ,ffmpeg) ("flac" ,flac) ("flatbuffers" ,flatbuffers) - ("fmt" ,fmt) + ("fmt" ,fmt-7) ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("fribidi" ,fribidi) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0ecc91294f..e40d28a473 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Simon South ;;; Copyright © 2020 Paul A. Patience ;;; Copyright © 2021 Vinícius dos Santos Oliveira +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1141,7 +1142,7 @@ shell command executions.") (inputs `(("boost" ,boost) ("boost-static" ,boost-static) - ("fmt" ,fmt) + ("fmt" ,fmt-7) ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty ;; fork. Emilua is severely affected by this limit, so the upstream package ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 1fc1441052..728f00f16e 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -168,14 +168,14 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "7.1.3") + (version "8.0.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" version "/fmt-" version ".zip")) (sha256 - (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x")))) + (base32 "1gqmsk4r93x65cqs8w7zhfiv70w5fv8279nrblggqm4mmdpaa9x6")))) (build-system cmake-build-system) (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) @@ -190,6 +190,17 @@ to @code{IOStreams}.") ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) +(define-public fmt-7 + (package (inherit fmt) + (version "7.1.3") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "17sc10hfg087z0s774lnn05wwy3bfzmcv7j448p92pr0s02cb62x")))))) + (define-public fmt-for-irods (package (inherit fmt) -- cgit 1.4.1 From 01eb317b9e96de312bc99f10bd5699e97c76b958 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 8 Oct 2021 19:06:02 +0000 Subject: gnu: bear: Update to 3.0.16. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/build-tools.scm (bear): Update to 3.0.16. * gnu/packages/patches/bear-disable-preinstall-tests.patch: Update. Signed-off-by: Ludovic Courtès --- gnu/packages/build-tools.scm | 4 ++-- .../patches/bear-disable-preinstall-tests.patch | 24 +++++----------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 7c44d2b80f..f8303a331b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -103,7 +103,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (define-public bear (package (name "bear") - (version "3.0.4") + (version "3.0.16") (source (origin (method git-fetch) (uri (git-reference @@ -114,7 +114,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") "bear-disable-preinstall-tests.patch")) (sha256 (base32 - "15r22sbk5bibrhf54lf0shiqw1gnsik24fr5as96w3hnj6iahgwn")))) + "01giv11nhjp4pvw8ssf8bxf503pabwnwnvfzmrxyxixnairwmykg")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/patches/bear-disable-preinstall-tests.patch b/gnu/packages/patches/bear-disable-preinstall-tests.patch index c65095405f..ffb31c28f1 100644 --- a/gnu/packages/patches/bear-disable-preinstall-tests.patch +++ b/gnu/packages/patches/bear-disable-preinstall-tests.patch @@ -1,20 +1,9 @@ -From d7d0cdd48017679e8529f8475d1b9902944cf243 Mon Sep 17 00:00:00 2001 -From: Brett Gilio -Date: Sun, 20 Dec 2020 14:43:30 -0600 -Subject: [PATCH] Disallow Pre-install Checks - ---- - CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 45c6d27..73b4ace 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -58,10 +58,6 @@ ExternalProject_Add(BearSource - -DROOT_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} +@@ -60,10 +60,6 @@ ExternalProject_Add(BearSource -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DENABLE_UNIT_TESTS:BOOL=${ENABLE_UNIT_TESTS} + -DENABLE_FUNC_TESTS:BOOL=${ENABLE_FUNC_TESTS} - TEST_BEFORE_INSTALL - 1 - TEST_COMMAND @@ -22,9 +11,9 @@ index 45c6d27..73b4ace 100644 ) # Run the functional tests -@@ -73,12 +69,8 @@ if (ENABLE_FUNC_TESTS) - BearSource - CMAKE_CACHE_ARGS +@@ -77,12 +73,8 @@ if (ENABLE_FUNC_TESTS) + -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR} + -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR} -DSTAGED_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX} - TEST_BEFORE_INSTALL - 1 @@ -35,6 +24,3 @@ index 45c6d27..73b4ace 100644 ) endif () --- -2.29.2 - -- cgit 1.4.1 From 8e5df0cea84fab4006767d2d75ad3ebaaaabfa4d Mon Sep 17 00:00:00 2001 From: James Thomas Date: Mon, 11 Oct 2021 05:09:39 +0530 Subject: gnu: Add axc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (axc): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index bdd0c29593..d68815e916 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -544,6 +544,47 @@ messaging environments. It can be used with messaging software to provide end-to-end encryption.") (license license:gpl3+))) +(define-public axc + (package + (name "axc") + (version "0.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gkdr/axc") + (commit (string-append "v" version)))) + (modules '((guix build utils))) + (snippet + `(begin + ;; Submodules + (delete-file-recursively "lib"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "05sv7l6lk0xk4wb2bspc2sdpygrb1f0szzi82a1kyfm0fjz887b3")))) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" "gcc") + (setenv "PREFIX" out))))) + #:parallel-tests? #f)) + (native-inputs `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (inputs `(("glib" ,glib) + ("libgcrypt" ,libgcrypt) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("sqlite" ,sqlite))) + (synopsis "Client library for libsignal-protocol-c") + (description "This is a client library for @code{libsignal-protocol-c}. +It implements the necessary interfaces using @code{libgcrypt} and +@code{sqlite}.") + (home-page "https://github.com/gkdr/axc") + (license license:gpl3))) ;GPLv3-only, per license headers + (define-public bitlbee (package (name "bitlbee") -- cgit 1.4.1 From 2a05676873ccdbbbdbeb89129f23a6e1412f219f Mon Sep 17 00:00:00 2001 From: James Thomas Date: Mon, 11 Oct 2021 05:12:41 +0530 Subject: gnu: Add libomemo. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (libomemo): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d68815e916..6294b89a17 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -585,6 +585,41 @@ It implements the necessary interfaces using @code{libgcrypt} and (home-page "https://github.com/gkdr/axc") (license license:gpl3))) ;GPLv3-only, per license headers +(define-public libomemo + (package + (name "libomemo") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gkdr/libomemo") + (commit (string-append "v" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1q3vyj8zk3vm0a4v6w8qya5dhk2yw04bga8799a0zl6907nf122k")))) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (setenv "CC" "gcc") + (setenv "PREFIX" out))))) + #:parallel-tests? #f)) + (native-inputs `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (inputs `(("glib" ,glib) + ("libgcrypt" ,libgcrypt) + ("minixml" ,minixml) + ("sqlite" ,sqlite))) + (synopsis "OMEMO C library") + (description "This library implements @acronym{OMEMO, OMEMO Multi-End +Message and Object Encryption} of XMPP (XEP-0384) in C.") + (home-page "https://github.com/gkdr/libomemo") + (license license:expat))) + (define-public bitlbee (package (name "bitlbee") -- cgit 1.4.1 From 704bd694d198ed568349e4772bc6488a58f15d8b Mon Sep 17 00:00:00 2001 From: James Thomas Date: Mon, 11 Oct 2021 05:14:12 +0530 Subject: gnu: Add purple-lurch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (purple-lurch): New variable Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 52 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 6294b89a17..40da7def84 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2685,6 +2685,58 @@ support for high performance Telegram Bot creation.") (home-page "https://source.puri.sm/Librem5/purple-mm-sms") (license license:gpl2+))) +(define-public purple-lurch + (package + (name "purple-lurch") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference (url "https://github.com/gkdr/lurch") + (commit (string-append "v" version)))) + (modules '((guix build utils))) + (snippet + `(begin + ;; Submodules + (delete-file-recursively "lib"))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "1ipd9gwh04wbqv6c10yxi02lc2yjsr02hwjycgxhl4r9x8b33psd")))) + (build-system cmake-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "Makefile" + (("^PURPLE_PLUGIN_DIR = .*") + (string-append "PURPLE_PLUGIN_DIR = " out + "/lib/purple-2\n"))) + (setenv "CC" "gcc"))))) + #:parallel-tests? #f)) + (native-inputs `(("cmocka" ,cmocka) + ("pkg-config" ,pkg-config))) + (inputs `(("axc" ,axc) + ("glib" ,glib) + ("libgcrypt" ,libgcrypt) + ("libomemo" ,libomemo) + ("libsignal-protocol-c" ,libsignal-protocol-c) + ("libxml2" ,libxml2) + ("minixml" ,minixml) + ("pidgin" ,pidgin) + ("sqlite" ,sqlite))) + (synopsis "OMEMO Encryption for libpurple") + (description "Purple-lurch plugin adds end-to-end encryption support +through the Double Ratchet (Axolotl) algorithm, to @code{libpurple} +applications using @acronym{XMPP, Extensible Messaging and Presence Protocol}, +through its standard XEP-0384: @acronym{OMEMO, OMEMO Multi-End Message and +Object Encryption} Encryption. It provides confidentiality, (weak) forward +secrecy, break-in recovery, authentication, integrity, deniability, and +asynchronicity.") + (home-page "https://github.com/gkdr/lurch") + (license license:gpl3+))) + (define-public chatty (package (name "chatty") -- cgit 1.4.1 From d0313cdf5f2288a8884b8550d1381627df209aa6 Mon Sep 17 00:00:00 2001 From: Wiktor Żelazny Date: Wed, 13 Oct 2021 19:01:13 +0200 Subject: gnu: Add renameutils. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/shellutils.scm (renameutils): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/shellutils.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 6e64cee1da..19effc34cc 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Alexandr Vityazev ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Foo Chuan Wei +;;; Copyright © 2021 Wiktor Żelazny ;;; ;;; This file is part of GNU Guix. ;;; @@ -512,3 +513,32 @@ real person, and are too lazy to think of one yourself. Also, if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out.") (license license:gpl2+))) + +(define-public renameutils + (package + (name "renameutils") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://download.savannah.gnu.org/releases/renameutils/" + name "-" version ".tar.gz")) + (sha256 + (base32 + "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "src/Makefile.in" + (("\\(\\$bindir\\)") "$(bindir)")) + #t)))) + (build-system gnu-build-system) + (inputs + `(("readline" ,readline))) + (home-page "https://www.nongnu.org/renameutils/") + (synopsis "File renaming utilities") + (description "The file renaming utilities (renameutils for short) are a set +of programs designed to make renaming of files faster and less cumbersome. The +file renaming utilities consists of five programs - qmv, qcp, imv, icp and +deurlname.") + (license license:gpl3))) -- cgit 1.4.1 From 2bb0d8bf0c51de73b7573982003ca8441e02af6d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Nov 2021 00:29:10 +0100 Subject: gnu: renameutils: Fix license and tweak. * gnu/packages/shellutils.scm (renameutils)[source]: Use mirror:// URL. [license]: Change to GPL3+. [description]: Use @command markup. --- gnu/packages/shellutils.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 19effc34cc..70443f5019 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -521,9 +521,8 @@ city, state, zip, or area code, it will check out.") (source (origin (method url-fetch) - (uri - (string-append "https://download.savannah.gnu.org/releases/renameutils/" - name "-" version ".tar.gz")) + (uri (string-append "mirror://savannah/renameutils/" + "renameutils-" version ".tar.gz")) (sha256 (base32 "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb")) @@ -537,8 +536,8 @@ city, state, zip, or area code, it will check out.") `(("readline" ,readline))) (home-page "https://www.nongnu.org/renameutils/") (synopsis "File renaming utilities") - (description "The file renaming utilities (renameutils for short) are a set -of programs designed to make renaming of files faster and less cumbersome. The -file renaming utilities consists of five programs - qmv, qcp, imv, icp and -deurlname.") - (license license:gpl3))) + (description "The file renaming utilities (renameutils for short) are a +set of programs designed to make renaming of files faster and less cumbersome. +The file renaming utilities consists of five programs: @command{qmv}, +@command{qcp}, @command{imv}, @command{icp}, and @command{deurlname}.") + (license license:gpl3+))) -- cgit 1.4.1 From 7f7f739e235548ec2f9337b0ec1ef976a1437b30 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Nov 2021 02:44:49 +0100 Subject: gnu: mu: Update to 1.6.10. * gnu/packages/mail.scm (mu): Update to 1.6.10. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 04d4a91795..f00e8ac7b3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1166,15 +1166,15 @@ security functionality including PGP, S/MIME, SSH, and SSL.") (define-public mu (package (name "mu") - (version "1.6.9") + (version "1.6.10") (source (origin (method url-fetch) (uri (string-append "https://github.com/djcb/mu/releases/" - "download/" version "-signed/" + "download/" version "/" "mu-" version ".tar.xz")) (sha256 (base32 - "0n5gvdz6vn6y69f5gx0gndjdl328qjbvi2q048qynhk99w5476cd")))) + "1dh0x4lqnjflb0k8fybr5clqjxv35scf055g1590pr5znam29hhb")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit 1.4.1 From efa6a40fa143e2d6956dcd1c485bc320f852db52 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 14:12:40 -0500 Subject: gnu: linux-libre: Update to 5.14.18. * gnu/packages/linux.scm (linux-libre-5.14-version): Update to 5.14.18. (linux-libre-5.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f386139638..cd289f7c24 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -347,7 +347,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-5.14-version "5.14.17") +(define-public linux-libre-5.14-version "5.14.18") (define-public linux-libre-5.14-gnu-revision "gnu") (define deblob-scripts-5.14 (linux-libre-deblob-scripts @@ -357,7 +357,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.14-pristine-source (let ((version linux-libre-5.14-version) - (hash (base32 "0q7df51yk6di1m8ky0gplkyx6smlr9inxrd569qv3ww3ykg933sd"))) + (hash (base32 "1pr7qh2wjw7h6r3fixg9ia5r3na7vdb6b4sp9wnbifnqckahzwis"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.14))) -- cgit 1.4.1 From d48224da8ff6fae8e39729c2526bc707e814c676 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:31:11 -0500 Subject: gnu: linux-libre 5.10: Update to 5.10.79. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.79. (linux-libre-5.10-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index cd289f7c24..7a9a2af90b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -365,7 +365,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-5.10-version "5.10.78") +(define-public linux-libre-5.10-version "5.10.79") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -375,7 +375,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "024rz0bp3n3r5nkwbib7byx10d72c2fh5cw9iv00diyzgnp819g7"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "03q5lrv8gr9hnm7984pxi9kwsvxrn21qwykj60amisi2wac6r05y"))) + (hash (base32 "1bd86ywff2mv73sybjdjlvvvhnmsv891jlm17h5nvqifdbhmb6g4"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -- cgit 1.4.1 From af6cc0dc6fec3ccc832de68bff49a3727273f0da Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:31:40 -0500 Subject: gnu: linux-libre 5.4: Update to 5.4.159. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.159. (linux-libre-5.4-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7a9a2af90b..be67c3941e 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -380,7 +380,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.158") +(define-public linux-libre-5.4-version "5.4.159") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -390,7 +390,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0ncdkf1iz49458k3dvq3dc5b2r9dp21jsn3ffm9lbhlgvkn8y0bf"))) + (hash (base32 "0hw68yjf0c8kahwra8hq863318cbyqc89f429z75scmb9rgk466p"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -- cgit 1.4.1 From f6c0ca2f9d2273694d4b5667eb2b3f25ee46e99c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:31:58 -0500 Subject: gnu: linux-libre 4.19: Update to 4.19.217. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.217. (linux-libre-4.19-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index be67c3941e..b42b2dd6e4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,7 +395,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.216") +(define-public linux-libre-4.19-version "4.19.217") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -405,7 +405,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0cs8yy5jfbvvi5j9f3kzyc4j0fjylxdj1641f53ga6gkmjmayv3d"))) + (hash (base32 "01500jcjvhbkn7xcan564jw0nnwc12cf8hhvl8118jqqqw612lc5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) -- cgit 1.4.1 From 2fdd6fe3fc537a4e9f345b97c5c8a49ec0412335 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:32:17 -0500 Subject: gnu: linux-libre 4.14: Update to 4.14.255. * gnu/packages/linux.scm (linux-libre-4.14-version): Update to 4.14.255. (linux-libre-4.14-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b42b2dd6e4..e3b7e6a7c5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -410,7 +410,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.19))) -(define-public linux-libre-4.14-version "4.14.254") +(define-public linux-libre-4.14-version "4.14.255") (define-public linux-libre-4.14-gnu-revision "gnu1") (define deblob-scripts-4.14 (linux-libre-deblob-scripts @@ -420,7 +420,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.14-pristine-source (let ((version linux-libre-4.14-version) - (hash (base32 "0ihdlsg4jg9wwhhcbjjmrcchnl9pc0szh21nwmbhwnxgqcdmrnfz"))) + (hash (base32 "1mxjwqijnlvrdbpd973kdycz1dwklfkj9vpnj1cihgsf880q02zh"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.14))) -- cgit 1.4.1 From 727b6e0c434ed0b765d9776dd94a6f619733ba58 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:32:33 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.290. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.290. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e3b7e6a7c5..a2e7e02bfa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -425,7 +425,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.14))) -(define-public linux-libre-4.9-version "4.9.289") +(define-public linux-libre-4.9-version "4.9.290") (define-public linux-libre-4.9-gnu-revision "gnu1") (define deblob-scripts-4.9 (linux-libre-deblob-scripts @@ -435,7 +435,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.9-pristine-source (let ((version linux-libre-4.9-version) - (hash (base32 "19kz74qgw5yzfinnsvljmn2zm855lr4cxgfpn8gwljmkspyx1hm5"))) + (hash (base32 "1ns0xbcgv0ix4b3xkcws8g3ks1a31kzc5whmkf9arz1k8si5mpnd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.9))) -- cgit 1.4.1 From 9aab7bb05fbf1741bc1819ebf317677ba1281ce8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 12 Nov 2021 21:32:50 -0500 Subject: gnu: linux-libre 4.9: Update to 4.9.292. * gnu/packages/linux.scm (linux-libre-4.9-version): Update to 4.9.292. (linux-libre-4.9-pristine-source): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a2e7e02bfa..8ba839a592 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -440,7 +440,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-4.9))) -(define-public linux-libre-4.4-version "4.4.291") +(define-public linux-libre-4.4-version "4.4.292") (define-public linux-libre-4.4-gnu-revision "gnu1") (define deblob-scripts-4.4 (linux-libre-deblob-scripts @@ -450,7 +450,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a0k9i8gnzkyvfr80f8xw2fnxfwddhz1pzicz9fh0y3jzzkzk45p"))) (define-public linux-libre-4.4-pristine-source (let ((version linux-libre-4.4-version) - (hash (base32 "0lbbvv3ha4d8nwzjh8bdk0aqyd12w6gw0nsxsdnp8pbmnndgb9vh"))) + (hash (base32 "0v5rz8na1d458grc49x3j1951mhvxvqzjq5g9rv1hi0p9rjala97"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.4))) -- cgit 1.4.1 From fb7424f2f874a6bc4fd11476e59584507719192f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Nov 2021 09:17:59 +0200 Subject: gnu: terminology: Update to 1.11.0. * gnu/packages/enlightenment.scm (terminology): Update to 1.11.0. --- gnu/packages/enlightenment.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/enlightenment.scm b/gnu/packages/enlightenment.scm index 5cbda66de1..5e34303f14 100644 --- a/gnu/packages/enlightenment.scm +++ b/gnu/packages/enlightenment.scm @@ -199,7 +199,7 @@ removable devices or support for multimedia.") (define-public terminology (package (name "terminology") - (version "1.10.0") + (version "1.11.0") (source (origin (method url-fetch) (uri @@ -207,7 +207,7 @@ removable devices or support for multimedia.") "terminology/terminology-" version ".tar.xz")) (sha256 (base32 - "0imk7cjkcjss3zf4hjwmy54pbizm6l6pq553jcx7bpsnhs56bbsz")) + "0bbav27p1xni7kidgf3vn42bwsfrzds301k3f7c8dg7v5yyq9n2g")) (modules '((guix build utils))) ;; Remove the bundled fonts. (snippet -- cgit 1.4.1 From bd1f30047de5456e84fccbbc07b5b417fb90c92b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 14 Nov 2021 14:11:59 +0200 Subject: gnu: pinentry-tty: Update to 1.2.0. * gnu/packages/gnupg.scm (pinentry-tty): Update to 1.2.0. --- gnu/packages/gnupg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 451b61a28e..348724e8fb 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -790,14 +790,14 @@ including tools for signing keys, keyring analysis, and party preparation. (define-public pinentry-tty (package (name "pinentry-tty") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/pinentry/pinentry-" version ".tar.bz2")) (sha256 (base32 - "0zx5vg6wws2sp2yxwi01b8i1pnsqkydncpj7x0p8xl9y05ja04nd")))) + "0w34c4x5hkxaxnnkcrm1azlzwzxcziv5dkci3xcd0hz0ld2j01qh")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--enable-pinentry-tty"))) -- cgit 1.4.1 From 1a72b6e999a8150dc3322412c570fa2c0ae49f2a Mon Sep 17 00:00:00 2001 From: jgart via Guix-patches via Date: Tue, 19 Oct 2021 02:13:58 -0400 Subject: gnu: Add neatmail. * gnu/packages/mail.scm (neatmail): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/mail.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f00e8ac7b3..aa9e6d3a3d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4488,6 +4488,41 @@ which can convert the contacts to @code{.ldif} format for import into LDAP databases, and other tools to process Outlook email archives.") (license license:gpl2+))) +(define-public neatmail + (package + (name "neatmail") + (version "02") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/aligrudi/neatmail") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00d453d57d3v6ja2gpmjd8vch804c72g38pc1nr5shmz3hkgd52d")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no tests + #:make-flags `((string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'install ;no install target in the Makefile + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (rename-file "mail" "neatmail") + (install-file "neatmail" bin))))))) + (home-page "https://litcave.rudi.ir/") + (synopsis "Text-mode mail client") + (description + "@command{neatmail} is a noninteractive mail client. It generates +a listing of the messages in a mailbox in mbox format and executes a list of +ex-like commands on it.") + (license license:isc))) + (define-public crm114 (package (name "crm114") -- cgit 1.4.1 From 686b9403a0e6bb76e6a0e1437328555dc2839c6f Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Sun, 31 Oct 2021 09:11:29 +0000 Subject: gnu: Add nsxiv. * gnu/packages/image-viewers.scm (nsxiv): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/image-viewers.scm | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 477f681573..b059f314db 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -417,6 +417,63 @@ base should be kept small and clean to make it easy for you to dig into it and customize it for your needs.") (license license:gpl2+))) +(define-public nsxiv + (package + (name "nsxiv") + (version "27.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nsxiv/nsxiv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1na7f0hpc9g04nm7991gzaqr5gkj08n2azx833hgxcm2w1pnn1bk")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no check target + #:make-flags + (list (string-append "PREFIX=" %output) + (string-append "CC=" ,(cc-for-target))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Xft.h #includes without ‘freetype2/’. The + ;; Makefile works around this by hard-coding /usr/include & + ;; $PREFIX. + (let ((freetype (string-append (assoc-ref inputs "freetype") + "/include/freetype2"))) + (substitute* "Makefile" + (("-I/usr/include/freetype2 -I\\$\\(PREFIX\\)/include/freetype2") + (string-append "-I" freetype)))))) + (add-after 'install 'install-desktop-file + (lambda* (#:key outputs #:allow-other-keys) + (install-file "nsxiv.desktop" + (string-append (assoc-ref outputs "out") + "/share/applications")))) + (add-after 'install 'install-icons + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "-C" "icon" "install" make-flags)))))) + (inputs + `(("freetype" ,freetype) + ("giflib" ,giflib) + ("imlib2" ,imlib2) + ("libexif" ,libexif) + ("libx11" ,libx11) + ("libxft" ,libxft))) + (home-page "https://github.com/nsxiv/nsxiv") + (synopsis "Neo Simple X Image Viewer") + (description + "nsxiv is a fork of sxiv. Its primary goal is to provide the most basic +features required for fast image viewing. It has vi key bindings and works +nicely with tiling window managers. Its code base should be kept small and +clean to make it easy for you to dig into it and customize it for your +needs.") + (license license:gpl2+))) + (define-public viewnior (package (name "viewnior") -- cgit 1.4.1 From d29a9aa54b9df9167f4641dd8ca42c561b460c4c Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Sat, 30 Oct 2021 14:27:48 +0530 Subject: gnu: Add borgmatic. * gnu/packages/backup.scm (borgmatic): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/backup.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 1dca6fd9b1..a5807d7aec 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2016, 2017 Leo Famulari ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2021 Arun Isaac ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017, 2020 Efraim Flashner ;;; Copyright © 2017 Christine Lemmer-Webber @@ -80,6 +80,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages rsync) + #:use-module (gnu packages serialization) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages valgrind) @@ -1172,3 +1173,51 @@ original files. For example, a software archive made using tar and Gzip will need to describe the order of files in the tarball and the compression parameters used by Gzip.") (license license:gpl3+))) + +(define-public borgmatic + (package + (name "borgmatic") + (version "1.5.20") + (source + (origin + (method url-fetch) + (uri (pypi-uri "borgmatic" version)) + (sha256 + (base32 "1rdpj1mii4fbyprg56krf5k0xsd97ghybaabr7zdhsrcsxf719ha")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Set absolute store path to borg. + (substitute* "borgmatic/commands/borgmatic.py" + (("location\\.get\\('local_path', 'borg'\\)") + (string-append "location.get('local_path', '" + (assoc-ref inputs "borg") "/bin/borg" + "')"))))) + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + ;; Tests require the installed executable. + (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" + ":" (getenv "PATH"))) + (invoke "pytest"))))))) + (inputs + `(("borg" ,borg) + ("python-colorama" ,python-colorama) + ("python-jsonschema" ,python-jsonschema) + ("python-requests" ,python-requests) + ("python-ruamel.yaml" ,python-ruamel.yaml))) + (native-inputs + `(("python-flexmock" ,python-flexmock) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov))) + (home-page "https://torsion.org/borgmatic/") + (synopsis "Simple, configuration-driven backup software") + (description + "borgmatic is a simple, configuration-driven backup software for servers +and workstations. Protect your files with client-side encryption. Backup +your databases too. Monitor it all with integrated third-party services. +borgmatic is powered by borg.") + (license license:gpl3+))) -- cgit 1.4.1 From 83289ca25505274f0ea9438f55bebeddfb0e1423 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 14 Nov 2021 16:27:30 +0000 Subject: gnu: guix-build-coordinator: Update to 0-36.87508af. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-36.87508af. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 12c689e9e2..7dd84aff46 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "a4d0ec6bc564bbe98d3e6c03be41de16edbda928") - (revision "35")) + (let ((commit "87508af9566d9f7dbacfd8478a353d612a811e38") + (revision "36")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ environments.") (commit commit))) (sha256 (base32 - "0qa7qkskp9xzhyl0fgbm98f8apy8cn2yc9gpxhw0dfc9bkbs1pb9")) + "0lqjqnpgvwhzan2pbq0h1gavf0f17h3zw3qd0kd8xwjcmx4bna82")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From f2d345a7b6add35d6cc0e45f0f0b1d96d9474de0 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Sun, 14 Nov 2021 19:31:50 +0100 Subject: doc: Fix guix shell -C example. The meaning changed by accident when guix environment was replaced by guix shell in 80edb7df6586464aa40e84e103f0045452de95db. * doc/guix.texi (Debugging Build Failures): Add missing -D option. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 7e54b5f75e..a5f38e166b 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -11464,7 +11464,7 @@ a container similar to the one the build daemon creates: $ guix build -K foo @dots{} $ cd /tmp/guix-build-foo.drv-0 -$ guix shell --no-grafts -C foo strace gdb +$ guix shell --no-grafts -C -D foo strace gdb [env]# source ./environment-variables [env]# cd foo-1.2 @end example -- cgit 1.4.1 From 97909fd6fd5edaefd3124fd0732ff639b713614c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 13 Nov 2021 16:40:18 +0100 Subject: gnu: python-translate-toolkit: Update to 3.5.1. * gnu/packages/python-xyz (python-translate-toolkit): Update to 3.5.1. (python2-translate-toolkit): Keep at previous version. --- gnu/packages/python-xyz.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e5cdaadb3b..35781831dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -18612,13 +18612,13 @@ current test, while only declaring the test-specific fields") (define-public python-translate-toolkit (package (name "python-translate-toolkit") - (version "2.1.0") + (version "3.5.1") (source (origin (method url-fetch) - (uri (pypi-uri "translate-toolkit" version ".tar.bz2")) + (uri (pypi-uri "translate-toolkit" version ".tar.gz")) (sha256 - (base32 "1vlkwrg83vb17jc36pmwh2b7jphwf390lz0jw8hakcg16qhwypvq")))) + (base32 "020pp7pbpnavxd41z90vyzzx06ci57mx9drkgbsb89wxxx4gal9v")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest) @@ -18646,8 +18646,18 @@ current test, while only declaring the test-specific fields") several utilities, as well as an API for building localization tools.") (license license:gpl2+))) +;; Required for virtaal, newer versions do not build with python2 (define-public python2-translate-toolkit - (package-with-python2 python-translate-toolkit)) + (package-with-python2 + (package + (inherit python-translate-toolkit) + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "translate-toolkit" version ".tar.bz2")) + (sha256 + (base32 "1vlkwrg83vb17jc36pmwh2b7jphwf390lz0jw8hakcg16qhwypvq"))))))) (define-public python-packaging (package -- cgit 1.4.1 From e95acc0919e5018a715bc62b0a3c980c9715fcc3 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 14 Nov 2021 20:32:38 +0100 Subject: doc: Add example to dist target. * doc/local.mk (OS_CONFIG_EXAMPLES_TEXI): Add he-config-bare-bones.scm. --- doc/local.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/local.mk b/doc/local.mk index 1bc717df84..029232b7ac 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -81,7 +81,8 @@ EXTRA_DIST += \ OS_CONFIG_EXAMPLES_TEXI = \ %D%/os-config-bare-bones.texi \ %D%/os-config-desktop.texi \ - %D%/os-config-lightweight-desktop.texi + %D%/os-config-lightweight-desktop.texi \ + %D%/he-config-bare-bones.scm TRANSLATED_INFO = \ $(call lang_to_texinfo,$(MANUAL_LANGUAGES),guix) \ -- cgit 1.4.1 From 2ebcc5387bac6fcf25272d0b9f0c5ac4cb1f1d24 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 13:11:18 -0800 Subject: gnu: u-boot, u-boot-am335x-boneblack, u-boot-novena: Fix lint warnings. * gnu/packages/bootloaders.scm (u-boot)[description]: Add second space after sentence. (u-boot-am335x-boneblack)[description]: Likewise. (u-boot-novena)[description]: Likewise. --- gnu/packages/bootloaders.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 706ddf0207..0108494f59 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -535,7 +535,7 @@ tree binary files. These are board description files used by Linux and BSD.") (build-system gnu-build-system) (home-page "https://www.denx.de/wiki/U-Boot/") (synopsis "ARM bootloader") - (description "U-Boot is a bootloader used mostly for ARM boards. It + (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc).") (license license:gpl2+))) @@ -734,7 +734,7 @@ board-independent tools."))) (package (inherit base) (name "u-boot-am335x-boneblack") - (description "U-Boot is a bootloader used mostly for ARM boards. It + (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc). This U-Boot is built for the BeagleBone Black, which was removed upstream, @@ -854,7 +854,7 @@ device while it's being turned on (and a while longer).") (let ((base (make-u-boot-package "novena" "arm-linux-gnueabihf"))) (package (inherit base) - (description "U-Boot is a bootloader used mostly for ARM boards. It + (description "U-Boot is a bootloader used mostly for ARM boards. It also initializes the boards (RAM etc). This U-Boot is built for Novena. Be advised that this version, contrary -- cgit 1.4.1 From 5c2f30d3de6507d868a1f38563170f6e49a7bb44 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 7 Oct 2021 08:12:04 +0300 Subject: home-services: on-first-login: Check if XDG_RUNTIME_DIR exists. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Jan Nieuwenhuizen . * gnu/home-services.scm (on-first-login): on-first-login won't execute anything if XDG_RUNTIME_DIR doesn't exists. Signed-off-by: Ludovic Courtès --- gnu/home/services.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 5c9b743f7b..1e295b6afe 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -286,8 +286,13 @@ will be put in @file{~/.guix-home/files}."))) ;; XDG_RUNTIME_DIR dissapears on logout, that means such trick ;; allows to launch on-first-login script on first login only ;; after complete logout/reboot. - (when (not (file-exists? flag-file-path)) - (begin #$@gexps (touch flag-file-path)))))) + (if (file-exists? xdg-runtime-dir) + (unless (file-exists? flag-file-path) + (begin #$@gexps (touch flag-file-path))) + (display "XDG_RUNTIME_DIR doesn't exists, on-first-login script +won't execute anything. You can check if xdg runtime directory exists, +XDG_RUNTIME_DIR variable is set to apropriate value and manually execute the +script by running '$HOME/.guix-home/on-first-login'"))))) (define (on-first-login-script-entry m-on-first-login) "Return, as a monadic value, an entry for the on-first-login script -- cgit 1.4.1 From a8b5b40f62e8907b0e82c5088a8fb647d05a7737 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Mon, 8 Nov 2021 12:22:04 +0300 Subject: doc: Add a note about elogind and XDG_RUNTIME_DIR for Guix Home. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Declaring the Home Environment): Add a note about elogind and XDG_RUNTIME_DIR. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index a5f38e166b..1b10e2d626 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -35975,6 +35975,14 @@ guix home reconfigure config.scm This ``builds'' your home environment and creates @file{~/.guix-home} pointing to it. Voilà! +@quotation Note +Make sure the operating system has elogind, systemd, or a similar +mechanism to create the XDG run-time directory and has the +@env{XDG_RUNTIME_DIR} variable set. Failing that, the +@file{on-first-login} script will not execute anything, and processes +like user Shepherd and its descendants will not start. +@end quotation + @node Configuring the Shell @section Configuring the Shell This section is safe to skip if your shell or shells are managed by -- cgit 1.4.1 From 4dcec60fa6a93dbc93bef2cdb91e3633c705579e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 Nov 2021 23:06:49 +0100 Subject: home-services: Demonadify 'on-first-login' handling. * gnu/home/services.scm (compute-on-first-login-script): Use 'computed-file' instead of' gexp->script'. (on-first-login-script-entry): Expect a regular value rather than a monadic value and remove 'mlet'. --- gnu/home/services.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 1e295b6afe..df1a3a19e2 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -275,7 +275,7 @@ directory containing FILES." will be put in @file{~/.guix-home/files}."))) (define (compute-on-first-login-script _ gexps) - (gexp->script + (computed-file "on-first-login" #~(let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR") (format #f "/run/user/~a" (getuid)))) @@ -294,11 +294,11 @@ won't execute anything. You can check if xdg runtime directory exists, XDG_RUNTIME_DIR variable is set to apropriate value and manually execute the script by running '$HOME/.guix-home/on-first-login'"))))) -(define (on-first-login-script-entry m-on-first-login) +(define (on-first-login-script-entry on-first-login) "Return, as a monadic value, an entry for the on-first-login script in the home environment directory." - (mlet %store-monad ((on-first-login m-on-first-login)) - (return `(("on-first-login" ,on-first-login))))) + (with-monad %store-monad + (return `(("on-first-login" ,on-first-login))))) (define home-run-on-first-login-service-type (service-type (name 'home-run-on-first-login) -- cgit 1.4.1 From 0aeb7b91a81d392d3a26eede53150e46ebfef76d Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 5 Nov 2021 18:31:56 +0100 Subject: gnu: alot: Disable hanging test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/mail.scm (alot) [#:phases]: Disable hanging test. Signed-off-by: Ludovic Courtès --- gnu/packages/mail.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index aa9e6d3a3d..0e7134eaf3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1270,6 +1270,10 @@ attachments, create new maildirs, and so on.") (substitute* "tests/commands/test_global.py" (("def test_no_spawn_no_stdin_attached") "def _test_no_spawn_no_stdin_attached")) + ;; FIXME: Investigate why this test hangs. + (substitute* "tests/db/test_manager.py" + (("def test_save_named_query") + "def _test_save_named_query")) #t))))) (native-inputs `(("procps" ,procps) -- cgit 1.4.1 From 12c06847f07b3fc530e07d4338e3959f60dbefdd Mon Sep 17 00:00:00 2001 From: Thiago Jung Bauermann Date: Thu, 11 Nov 2021 20:46:48 -0300 Subject: environment: Fix ‘--check’ with exported PS1 variable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If your .bashrc (unnecessarily) exports PS1 and you’re in a non-login shell, Guix crashes: user@popigai:~$ guix shell --check coreutils guix shell: checking the environment variables visible from shell '/bin/bash'... Backtrace: 14 (primitive-load "/home/user/.config/guix/current/bin/g…") In guix/ui.scm: 2206:7 13 (run-guix . _) 2169:10 12 (run-guix-command _ . _) In ice-9/boot-9.scm: 1752:10 11 (with-exception-handler _ _ #:unwind? _ # _) 1752:10 10 (with-exception-handler _ _ #:unwind? _ # _) In guix/store.scm: 658:37 9 (thunk) 1320:8 8 (call-with-build-handler _ _) 1320:8 7 (call-with-build-handler # …) In guix/status.scm: 800:4 6 (call-with-status-report _ _) In guix/scripts/environment.scm: 951:12 5 (_) In guix/store.scm: 2119:24 4 (run-with-store # …) In guix/scripts/environment.scm: 521:35 3 (_ _) In unknown file: 2 (string=? ("PS1" . "${debian_chroot:+($debian_chroot)…") …) In ice-9/boot-9.scm: 1685:16 1 (raise-exception _ #:continuable? _) 1685:16 0 (raise-exception _ #:continuable? _) ice-9/boot-9.scm:1685:16: In procedure raise-exception: In procedure string=: Wrong type argument in position 1 (expecting string): ("PS1" . "${debian_chroot:+($debian_chroot)}\\[\\033[01;32m\\]\\u@\\h\\[\\033[00m\\]:\\[\\033[01;34m\\]\\w\\[\\033[00m\\]${EXTRA}\\$ ") user@popigai:~$ This is because the match pattern doesn’t expect `(vhash-assoc "PS1" actual)` to return a pair. * guix/scripts/environment.scm (validate-child-shell-environment): Change match pattern to expect a pair. Signed-off-by: Ludovic Courtès --- guix/scripts/environment.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 8176de4a5e..821f20e2f2 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -517,7 +517,7 @@ environment~%"))) (unless warned? (match (vhash-assoc "PS1" actual) (#f #f) - (str + ((_ . str) (when (and (getenv "PS1") (string=? str (getenv "PS1"))) (warning (G_ "'PS1' is the same in sub-shell~%")) (display-hint (G_ "Consider setting a different prompt for -- cgit 1.4.1 From 3baa1017eb6d5daf28ea2fc400d58eeb5cffa46c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 13:27:45 +0100 Subject: gnu: Remove python2-sqlalchemy-utils. Some of its dependencies no longer support Python 2, so drop it. * gnu/packages/databases.scm (python2-sqlalchemy-utils): Remove variable. --- gnu/packages/databases.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 92a7aa2761..fc022bd13e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3092,9 +3092,6 @@ You might also want to install the following optional dependencies: ") (license license:bsd-3))) -(define-public python2-sqlalchemy-utils - (package-with-python2 python-sqlalchemy-utils)) - (define-public python-alchemy-mock (package (name "python-alchemy-mock") -- cgit 1.4.1 From 52d9e2c2993f655ed89c157c1dee0669491d2040 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 12:34:21 +0100 Subject: gnu: python-pyasn1-modules: Update to 0.2.8. * gnu/packages/python-xyz.scm (python-pyasn1-modules): Update to 0.2.8. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 35781831dc..ea5ad8e8ce 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11280,14 +11280,14 @@ suitable for a wide range of protocols based on the ASN.1 specification.") (define-public python-pyasn1-modules (package (name "python-pyasn1-modules") - (version "0.2.2") + (version "0.2.8") (source (origin (method url-fetch) (uri (pypi-uri "pyasn1-modules" version)) (sha256 (base32 - "0ivm850yi7ajjbi8j115qpsj95bgxdsx48nbjzg0zip788c3xkx0")))) + "0pp6dcagd8c2c9qx3lahc1rdwlnmm0y0siqr5icjq2r32b3q8pwh")))) (build-system python-build-system) (propagated-inputs `(("python-pyasn1" ,python-pyasn1))) -- cgit 1.4.1 From e493f5479c1b6ac236c58047ffff2746f618dd99 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 13:02:04 +0100 Subject: gnu: python-psycopg2: Update to 2.9.2. * gnu/packages/databases.scm (python-psycopg2): Update to 2.9.2. (python2-psycopg2): Remove variable (no longer supported). --- gnu/packages/databases.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index fc022bd13e..0eab4c0d1e 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -3326,13 +3326,13 @@ designed to be easy and intuitive to use.") (define-public python-psycopg2 (package (name "python-psycopg2") - (version "2.8.6") + (version "2.9.2") (source (origin (method url-fetch) (uri (pypi-uri "psycopg2" version)) (sha256 - (base32 "0hzmk6b1hb5riqkljr5xics6p4zbvmis6knbczb7zhq7273zc8zv")))) + (base32 "1smvvs1ngqy0ymlp1d7f85j09j9v0z5dq14f1qky0j0qi7xajkd8")))) (build-system python-build-system) (arguments ;; Tests would require a postgresql database "psycopg2_test" @@ -3347,9 +3347,6 @@ designed to be easy and intuitive to use.") 2.0.") (license license:lgpl3+))) -(define-public python2-psycopg2 - (package-with-python2 python-psycopg2)) - (define-public python-sadisplay (package (name "python-sadisplay") -- cgit 1.4.1 From eeecee1de819b77e4683f9b5534832963603114e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 13:07:12 +0100 Subject: gnu: python-sqlalchemy: Update to 1.4.27. * gnu/packages/databases.scm (python-sqlalchemy): Update to 1.4.27. --- gnu/packages/databases.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 0eab4c0d1e..de161e1864 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2977,13 +2977,13 @@ Database API 2.0T.") (define-public python-sqlalchemy (package (name "python-sqlalchemy") - (version "1.4.26") + (version "1.4.27") (source (origin (method url-fetch) (uri (pypi-uri "SQLAlchemy" version)) (sha256 - (base32 "06imr96jirwmkc8mkxrl9bi413yd3638lc5idn65xx8fv7bzkivb")))) + (base32 "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p")))) (build-system python-build-system) (native-inputs `(("python-cython" ,python-cython) ; for C extensions -- cgit 1.4.1 From d67a5a8a490e58bc645793128a25d642ccb96e83 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 16:41:55 +0100 Subject: gnu: Remove python2-google-api-client. Some of its dependencies no longer support Python 2. * gnu/packages/python-web.scm (python2-google-api-client): Remove variable. --- gnu/packages/python-web.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 608276325f..59e8145cef 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4393,9 +4393,6 @@ Google search engine. Its module is called @code{googlesearch}.") (description "Python client library for Google's discovery based APIs") (license license:asl2.0))) -(define-public python2-google-api-client - (package-with-python2 python-google-api-client)) - (define-public python-hawkauthlib (package (name "python-hawkauthlib") -- cgit 1.4.1 From e5b53b1e828d7838c4162b76e118e8ec238d4309 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 12 Nov 2021 16:42:41 +0100 Subject: gnu: python-uritemplate: Update to 4.1.1. * gnu/packages/python-web.scm (python-uritemplate): Update to 4.1.1. [license]: Add LICENSE:ASL2.0. (python2-uritemplate): Remove variable. --- gnu/packages/python-web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 59e8145cef..690c85b1ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -4044,23 +4044,23 @@ authentication for Flask routes.") (define-public python-uritemplate (package (name "python-uritemplate") - (version "3.0.1") + (version "4.1.1") (source (origin (method url-fetch) (uri (pypi-uri "uritemplate" version)) (sha256 (base32 - "1bkwmgr0ia9gcn4bszs2xlvml79f0bi2s4a87xg22ky9rq8avy2s")))) + "1w14a775d92mx9pdhb5zimifpfr2lfcn0vfdpjagcy9vbkyfsij3")))) (build-system python-build-system) (home-page "https://uritemplate.readthedocs.org") (synopsis "Library to deal with URI Templates") (description "@code{uritemplate} provides Python library to deal with URI Templates.") - (license license:bsd-2))) - -(define-public python2-uritemplate - (package-with-python2 python-uritemplate)) + ;; The software is made available under the terms of *either* of the + ;; licenses found in LICENSE.APACHE or LICENSE.BSD. Contributions + ;; are made under *both* licenses (excerpt from the LICENSE file). + (license (list license:bsd-2 license:asl2.0)))) (define-public python-publicsuffix (package -- cgit 1.4.1 From 40a18f493409b9917964a6e2476382cca4856c7d Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:30:07 -0800 Subject: home: services: Typo fix. * gnu/home/services.scm: Fix spelling of "directory". --- gnu/home/services.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index df1a3a19e2..992e522fa2 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -351,7 +351,7 @@ extended with one gexp."))) (unless new-home-env (setenv "GUIX_NEW_HOME" #f)) (unless old-home-env (setenv "GUIX_OLD_HOME" #f))) (format #t "\ -Activation script was either called or loaded by file from this direcotry: +Activation script was either called or loaded by file from this directory: ~a It doesn't seem that home environment is somewhere around. Make sure that you call ./activate by symlink from -home store item.\n" -- cgit 1.4.1 From 6edfcf3e908ea9694417e798984461b1ef370626 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:33:35 -0800 Subject: gnu: home: services: Fix typo. * gnu/home/services/shells.scm (home-shell-profile-configuration): Fix spelling of "available". --- gnu/home/services/shells.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 81d07da86c..6b9ebe42e9 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -69,7 +69,7 @@ only be extended. @code{profile} is a list of file-like objects, which will go to @file{~/.profile}. By default @file{~/.profile} contains the initialization code, which have to be evaluated by login shell to make -home-environment's profile avaliable to the user, but other commands +home-environment's profile available to the user, but other commands can be added to the file if it is really necessary. In most cases shell's configuration files are preferred places for -- cgit 1.4.1 From e1498538459f366e97eb96e92067391b163b00b4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:35:30 -0800 Subject: gnu: home: services: Fix typo. * gnu/home/services/utils.scm: Fix spelling of "anything". --- gnu/home/services/utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/home/services/utils.scm b/gnu/home/services/utils.scm index cea75ee896..3ce32f80c0 100644 --- a/gnu/home/services/utils.scm +++ b/gnu/home/services/utils.scm @@ -28,7 +28,7 @@ list->human-readable-list)) (define (maybe-object->string object) - "Like @code{object->string} but don't do anyting if OBJECT already is + "Like @code{object->string} but don't do anything if OBJECT already is a string." (if (string? object) object -- cgit 1.4.1 From 57bf76d832cff03435390b04a4d5951aaeff98fe Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:37:54 -0800 Subject: gnu: home: services: Fix typo. * gnu/home/services/xdg.scm (home-xdg-base-directories-service-type): Fix spelling of "convenient". --- gnu/home/services/xdg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm index 20fb7f7b40..d230dd7665 100644 --- a/gnu/home/services/xdg.scm +++ b/gnu/home/services/xdg.scm @@ -136,7 +136,7 @@ are no extensions use configuration instead." (description "Configure XDG base directories. This service introduces two additional variables @env{XDG_STATE_HOME}, @env{XDG_LOG_HOME}. They are not a part of XDG specification, at -least yet, but are convinient to have, it improves the consistency +least yet, but are convenient to have, it improves the consistency between different home services. The services of this service-type is instantiated by default, to provide non-default value, extend the service-type (using @code{simple-service} for example)."))) -- cgit 1.4.1 From 8f392c48174f429b35af2afa42d2c8631e0d2f41 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:40:40 -0800 Subject: gnu: r-msfeatures: Fix typo. * gnu/packages/bioconductor.scm (r-msfeatures)[description]: Fix spelling of "package". --- gnu/packages/bioconductor.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 47bfa11e68..d36d070a56 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -13123,7 +13123,7 @@ within the R for Mass Spectrometry packages.") "The MsFeature package defines functionality for Mass Spectrometry features. This includes functions to group (LC-MS) features based on some of their properties, such as retention time (coeluting features), or correlation -of signals across samples. This packge hence allows to group features, and +of signals across samples. This package hence allows to group features, and its results can be used as an input for the @code{QFeatures} package which allows to aggregate abundance levels of features within each group. This package defines concepts and functions for base and common data types, -- cgit 1.4.1 From df808170987a27e8682f2b6840ecbc94274973c4 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:43:44 -0800 Subject: gnu: rust-fallible-collections-0.4: Fix typo. * gnu/packages/crates-io.scm (rust-fallible-collections-0.4)[description]: Fix spelling of "which". --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aa5cdef1e2..9f9014b9ce 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -17405,7 +17405,7 @@ a result when an allocation error occurs, ala @url{https://github.com/rust-lang/rfcs/blob/master/text/2116-alloc-me-maybe.md,RFC 2116}. The API currently proposes a fallible interface for @code{Vec}, @code{Box}, @code{Arc}, @code{Btree} and @code{Rc}, as well as a -@code{TryClone} trait wich is implemented for primitive Rust traits and a +@code{TryClone} trait which is implemented for primitive Rust traits and a fallible format macro.") (license (list license:expat license:asl2.0)))) -- cgit 1.4.1 From 34af64a8ccbd521038c8dc18cd981d6f59e86e37 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:47:20 -0800 Subject: gnu: emacs-org-contrib: Fix typo. * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[description]: Fix spelling of "maintenance". --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b305bb5386..7e49fcbf5f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12360,7 +12360,7 @@ programming and reproducible research.") (synopsis "Unmaintained add-ons for Org mode") (description "This package contains add-ons to Org. Be warned that these libraries -receive little if no maintainance and there is no guaranty that they are +receive little if no maintenance and there is no guaranty that they are compatible with the Org stable version.") (license license:gpl3+))) -- cgit 1.4.1 From 4b7517cee18e782d04907bb1caf3cd95891bd32f Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:50:49 -0800 Subject: gnu: ghc-quickcheck-classes-base: Fix typo. * gnu/packages/emacs-xyz.scm (ghc-quickcheck-classes-base)[description]: Fix spelling of "library" --- gnu/packages/haskell-check.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index 04d9ff6253..90ef3236b6 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -1120,7 +1120,7 @@ examples and more information.") (home-page "https://github.com/andrewthad/quickcheck-classes#readme") (synopsis "QuickCheck common typeclasses from `base`") (description - "This libary is a minimal variant of `quickcheck-classes` + "This library is a minimal variant of `quickcheck-classes` that only provides laws for typeclasses from `base`. The main purpose of splitting this out is so that `primitive` can depend on `quickcheck-classes-base` in its test suite, avoiding the -- cgit 1.4.1 From 2c75559f72cf1a009f4a43250799f3f2cb31b233 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:53:49 -0800 Subject: gnu: python-cligj: Fix typo. * gnu/packages/emacs-xyz.scm (python-cligj)[description]: Fix spelling of "command". --- gnu/packages/python-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ea5ad8e8ce..3d34ea4ba7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3434,7 +3434,7 @@ with sensible defaults out of the box.") (native-inputs `(("python-pytest-cov" ,python-pytest-cov))) (home-page "https://github.com/mapbox/cligj") - (synopsis "Click params for commmand line interfaces to GeoJSON") + (synopsis "Click params for command line interfaces to GeoJSON") (description "cligj is for Python developers who create command line interfaces for geospatial data. cligj allows you to quickly build consistent, -- cgit 1.4.1 From c9b171f46b75665cd475c594f97f663243e21ed1 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Oct 2021 15:40:05 -0400 Subject: gnu: MPD: Update to 0.23.4. * gnu/packages/mpd.scm (mpd): Update to 0.23.4. [arguments]: Use meson-next for meson-build-system. [inputs]: Add fmt. [native-inputs]: Add cmake. [properties]: Add release-monitoring-url. --- gnu/packages/mpd.scm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index b031525ad4..3c2fe49079 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -42,8 +42,10 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages base) + #:use-module (gnu packages build-tools) ;meson-next #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) + #:use-module (gnu packages cmake) ;for MPD #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -61,6 +63,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) @@ -105,7 +108,7 @@ interfacing MPD in the C, C++ & Objective C languages.") (define-public mpd (package (name "mpd") - (version "0.22.11") + (version "0.23.4") (source (origin (method url-fetch) (uri @@ -114,10 +117,11 @@ interfacing MPD in the C, C++ & Objective C languages.") "/mpd-" version ".tar.xz")) (sha256 (base32 - "1850ii8vnv5l8b561fai4q2mcrnym94mvlrxiy48fvpfm8s7ygql")))) + "0m67wibxc6n6438h2va59n51wwwbwhbdj9635cnpc3wqvlq9sd9g")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocumentation=enabled"))) + `(#:meson ,meson-next ; Requires Meson >= 0.56.0 + #:configure-flags '("-Ddocumentation=enabled"))) (inputs `(("ao" ,ao) ("alsa-lib" ,alsa-lib) ("avahi" ,avahi) @@ -125,6 +129,7 @@ interfacing MPD in the C, C++ & Objective C languages.") ("curl" ,curl) ("ffmpeg" ,ffmpeg) ("flac" ,flac) + ("fmt" ,fmt) ("glib" ,glib) ("icu4c" ,icu4c) ;; The LAME decoder comes from FFmpeg, but is added here so that @@ -139,7 +144,8 @@ interfacing MPD in the C, C++ & Objective C languages.") ("pulseaudio" ,pulseaudio) ("sqlite" ,sqlite) ("zlib" ,zlib))) - (native-inputs `(("pkg-config" ,pkg-config) + (native-inputs `(("cmake" ,cmake) + ("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx))) ;; Missing optional inputs: ;; libyajl @@ -167,6 +173,7 @@ server-side application for playing music. Through plugins and libraries it can play a variety of sound files while being controlled by its network protocol.") (home-page "https://www.musicpd.org/") + (properties `((release-monitoring-url . "https://musicpd.org"))) (license license:gpl2))) (define-public mpd-mpc -- cgit 1.4.1 From 7cad4997e8beaa7252aec2d89ba20fb8dab6d726 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 17:57:22 -0800 Subject: gnu: scandb: Fix typo. * gnu/packages/emacs-xyz.scm (scandb)[description]: Fix spelling of "regularly". --- gnu/packages/scanner.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/scanner.scm b/gnu/packages/scanner.scm index 00d094cc4b..9d4abe88c6 100644 --- a/gnu/packages/scanner.scm +++ b/gnu/packages/scanner.scm @@ -240,7 +240,7 @@ package contains the library and drivers."))) ("zlib" ,zlib))) (home-page "https://scanbd.sourceforge.io") (synopsis "Configurable scanner button monitor") - (description "Scanbd stands for scanner button daemon. It regulary polls + (description "Scanbd stands for scanner button daemon. It regularly polls scanners for pressed buttons, function knob changes, or other events such as (un)plugging the scanner or inserting and removing paper. Then it performs the desired action(s) such as saving, copying, or e-mailing the image. -- cgit 1.4.1 From 75cae188ad6e911564c1c7984680bb431793ff18 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 14 Nov 2021 18:00:22 -0800 Subject: build: wrap-qt-program: Fix typo. * gnu/build/qt-utils.scm (wrap-qt-program): Fix spelling of "program". --- guix/build/qt-utils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..5d3a4d22e6 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -109,7 +109,7 @@ (define* (wrap-qt-program program-name #:key inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) - "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" + "Wrap the specified program (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program -- cgit 1.4.1 From 1fc71de3abbd7e205d2037cd0263c6a1026d3643 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 10 Nov 2021 01:05:40 -0500 Subject: gnu: python-orderedmultidict: Update to 1.0.1. * gnu/packages/python-xyz.scm (python-orderedmultidict): Update to 1.0.1. [arguments]: Delete custom fix-tests phase. [native-inputs]: Add python-flake8. Signed-off-by: Arun Isaac --- gnu/packages/python-xyz.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3d34ea4ba7..afc86ec559 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6682,29 +6682,20 @@ where key might be occurred more than once in the container.") (define-public python-orderedmultidict (package (name "python-orderedmultidict") - (version "1.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (pypi-uri "orderedmultidict" version)) (sha256 (base32 - "1idjbl933avgaadscrjw1np3xkvnz3phq0l8vw5qs0rqcjx9b65q")))) + "1bc2v0yflsxjyyjx4q9wqx0j3bvzcw9z87d5pz4iqac7bsxhn1q4")))) (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - ;; The package uses nosetest for running the tests. - ;; Adding this initfile allows to run the test suite - ;; without requiring nosetest. - (with-output-to-file "tests/__init__.py" newline) - #t))))) (propagated-inputs `(("python-six" ,python-six))) (native-inputs - `(("python-pycodestyle" ,python-pycodestyle))) + `(("python-flake8" ,python-flake8) + ("python-pycodestyle" ,python-pycodestyle))) (home-page "https://github.com/gruns/orderedmultidict") (synopsis "Python Ordered Multivalue Dictionary - omdict") (description "This package contains a library for ordered multivalue -- cgit 1.4.1 From b18df944c5035fb8bbe02c92345eeb12a223956d Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 10 Nov 2021 01:05:41 -0500 Subject: gnu: python2-orderedmultidict: Remove package. * gnu/packages/python-web.scm (python2-orderedmultidict): Delete variable. Signed-off-by: Arun Isaac --- gnu/packages/python-xyz.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index afc86ec559..79ac39e817 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6704,9 +6704,6 @@ multiple values for the same key. An ordered multivalue dictionary is a multivalue dictionary that retains the order of insertions and deletions.") (license license:unlicense))) -(define-public python2-orderedmultidict - (package-with-python2 python-orderedmultidict)) - (define-public python-autopep8 (package (name "python-autopep8") -- cgit 1.4.1 From da2ee1b13591438847b85baca8070bb2285ac411 Mon Sep 17 00:00:00 2001 From: jgart Date: Wed, 10 Nov 2021 12:32:48 -0500 Subject: gnu: python-furl: Update to 2.1.3. * gnu/packages/python-web.scm (python-furl): Update to 2.1.3. Signed-off-by: Arun Isaac --- gnu/packages/python-web.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 690c85b1ab..4ddf89c207 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Pradana Aumars ;;; Copyright © 2021 Arun Isaac +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -640,14 +641,14 @@ over a different origin than that of the web application.") (define-public python-furl (package (name "python-furl") - (version "2.0.0") + (version "2.1.3") (source (origin (method url-fetch) (uri (pypi-uri "furl" version)) (sha256 (base32 - "1v2lakx03d5w8954a39ki44xv5mllnq0a0avhxykv9hrzg0yvjpx")))) + "0knc76pm8pzigs3bpx9fccfsfxqrgblqphar46hq9i364vz8hqas")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six) -- cgit 1.4.1 From 6119120f6dc0a36e8b32a3029ab4ae000cedd7d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 15 Nov 2021 10:17:56 +0200 Subject: gnu: lagrange: Update to 1.8.2. * gnu/packages/web-browsers.scm (lagrange): Update to 1.8.2. [source]: Add snippet to remove bundled libraries. [native-inputs]: Add zip. --- gnu/packages/web-browsers.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index a6d2d9106b..3b495b8978 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -693,7 +693,7 @@ key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.7.2") + (version "1.8.2") (source (origin (method url-fetch) @@ -701,13 +701,20 @@ key-bindings (Emacs, vi, CUA), and is fully configurable in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "1fr7p0pjli9clsgr0a1fp1pr119r9zqx43dvhc1g91bj742mxhfa")))) + (base32 "1wb4gqn32sja2qik04chlcl743arr6c844zczy1a2aad5103cnip")) + (modules '((guix build utils))) + (snippet + '(begin + ;; TODO: unbundle fonts. + (delete-file-recursively "lib/fribidi") + (delete-file-recursively "lib/harfbuzz"))))) (build-system cmake-build-system) (arguments `(#:tests? #false ;no tests #:configure-flags (list "-DTFDN_ENABLE_SSE41=OFF"))) (native-inputs - `(("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config) + ("zip" ,zip))) (inputs `(("fribidi" ,fribidi) ("harfbuzz" ,harfbuzz) -- cgit 1.4.1 From fa1550647c9c1add09d90ad5cbaff9db674ddf19 Mon Sep 17 00:00:00 2001 From: Morgan Smith Date: Sun, 14 Nov 2021 11:02:29 -0500 Subject: gnu: emacs-request: Update to 0.3.2-1.3336eaa. * gnu/packages/emacs-xyz.scm (emacs-request): Update to 0.3.2-1.3336eaa. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7e49fcbf5f..b26318b348 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8790,9 +8790,9 @@ a source code input file.") (define-public emacs-request ;; We prefer a more recent commit that has support for auth-source, - ;; which makes authentication more convenient for users and maintainers. - (let ((commit "d02d1347ffdf138cffd380cbeac62ac8732036ef") - (revision "0")) + ;; and has some bug fixes for Emacs 28. + (let ((commit "3336eaa97de923f74b90dda3e35985e122d40805") + (revision "1")) (package (name "emacs-request") (version (git-version "0.3.2" revision commit)) @@ -8804,7 +8804,7 @@ a source code input file.") (file-name (git-file-name name version)) (sha256 (base32 - "1rkpakzish2d470ca15yq3k0m1j7a2lrkvvddcyvc2rx0sncsdjs")))) + "0jckwy5zhz95d6l3lz8b9b34pppcjjzy97fg1wn8mqzhf3h460ac")))) (build-system emacs-build-system) (arguments `(#:tests? #f)) ; requires network access. -- cgit 1.4.1 From 76c3e6859479b8a9b3035cc6fa4d737c7925a899 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sun, 14 Nov 2021 14:30:46 +0100 Subject: gnu: scrot: Update to 1.7. * gnu/packages/xdisorg.scm (scrot): Update to 1.7. [inputs]: Add libbsd. Signed-off-by: Nicolas Goaziou --- gnu/packages/xdisorg.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 282763b8aa..b0c2f9dd6a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2019 Wiktor Żelazny ;;; Copyright © 2019 Kyle Andrews ;;; Copyright © 2019, 2020 Josh Holland -;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2019, 2021 Tanguy Le Carrour ;;; Copyright © 2020, 2021 Guillaume Le Vaillant ;;; Copyright © 2020 David Wilson ;;; Copyright © 2020 Ivan Vilata i Balaguer @@ -103,6 +103,7 @@ #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libevent) #:use-module (gnu packages linux) #:use-module (gnu packages m4) @@ -768,7 +769,7 @@ move windows, switch between desktops, etc.).") (define-public scrot (package (name "scrot") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) @@ -778,7 +779,7 @@ move windows, switch between desktops, etc.).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qanx2xx9m5l995csqzfcm1ks2nhk90zga1wzbkjjl75ga4iik2h")))) + (base32 "0rls08mpalx4xp5ysmg7m5lgx9q8g8m8q40m47f11mqa84z88nd1")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) @@ -788,6 +789,7 @@ move windows, switch between desktops, etc.).") (inputs `(("giblib" ,giblib) ("imlib2" ,imlib2) + ("libbsd" ,libbsd) ("libx11" ,libx11) ("libxcomposite" ,libxcomposite) ("libxext" ,libxext) -- cgit 1.4.1 From 2b9b9740fd210b327bb080202f2196ed9d2429a5 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sun, 14 Nov 2021 11:19:02 +0100 Subject: gnu: diff-so-fancy: Update to 1.4.2. * gnu/packages/version-control.scm (diff-so-fancy): Update to 1.4.2. Signed-off-by: Nicolas Goaziou --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c57deff686..00a8be49f9 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3036,7 +3036,7 @@ for historians.") (define-public diff-so-fancy (package (name "diff-so-fancy") - (version "1.3.0") + (version "1.4.2") (source (origin (method git-fetch) (uri (git-reference @@ -3045,7 +3045,7 @@ for historians.") (file-name (git-file-name name version)) (sha256 (base32 - "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + "0q0byg2bpibl3lbn4zibwcfxzlx2x5krajxmpwgizf32qjp5lh6n")))) (inputs `(("perl" ,perl) ("ncurses" ,ncurses))) -- cgit 1.4.1 From 378955341a19b25017bfabfc6d90b34630f6258c Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sun, 14 Nov 2021 11:13:32 +0100 Subject: gnu: grisbi: Update to 2.0.5. * gnu/packages/finance.scm (grisbi): Update to 2.0.5. Signed-off-by: Nicolas Goaziou --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c9732f936e..82bce14fae 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1239,7 +1239,7 @@ Its features are: (define-public grisbi (package (name "grisbi") - (version "1.2.2") + (version "2.0.5") (source (origin (method url-fetch) @@ -1249,7 +1249,7 @@ Its features are: "/grisbi-" version ".tar.bz2")) (sha256 (base32 - "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw")))) + "0gvsqw1z5wkakyi3bkq71pqb094a8lv2nbgnxw2zqkabzjmxnfmx")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags (list "--without-ofx"))) -- cgit 1.4.1 From 1e9bed9ebe130e4ba7daa47207730a8e465584cd Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Sun, 14 Nov 2021 10:48:58 +0100 Subject: gnu: profanity: Update to 0.11.1. * gnu/packages/messaging.scm (profanity): Update to 0.11.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 40da7def84..9f4134362a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2124,7 +2124,7 @@ are both supported).") (define-public profanity (package (name "profanity") - (version "0.10.0") + (version "0.11.1") (source (origin (method url-fetch) @@ -2133,7 +2133,7 @@ are both supported).") version ".tar.gz")) (sha256 (base32 - "137z77514fgj2dk13d12g4jrn6gs5k85nwrk1r1kiv7rj0jy61aa")))) + "0idx0a5g077a57q462w01m0h8i4vyvabzlj87p8527wpqbv4s6vg")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From 50f3b082a728fdda78c78753e5c4fd15e7f483b2 Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 11 Nov 2021 04:12:54 -0500 Subject: gnu: Add music21. * gnu/packages/music.scm (music21): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/music.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 32ed4081b6..60cff2cc28 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1528,6 +1528,39 @@ Guile.") ;; more than an hour of silence, so double the max silent time. (properties `((max-silent-time . 7200))))) +(define-public music21 + (package + (name "music21") + (version "7.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "music21" version)) + (sha256 + (base32 "17v2id8qm99xqymqsdczq173fmbdha4w109ahh8j1d9l5a7mqc86")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + ;; See: https://github.com/cuthbertLab/music21/issues/1164 + (invoke "python" "-m" "music21.stream.tests"))))))) + (propagated-inputs + `(("python-chardet" ,python-chardet) + ("python-joblib" ,python-joblib) + ("python-more-itertools" ,python-more-itertools) + ("python-webcolors" ,python-webcolors))) + (home-page "https://web.mit.edu/music21/") + (synopsis "Toolkit for Computational Musicology") + (description + "Music21 is a set of tools for helping scholars and other active +listeners answer questions about music quickly and simply.") + ;; Software is dual-licensed. + (license (list license:bsd-3 license:lgpl3+)))) + (define-public abjad (package (name "abjad") -- cgit 1.4.1 From 879bcb71e82b1a463e130b3acdd1552b1fcd890b Mon Sep 17 00:00:00 2001 From: phodina via Guix-patches via Date: Wed, 10 Nov 2021 13:41:57 +0000 Subject: gnu: Add mtm. * gnu/packages/terminals.scm (mtm): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/terminals.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index daecc95837..0410b1e960 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -23,11 +23,13 @@ ;;; Copyright © 2020, 2021 Marius Bakke ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Leo Famulari +;;; Copyright @ 2020 luhux ;;; Copyright © 2021 Ekaitz Zarraga ;;; Copyright © 2021 Raphaël Mélotte ;;; Copyright © 2021 ikasero ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Solene Rapenne +;;; Copyright © 2021 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -424,6 +426,64 @@ character sets and encodings from around the world. It can display double-width Vietnamese, and bi-directional scripts like Arabic and Hebrew.") (license license:bsd-3))) +(define-public mtm + (package + (name "mtm") + (version "1.2.1") + (source + (origin + (uri (git-reference + (url "https://github.com/deadpixi/mtm") + (commit version))) + (method git-fetch) + (sha256 + (base32 "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + #:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "DESTDIR=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) ;no configure script + (add-before 'build 'fix-headers + (lambda _ + (substitute* "config.def.h" + (("ncursesw/curses.h") "curses.h")))) + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + ;; install binary + (mkdir-p (string-append out "bin/")) + (install-file "mtm" (string-append out "/bin")) + ;; install manpage + (mkdir-p (string-append out "share/man/man1")) + (install-file "mtm.1" (string-append out "/share/man/man1")) + ;; install terminfo + (mkdir-p (string-append out "share/terminfo")) + (invoke (string-append (assoc-ref inputs "ncurses") "/bin/tic") + "-x" "-s" "-o" + (string-append + out "/share/terminfo") + "mtm.ti"))))))) + (inputs + `(("ncurses" ,ncurses))) + ;; FIXME: This should only be located in 'ncurses'. Nonetheless it is + ;; provided for usability reasons. See . + (native-search-paths + (list (search-path-specification + (variable "TERMINFO_DIRS") + (files '("share/terminfo"))))) + (home-page "https://github.com/deadpixi/mtm") + (synopsis "Micro Terminal Multiplexer") + (description + "This package provides multiplexer for the terminal focused on simplicity, +compatibility, size and stability.") + (license (list license:gpl3+ + license:bsd-3)))) ;vtparser.c + (define-public picocom (package (name "picocom") -- cgit 1.4.1 From 2b1e80773379c2492243dab9d918cef8c1dbfc0d Mon Sep 17 00:00:00 2001 From: pinoaffe Date: Tue, 9 Nov 2021 10:34:21 +0100 Subject: gnu: Add emacs-org-vcard * gnu/packages/emacs-xyz.scm (emacs-org-vcard): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b26318b348..ec0376442b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12388,6 +12388,27 @@ complete email addresses, export contacts to a vCard file, put birthdays in your Org Agenda, and more.") (license license:gpl3+)))) +(define-public emacs-org-vcard + (package + (name "emacs-org-vcard") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flexibeast/org-vcard") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7")))) + (build-system emacs-build-system) + (home-page "https://github.com/flexibeast/org-vcard") + (synopsis "Org mode support for vCard export and import") + (description + "This package exports and imports vCard files from within GNU Emacs' Org +mode.") + (license license:gpl3+))) + (define-public emacs-org-pretty-table ;; There is no release yet. (let ((commit "1331c600b83d95b28730b1bfcb48369ac1cf12ef") -- cgit 1.4.1 From dd1b0d9d7683ed7590ca75bb5c31fc3efbc04fe5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Tue, 9 Nov 2021 17:19:10 +0100 Subject: gnu: stockfish: Update to 14.1. * gnu/packages/games.scm (stockfish): Update to 14.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/games.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cad9200a7f..8f80772f1e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -12074,10 +12074,10 @@ etc. You can also play games on FICS or against an engine.") (license license:gpl2+))) (define-public stockfish - (let ((neural-network-revision "3475407dc199")) ; also update hash below + (let ((neural-network-revision "13406b1dcbe0")) ; also update hash below (package (name "stockfish") - (version "14") + (version "14.1") (source (origin (method git-fetch) @@ -12086,7 +12086,7 @@ etc. You can also play games on FICS or against an engine.") (commit (string-append "sf_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "046b3rq9w8lzgk07q5zazzkl93ai99ab18hr9d8n73mabjpi6zbx")))) + (base32 "0apqqcgpcflm3c6mcl13ln2y04f6zksnljmk4ys7naf7xk4vdgkd")))) (build-system gnu-build-system) (inputs `(("neural-network" @@ -12096,7 +12096,7 @@ etc. You can also play games on FICS or against an engine.") neural-network-revision ".nnue")) (sha256 (base32 - "11zci5kgwdw9rh8w2w4p84764g82rr666y3n8r2flwwrq5yl0x9l")))))) + "0vr3hcmlqqm74pn7hc54gmfs9drqvgc53nh7bvy6v8z0rcfnnh0k")))))) (arguments `(#:tests? #f #:make-flags (list "-C" "src" -- cgit 1.4.1 From 01b64290cba63586371189b937ed6f1481396086 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 16:46:30 +0000 Subject: gnu: Add rust-lifeguard-0.6. * gnu/packages/crates-io.scm (rust-lifeguard-0.6): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9f9014b9ce..1a2cefc591 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -27160,6 +27160,25 @@ known as zlib).") (license (list license:asl2.0 license:expat)))) +(define-public rust-lifeguard-0.6 + (package + (name "rust-lifeguard") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "lifeguard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "09iwwy7888i1kfvbrgwpl4xv3pwsz1fbzx54djs3gnvmszdr9gl9")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/zslayton/lifeguard") + (synopsis "Object pool manager in Rust") + (description "This package provides an object pool manager in Rust.") + (license license:expat))) + (define-public rust-line-0.1 (package (name "rust-line") -- cgit 1.4.1 From 6d5295acb820609b7d6c9e9c22389605e6c09158 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 16:58:56 +0000 Subject: gnu: Add rust-psl-types-2. * gnu/packages/crates-io.scm (rust-psl-types-2): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a2cefc591..47a4dbd63d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38891,6 +38891,26 @@ including most strategies and the testing framework itself.") trait of proptest.") (license (list license:expat license:asl2.0)))) +(define-public rust-psl-types-2 + (package + (name "rust-psl-types") + (version "2.0.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "psl-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0kqssn9wgqpl1m26ynv7cvxanfhyjvssi2a3jc2nzpbw7q3ricv6")))) + (build-system cargo-build-system) + (arguments `(#:skip-build? #t)) + (home-page "https://github.com/addr-rs/psl-types") + (synopsis "Common types for the public suffix implementation crates") + (description "This package provides common types for the public suffix +implementation crates.") + (license (list license:expat license:asl2.0)))) + (define-public rust-psm-0.1 (package (name "rust-psm") -- cgit 1.4.1 From 492bec66a845e3ded38d019f38902029dd14fb95 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 16:59:38 +0000 Subject: gnu: Add rust-psl-2. * gnu/packages/crates-io.scm (rust-psl-2): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 47a4dbd63d..9e43f096ba 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38891,6 +38891,37 @@ including most strategies and the testing framework itself.") trait of proptest.") (license (list license:expat license:asl2.0)))) +(define-public rust-psl-2 + (package + (name "rust-psl") + (version "2.0.48") + (source + (origin + (method url-fetch) + (uri (crate-uri "psl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0a2d3z6gi7bwsi4xr6m3kq44wxyr81yqr5z76afv8kfxsc8p1nxh")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-psl-types" ,rust-psl-types-2)) + #:cargo-development-inputs + (("rust-rspec", rust-rspec-1)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("1.0.0") ,(package-version rust-rspec-1)))))))) + (home-page "https://github.com/addr-rs/psl") + (synopsis "Extract root domain and suffix") + (description "This package extracts root domain and suffix from a domain +name.") + (license (list license:expat license:asl2.0)))) + (define-public rust-psl-types-2 (package (name "rust-psl-types") -- cgit 1.4.1 From 5489dd376fbe8ced1eefabf80953c27972586dcb Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:00:15 +0000 Subject: gnu: Add rust-publicsuffix-2. * gnu/packages/crates-io.scm (rust-publicsuffix-2): New variable. (rust-publicsuffix-1): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9e43f096ba..37d1677890 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -38965,8 +38965,36 @@ implementation crates.") stack pointer and inspect the properties of the stack.") (license (list license:isc license:asl2.0)))) +(define-public rust-publicsuffix-2 + (package + (name "rust-publicsuffix") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "publicsuffix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1q9kbcqh9pa06p3kq7d3ksbnqjhs88v5wk5qg89wrgkbmpnp4a99")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) + ("rust-idna" ,rust-idna-0.2) + ("rust-psl-types" ,rust-psl-types-2) + ("rust-unicase" ,rust-unicase-2)))) + (home-page "https://github.com/rushmorem/publicsuffix") + (synopsis "Domain name parsing and email address validation") + (description "This package provides robust domain name parsing and RFC +compliant email address validation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-publicsuffix-1 (package + (inherit rust-publicsuffix-2) (name "rust-publicsuffix") (version "1.5.4") (source @@ -38977,7 +39005,6 @@ stack pointer and inspect the properties of the stack.") (sha256 (base32 "0yvmjpywfyypfr17kxiwy6ssykgv8nmcdhfakas6548pfn8a9fiv")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-error-chain" ,rust-error-chain-0.12) @@ -38987,12 +39014,7 @@ stack pointer and inspect the properties of the stack.") ("rust-regex" ,rust-regex-1) ("rust-url" ,rust-url-2)) #:cargo-development-inputs - (("rust-rspec" ,rust-rspec-1)))) - (home-page "https://github.com/rushmorem/publicsuffix") - (synopsis "Domain name parsing and email address validation") - (description "This package provides robust domain name parsing and RFC -compliant email address validation.") - (license (list license:expat license:asl2.0)))) + (("rust-rspec" ,rust-rspec-1)))))) (define-public rust-pulldown-cmark-0.8 (package -- cgit 1.4.1 From 3fb4515d0fb01159ab73ea814527cf1c2415dffe Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:00:58 +0000 Subject: gnu: Add rust-no-std-net-0.5. * gnu/packages/crates-io.scm (rust-no-std-net-0.5): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 37d1677890..5d9eed756e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -32087,6 +32087,29 @@ to nl80211 and receive messages.") prove a function can't ever panic.") (license (list license:expat license:asl2.0)))) +(define-public rust-no-std-net-0.5 + (package + (name "rust-no-std-net") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "no-std-net" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/dunmatt/no-std-net") + (synopsis "Rust's std::net... without the @code{std}") + (description "This package provides Rust's std::net for environment +without the @code{std}.") + (license license:expat))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") -- cgit 1.4.1 From 62939e47b3adba54837a53bd4e70c93bb0432e34 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:01:35 +0000 Subject: gnu: Add rust-addr-0.14. * gnu/packages/crates-io.scm (rust-addr-0.14): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 5d9eed756e..9fca0b9b9a 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -1015,6 +1015,32 @@ deadlock, like the standard Barrier).") Rust, using gimli.") (license (list license:asl2.0 license:expat)))) +(define-public rust-addr-0.14 + (package + (name "rust-addr") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "addr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w6v0wwv203v0lyvwsq27rwfhvmw7dsmrqc9r3gszbx2974wlk65")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-no-std-net" ,rust-no-std-net-0.5) + ("rust-psl" ,rust-psl-2) + ("rust-psl-types" ,rust-psl-types-2) + ("rust-publicsuffix" ,rust-publicsuffix-2) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/addr-rs/addr") + (synopsis "Parsing domain names") + (description "This package provides a library for parsing domain names.") + (license (list license:expat license:asl2.0)))) + (define-public rust-addr2line-0.11 (package (inherit rust-addr2line-0.14) -- cgit 1.4.1 From c8f6f58c9ad77900cda5d4f94088413422c95fda Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:02:03 +0000 Subject: gnu: rust-rmp-serde: Update to 0.15.5. * gnu/packages/crates-io.scm (rust-rmp-serde): Update to 0.15.5. (rust-serdeconv-0.4)[arguments]: Update rust-rmp-serde-0.15 in cargo-inputs. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fca0b9b9a..cc7884a0ef 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42324,17 +42324,17 @@ writers and readers for primitive values with direct mapping between binary MessagePack format.") (license license:expat))) -(define-public rust-rmp-serde-0.14 +(define-public rust-rmp-serde-0.15 (package (name "rust-rmp-serde") - (version "0.14.4") + (version "0.15.5") (source (origin (method url-fetch) (uri (crate-uri "rmp-serde" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1n2jn3yj5zbjhz5lah98yylpzhfc1c0h5fcksjp75r3gj86dgrsc")))) + (base32 "178f4qlicldm9iy74q4wdqldk5i11p1ad30wzs9avx04mpwwygkj")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -46884,7 +46884,7 @@ framework.") (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-rmp-serde" ,rust-rmp-serde-0.14) + (("rust-rmp-serde" ,rust-rmp-serde-0.15) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-toml" ,rust-toml-0.5) -- cgit 1.4.1 From d3d064a0731909fde55b155b92d85028927877fe Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:02:40 +0000 Subject: gnu: Add rust-twoway-0.2. * gnu/packages/crates-io.scm (rust-twoway-0.2): New variable. (rust-twoway-0.1): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cc7884a0ef..687ec4bba9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58148,17 +58148,17 @@ design abstracts away all the internals of the WebSocket protocol but still makes them accessible for those who wants full control over the network.") (license (list license:expat license:asl2.0)))) -(define-public rust-twoway-0.1 +(define-public rust-twoway-0.2 (package (name "rust-twoway") - (version "0.1.8") + (version "0.2.2") (source (origin (method url-fetch) (uri (crate-uri "twoway" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar")))) + (base32 "0iqb54firzb8jinl2674vz8s6c4h30842sa3v9pcs93w1m3gnzy5")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -58174,6 +58174,20 @@ makes them accessible for those who wants full control over the network.") strings.") (license (list license:expat license:asl2.0)))) +(define-public rust-twoway-0.1 + (package + (inherit rust-twoway-0.2) + (name "rust-twoway") + (version "0.1.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "twoway" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar")))))) + (define-public rust-typeable-0.1 (package (name "rust-typeable") -- cgit 1.4.1 From a19423cd75f440a9bed3d585804730661c6ae15d Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:03:06 +0000 Subject: gnu: Add rust-rmp-serde-0.13. * gnu/packages/crates-io.scm (rust-rmp-serde-0.13): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 687ec4bba9..cfbb0787c6 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42347,6 +42347,29 @@ MessagePack format.") (description "This crate provides Serde bindings for RMP.") (license license:expat))) +(define-public rust-rmp-serde-0.13 + (package + (name "rust-rmp-serde") + (version "0.13.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "rmp-serde" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lqclnffx1b3r1faicscmk9j21mijl9bj7ywgjps77vf8ic1s7h1")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-rmp" ,rust-rmp-0.8) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/3Hren/msgpack-rust") + (synopsis "Serde bindings for RMP") + (description "This crate provides Serde bindings for RMP.") + (license license:expat))) + (define-public rust-rocket-0.4 (package (name "rust-rocket") -- cgit 1.4.1 From a8cce5c3b933b4c0f31ac5a84df54cd32bdb0ba5 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:03:39 +0000 Subject: gnu: Add rust-selectors-0.21. * gnu/packages/crates-io.scm (rust-selectors-0.21): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cfbb0787c6..44ef8a4b15 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46145,6 +46145,21 @@ macOS and iOS.") (description "This package provides CSS Selectors matching for Rust.") (license license:mpl2.0))) +(define-public rust-selectors-0.21 + (package + (inherit rust-selectors-0.22) + (name "rust-selectors") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "selectors" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "11icfj8ix8fqjsnw3dqw83bmhd5qdhxzq2klb486akyypq0b31hv")))))) + (define-public rust-sema-0.1 (package (name "rust-sema") -- cgit 1.4.1 From e5354455e58e5c33d41b28dedb9d1f36c13d5dc9 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:04:08 +0000 Subject: gnu: Add rust-tokio-1.8. * gnu/packages/crates-io.scm (rust-tokio-1.8): New variable. (rust-tokio-1): Inherit from above. Signed-off-by: Nicolas Goaziou --- gnu/packages/crates-io.scm | 50 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 44ef8a4b15..692cd2a28b 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -54760,10 +54760,10 @@ to a style defined by John Gruber for post titles on his website ``Daring Fireball''.") (license license:expat))) -(define-public rust-tokio-1 +(define-public rust-tokio-1.8 (package (name "rust-tokio") - (version "1.2.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -54771,13 +54771,12 @@ Fireball''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8")))) + "1m18rs51wz6s7dwdwzr0j63kh815x4dx9k0f2c485crs7fqjw32p")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-autocfg" ,rust-autocfg-1) - ("rust-bytes" ,rust-bytes-1) + (("rust-bytes" ,rust-bytes-1) ("rust-libc" ,rust-libc-0.2) ("rust-memchr" ,rust-memchr-2) ("rust-mio" ,rust-mio-0.7) @@ -54788,7 +54787,16 @@ Fireball''.") ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) ("rust-tokio-macros" ,rust-tokio-macros-1) ("rust-tracing" ,rust-tracing-0.1) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs + (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-autocfg" ,rust-autocfg-1) + ("rust-nix" ,rust-nix-0.19) + ("rust-futures" ,rust-futures-0.3) + ("rust-proptest" ,rust-proptest-1) + ("rust-sokcet2-0.4" ,rust-socket2-0.4) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-test" ,rust-tokio-test-0.4)))) (home-page "https://tokio.rs") (synopsis "Event-driven, non-blocking I/O platform") (description @@ -54796,6 +54804,36 @@ Fireball''.") writing asynchronous I/O backed applications.") (license license:expat))) +(define-public rust-tokio-1 + (package + (inherit rust-tokio-1.8) + (name "rust-tokio") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0fmfykdp29hjq5264mp6sa4c0wp5mlimbi0dd9mrxsk5qq20s6g8")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-autocfg" ,rust-autocfg-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memchr" ,rust-memchr-2) + ("rust-mio" ,rust-mio-0.7) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) + ("rust-tokio-macros" ,rust-tokio-macros-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-tokio-0.3 (package (inherit rust-tokio-1) -- cgit 1.4.1 From ce9b9e7cba87f648dff911d5c055e2a833c25c43 Mon Sep 17 00:00:00 2001 From: phodina Date: Tue, 9 Nov 2021 17:04:49 +0000 Subject: gnu: Add rust-adblock-0.4. * gnu/packages/crates-io.scm (rust-adblock-0.4): New variable. * gnu/packages/patches/rust-adblock-ignore-live-tests.patch: New file. * gnu/local.mk: Add patch. Signed-off-by: Nicolas Goaziou --- gnu/local.mk | 1 + gnu/packages/crates-io.scm | 54 +++++++++++++++++ .../patches/rust-adblock-ignore-live-tests.patch | 69 ++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 gnu/packages/patches/rust-adblock-ignore-live-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 208875754b..5b21a6ee1b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1752,6 +1752,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-1.25-accept-more-detailed-gdb-lines.patch \ %D%/packages/patches/rust-1.45-linker-locale.patch \ %D%/packages/patches/rust-1.48-linker-locale.patch \ + %D%/packages/patches/rust-adblock-ignore-live-tests.patch \ %D%/packages/patches/rust-bootstrap-stage0-test.patch \ %D%/packages/patches/rust-coresimd-doctest.patch \ %D%/packages/patches/rust-ndarray-remove-blas-src-dep.patch \ diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 692cd2a28b..9327ed5e1c 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -984,6 +984,60 @@ threads. This makes it robust in face of panics (it won't make your program deadlock, like the standard Barrier).") (license (list license:asl2.0 license:expat)))) +(define-public rust-adblock-0.4 + (package + (name "rust-adblock") + (version "0.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/brave/adblock-rust") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "rust-adblock-ignore-live-tests.patch")) + (sha256 + (base32 + "0l2iacwkm66z6wc71wy62x2k5xllx94adrqncicxqsx203c3ljpl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-addr" ,rust-addr-0.14) + ("rust-base64" ,rust-base64-0.13) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cssparser" ,rust-cssparser-0.25) + ("rust-flate2" ,rust-flate2-1) + ("rust-idna" ,rust-idna-0.2) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lifeguard" ,rust-lifeguard-0.6) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" + ,rust-percent-encoding-2) + ("rust-regex" ,rust-regex-1) + ("rust-rmp-serde" ,rust-rmp-serde-0.13) + ("rust-rmp-serde" ,rust-rmp-serde-0.15) + ("rust-seahash" ,rust-seahash-3) + ("rust-selectors" ,rust-selectors-0.21) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-twoway" ,rust-twoway-0.2) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-csv" ,rust-csv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-tokio" ,rust-tokio-1.8)))) + (native-inputs `(("pkg-config" ,pkg-config) + ("openssl" ,openssl))) + (home-page "https://github.com/brave/adblock-rust/") + (synopsis "Adblock Plus syntax filter parsing and matching") + (description "This package provides native Rust module for Adblock Plus +syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching.") + (license license:mpl2.0))) + (define-public rust-addr2line-0.14 (package (name "rust-addr2line") diff --git a/gnu/packages/patches/rust-adblock-ignore-live-tests.patch b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch new file mode 100644 index 0000000000..fc7f2858ff --- /dev/null +++ b/gnu/packages/patches/rust-adblock-ignore-live-tests.patch @@ -0,0 +1,69 @@ +From b83b5b453d3f7883ef4c12f84a7045486957c709 Mon Sep 17 00:00:00 2001 +From: Petr Hodina +Date: Tue, 9 Nov 2021 17:02:54 +0100 +Subject: [PATCH] Ignore live tests. + + +diff --git a/tests/live.rs b/tests/live.rs +index b1a19fc..6bd4685 100644 +--- a/tests/live.rs ++++ b/tests/live.rs +@@ -140,6 +140,7 @@ fn get_blocker_engine_deserialized_ios() -> Engine { + } + + #[test] ++#[ignore] + fn check_live_specific_urls() { + let mut engine = get_blocker_engine(); + { +@@ -176,6 +177,7 @@ fn check_live_specific_urls() { + } + + #[test] ++#[ignore] + fn check_live_deserialized_specific_urls() { + let mut engine = get_blocker_engine_deserialized(); + { +@@ -201,6 +203,7 @@ fn check_live_deserialized_specific_urls() { + } + + #[test] ++#[ignore] + fn check_live_from_filterlists() { + let engine = get_blocker_engine(); + let requests = load_requests(); +@@ -214,6 +217,7 @@ fn check_live_from_filterlists() { + } + + #[test] ++#[ignore] + fn check_live_deserialized_file() { + let engine = get_blocker_engine_deserialized(); + let requests = load_requests(); +@@ -243,6 +247,7 @@ fn check_live_deserialized_ios() { + + #[cfg(feature = "resource_assembler")] + #[test] ++#[ignore] + fn check_live_redirects() { + use adblock::resources::resource_assembler::assemble_web_accessible_resources; + +@@ -278,6 +283,7 @@ fn check_live_redirects() { + } + + #[test] ++#[ignore] + /// Ensure that two different engines loaded from the same textual filter set serialize to + /// identical buffers. + fn stable_serialization() { +@@ -291,6 +297,7 @@ fn stable_serialization() { + } + + #[test] ++#[ignore] + /// Ensure that one engine's serialization result can be exactly reproduced by another engine after + /// deserializing from it. + fn stable_serialization_through_load() { +-- +2.33.1 + -- cgit 1.4.1 From f2d55971453bd11f43c2734f91c42005ee314091 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 12 Nov 2021 08:23:53 +0000 Subject: gnu: Add texlive-fira. * gnu/packages/tex.scm (texlive-fira): New variable. --- gnu/packages/tex.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 5231840b26..3c174a3f80 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -4138,6 +4138,31 @@ but non-expandable ones.") (define-public texlive-latex-filemod (deprecated-package "texlive-latex-filemod" texlive-filemod)) +(define-public texlive-fira + (package + (inherit (simple-texlive-package + "texlive-fira" + (list "doc/fonts/fira/" + "tex/latex/fira/" + "fonts/vf/public/fira/" + "fonts/type1/public/fira/" + "fonts/tfm/public/fira/" + "fonts/opentype/public/fira/" + "fonts/map/dvips/fira/" + "fonts/enc/dvips/fira/") + (base32 "0mxrwwf8i383vrs64lsyiwnai4cy305pkv1kgd4nrhmgi7pdc3ac") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/fonts/fira") + (synopsis "Fira fonts with LaTeX support") + (description + "This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for +the Fira Sans family of fonts designed by Erik Spiekermann and Ralph du +Carrois of Carrois Type Design. Fira Sans is available in eleven weights with +corresponding italics: light, regular, medium, bold, ...") + (license (list license:lppl + license:silofl1.1)))) + (define-public texlive-latex-ifplatform (package (name "texlive-latex-ifplatform") -- cgit 1.4.1 From 373d2099c9def2c21ea6528f0954b8ba63176f8f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Nov 2021 10:56:22 +0000 Subject: gnu: Add python-hnswlib. * gnu/packages/python-xyz.scm (python-hnswlib): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 79ac39e817..e9ec280083 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1369,6 +1369,27 @@ concepts.") (define-public python2-h5py (package-with-python2 python-h5py)) +(define-public python-hnswlib + (package + (name "python-hnswlib") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "hnswlib" version)) + (sha256 + (base32 "0wf1cwmxmdzfqmfhrkqdxb5spf21ylgl2bidswhzjrqhwf35c9qf")))) + (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (native-inputs + `(("pybind11" ,pybind11))) + (home-page "https://github.com/nmslib/hnswlib") + (synopsis "Fast approximate nearest neighbor search") + (description "Hnswlib is a header-only C++ implementation of fast +approximate nearest neighbor search with Python bindings.") + (license license:asl2.0))) + (define-public python-pyls-black (package (name "python-pyls-black") -- cgit 1.4.1 From 078934bdd4556cf19da728bd49608d7792b533f1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Nov 2021 11:46:23 +0000 Subject: gnu: python-scipy: Run tests conditionally. * gnu/packages/python-science.scm (python-scipy)[arguments]: Respect TESTS? in 'CHECK phase. --- gnu/packages/python-science.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index b68a2838fc..ef7ae2b0a1 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -160,11 +160,12 @@ atlas_libs = openblas ;; within the source directory. (delete 'check) (add-after 'install 'check - (lambda* (#:key inputs outputs #:allow-other-keys) - (add-installed-pythonpath inputs outputs) - (with-directory-excursion "/tmp" - (invoke "python" "-c" - "import scipy; scipy.test(verbose=2)"))))))) + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (with-directory-excursion "/tmp" + (invoke "python" "-c" + "import scipy; scipy.test(verbose=2)")))))))) (home-page "https://www.scipy.org/") (synopsis "The Scipy library provides efficient numerical routines") (description "The SciPy library is one of the core packages that make up -- cgit 1.4.1 From f2ad33bc3933b710e5beb6592a9a4925b91b199a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 15 Nov 2021 17:00:09 +0530 Subject: gnu: python-pingouin: Update to 0.5.0. * gnu/packages/python-science.scm (python-pingouin): Update to 0.5.0. --- gnu/packages/python-science.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index ef7ae2b0a1..13ee6b3df6 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -830,7 +830,7 @@ of Pandas (define-public python-pingouin (package (name "python-pingouin") - (version "0.3.12") + (version "0.5.0") (source ;; The PyPI tarball does not contain the tests. (origin @@ -841,7 +841,7 @@ of Pandas (file-name (git-file-name name version)) (sha256 (base32 - "1ap29x54kdr19vi8qxj9g6cz2r1q4f0z7dcf6g77zwav7hf7r61a")))) + "01aaq023q4bymffrc2wm56af87da32wcvy5d5156i4g7qgvh346r")))) (build-system python-build-system) (arguments `(#:phases -- cgit 1.4.1 From 46432cceebe392a1744980f370a48ef73afbac2c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Mon, 15 Nov 2021 16:04:47 +0100 Subject: gnu: guile-netlink: Update to 1.1. * gnu/packages/guile-xyz.scm (guile-netlink): Update to 1.1. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 56d6d2565d..628d81710a 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4765,7 +4765,7 @@ locations.") (define-public guile-netlink (package (name "guile-netlink") - (version "1.0.1") + (version "1.1") (source (origin (method git-fetch) @@ -4775,7 +4775,7 @@ locations.") (file-name (git-file-name name version)) (sha256 (base32 - "03zmsha2d7whlwb52gna83jdas9bqi18rq3sss7kkicv814qb35g")))) + "1x1rx6agjdah56r50cfs41vyvycydyjdq0plq3jxgvl1q2dar1gw")))) (build-system gnu-build-system) (arguments `(#:tests? #f)); no tests -- cgit 1.4.1 From 616bcc9c0b71de1cae271fa37ef8829872c92773 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Nov 2021 15:12:50 +0000 Subject: gnu: python-scanpy: Run tests conditionally. * gnu/packages/bioinformatics.scm (python-scanpy)[arguments]: Respect TESTS? argument. --- gnu/packages/bioinformatics.scm | 81 +++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c5a1215442..2ffe7f7f9f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11996,47 +11996,48 @@ implementation differs in these ways: wheel (string-append "--prefix=" out))) (find-files "dist" "\\.whl$"))))) (replace 'check - (lambda* (#:key inputs #:allow-other-keys) - ;; These tests require Internet access. - (delete-file-recursively "scanpy/tests/notebooks") - (delete-file "scanpy/tests/test_clustering.py") - (delete-file "scanpy/tests/test_datasets.py") - (delete-file "scanpy/tests/test_score_genes.py") - (delete-file "scanpy/tests/test_highly_variable_genes.py") - - ;; TODO: I can't get the plotting tests to work, even with Xvfb. - (delete-file "scanpy/tests/test_embedding_plots.py") - (delete-file "scanpy/tests/test_preprocessing.py") - (delete-file "scanpy/tests/test_read_10x.py") - - ;; TODO: these fail with TypingError and "Use of unsupported - ;; NumPy function 'numpy.split'". - (delete-file "scanpy/tests/test_metrics.py") - - ;; The following tests requires 'scanorama', which isn't - ;; packaged yet. - (delete-file "scanpy/tests/external/test_scanorama_integrate.py") + (lambda* (#:key tests? inputs #:allow-other-keys) + (when tests? + ;; These tests require Internet access. + (delete-file-recursively "scanpy/tests/notebooks") + (delete-file "scanpy/tests/test_clustering.py") + (delete-file "scanpy/tests/test_datasets.py") + (delete-file "scanpy/tests/test_score_genes.py") + (delete-file "scanpy/tests/test_highly_variable_genes.py") + + ;; TODO: I can't get the plotting tests to work, even with Xvfb. + (delete-file "scanpy/tests/test_embedding_plots.py") + (delete-file "scanpy/tests/test_preprocessing.py") + (delete-file "scanpy/tests/test_read_10x.py") + + ;; TODO: these fail with TypingError and "Use of unsupported + ;; NumPy function 'numpy.split'". + (delete-file "scanpy/tests/test_metrics.py") + + ;; The following tests requires 'scanorama', which isn't + ;; packaged yet. + (delete-file "scanpy/tests/external/test_scanorama_integrate.py") - (setenv "PYTHONPATH" - (string-append (getcwd) ":" - (assoc-ref inputs "python-anndata:source") ":" - (getenv "PYTHONPATH"))) - (invoke "pytest" "-vv" - "-k" - ;; Plot tests that fail. - (string-append "not test_dotplot_matrixplot_stacked_violin" - " and not test_violin_without_raw" - " and not test_correlation" - " and not test_scatterplots" - " and not test_scatter_embedding_add_outline_vmin_vmax_norm" - " and not test_paga" - " and not test_paga_compare" - - ;; These try to connect to the network - " and not test_plot_rank_genes_groups_gene_symbols" - " and not test_pca_chunked" - " and not test_pca_sparse" - " and not test_pca_reproducible"))))))) + (setenv "PYTHONPATH" + (string-append (getcwd) ":" + (assoc-ref inputs "python-anndata:source") ":" + (getenv "PYTHONPATH"))) + (invoke "pytest" "-vv" + "-k" + ;; Plot tests that fail. + (string-append "not test_dotplot_matrixplot_stacked_violin" + " and not test_violin_without_raw" + " and not test_correlation" + " and not test_scatterplots" + " and not test_scatter_embedding_add_outline_vmin_vmax_norm" + " and not test_paga" + " and not test_paga_compare" + + ;; These try to connect to the network + " and not test_plot_rank_genes_groups_gene_symbols" + " and not test_pca_chunked" + " and not test_pca_sparse" + " and not test_pca_reproducible")))))))) (propagated-inputs `(("python-anndata" ,python-anndata) ("python-h5py" ,python-h5py) -- cgit 1.4.1 From 333e1b3ce670d257c5aee4ed2b9303992aeeaa69 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Mon, 15 Nov 2021 08:18:58 +0000 Subject: gnu: Add cl-periodic-table. * gnu/packages/lisp-xyz.scm (cl-periodic-table, ecl-periodic-table, sbcl-periodic-table): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 778b48995d..22cba13a54 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18679,6 +18679,33 @@ terminals.") (define-public ecl-clinenoise (sbcl-package->ecl-package sbcl-clinenoise)) +(define-public sbcl-periodic-table + (package + (name "sbcl-periodic-table") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://common-lisp.net/project/chemboy/periodic-table-" + version ".tar.gz")) + (sha256 + (base32 "1ircvqm3q93ma4rxbxprb1i9rcax10ld6xmdzdhfnigr27sh5jvg")))) + (build-system asdf-build-system/sbcl) + (home-page "https://common-lisp.net/project/chemboy/") + (synopsis "Periodic table for Common Lisp") + (description + "This package defines a Common Lisp package, @code{:elements}, with an +@code{ELEMENT} structure and a number of functions to search the periodic +table.") + (license license:llgpl))) + +(define-public cl-periodic-table + (sbcl-package->cl-source-package sbcl-periodic-table)) + +(define-public ecl-periodic-table + (sbcl-package->ecl-package sbcl-periodic-table)) + (define-public sbcl-cl-pass (let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34") (revision "1")) -- cgit 1.4.1 From 8e18eb8cdf7a66cd447e7daaa14317f6a73ccbb0 Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Mon, 15 Nov 2021 08:20:20 +0000 Subject: gnu: Add cl-chemical-compounds. * gnu/packages/lisp-xyz.scm (cl-chemical-compounds, ecl-chemical-compounds, sbcl-chemical-compounds): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 22cba13a54..c53582d56a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18706,6 +18706,49 @@ table.") (define-public ecl-periodic-table (sbcl-package->ecl-package sbcl-periodic-table)) +(define-public sbcl-chemical-compounds + (package + (name "sbcl-chemical-compounds") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (string-append + "https://common-lisp.net/project/chemboy/chemical-compounds-" + version ".tar.gz")) + (sha256 + (base32 "12fd8a6ay5qlsq4givzgh9d55mbg4ci2vvmymig6pjl2ms64v0pf")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("periodic-table" ,sbcl-periodic-table))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-files + (lambda _ + ;; Fix incorrect version number. + (substitute* "chemical-compounds.asd" + ((":version \"1.0.1\"") + (string-append ":version \"" ,version "\""))) + ;; Remove incorrect declaration of string type. + (substitute* "parsing.lisp" + (("\\(declare \\(simple-base-string string\\)") + "(declare"))))))) + (home-page "https://common-lisp.net/project/chemboy/") + (synopsis "Chemical formula parser and pretty-printer for Common Lisp") + (description + "It can sometimes be useful to be able to parse chemical compounds in a +user-friendly syntax into easy-to-manipulate s-expressions. You also want to +be able to go in reverse. You could probably write your own parser — or you +could just install the chemical-compounds package.") + (license license:llgpl))) + +(define-public cl-chemical-compounds + (sbcl-package->cl-source-package sbcl-chemical-compounds)) + +(define-public ecl-chemical-compounds + (sbcl-package->ecl-package sbcl-chemical-compounds)) + (define-public sbcl-cl-pass (let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34") (revision "1")) -- cgit 1.4.1 From f50c9b45ad6bd22b06eba7b1ea5ba9c5edc3a2cc Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Mon, 15 Nov 2021 08:22:37 +0000 Subject: gnu: Add cl-chemboy. * gnu/packages/lisp-xyz.scm (cl-chemboy, ecl-chemboy, sbcl-chemboy): New variables. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index c53582d56a..151a5828db 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18749,6 +18749,54 @@ could just install the chemical-compounds package.") (define-public ecl-chemical-compounds (sbcl-package->ecl-package sbcl-chemical-compounds)) +(define-public sbcl-chemboy + (package + (name "sbcl-chemboy") + (version "0.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://common-lisp.net/project/chemboy/chemboy-" + version ".tar.gz")) + (sha256 + (base32 "0lr134l16mjcgdj3fm2yff4chlfbihn1sji7q80y7lnr176zgs7d")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("chemical-compounds" ,sbcl-chemical-compounds) + ("periodic-table" ,sbcl-periodic-table))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-files + (lambda _ + ;; Fix incorrect version number. + (substitute* "chemboy.asd" + ((":version \"0.2\"") + (string-append ":version \"" ,version "\""))) + ;; Remove incorrect declaration of string type. + (substitute* "query-parsing.lisp" + (("\\(declare \\(simple-base-string string\\)") + "(declare")) + ;; Fix incorrect function calls. + (substitute* "conversions.lisp" + (("\\(pprint-compound element s\\)") + "(pprint-compound element :stream s)") + (("\\(pprint-compound parsed-compound s\\)") + "(pprint-compound parsed-compound :stream s)"))))))) + (home-page "https://common-lisp.net/project/chemboy/") + (synopsis "Common Lisp program for doing basic chemistry calculations") + (description + "Chemboy is a Common Lisp program for doing basic chemistry calculations. +This package provides the text-based interface for Chemboy.") + (license license:llgpl))) + +(define-public cl-chemboy + (sbcl-package->cl-source-package sbcl-chemboy)) + +(define-public ecl-chemboy + (sbcl-package->ecl-package sbcl-chemboy)) + (define-public sbcl-cl-pass (let ((commit "e58e97c0c0588dc742c061208afb9bc31e4dbd34") (revision "1")) -- cgit 1.4.1 From 386db367c9ad8633252cea8727de9f09b3a552db Mon Sep 17 00:00:00 2001 From: Foo Chuan Wei Date: Mon, 15 Nov 2021 05:25:33 +0000 Subject: gnu: Add python-ta-lib. * gnu/packages/finance.scm (python-ta-lib): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/finance.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 82bce14fae..00e3b7a5af 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -98,6 +98,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-science) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -1755,6 +1756,32 @@ local, single-user UI, or as a multi-user UI for viewing, adding, and editing on the Web.") (license license:gpl3))) +(define-public python-ta-lib + (package + (name "python-ta-lib") + (version "0.4.21") + (source + (origin + (method url-fetch) + (uri (pypi-uri "TA-Lib" version)) + (sha256 + (base32 "17sf222mq2vx924f15qlz5czkkq5vsnsjy9ibwkrk8lalr6g5lkl")))) + (build-system python-build-system) + (inputs + `(("ta-lib" ,ta-lib))) + (propagated-inputs + `(("python-numpy" ,python-numpy))) + (native-inputs + `(("python-cython" ,python-cython) + ("python-nose" ,python-nose) + ("python-pandas" ,python-pandas))) + (home-page "https://github.com/mrjbq7/ta-lib") + (synopsis "Python wrapper for TA-Lib") + (description + "This is a Python wrapper for TA-Lib based on Cython. TA-Lib is a library +providing common functions for the technical analysis of financial market data.") + (license license:bsd-2))) + (define-public ta-lib (package (name "ta-lib") -- cgit 1.4.1 From 3288d6bf760a0033702684d08ae6516e869dd4cb Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sun, 14 Nov 2021 23:00:52 +0000 Subject: gnu: Add python-rtree. * gnu/packages/geo.scm (python-rtree): New variable. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/geo.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index adfec13b4f..d70e2f6cc3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -92,6 +92,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-science) @@ -1468,6 +1469,42 @@ persisted. ") (license license:expat))) +(define-public python-rtree + (package + (name "python-rtree") + (version "0.9.7") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Rtree" version)) + (sha256 + (base32 "0gna530vy6rh76035cqh7i2lx199cvxjrzjczg9rm6k96k5751xy")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'find-libspatialindex + (lambda* (#:key inputs #:allow-other-keys) + (setenv "SPATIALINDEX_C_LIBRARY" + (string-append (assoc-ref inputs "libspatialindex") + "/lib/libspatialindex.so")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) + (native-inputs + `(("python-numpy" ,python-numpy) + ("python-pytest" ,python-pytest) + ("python-wheel" ,python-wheel))) + (inputs + `(("libspatialindex" ,libspatialindex))) + (home-page "https://github.com/Toblerity/rtree") + (synopsis "R-Tree spatial index for Python GIS") + (description + "RTree is a Python package with bindings for @code{libspatialindex}.") + (license license:expat))) + (define-public java-jmapviewer (package (name "java-jmapviewer") -- cgit 1.4.1 From 2a32c99b387cec52d586007172f419630d79bc6b Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Nov 2021 11:28:26 +0100 Subject: gnu: clang-toolchain: Add libomp. * gnu/packages/llvm.scm (make-clang-toolchain)[inputs]: Add LIBOMP. --- gnu/packages/llvm.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a79998e5ac..617dfb6974 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -473,6 +473,7 @@ output), and Binutils.") (inputs `(("clang" ,clang) ("ld-wrapper" ,(car (assoc-ref (%final-inputs) "ld-wrapper"))) ("binutils" ,binutils) + ("libomp" ,libomp) ;used when linking with '-fopenmp' ("libc" ,glibc) ("libc-debug" ,glibc "debug") ("libc-static" ,glibc "static"))))) -- cgit 1.4.1 From 0ace339cbeb01552a496397a547c6c782ad8f2c8 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 27 Sep 2021 02:20:14 +0000 Subject: gnu: Add python-multipledispatch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-multipledispatch): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e9ec280083..bc1f6bc2b7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27381,6 +27381,25 @@ objects in the combined source, and how they define or use each other. The graph can be output for rendering by GraphViz or yEd.") (license license:gpl2))) +(define-public python-multipledispatch + (package + (name "python-multipledispatch") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "multipledispatch" version)) + (sha256 + (base32 + "1slblghfjg9fdi9zpd7gmrkvfbv20nrdgnrymcnbky8bzm8i9ax7")))) + (build-system python-build-system) + (propagated-inputs `(("python-six" ,python-six))) + (home-page "https://github.com/mrocklin/multipledispatch/") + (synopsis "Multiple dispatch for Python based on pattern matching") + (description "This library provides an efficient mechanism for overloading +function implementations based on the types of the arguments.") + (license license:bsd-3))) + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit 1.4.1 From 93730073219fa3da6558c90ac9b14064727f4916 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 27 Sep 2021 02:20:17 +0000 Subject: gnu: Add python-logical-unification. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-logical-unification): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index bc1f6bc2b7..ece7e7bf2f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27400,6 +27400,27 @@ graph can be output for rendering by GraphViz or yEd.") function implementations based on the types of the arguments.") (license license:bsd-3))) +(define-public python-logical-unification + (package + (name "python-logical-unification") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "logical-unification" version)) + (sha256 + (base32 + "0j57953hi7kg2rl0163vzjzsvzdyjimnklhx6idf5vaqqf1d3p1j")))) + (build-system python-build-system) + (propagated-inputs + `(("python-multipledispatch" ,python-multipledispatch) + ("python-toolz" ,python-toolz))) + (home-page "https://github.com/pythological/unification/") + (synopsis "Logical unification in Python for solving symbolic expressions") + (description "This library provides algorithms and data types for solving +symbolic expressions in pure Python using the technique of logical unification.") + (license license:bsd-3))) + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit 1.4.1 From 37e6f028804aa63648534e1f533913b5c93265f8 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 27 Sep 2021 02:20:19 +0000 Subject: gnu: Add python-cons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-cons): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ece7e7bf2f..3462704223 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27421,6 +27421,30 @@ function implementations based on the types of the arguments.") symbolic expressions in pure Python using the technique of logical unification.") (license license:bsd-3))) +(define-public python-cons + (package + (name "python-cons") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cons" version)) + (sha256 + (base32 + "0w9giq196wps7mbm47c4shdzs5yvwvqajqzkim2p92i51sm5qgvm")))) + (build-system python-build-system) + (native-inputs + `(("python-pytest" ,python-pytest-6) + ("python-toml" ,python-toml))) + (propagated-inputs + `(("python-logical-unification" ,python-logical-unification))) + (home-page "https://github.com/pythological/python-cons") + (synopsis "Cons cell data structures and related algorithms for Python") + (description + "This library implements algorithms and data structures for Lisp-style +cons cells in Python.") + (license license:lgpl3+))) + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit 1.4.1 From f661fa8e8f23bdaf854bcde6656f865f5d34ae84 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 27 Sep 2021 02:20:22 +0000 Subject: gnu: Add python-etuples. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-etuples): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3462704223..c6d0d97239 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27445,6 +27445,27 @@ symbolic expressions in pure Python using the technique of logical unification." cons cells in Python.") (license license:lgpl3+))) +(define-public python-etuples + (package + (name "python-etuples") + (version "0.3.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "etuples" version)) + (sha256 + (base32 + "0jhfyp177v37rl0i7wqfx7q6s5qkz027hl283d1x8d0vm3w0zqc8")))) + (build-system python-build-system) + (propagated-inputs + `(("python-cons" ,python-cons) + ("python-multipledispatch" ,python-multipledispatch))) + (home-page "https://github.com/pythological/etuples") + (synopsis "S-expressions in Python") + (description + "This library implements eval'able S-expression in Python using tuple-like objects.") + (license license:asl2.0))) + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit 1.4.1 From 1a501646f516fbab1c84b6b23c9c07a184cb1ae3 Mon Sep 17 00:00:00 2001 From: Ryan Prior Date: Mon, 27 Sep 2021 02:20:24 +0000 Subject: gnu: Add python-minikanren. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-minikanren): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 46 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c6d0d97239..f32c322c0a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27466,6 +27466,52 @@ cons cells in Python.") "This library implements eval'able S-expression in Python using tuple-like objects.") (license license:asl2.0))) +(define-public python-minikanren + (package + (name "python-minikanren") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pythological/kanren") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g7wfj5hxalwz7k1301nsjqhjpzsif1bj6wjm2x2kavlm2ypv9jc")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "pytest" "-v" "tests/" "kanren/")) + #t))))) + (native-inputs + `(("python-coveralls" ,python-coveralls) + ("python-pydocstyle" ,python-pydocstyle) + ("python-pytest" ,python-pytest) + ("python-pytest-cov" ,python-pytest-cov) + ("python-pylint" ,python-pylint) + ("python-black" ,python-black) + ("python-sympy" ,python-sympy) + ("python-versioneer" ,python-versioneer) + ("python-coverage" ,python-coverage) + ("python-pre-commit" ,python-pre-commit))) + (propagated-inputs + `(("python-toolz" ,python-toolz) + ("python-cons" ,python-cons) + ("python-multipledispatch" ,python-multipledispatch) + ("python-etuples" ,python-etuples) + ("python-logical-unification" ,python-logical-unification))) + (home-page "https://github.com/pythological/kanren") + (synopsis "Relational logic programming in pure Python") + (description + "The minikanren library provides an algorithmic core for computer algebra +systems in Python.") + (license license:bsd-3))) + + (define-public date2name (let ((commit "6c8f37277e8ec82aa50f90b8921422be30c4e798") (revision "1")) -- cgit 1.4.1 From 782e9975dc11e614fe38f9899806b968f9cd7d70 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Nov 2021 17:25:33 +0100 Subject: gnu: python-pytorch: Update to 1.10.0. * gnu/packages/machine-learning.scm (python-pytorch): Update to 1.10.0. * gnu/packages/patches/python-pytorch-system-libraries.patch: Adjust. --- gnu/packages/machine-learning.scm | 4 +- .../patches/python-pytorch-system-libraries.patch | 164 ++++++++++++--------- 2 files changed, 93 insertions(+), 75 deletions(-) diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 029422677a..701a121627 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2770,7 +2770,7 @@ TensorFlow.js, PyTorch, and MediaPipe.") (define-public python-pytorch (package (name "python-pytorch") - (version "1.9.0") + (version "1.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -2780,7 +2780,7 @@ TensorFlow.js, PyTorch, and MediaPipe.") (file-name (git-file-name name version)) (sha256 (base32 - "0cznsh68hwk5761gv7iijb4g6jgjpvs3bbixwpzzmkbkbn2q96c1")) + "1ihsjw48qqbikmhxxn17bcdvk2zsjabvkq61q6pvj7dzvrdpkb60")) (patches (search-patches "python-pytorch-system-libraries.patch" "python-pytorch-runpath.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/python-pytorch-system-libraries.patch b/gnu/packages/patches/python-pytorch-system-libraries.patch index 76c06520f0..ae872cfd84 100644 --- a/gnu/packages/patches/python-pytorch-system-libraries.patch +++ b/gnu/packages/patches/python-pytorch-system-libraries.patch @@ -1,37 +1,11 @@ Use our own googletest rather than the bundled one. Get NNPACK to use our own PeachPy rather than the bundled one. -diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake -index 5d57b9ca78..620cca4e60 100644 ---- a/cmake/Dependencies.cmake -+++ b/cmake/Dependencies.cmake -@@ -644,11 +644,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) - # this shouldn't be necessary anymore. - get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") -- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest) -- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp}) -- -- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include) -- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include) - - # We will not need to test benchmark lib itself. - set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") -@@ -1485,7 +1480,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) - endif() - set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) - message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") -- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) -+ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer) - endif() - include_directories(${FOXI_INCLUDE_DIRS}) - list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) - diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt -index 50ebb224ce..5953d9ddf7 100644 +index 26210cb5..18b6df27 100644 --- a/caffe2/CMakeLists.txt +++ b/caffe2/CMakeLists.txt -@@ -1632,7 +1632,7 @@ if(BUILD_TEST) +@@ -1723,7 +1723,7 @@ if(BUILD_TEST) if(NOT MSVC) add_executable(${test_name}_${CPU_CAPABILITY} "${test_src}" ../aten/src/ATen/native/quantized/affine_quantizer_base.cpp) # TODO: Get rid of c10 dependency (which is only needed for the implementation of AT_ERROR) @@ -40,16 +14,16 @@ index 50ebb224ce..5953d9ddf7 100644 if(USE_FBGEMM) target_link_libraries(${test_name}_${CPU_CAPABILITY} fbgemm) endif() -@@ -1655,7 +1655,7 @@ if(BUILD_TEST) +@@ -1746,7 +1746,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_CPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") - target_link_libraries(${test_name} torch_library gtest_main) + target_link_libraries(${test_name} torch_library gtest_main gtest) - target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE $) - target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) -@@ -1673,7 +1673,7 @@ if(BUILD_TEST) + if(USE_OPENMP) + # -fopenmp is a compile time flag and as result not guaranteed + # to link executable against OpenMP runtime library +@@ -1769,7 +1769,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_GPU_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) cuda_add_executable(${test_name} "${test_src}") @@ -58,7 +32,7 @@ index 50ebb224ce..5953d9ddf7 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) add_test(NAME ${test_name} COMMAND $) -@@ -1691,7 +1691,7 @@ if(BUILD_TEST) +@@ -1787,7 +1787,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_VULKAN_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -67,7 +41,7 @@ index 50ebb224ce..5953d9ddf7 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE}) add_test(NAME ${test_name} COMMAND $) -@@ -1709,7 +1709,7 @@ if(BUILD_TEST) +@@ -1805,7 +1805,7 @@ if(BUILD_TEST) foreach(test_src ${Caffe2_HIP_TEST_SRCS}) get_filename_component(test_name ${test_src} NAME_WE) add_executable(${test_name} "${test_src}") @@ -76,47 +50,33 @@ index 50ebb224ce..5953d9ddf7 100644 target_include_directories(${test_name} PRIVATE $) target_include_directories(${test_name} PRIVATE ${Caffe2_CPU_INCLUDE} ${Caffe2_HIP_INCLUDE}) target_compile_options(${test_name} PRIVATE ${HIP_CXX_FLAGS}) - -diff --git a/torch/lib/c10d/test/CMakeLists.txt b/torch/lib/c10d/test/CMakeLists.txt -index b74d4b65f7..fc7c207505 100644 ---- a/torch/lib/c10d/test/CMakeLists.txt -+++ b/torch/lib/c10d/test/CMakeLists.txt -@@ -16,24 +16,24 @@ function(c10d_add_test test_src) - add_test(NAME ${test_name} COMMAND $) - endfunction() - --c10d_add_test(FileStoreTest.cpp c10d gtest_main) --c10d_add_test(TCPStoreTest.cpp c10d gtest_main) -+c10d_add_test(FileStoreTest.cpp c10d gtest_main gtest) -+c10d_add_test(TCPStoreTest.cpp c10d gtest_main gtest) - if(NOT WIN32) -- c10d_add_test(HashStoreTest.cpp c10d gtest_main) -+ c10d_add_test(HashStoreTest.cpp c10d gtest_main gtest) - endif() +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index ca560288..c0696e53 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -684,11 +684,6 @@ if(BUILD_TEST OR BUILD_MOBILE_BENCHMARK OR BUILD_MOBILE_TEST) + # this shouldn't be necessary anymore. + get_property(INC_DIR_temp DIRECTORY PROPERTY INCLUDE_DIRECTORIES) + set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "") +- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest) +- set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES ${INC_DIR_temp}) +- +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googletest/include) +- include_directories(BEFORE SYSTEM ${CMAKE_CURRENT_LIST_DIR}/../third_party/googletest/googlemock/include) - if(USE_CUDA) - if(USE_C10D_GLOO) -- c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main) -- c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main) -+ c10d_add_test(ProcessGroupGlooTest.cpp c10d c10d_cuda_test gtest_main gtest) -+ c10d_add_test(ProcessGroupGlooAsyncTest.cpp c10d c10d_cuda_test gtest_main gtest) - endif() - if(USE_C10D_NCCL) -- c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main) -+ c10d_add_test(ProcessGroupNCCLTest.cpp c10d c10d_cuda_test gtest_main gtest) - c10d_add_test(ProcessGroupNCCLErrorsTest.cpp c10d c10d_cuda_test -- gtest_main) -+ gtest_main gtest) - endif() - else() - if(USE_C10D_GLOO) -- c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main) -+ c10d_add_test(ProcessGroupGlooTest.cpp c10d gtest_main gtest) + # We will not need to test benchmark lib itself. + set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Disable benchmark testing as we don't need it.") +@@ -1537,7 +1532,7 @@ if(CAFFE2_CMAKE_BUILDING_WITH_MAIN_REPO AND NOT INTERN_DISABLE_ONNX) + endif() + set_property(TARGET onnx_proto PROPERTY IMPORTED_LOCATION ${ONNX_PROTO_LIBRARY}) + message("-- Found onnx: ${ONNX_LIBRARY} ${ONNX_PROTO_LIBRARY}") +- list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx) ++ list(APPEND Caffe2_DEPENDENCY_LIBS onnx_proto onnx onnx_optimizer) endif() - endif() - + include_directories(${FOXI_INCLUDE_DIRS}) + list(APPEND Caffe2_DEPENDENCY_LIBS foxi_loader) diff --git a/cmake/External/nnpack.cmake b/cmake/External/nnpack.cmake -index a41343cbb5..6075bdd0a4 100644 +index a41343cb..6075bdd0 100644 --- a/cmake/External/nnpack.cmake +++ b/cmake/External/nnpack.cmake @@ -40,7 +40,7 @@ endif() @@ -137,3 +97,61 @@ index a41343cbb5..6075bdd0a4 100644 -set(USE_NNPACK OFF) +set(NNPACK_FOUND TRUE) +set(USE_NNPACK ON) +diff --git a/test/cpp/c10d/CMakeLists.txt b/test/cpp/c10d/CMakeLists.txt +index 2e48773a..a70506ce 100644 +--- a/test/cpp/c10d/CMakeLists.txt ++++ b/test/cpp/c10d/CMakeLists.txt +@@ -17,14 +17,14 @@ function(c10d_add_test test_src) + add_test(NAME ${test_name} COMMAND $) + endfunction() + +-c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main) +-c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main) ++c10d_add_test(FileStoreTest.cpp torch_cpu gtest_main gtest) ++c10d_add_test(TCPStoreTest.cpp torch_cpu gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS FileStoreTest DESTINATION bin) + install(TARGETS TCPStoreTest DESTINATION bin) + endif() + if(NOT WIN32) +- c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main) ++ c10d_add_test(HashStoreTest.cpp torch_cpu gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS HashStoreTest DESTINATION bin) + endif() +@@ -32,11 +32,11 @@ endif() + + if(USE_CUDA) + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main) ++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) + if(INSTALL_TEST) + install(TARGETS ProcessGroupGlooTest DESTINATION bin) + endif() +- c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main) ++ c10d_add_test(ProcessGroupGlooAsyncTest.cpp torch_cpu c10d_cuda_test gtest_main gtest) + endif() + if(USE_NCCL AND USE_C10D_NCCL) + # NCCL is a private dependency of libtorch, but the tests include some +@@ -57,7 +57,7 @@ if(USE_CUDA) + endif() + else() + if(USE_GLOO AND USE_C10D_GLOO) +- c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main) ++ c10d_add_test(ProcessGroupGlooTest.cpp torch_cpu gtest_main gtest) + endif() + endif() + +diff --git a/test/cpp/tensorexpr/CMakeLists.txt b/test/cpp/tensorexpr/CMakeLists.txt +index 213e99bd..ecaae840 100644 +--- a/test/cpp/tensorexpr/CMakeLists.txt ++++ b/test/cpp/tensorexpr/CMakeLists.txt +@@ -46,7 +46,7 @@ target_include_directories(tutorial_tensorexpr PRIVATE ${ATen_CPU_INCLUDE}) + # pthreadpool header. For some build environment we need add the dependency + # explicitly. + if(USE_PTHREADPOOL) +- target_link_libraries(test_tensorexpr PRIVATE pthreadpool_interface) ++ target_link_libraries(test_tensorexpr PRIVATE pthreadpool) + endif() + if(USE_CUDA) + target_link_libraries(test_tensorexpr PRIVATE -- cgit 1.4.1 From 21332f3b8cb8f407a89cdfe7d0460a9947675872 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 15 Nov 2021 17:23:08 +0100 Subject: gnu: hpcguix-web: Update to 0.2.0. * gnu/packages/web.scm (hpcguix-web): Update to 0.2.0. [arguments]: In 'wrap-program' phase, add guile-zlib to DEPS. [native-inputs]: Add GUILE. [inputs]: Add GUILE-ZLIB, GUILE-COMMONMARK, and GUILE-JSON. [propagated-inputs]: Remove. These were pointless. * gnu/services/web.scm ()[address, port]: New fields. * doc/guix.texi (Web Services): Document them. * gnu/tests/web.scm (%hpcguix-web-os): Add 'address'. --- doc/guix.texi | 6 ++++++ gnu/packages/web.scm | 17 +++++++++-------- gnu/services/web.scm | 10 +++++++++- gnu/tests/web.scm | 5 +++-- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 1b10e2d626..ea0c51d11a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -26552,6 +26552,12 @@ complete example}. @item @code{package} (default: @code{hpcguix-web}) The hpcguix-web package to use. + +@item @code{address} (default: @code{"127.0.0.1"}) +The IP address to listen to. + +@item @code{port} (default: @code{5000}) +The port number to listen to. @end table @end deftp diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a4c47f92d8..9cdbc31459 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7668,7 +7668,7 @@ compressed JSON header blocks. (define-public hpcguix-web (package (name "hpcguix-web") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -7677,7 +7677,7 @@ compressed JSON header blocks. (file-name (git-file-name name version)) (sha256 (base32 - "02lz5k1hhkwfz3nr3lsd69icsz6n0q82z047d3svi09qpxw6y0cj")))) + "1l856d1vr63ns1sp9fm6v97p71mx00769k6lwzqzppsb9clksnwp")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -7701,9 +7701,10 @@ compressed JSON header blocks. (git (assoc-ref inputs "guile-git")) (bs (assoc-ref inputs "guile-bytestructures")) (json (assoc-ref inputs "guile-json")) + (zlib (assoc-ref inputs "guile-zlib")) (guile-cm (assoc-ref inputs "guile-commonmark")) - (deps (list guile gcrypt git bs guile-cm guix json)) + (deps (list guile gcrypt git bs zlib guile-cm guix json)) (effective (read-line (open-pipe* OPEN_READ @@ -7728,15 +7729,15 @@ compressed JSON header blocks. `(("autoconf" ,autoconf) ("automake" ,automake) ("uglify-js" ,uglify-js) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("guile" ,@(assoc-ref (package-native-inputs guix) "guile")))) (inputs `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) ("guix" ,guix) - ("bash-minimal" ,bash-minimal))) ;for 'wrap-program' - (propagated-inputs - `(("guile" ,@(assoc-ref (package-native-inputs guix) "guile")) + ("guile-zlib" ,guile-zlib) ("guile-commonmark" ,guile-commonmark) - ("guile-json" ,guile-json-4))) + ("guile-json" ,guile-json-4) + ("bash-minimal" ,bash-minimal))) (home-page "https://github.com/UMCUGenetics/hpcguix-web") (synopsis "Web interface for cluster deployments of Guix") (description "Hpcguix-web provides a web interface to the list of packages diff --git a/gnu/services/web.scm b/gnu/services/web.scm index bb42eacf83..f1c3a2f75e 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -1110,7 +1110,9 @@ a webserver.") (package hpcguix-web-package (default hpcguix-web)) ; ;; Specs is gexp of hpcguix-web configuration file - (specs hpcguix-web-configuration-specs)) + (specs hpcguix-web-configuration-specs) + (address hpcguix-web-configuration-address (default "127.0.0.1")) + (port hpcguix-web-configuration-port (default 5000))) (define %hpcguix-web-accounts (list (user-group @@ -1163,6 +1165,12 @@ a webserver.") (requirement '(networking)) (start #~(make-forkexec-constructor (list #$(file-append hpcguix-web "/bin/hpcguix-web") + (string-append "--listen=" + #$(hpcguix-web-configuration-address + config)) + "-p" + #$(number->string + (hpcguix-web-configuration-port config)) (string-append "--config=" #$(scheme-file "hpcguix-web.scm" specs))) #:user "hpcguix-web" diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm index 518c9c1ff3..ccb2f53137 100644 --- a/gnu/tests/web.scm +++ b/gnu/tests/web.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017, 2020 Ludovic Courtès +;;; Copyright © 2017, 2020-2021 Ludovic Courtès ;;; Copyright © 2017, 2019 Christopher Baines ;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -438,7 +438,8 @@ HTTP-PORT, along with php-fpm." (service dhcp-client-service-type) (service hpcguix-web-service-type (hpcguix-web-configuration - (specs %hpcguix-web-specs))))) + (specs %hpcguix-web-specs) + (address "0.0.0.0"))))) (define %test-hpcguix-web (system-test -- cgit 1.4.1 From fb8e5f530ed52fda77066da2e7476dd1343c3b2c Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:17:21 +0100 Subject: gnu: borgmatic: Fix typo in description. * gnu/packages/backup.scm (borgmatic): Fix typo, "software" being a mass noun. --- gnu/packages/backup.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a5807d7aec..d30e546500 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1216,7 +1216,7 @@ compression parameters used by Gzip.") (home-page "https://torsion.org/borgmatic/") (synopsis "Simple, configuration-driven backup software") (description - "borgmatic is a simple, configuration-driven backup software for servers + "borgmatic is simple, configuration-driven backup software for servers and workstations. Protect your files with client-side encryption. Backup your databases too. Monitor it all with integrated third-party services. borgmatic is powered by borg.") -- cgit 1.4.1 From 563354db485d673af13987ce6fb55b43859e9677 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:29:47 +0100 Subject: gnu: emacs-marginalia: Update to 0.10. * gnu/packages/emacs-xyz.scm (emacs-marginalia): Update to 0.10. --- gnu/packages/emacs-xyz.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ec0376442b..7add407608 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8414,27 +8414,30 @@ and present results either as single emails or full trees.") (license license:gpl3+))) (define-public emacs-marginalia - (package - (name "emacs-marginalia") - (version "0.9") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/minad/marginalia") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "19l3fwh6phd17rssxk30v2380bs04x7w6cb3hjy4mx7vkc7w6ymv")))) - (build-system emacs-build-system) - (home-page "https://github.com/minad/marginalia") - (synopsis "Marginalia in the minibuffer completions") - (description - "This package provides Marginalia mode which adds marginalia to the + ;; Upstream did not tag latest release. The commit below matches version + ;; bump. + (let ((commit "2dbad0b166d6dc76862697bb25b95d34c1703acc")) + (package + (name "emacs-marginalia") + (version "0.10") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/minad/marginalia") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xb0w7fxbmwbq2mdhs7xrf8z6x6qmkq68p1fv08wb4ksvphyvz5h")))) + (build-system emacs-build-system) + (home-page "https://github.com/minad/marginalia") + (synopsis "Marginalia in the minibuffer completions") + (description + "This package provides Marginalia mode which adds marginalia to the minibuffer completions. Marginalia are marks or annotations placed at the margin of the page of a book or in this case helpful colorful annotations placed at the margin of the minibuffer for your completion candidates.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-smartparens (package -- cgit 1.4.1 From d24333c29c610fe9aad86d42ad02c3b0fcec085e Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:31:38 +0100 Subject: gnu: emacs-rustic: Update to 2.1. * gnu/packages/emacs-xyz.scm (emacs-rustic): Update to 2.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7add407608..e979add5ec 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21885,7 +21885,7 @@ source code.") (define-public emacs-rustic (package (name "emacs-rustic") - (version "2.0") + (version "2.1") (source (origin (method git-fetch) @@ -21894,7 +21894,7 @@ source code.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1x06lp0c656zm07n28lnkqp678y4f9zkd9n5m0lramndllrpk3x2")))) + (base32 "0nklqpd24s83ng34xrm4rp80sbylajikj6svz1c6j721pz9crxg9")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-dash" ,emacs-dash) -- cgit 1.4.1 From 9784e14817d891d289a1c24f4679be8fc6d3b215 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:33:51 +0100 Subject: gnu: emacs-exwm: Update to 0.26. * gnu/packages/emacs-xyz.scm (emacs-exwm): Update to 0.26. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e979add5ec..0a6d12e73b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -14142,7 +14142,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.25") + (version "0.26") (synopsis "Emacs X window manager") (source (origin @@ -14150,7 +14150,7 @@ It should enable you to implement low-level X11 applications.") (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "0imd4v9ccvpsskmfnycz5fgabsvdjp1msg5v8rc7x0v26r3kr4x7")))) + (base32 "03pg0r8a5vb1wc5grmjgzql74p47fniv47x39gdll5s3cq0haf6q")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-xelb" ,emacs-xelb))) -- cgit 1.4.1 From 2b56e477f36b0561e5d8861a902ec25c5e7bafb3 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:35:33 +0100 Subject: gnu: emacs-consult: Update to 0.13. * gnu/packages/emacs-xyz.scm (emacs-consult): Update to 0.13. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0a6d12e73b..34f27157ef 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8368,7 +8368,7 @@ style, or as multiple word prefixes.") (define-public emacs-consult (package (name "emacs-consult") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) @@ -8376,7 +8376,7 @@ style, or as multiple word prefixes.") (url "https://github.com/minad/consult") (commit version))) (sha256 - (base32 "1bzlqn7k5akhyl763q29853yh5s8rmk6y1ncmy3am940wfypxjic")) + (base32 "0ik5j4i4vb9hz629cjwnzhimskpv0fc8wca37z4ak0q1d898ayph")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (propagated-inputs -- cgit 1.4.1 From a1a7e2b95170dd2e998ef1855544fea162b11685 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Volatier Date: Sat, 16 Oct 2021 19:12:14 +0000 Subject: gnu: julia: Fix llvm-julia version. LLVM bundled in the binary julia distributed by upstream has its version with a "jl" suffix. The llvm-julia package does not have this suffix, which causes some packages (e. g. LLVM.jl) to fail to load. LLVM.jl does this in order to be sure that it is loading a LLVM as patched for julia and not LLVM from the distribution which will lack the correct patches on distribs other than GUIX. I guess there might be other packages that rely on this, so we should fix our llvm-julia package. * gnu/packages/julia.scm (llvm) [source]: Add missing upstream patch [arguments]: Add configure-flag to set a "jl" suffix to llvm version (julia)[arguments]: Symlink llvm to llvm-11jl.so Signed-off-by: Efraim Flashner --- gnu/packages/julia.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index fe31e545c9..411f2e2e10 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -131,6 +131,8 @@ "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") '("llvm-7.0-D44650" "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") + '("llvm7-symver-jlprefix" + "00ng32x6xhm9czczirn5r1q1mc1myad44fqhi061hwh1vb46dwgm") '("llvm-6.0-DISABLE_ABI_CHECKS" "014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") '("llvm9-D50010-VNCoercion-ni" @@ -211,7 +213,8 @@ ;; "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" ;; "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=WebAssembly" "-DLLVM_ENABLE_DUMP=ON" - "-DLLVM_LINK_LLVM_DYLIB=ON")))) + "-DLLVM_LINK_LLVM_DYLIB=ON" + "-DLLVM_VERSION_SUFFIX:STRING=jl")))) (inputs (append (package-inputs llvm-11) @@ -548,7 +551,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (basename file))))) (find-files (string-append (assoc-ref inputs pkgname) "/lib") pred))))) - (link "llvm" "libLLVM-11\\.so") + (link "llvm" "libLLVM-11jl\\.so") (link "utf8proc" "libutf8proc\\.so") #t))) (add-after 'install 'make-wrapper -- cgit 1.4.1 From 1a925d3af7ba1968f019101a18fc47de4a624408 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:41:26 +0100 Subject: gnu: pdfarranger: Update to 1.8.0. * gnu/packages/pdf.scm (pdfarranger): Update to 1.8.0. --- gnu/packages/pdf.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 16367bbfbb..36ff314193 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1261,7 +1261,7 @@ python-pypdf2 instead.") (define-public pdfarranger (package (name "pdfarranger") - (version "1.7.1") + (version "1.8.0") (source (origin (method git-fetch) @@ -1270,19 +1270,19 @@ python-pypdf2 instead.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1c2mafnz8pv32wzkc2wx4q8y2x7xffpn6ag12dj7ga5n772fb6s3")))) + (base32 "0xfxcwb24rp0kni2b4wdk6fvhqnhd6fh559ag6wdr4sspzkqwdjf")))) (build-system python-build-system) (arguments '(#:tests? #f ;no tests - #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-for-typelib - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (program (string-append out "/bin/pdfarranger"))) - (wrap-program program - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH")))) - #t)))))) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-for-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (program (string-append out "/bin/pdfarranger"))) + (wrap-program program + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH")))))))))) (native-inputs `(("intltool" ,intltool) ("python-distutils-extra" ,python-distutils-extra))) -- cgit 1.4.1 From ae1407657855814b7c24e3cba7994fd1bf0b13b6 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 15 Nov 2021 21:43:39 +0100 Subject: gnu: emacs-helm: Update to 3.8.1. * gnu/packages/emacs-xyz.scm (emacs-helm): Update to 3.8.1. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 34f27157ef..dddf0588d5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11069,7 +11069,7 @@ ack, ag, helm and pt.") (define-public emacs-helm (package (name "emacs-helm") - (version "3.8.0") + (version "3.8.1") (source (origin (method git-fetch) @@ -11078,7 +11078,7 @@ ack, ag, helm and pt.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv")))) + (base32 "1yfr2vz1kd21rvnxi8xzv67gs5r599fhjmw8qphsmpv5afscfl7k")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) -- cgit 1.4.1 From 847f2ae8590833141a1f81a7a3664a1177d99eac Mon Sep 17 00:00:00 2001 From: Lenny Händler Date: Mon, 15 Nov 2021 12:17:19 +0100 Subject: gnu: taskwarrior: Update to 2.6.1. * gnu/packages/task-management.scm (taskwarrior): Update to 2.6.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/task-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index 9968fc28da..79999ccfea 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -115,14 +115,14 @@ to finish tasks, not organize them.") (define-public taskwarrior (package (name "taskwarrior") - (version "2.5.3") + (version "2.6.1") (source (origin (method url-fetch) (uri (string-append "http://taskwarrior.org/download/task-" version ".tar.gz")) (sha256 (base32 - "0fwnxshhlha21hlgg5z1ad01w13zm1hlmncs274y5n8i15gdfhvj")))) + "0kq8n2y4srax48yp7shz7ngac0q75dnvdbr9z9f9ldyqncr61ah0")))) (build-system cmake-build-system) (inputs `(("gnutls" ,gnutls) -- cgit 1.4.1 From a69076e7921963e6931e0d5628ac99900f2bc796 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 15 Nov 2021 21:38:16 +0100 Subject: gnu: node: Add cpe-name. * gnu/packages/node.scm (node)[properties]: Add cpe-name. --- gnu/packages/node.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index d0ffe8a398..ca8db58580 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -273,8 +273,9 @@ perfect for data-intensive real-time applications that run across distributed devices.") (home-page "https://nodejs.org/") (license license:expat) - (properties '((max-silent-time . 7200) ;2h, needed on ARM - (timeout . 21600))))) ;6h + (properties '((max-silent-time . 7200) ;2h, needed on ARM + (timeout . 21600) ;6h + (cpe-name . "node.js"))))) ;; This should be the latest version of node that still builds without ;; depending on llhttp. -- cgit 1.4.1 From ecbf59abad4e146a80ea2849d12569886bce732e Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 15 Nov 2021 15:21:21 +0100 Subject: gnu: Add c-ares-for-node. * gnu/packages/adns.scm (c-ares-for-node): New variable. Co-authored-by: Marius Bakke --- gnu/packages/adns.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/adns.scm b/gnu/packages/adns.scm index b003511afa..51694d0982 100644 --- a/gnu/packages/adns.scm +++ b/gnu/packages/adns.scm @@ -118,3 +118,25 @@ multiple clients and programs with graphical user interfaces.") (arguments `(;; XXX: Tests require name resolution (the normal variant runs no tests). #:tests? #f))))) + +(define-public c-ares-for-node + (hidden-package + (package + (inherit c-ares) + (name "c-ares") + (version "1.18.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://c-ares.haxx.se/download/" name "-" version + ".tar.gz")) + (sha256 + (base32 + "1kxviskwsaa7dcgscvssxa8ps88pdq7kq4z93gxvz7sam2l54z8s")))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'filter-live-tests + (lambda _ + ;; Filter tests that require internet access. + (setenv "GTEST_FILTER" "-*.Live*:*.FamilyV4*"))))))))) -- cgit 1.4.1 From cae7c3f3890a15ec5ed977966e5850fb3a93f9cd Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 28 Oct 2021 14:10:23 +0200 Subject: gnu: llhttp-bootstrap: Update to 2.1.4 [security-fixes]. * gnu/packages/node.scm (llhttp-bootstrap): Update to 2.1.4. Includes fixes for CVE-2021-22959 and CVE-2021-22960. --- gnu/packages/node.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index ca8db58580..7a252e68be 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -576,7 +576,7 @@ parser definition into a C output.") (define-public llhttp-bootstrap (package (name "llhttp") - (version "2.1.3") + (version "2.1.4") (source (origin (method git-fetch) (uri (git-reference @@ -585,7 +585,7 @@ parser definition into a C output.") (file-name (git-file-name name version)) (sha256 (base32 - "0pqj7kyyzr1zs4h9yzn5rdxnxspm3wqgsv00765dd42fszlmrmk8")) + "115mwyds9655p76lhglxg2blc1ksgrix6zhigaxnc2q6syy3pa6x")) (patches (search-patches "llhttp-bootstrap-CVE-2020-8287.patch")) (modules '((guix build utils))) (snippet -- cgit 1.4.1 From f3cd70ff8c60ce51dfe8e37365caf1c787fcf62c Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Thu, 28 Oct 2021 14:11:45 +0200 Subject: gnu: node-lts: Update to 14.18.1 [security fixes]. * gnu/packages/node.scm (node-lts): Update to 14.18.1. [native-inputs]: Replace c-ares with c-ares-for-node. [inputs]: Replace c-ares with c-ares-for-node. Includes fixes for CVE-2021-22918, CVE-2021-22930, CVE-2021-22931, CVE-2021-22939, and CVE-2021-22940. --- gnu/packages/node.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 7a252e68be..dccf871d2c 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -647,14 +647,14 @@ source files.") (define-public node-lts (package (inherit node) - (version "14.16.0") + (version "14.18.1") (source (origin (method url-fetch) (uri (string-append "https://nodejs.org/dist/v" version "/node-v" version ".tar.xz")) (sha256 (base32 - "19nz2mhmn6ikahxqyna1dn25pb5v3z9vsz9zb2flb6zp2yk4hxjf")) + "1vc9rypkgr5i5y946jnyr9jjpydxvm74p1s17rg2zayzvlddg89z")) (modules '((guix build utils))) (snippet `(begin @@ -783,6 +783,9 @@ source files.") '("test/parallel/test-dns.js" "test/parallel/test-dns-lookupService-promises.js")) + ;; These tests require networking. + (delete-file "test/parallel/test-https-agent-unref-socket.js") + ;; FIXME: This test fails randomly: ;; https://github.com/nodejs/node/issues/31213 (delete-file "test/parallel/test-net-listen-after-destroying-stdin.js") @@ -821,7 +824,7 @@ source files.") "deps/llhttp/include/llhttp.h")))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. - ("c-ares" ,c-ares) + ("c-ares" ,c-ares-for-node) ("brotli" ,brotli) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) @@ -837,7 +840,7 @@ source files.") (inputs `(("bash" ,bash) ("coreutils" ,coreutils) - ("c-ares" ,c-ares) + ("c-ares" ,c-ares-for-node) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) ("llhttp" ,llhttp-bootstrap) -- cgit 1.4.1 From 63915955e2360ae93b1f490c8fdbbf02ef85a7d5 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Mon, 15 Nov 2021 22:04:49 +0100 Subject: gnu: libuv-for-node: Update to 1.42.0. * gnu/packages/libevent.scm (libuv-for-node): Update to 1.42.0. --- gnu/packages/libevent.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 0e683570d3..c55b0d89d1 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -140,14 +140,14 @@ resolution, asynchronous file system operations, and threading primitives.") (package (inherit libuv) (name "libuv") - (version "1.40.0") + (version "1.42.0") (source (origin (method url-fetch) (uri (string-append "https://dist.libuv.org/dist/v" version "/libuv-v" version ".tar.gz")) (sha256 (base32 - "1551k3ab27vbg9517l9b4iqbramwxdkwgpf53knas05cbfwhvab1")))) + "0wpb9pz3r8nksnrf4zbixj2kk9whr7abi45ydrwyv2js2ljrc4j3")))) (properties '((hidden? . #t))))) (define-public perl-anyevent -- cgit 1.4.1 From db5907138cbf9139e885fa4b3860d604aff0be9c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 15 Nov 2021 21:46:58 +0000 Subject: gnu: guix-build-coordinator: Update to 0-37.200ffe7. * gnu/packages/package-management.scm (guix-build-coordinator): Update to 0-37.200ffe7. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7dd84aff46..6f2b2fd61c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1181,8 +1181,8 @@ environments.") (license (list license:gpl3+ license:agpl3+ license:silofl1.1)))) (define-public guix-build-coordinator - (let ((commit "87508af9566d9f7dbacfd8478a353d612a811e38") - (revision "36")) + (let ((commit "200ffe795bd36052b64f7868c71a92925ee7beca") + (revision "37")) (package (name "guix-build-coordinator") (version (git-version "0" revision commit)) @@ -1193,7 +1193,7 @@ environments.") (commit commit))) (sha256 (base32 - "0lqjqnpgvwhzan2pbq0h1gavf0f17h3zw3qd0kd8xwjcmx4bna82")) + "09j67zdx5h6ic2yvzn1vvhmwlsj7kb06s765yjnvpnsb228ja96s")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From 58649b87470b3eaaa3c7f28656e125ae087b3186 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 14 Nov 2021 03:05:34 +0100 Subject: doc: Remove obsolete example module import. This follows up on commit a247f5c7537df7e0c09051ba22d5c95eb08f48b9. * doc/guix.texi (X Window): Remove unused (srfi srfi-1) from the modify-services example. --- doc/guix.texi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ea0c51d11a..debdb166e4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18651,8 +18651,7 @@ and tty8. @lisp (use-modules (gnu services) (gnu services desktop) - (gnu services xorg) - (srfi srfi-1)) ;for 'remove' + (gnu services xorg)) (operating-system ;; ... -- cgit 1.4.1 From 122396075f12b013b6bde56dafb895587b95bc9d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Nov 2021 01:04:54 +0100 Subject: services: cups: Update default timeouts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream raised these back in 2019 with CUPS 2.3.0. * gnu/services/cups.scm (): Raise default ‘multiple-operation-timeout’ and ‘timeout’ from 300 to 900 seconds. * doc/guix.texi (Printing Services): Adjust accordingly. --- doc/guix.texi | 4 ++-- gnu/services/cups.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index debdb166e4..8fdeb9328d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19540,7 +19540,7 @@ Defaults to @samp{1048576}. Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds. -Defaults to @samp{300}. +Defaults to @samp{900}. @end deftypevr @deftypevr {@code{cups-configuration} parameter} string page-log-format @@ -19751,7 +19751,7 @@ Defaults to @samp{#f}. @deftypevr {@code{cups-configuration} parameter} non-negative-integer timeout Specifies the HTTP request timeout, in seconds. -Defaults to @samp{300}. +Defaults to @samp{900}. @end deftypevr diff --git a/gnu/services/cups.scm b/gnu/services/cups.scm index 8bcb450ddf..1b8e19bed8 100644 --- a/gnu/services/cups.scm +++ b/gnu/services/cups.scm @@ -702,7 +702,7 @@ in seconds. Set to 0 to disable cancellation of \"stuck\" jobs.") "Specifies the maximum size of the log files before they are rotated, in bytes. The value 0 disables log rotation.") (multiple-operation-timeout - (non-negative-integer 300) + (non-negative-integer 900) "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds.") (page-log-format @@ -847,7 +847,7 @@ protocol version to TLS v1.1.") "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications.") (timeout - (non-negative-integer 300) + (non-negative-integer 900) "Specifies the HTTP request timeout, in seconds.") (web-interface? (boolean #f) -- cgit 1.4.1 From 95a0f249ab5a36c9826080642257d34a753771fd Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 17:28:02 +0100 Subject: gnu: sbcl-cmd: Update to 20211009. * gnu/packages/lisp-xyz.scm (sbcl-cmd): Update to 20211009. --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 151a5828db..55f8fdbf93 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14135,10 +14135,10 @@ standard library.") (sbcl-package->cl-source-package sbcl-shlex)) (define-public sbcl-cmd - (let ((commit "8ace7fb45f2ecf0eefae28583ee36c941d142179")) + (let ((commit "b0b79adf1214dbec082f3dd2274a72a0ff58efd7")) (package (name "sbcl-cmd") - (version (git-version "0.0.1" "4" commit)) + (version (git-version "0.0.1" "5" commit)) (source (origin (method git-fetch) @@ -14147,7 +14147,7 @@ standard library.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1da8sa0fsvsdivnx2s9m6jbb7yszrnkqqcxrn1sszp7k6iwnnkgi")))) + (base32 "0kk29vydmi1fyhpbwy3mrsg3bhvx0478r6r7jcsfkr3ci2h8w8a1")))) (build-system asdf-build-system/sbcl) (inputs `(("alexandria" ,sbcl-alexandria) -- cgit 1.4.1 From 66cfc6ad12ccd1edb8cba9730a756a8660cb31f4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 19:18:27 +0100 Subject: gnu: sbcl-cl-webkit: Update to 3.2.0. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Update to 3.2.0. --- gnu/packages/lisp-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 55f8fdbf93..920cbfbdcb 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -3230,7 +3230,7 @@ is a library for creating graphical user interfaces.") (define-public sbcl-cl-webkit (package (name "sbcl-cl-webkit") - (version "3.0.0") + (version "3.2.0") (source (origin (method git-fetch) @@ -3240,7 +3240,7 @@ is a library for creating graphical user interfaces.") (file-name (git-file-name "cl-webkit" version)) (sha256 (base32 - "015xry1cvbgspfzz35ifz2qscz946ljhj2z8rzjscy9v8fgnjsdk")))) + "1c0kas8k02167v5f1gjbhy3741b7ky91x7lkc5bh5429jmbpiapf")))) (build-system asdf-build-system/sbcl) (inputs `(("cffi" ,sbcl-cffi) -- cgit 1.4.1 From 342f3de7428759ae98b4a5f6e45bdadf49d0bd85 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 19:19:05 +0100 Subject: gnu: Add sbcl-cl-tld. * gnu/packages/lisp-xyz.scm (sbcl-cl-tld): New variable. --- gnu/packages/lisp-xyz.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 920cbfbdcb..2233a5cf9b 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18830,3 +18830,32 @@ This package provides the text-based interface for Chemboy.") (define-public ecl-cl-pass (sbcl-package->ecl-package sbcl-cl-pass)) + +(define-public sbcl-cl-tld + ;; No release. + (let ((commit "6529c70042cf6e82be39bc522e87ad87da08f1c9")) + (package + (name "sbcl-cl-tld") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/lu4nx/cl-tld") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1l6f0sak90pqjzkrjg0cyk7gv9h8gwpfvc0964z98dw2nj3hakqb")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/lu4nx/cl-tld/") + (synopsis "Extract the Top Level Domain from domains, in Common Lisp") + (description + "This library extracts the TLD (Top Level Domain) from domains. The +information is taken from @url{https://publicsuffix.org}.") + (license license:public-domain)))) + +(define-public cl-tld + (sbcl-package->cl-source-package sbcl-cl-tld)) + +(define-public ecl-cl-tld + (sbcl-package->ecl-package sbcl-cl-tld)) -- cgit 1.4.1 From 462bb6cca87c5ed8d9d0917de2ba191afaf8988b Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 19:20:03 +0100 Subject: gnu: Add cl-strftime. * gnu/packages/lisp-xyz.scm (cl-strftime, ecl-cl-strftime, sbcl-cl-strftime): New variables. --- gnu/packages/lisp-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 2233a5cf9b..bba167ff8a 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18859,3 +18859,39 @@ information is taken from @url{https://publicsuffix.org}.") (define-public ecl-cl-tld (sbcl-package->ecl-package sbcl-cl-tld)) + +(define-public sbcl-cl-strftime + ;; No release. + (let ((commit "21cb57f2595faa26d687893963f24ec41822b63c")) + (package + (name "sbcl-cl-strftime") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/cl-strftime/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00c8hq7vzgb89ab3q7mrp60x743kiqmsk1g51ynhxlqhph2bnslf")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("local-time" ,sbcl-local-time) + ("ppcre" ,sbcl-cl-ppcre) + ("serapeum" ,sbcl-serapeum))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("cffi" ,sbcl-cffi))) + (home-page "https://github.com/ruricolist/cl-strftime") + (synopsis "Common Lisp compiler for the strftime language") + (description + "CL-STRFTIME is a Common Lisp compiler for the strftime “language.”") + (license license:expat)))) + +(define-public cl-strftime + (sbcl-package->cl-source-package sbcl-cl-strftime)) + +(define-public ecl-cl-strftime + (sbcl-package->ecl-package sbcl-cl-strftime)) -- cgit 1.4.1 From 6366aaf7cc2aeab57c9ee0eb8757170f7d10c6a6 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 20:04:52 +0100 Subject: gnu: Add exit-hooks. * gnu/packages/lisp-xyz.scm (cl-exit-hooks, ecl-exit-hooks, sbcl-exit-hooks): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index bba167ff8a..721f6150c2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18895,3 +18895,37 @@ information is taken from @url{https://publicsuffix.org}.") (define-public ecl-cl-strftime (sbcl-package->ecl-package sbcl-cl-strftime)) + +(define-public sbcl-exit-hooks + ;; No release. + (let ((commit "78050f4f55c138fcea86a9d720928782021b6012")) + (package + (name "sbcl-exit-hooks") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ailisp/exit-hooks/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00rk0pr2cy3hy6giblh166b7yrg06d5lanipjcqv508gkfb0vi47")))) + (build-system asdf-build-system/sbcl) + (home-page "https://github.com/ailisp/exit-hooks") + (synopsis "Call functions automatically when Common Lisp exits") + (description + "@code{exit-hooks} provides a portable way to automatically call some +user-defined function when exiting Common Lisp (both @code{quit} from the REPL +or a kill in a shell). Like @code{atexit} in C and Python or Java’s +@code{Runtime.addShutdownHook()}. It currently supports SBCL, CCL, ECL, ABCL, +Allegro CL, clisp and CMUCL. Before exit-hooks, there was no portable way of +doing so and no staightforward way to use an exit hook on ABCL. It can be used +for tasks like parmenantly save something when exiting Lisp.") + (license license:bsd-2)))) + +(define-public cl-exit-hooks + (sbcl-package->cl-source-package sbcl-exit-hooks)) + +(define-public ecl-exit-hooks + (sbcl-package->ecl-package sbcl-exit-hooks)) -- cgit 1.4.1 From de28e45e0f40f527189f5eafc8d24b2e19ae7bb1 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 20:21:27 +0100 Subject: gnu: Add cl-base58. * gnu/packages/lisp-xyz.scm (cl-base58, ecl-cl-base58, sbcl-cl-base58): New variables. --- gnu/packages/lisp-xyz.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 721f6150c2..e4da2dcda8 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18929,3 +18929,47 @@ for tasks like parmenantly save something when exiting Lisp.") (define-public ecl-exit-hooks (sbcl-package->ecl-package sbcl-exit-hooks)) + +(define-public sbcl-cl-base58 + (let ((commit "f446835b4104896e0eed6a61d2ceb4ad22f589d8") + (revision "1")) + (package + (name "sbcl-cl-base58") + (version (git-version "0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/eudoxia0/cl-base58/") + (commit commit))) + (file-name (git-file-name "cl-base58" version)) + (sha256 + (base32 "01wiiyz1jzxx3zhxi2hpq5n8hv28g1mn0adk793vwjzh4v5bi5zz")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:asd-systems '("cl-base58-test" "cl-base58") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + (substitute* "cl-base58-test.asd" + (("cl-test-more") + "prove")) + #t))))) + (native-inputs + `(("prove" ,sbcl-prove))) + (home-page "https://github.com/eudoxia0/cl-base58") + (synopsis "Implementation of base58 for Common Lisp") + (description + "This library implements the @code{base58} encoding algorithm. It's +basically @code{base64} but with a smaller alphabet (58, as in the name) that +doesn't include similar looking characters, among other things. See +@url{https://github.com/bitcoin/bitcoin/blob/master/src/base58.h} for a full +reference.") + (license license:expat)))) + +(define-public cl-base58 + (sbcl-package->cl-source-package sbcl-cl-base58)) + +(define-public ecl-cl-base58 + (sbcl-package->ecl-package sbcl-cl-base58)) -- cgit 1.4.1 From d0c3efb78acd43b766f906648900e3d33d32a7e4 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Mon, 15 Nov 2021 20:33:31 +0100 Subject: gnu: Add bit-smasher. * gnu/packages/lisp-xyz.scm (cl-bit-smasher, ecl-bit-smasher, sbcl-bit-smasher): New variables. --- gnu/packages/lisp-xyz.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index e4da2dcda8..f2b2325d8f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -18973,3 +18973,40 @@ reference.") (define-public ecl-cl-base58 (sbcl-package->ecl-package sbcl-cl-base58)) + +(define-public sbcl-bit-smasher + ;; No release. + (let ((commit "c2dcb3b5ec0e485484be681fe17c4e81e58790d9")) + (package + (name "sbcl-bit-smasher") + (version (git-version "1.0.2" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thephoeron/bit-smasher/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wjmwn06fjpw0rlpaksf3ab727p8fnzj58z7jajl3m0wqd4ii74w")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cl-base64" ,sbcl-cl-base64) + ("cl-base58" ,sbcl-cl-base58))) + ;; Load order matters for tests, both for file reading and evaluation. + (arguments + `(#:asd-systems '("bit-smasher-test" "bit-smasher") + #:asd-files '("bit-smasher.asd" "bit-smasher-test.asd"))) + (home-page "https://github.com/thephoeron/bit-smasher/") + (synopsis "Handle bit vectors, bit vector arithmetic, and type conversions") + (description + "Utility library for handling bit vectors, bit vector arithmetic, and +universal integer type conversions between bit-vectors, byte-vectors, octals, +decimals, and hexadecimal notation.") + (license license:expat)))) + +(define-public cl-bit-smasher + (sbcl-package->cl-source-package sbcl-bit-smasher)) + +(define-public ecl-bit-smasher + (sbcl-package->ecl-package sbcl-bit-smasher)) -- cgit 1.4.1 From 3f6953b54e183a36d6e5a2c6d7a5a3d4a09b8a53 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 09:42:42 +0100 Subject: gnu: Add cxml-rng. * gnu/packages/lisp-xyz.scm (cl-cxml-rng, sbcl-cxml-rng): New variables. --- gnu/packages/lisp-xyz.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index f2b2325d8f..6afcb53f65 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5775,6 +5775,46 @@ offered, one SAX-like, the other similar to StAX.") (define-public ecl-cxml (sbcl-package->ecl-package sbcl-cxml)) +(define-public sbcl-cxml-rng + (let ((commit "bdcfeb92798694b2935a8321e641d8803e814b7b") + (revision "1")) + (package + (name "sbcl-cxml-rng") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://www.lichteblau.com/git/cxml-rng.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rld038hmvm0whaffkszd5ks7mg44z1vfbgddal434df8sgspzql")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cxml" ,sbcl-cxml) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("yacc" ,sbcl-cl-yacc) + ("parse-number" ,sbcl-parse-number) + ("cl-base64" ,sbcl-cl-base64))) + (synopsis "Relax NG for Closure XML (CXML)") + (description "An implementation of Relax NG schema validation written in +Common Lisp, including support for compact syntax, DTD Compatibility, and the +XSD type library.") + (home-page "http://www.lichteblau.com/cxml-rng/") + (license license:x11-style)))) + +(define-public cl-cxml-rng + (sbcl-package->cl-source-package sbcl-cxml-rng)) + +;; FIXME: Fails on ECL with +;; In function STRUCTURE-SET, the value of the first argument is +;; # +;; which is not of the expected type %TYPED-PATTERN. +;; (define-public ecl-cxml-rng +;; (sbcl-package->ecl-package sbcl-cxml-rng)) + (define-public sbcl-cl-reexport (let ((commit "312f3661bbe187b5f28536cd7ec2956e91366c3b") (revision "1")) -- cgit 1.4.1 From e37bb39971dead5d8f5eca5d1c452d45c00485ff Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 09:43:08 +0100 Subject: gnu: Add overlord. * gnu/packages/lisp-xyz.scm (cl-overlord, sbcl-overlord): New variables. --- gnu/packages/lisp-xyz.scm | 74 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 6afcb53f65..20f8abcfb1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19050,3 +19050,77 @@ decimals, and hexadecimal notation.") (define-public ecl-bit-smasher (sbcl-package->ecl-package sbcl-bit-smasher)) + +(define-public sbcl-overlord + ;; No release. + (let ((commit "a8f37b321a8aae1652fc50b78e74e57c771cc763")) + (package + (name "sbcl-overlord") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/overlord/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1maqm53yhlhaa3cka8xcc4sq24ifrr4y3y0s5dyyn682xsh14hb4")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("babel" ,sbcl-babel) + ("bit-smasher" ,sbcl-bit-smasher) + ("bordeaux-threads" ,sbcl-bordeaux-threads) + ("cl-strftime" ,sbcl-cl-strftime) + ("cmd" ,sbcl-cmd) + ("drakma" ,sbcl-drakma) + ("exit-hooks" ,sbcl-exit-hooks) + ("fset" ,sbcl-fset) + ("local-time" ,sbcl-local-time) + ("lparallel" ,sbcl-lparallel) + ("md5" ,sbcl-md5) + ("murmurhash" ,sbcl-cl-murmurhash) + ("named-readtables" ,sbcl-named-readtables) + ("ppcre" ,sbcl-cl-ppcre) + ("serapeum" ,sbcl-serapeum) + ("trivia" ,sbcl-trivia) + ("trivial-file-size" ,sbcl-trivial-file-size))) + (propagated-inputs + `(("quickproject" ,sbcl-quickproject))) + (native-inputs + `(("fiveam" ,sbcl-fiveam))) + (arguments + `(#:asd-files '("overlord.asd") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'include-overlord/net + (lambda _ + (substitute* "all.lisp" + (("\\(:import-from :overlord/kernel :nproc\\)") + (string-append + "(:import-from :overlord/kernel :nproc)" + "\n" + "(:import-from :overlord/net)"))) + #t))))) + (home-page "https://github.com/ruricolist/overlord") + (synopsis "Build system in Common Lisp") + (description + "Overlord is a build system in Common Lisp. It is a real build system, +with all the modern features: rules with multiple outputs, parallel builds, +immunity to clock issues, and dynamic dependencies. + +But Overlord is more than another build system. Overlord is a uniform +approach to dependencies inside or outside of a Lisp image. Overlord is to +Make what Lisp macros are to C macros. + +Overlord is designed to be used from the Lisp REPL. A command line interface +is available in a separate repository. See +@url{https://github.com/ruricolist/overlord-cli}.") + (license license:expat)))) + +(define-public cl-overlord + (sbcl-package->cl-source-package sbcl-overlord)) + +;; FIXME: Broken on ECL? https://github.com/ruricolist/overlord/issues/25 +;; (define-public ecl-overlord +;; (sbcl-package->ecl-package sbcl-overlord)) -- cgit 1.4.1 From 3ddfe4c1a0b9d7bc3f65c2345360d533e81d0c2a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 09:44:00 +0100 Subject: gnu: Add xpath. * gnu/packages/lisp-xyz.scm (cl-xpath, sbcl-xpath): New variables. --- gnu/packages/lisp-xyz.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 20f8abcfb1..528579afe2 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19124,3 +19124,37 @@ is available in a separate repository. See ;; FIXME: Broken on ECL? https://github.com/ruricolist/overlord/issues/25 ;; (define-public ecl-overlord ;; (sbcl-package->ecl-package sbcl-overlord)) + +(define-public sbcl-xpath + ;; No release. + (let ((commit "d364da693a534e23bd5eb3a85420e9c25e6c75b3")) + (package + (name "sbcl-xpath") + (version (git-version "0.1" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/xpath/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fb03fgnzrvh22lw1jdg04pmyja5fib5n42rzwp5mhr829yvxkvp")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("cxml" ,sbcl-cxml) + ("parse-number" ,sbcl-parse-number) + ("cl-ppcre" ,sbcl-cl-ppcre) + ("yacc" ,sbcl-cl-yacc))) + (home-page "https://github.com/sharplispers/xpath/") + (synopsis "Implementation of the XML Path Language (XPath) Version 1.0") + (description + "This library is an implementation of the XML Path Language (XPath) +Version 1.0.") + (license license:bsd-2)))) + +;; According to +;; https://github.com/sharplispers/xpath/blob/master/doc/index.xml ECL is not +;; supported. +(define-public cl-xpath + (sbcl-package->cl-source-package sbcl-xpath)) -- cgit 1.4.1 From f1dd3279962b430c21fd145f059dea938030ff74 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 10:51:39 +0100 Subject: gnu: Add fxml. * gnu/packages/lisp-xyz.scm (cl-fxml, sbcl-fxml): New variables. --- gnu/packages/lisp-xyz.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 528579afe2..435975b127 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19158,3 +19158,53 @@ Version 1.0.") ;; supported. (define-public cl-xpath (sbcl-package->cl-source-package sbcl-xpath)) + +(define-public sbcl-fxml + ;; No release. + (let ((commit "a0e73bb48ef03adea94a55986cc27f522074c8e1")) + (package + (name "sbcl-fxml") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/fxml/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vxdb1cjjqi986f72bggnw1s4yzv12g4li7vn4y49b6lphshr8lm")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("babel" ,sbcl-babel) + ("named-readtables" ,sbcl-named-readtables) + ("serapeum" ,sbcl-serapeum) + ("quri" ,sbcl-quri) + ("flexi-streams" ,sbcl-flexi-streams) + ("split-sequence" ,sbcl-split-sequence) + ("alexandria" ,sbcl-alexandria) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("cxml" ,sbcl-cxml) + ("cxml-rng" ,sbcl-cxml-rng) + ("xpath" ,sbcl-xpath))) + (home-page "https://github.com/ruricolist/fxml") + (synopsis "XML parser and serializer in Common Lisp") + (description + "FXML is a secure-by-default, error-recovering XML parser and serializer. +It is a fork of CXML. + +You should use FXML instead of CXML if: +@itemize +@item You are parsing potentially ill-formed XML. +@item You are parsing potentially malicious XML. +@item You need to use Klacks with namespaces. +@end itemize + +FXML’s API is very close to CXML's, and for the most part you can refer to the +CXML documentation for usage.") + (license license:llgpl)))) + +(define-public cl-fxml + (sbcl-package->cl-source-package sbcl-fxml)) -- cgit 1.4.1 From 2d55463053b411a4f034ca1ef65be615907b6012 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 10:55:01 +0100 Subject: gnu: Add vernacular. * gnu/packages/lisp-xyz.scm (cl-vernacular, sbcl-vernacular): New variables. --- gnu/packages/lisp-xyz.scm | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 435975b127..4b17c173c9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19208,3 +19208,59 @@ CXML documentation for usage.") (define-public cl-fxml (sbcl-package->cl-source-package sbcl-fxml)) + +(define-public sbcl-vernacular + ;; No release. + (let ((commit "79be179e9ada423b3ec41d2a1ea6f6e0266ed21f")) + (package + (name "sbcl-vernacular") + (version (git-version "0.8.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/vernacular/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19vzn28hw4is4sgmvzqin18ds89s0pai21vcm0ky10vmfv6wg745")) + (modules '((guix build utils))) + (snippet + '(begin + ;; The demo depends on cl-js, which we don't have at this point. + (delete-file-recursively "demo") + #t)))) + (build-system asdf-build-system/sbcl) + (inputs + `(("overlord" ,sbcl-overlord) + ("trivial-macroexpand-all" ,sbcl-trivial-macroexpand-all) + ("local-time" ,sbcl-local-time) + ("parse-js" ,sbcl-parse-js) + ("trivia" ,sbcl-trivia) + ("trivial-garbage" ,sbcl-trivial-garbage) + ("named-readtables" ,sbcl-named-readtables) + ("alexandria" ,sbcl-alexandria) + ("serapeum" ,sbcl-serapeum) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (arguments + ;; Circular dependency: Tests depend on core-lisp + ;; (http://github.com/ruricolist/core-lisp) which depends on + ;; Vernacular. + '(#:tests? #f)) + (home-page "https://github.com/ruricolist/vernacular") + (synopsis "Module system for languages that compile to Common Lisp") + (description + "Vernacular is a build and module system for languages that compile to +Common Lisp. It allows languages to compile to Lisp while remaining part of +the Common Lisp ecosystem. Vernacular languages interoperate with Common Lisp +and one another. + +Vernacular handles locating files, compiling files into FASLs, tracking +dependencies and rebuilding, and export and import between your new language, +Lisp, and any other language Vernacular supports. + +Vernacular builds on Overlord and is inspired by Racket.") + (license license:expat)))) + +(define-public cl-vernacular + (sbcl-package->cl-source-package sbcl-vernacular)) -- cgit 1.4.1 From e31d48d8db09e723727eeadbeea22d677f5d1d52 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Tue, 16 Nov 2021 11:53:02 +0100 Subject: gnu: Add cl-https-everywhere. * gnu/packages/lisp-xyz.scm (cl-https-everywhere, sbcl-cl-https-everywhere): New variables. --- gnu/packages/lisp-xyz.scm | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 4b17c173c9..da1a08edd7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19264,3 +19264,85 @@ Vernacular builds on Overlord and is inspired by Racket.") (define-public cl-vernacular (sbcl-package->cl-source-package sbcl-vernacular)) + +(define-public sbcl-cl-https-everywhere + ;; No release. + (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8")) + (package + (name "sbcl-cl-https-everywhere") + (version (git-version "0.0.0" "1" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ruricolist/cl-https-everywhere/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wcvx1icwym1ncd6wl1wxzkyyndrm796caalbklvjd4a2cbl3xxi")))) + (build-system asdf-build-system/sbcl) + (inputs + `(("alexandria" ,sbcl-alexandria) + ("global-vars" ,sbcl-global-vars) + ("parenscript" ,sbcl-parenscript) + ("cl-markdown" ,sbcl-cl-markdown) + ("cl-tld" ,sbcl-cl-tld) + ("fxml" ,sbcl-fxml) + ("overlord" ,sbcl-overlord) + ("ppcre" ,sbcl-cl-ppcre) + ("serapeum" ,sbcl-serapeum) + ("trivial-gray-streams" ,sbcl-trivial-gray-streams) + ("vernacular" ,sbcl-vernacular))) + (native-inputs + `(("fiveam" ,sbcl-fiveam) + ("https-everywhere" + ,(let ((commit "78d3425aef62d79da2c63c0fcd89ae9837af9a09")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/EFForg/https-everywhere") + (commit commit))) + (file-name (git-file-name "https-everywhere" + (git-version "2021.7.13" "1" commit))) + (sha256 + (base32 + "1bx5895lbsddx449mcvvss4dlvi07xsh4d2qnajsdvais6fpckh8"))))))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'link-https-everywhere-repo + (lambda* (#:key inputs #:allow-other-keys) + (let ((https-everywhere (assoc-ref inputs "https-everywhere"))) + (symlink https-everywhere "https-everywhere")))) + (add-after 'unpack 'fix-overlord-build + ;; Upstream bugs? See + ;; https://github.com/ruricolist/cl-https-everywhere/issues/1. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (rulesets.xml (string-append out "/share/common-lisp/" (%lisp-type) + "/cl-https-everywhere/rulesets.xml"))) + (substitute* "build.lisp" + (("\\(depends-on https-everywhere-version\\)") "") + ;; Don't rebuild the rulesets just because the timestamp is epoch. + (("\\(vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"\\)") + (format #f "(if (uiop:file-exists-p ~s) + (compile-rulesets ~s) + (vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"))" + rulesets.xml + rulesets.xml)) + (("\\(uiop:parse-unix-namestring \"https-everywhere/src/chrome/content/rules/\\*\\.xml\")") + "\"https-everywhere/src/chrome/content/rules/*.xml\"") + (("\\(out temp :external-format :utf-8\\)") + "(out temp :external-format :utf-8 :if-exists :supersede)"))) + #t))))) + (home-page "https://github.com/ruricolist/cl-https-everywhere/") + (synopsis "Use HTTPS Everywhere rules from Lisp") + (description + "CL-HTTPS-EVERYWHERE parses HTTPS Everywhere rulesets and makes them +available for use in Lisp programs.") + (license (list license:expat + ;; For the ruleset + license:gpl2+))))) + +(define-public cl-https-everywhere + (sbcl-package->cl-source-package sbcl-cl-https-everywhere)) -- cgit 1.4.1 From 3af351a7de41b8d50f27f3623c46392f571b9a4e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Volatier Date: Fri, 12 Nov 2021 14:23:52 +0000 Subject: build-system/julia: Enable Julia Pkg to find installed packages. Julia's built-in package manager (Pkg) looks for packages in JULIA_DEPOT_PATH/packages/PACKAGENAME/XXXX, where XXXX is a string encoding package UUID and SHA1 of files. The link-depot phase creates a link at the correct location to allow Pkg to find packages that were already installed by Guix. * guix/build/julia-build-system.scm (link-depot): New phase. (%package-path): Modified package path from packages/ to loadpath/. (project.toml->uuid): New procedure, retrive package uuid from TOML file. (precompile, check): Adjust to the change in paths. (%standard-phases): Add link-depot phase. (julia-build): Add julia-package-uuid keyword. * guix/build-system/julia.scm (julia-build): Also use the julia-package-uuid keyword. * gnu/packages/julia-jll.scm (julia-bzip2-jll, julia-cairo-jll, julia-compilersupportlibraries-jll, julia-expat-jll, julia-ffmpeg-jll, julia-fontconfig-jll, julia-freetype2-jll, julia-fribidi-jll, julia-gettext-jll, julia-glib-jll, julia-gr-jll, julia-gumbo-jll, julia-imagemagick-jll, julia-jllwrappers-jll, julia-jpegturbo-jll, julia-lame-jll, julia-libass-jll, julia-libfdk-aac-jll, julia-libffi-jll, julia-libgcrypt-jll, julia-libglvnd-jll, julia-libgpg-error-jll, juli-libiconv-jll, julia-libmount-jll, julia-libpng-jll, julia-libsass-jll, julia-libtiff-jll, julia-libuuid-jll, julia-libvorbis-jll, julia-lzo-jll, julia-mbedtls-jll, julia-ogg-jll, julia-openspecfun-jll, julia-openssl-jll, julia-opus-jll, julia-pcre-jll, julia-pixman-jll, julia-qt5base-jll, julia-wayland-jll, julia-wayland-protocols-jll, julia-x264-jll, julia-x265-jll, julia-xkbcommon-jll, julia-xml2-jll, julia-xorg-libpthread-stubs-jll, julia-xorg-libx11-jll, julia-xorg-libxau-jll, julia-xorg-libxcb-jll, julia-xorg-libxcursor-jll, julia-xorg-libxdmcp-jll, julia-xorg-libxext-jll, julia-xorg-libxfixes-jll, julia-xorg-libxi-jll, julia-xorg-libxinerama-jll, julia-xorg-libxkbfile-jll, julia-xorg-libxrandr-jll, julia-xorg-libxrender-jll, julia-xorg-xcb-util-jll, julia-xorg-xcb-util-keysyms-jll, julia-xorg-xcb-util-renderutil-jll, julia-xorg-xcb-util-wm-jll, julia-xorg-xkbcomp-jll, julia-xorg-xkeyboard-config-jll, julia-xorg-xtrans-jll, julia-xslt-jll, julia-zlib-jll, julia-zstd-jll) [argument]: Adjust the order of the phases to the change in the julia-build-system. * gnu/packages/julia-xyz.scm (julia-bufferedstreams, julia-calculus, julia-dataframes, julia-datavalues, julia-distances, julia-documenter, julia-dualnumbers, julia-ellipsisnotation, julia-expronicon, julia-fileio, julia-fixedpointnumbers, julia-functionwrappers, julia-fuzzycompletions, julia-genericlinearalgebra, julia-genericschur, julia-geometrybasics, julia-imagemagick, julia-infinity, julia-matrixfactorizations, julia-media, julia-missings, julia-nnlib, julia-optimtestproblems, julia-orderedcollections, julia-prettytables, julia-pycall, julia-quadmath, julia-safetests, julia-stackviews) [arguments]: Correct paths to reflect change of %package-path modify order of phases as link-depot needs to run on an unmodified src directory add package-name-uuid keyword argument to packages without Project.toml file. * gnu/packages/julia.scm (julia)[native-search-paths]: Correct paths to reflect change of %package-path modify order of phases as link-depot needs to run on an unmodified src directory. Signed-off-by: Efraim Flashner --- gnu/packages/julia-jll.scm | 138 +++++++++++++++++++------------------- gnu/packages/julia-xyz.scm | 69 ++++++++++--------- gnu/packages/julia.scm | 2 +- guix/build-system/julia.scm | 5 +- guix/build/julia-build-system.scm | 48 +++++++++++-- 5 files changed, 154 insertions(+), 108 deletions(-) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index 51643819ae..d8cf5b9eaf 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -77,7 +77,7 @@ '(#:tests? #f ; No runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -117,7 +117,7 @@ compression program.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -163,7 +163,7 @@ compression program.") `(#:tests? #f ; no runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -205,7 +205,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -243,7 +243,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -292,7 +292,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -335,7 +335,7 @@ build tree Yggdrasil.") '(#:tests? #f ; No runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -377,7 +377,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -413,7 +413,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -454,7 +454,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -497,7 +497,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -541,7 +541,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -590,7 +590,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (let ((gumbo (string-append (assoc-ref inputs "gumbo-parser")))) (for-each @@ -630,7 +630,7 @@ rendering library.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -672,7 +672,7 @@ rendering library.") '(#:tests? #f #:phases (modify-phases %standard-phases - (add-after 'unpack 'custom-override-path + (add-after 'link-depot 'custom-override-path (lambda* (#:key inputs #:allow-other-keys) ;; Make @generate_wrapper_header take an optional argument that ;; guix packagers can pass to override the default "override" @@ -718,7 +718,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -754,7 +754,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -790,7 +790,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -830,7 +830,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -866,7 +866,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -903,7 +903,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -942,7 +942,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -980,7 +980,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1018,7 +1018,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1056,7 +1056,7 @@ used in autogenerated packages via @code{BinaryBuilder.jl}.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1095,7 +1095,7 @@ from util-linux.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1133,7 +1133,7 @@ from util-linux.") `(#:tests? #f ; no runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1175,7 +1175,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1214,7 +1214,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1252,7 +1252,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1290,7 +1290,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1328,7 +1328,7 @@ build tree Yggdrasil.") '(#:tests? #f ; No runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1366,7 +1366,7 @@ wrappers.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1403,7 +1403,7 @@ wrappers.") `(#:tests? #f ; no runtests.jl #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1446,7 +1446,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1482,7 +1482,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1518,7 +1518,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1556,7 +1556,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1594,7 +1594,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1645,7 +1645,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1684,7 +1684,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1721,7 +1721,7 @@ build tree Yggdrasil.") `(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (let ((libx264 (assoc-ref inputs "libx264"))) (map @@ -1762,7 +1762,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1798,7 +1798,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1838,7 +1838,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1878,7 +1878,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1915,7 +1915,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1953,7 +1953,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -1989,7 +1989,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2029,7 +2029,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2067,7 +2067,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2103,7 +2103,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2140,7 +2140,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2177,7 +2177,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2215,7 +2215,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2252,7 +2252,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2289,7 +2289,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2327,7 +2327,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2364,7 +2364,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2401,7 +2401,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2438,7 +2438,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2475,7 +2475,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2512,7 +2512,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2549,7 +2549,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2586,7 +2586,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2623,7 +2623,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2659,7 +2659,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2702,7 +2702,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) @@ -2740,7 +2740,7 @@ build tree Yggdrasil.") '(#:tests? #f ; no runtests #:phases (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path + (add-after 'link-depot 'override-binary-path (lambda* (#:key inputs #:allow-other-keys) (map (lambda (wrapper) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 93fadf318c..73768317b8 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -410,7 +410,8 @@ structures.") ;; https://travis-ci.org/BioJulia/BufferedStreams.jl/jobs/491050182 (arguments '(#:tests? #f - #:julia-package-name "BufferedStreams")) + #:julia-package-name "BufferedStreams" + #:julia-package-uuid "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d")) (propagated-inputs `(("julia-compat" ,julia-compat))) (home-page "https://github.com/BioJulia/BufferedStreams.jl") (synopsis "Fast composable IO streams") @@ -778,12 +779,12 @@ way.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-tests + (add-after 'link-depot 'fix-tests (lambda _ (substitute* "test/runtests.jl" (("option.toml") "test/option.toml")) #t)) - (add-after 'unpack 'dont-use-exproniconlite + (add-after 'link-depot 'dont-use-exproniconlite (lambda _ (substitute* '("Project.toml" "src/Configurations.jl" @@ -919,7 +920,7 @@ dependency on it.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-failing-test + (add-after 'link-depot 'skip-failing-test (lambda _ ;; Tests with non-standard colors. (substitute* "test/show.jl" @@ -1022,7 +1023,7 @@ without having to take direct dependencies.") `(#:tests? #f ; Tests need upgrading with newer Julia version. #:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-known-failing-tests + (add-after 'link-depot 'skip-known-failing-tests (lambda _ ;; See upstream report: ;; https://github.com/queryverse/DataValues.jl/issues/83 @@ -1100,7 +1101,7 @@ dictionaries in Julia, for improved productivity and performance.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-flakey-tests + (add-after 'link-depot 'skip-flakey-tests (lambda _ ;; Some combination of these tests fail nondeterministically ;; each of the times this package is built. @@ -1166,14 +1167,14 @@ valuable enough at this time.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-source + (add-after 'link-depot 'patch-source (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/Deps.jl" (("pip install") (string-append (assoc-ref inputs "python") "/bin/pip install"))) #t)) - (add-after 'unpack 'remove-javascript-downloads + (add-after 'link-depot 'remove-javascript-downloads (lambda _ (substitute* "src/Writers/HTMLWriter.jl" (("cdnjs.cloudflare.com") "example.com")) @@ -1352,7 +1353,7 @@ stressing the robustness of differentiation tools.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-test-suite + (add-after 'link-depot 'adjust-test-suite (lambda _ (substitute* "test/runtests.jl" ;; Seems to not play nicely with SpecialFunctions @@ -1386,7 +1387,7 @@ combinations of dual numbers with predefined Julia numeric types.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-test-suite + (add-after 'link-depot 'adjust-test-suite (lambda _ (substitute* "test/runtests.jl" ;; Seems to not play nicely with Julia-1.6. @@ -1438,7 +1439,7 @@ before (or after)\".") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-network-tests + (add-after 'link-depot 'skip-network-tests (lambda _ (substitute* "test/runtests.jl" ;; This test tries to access the Julia package registry. @@ -1517,7 +1518,7 @@ need the ffmpeg binaries + executables, and don't want the overhead of `(#:phases (modify-phases %standard-phases (delete 'reset-gzip-timestamps) - (add-after 'unpack 'skip-network-tests + (add-after 'link-depot 'skip-network-tests (lambda _ ;; These tests try to download audio/video files. (substitute* "test/query.jl" @@ -1677,7 +1678,7 @@ using finite difference.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test + (add-after 'link-depot 'disable-failing-test (lambda* (#:key outputs #:allow-other-keys) (substitute* "test/fixed.jl" ;; A deprecation warning is not thrown @@ -1764,7 +1765,7 @@ differentiation (AD).") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-tests + (add-after 'link-depot 'adjust-tests (lambda _ (substitute* "test/runtests.jl" (("testset \\\"Abstract.*" all) @@ -1817,7 +1818,7 @@ update step.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-failing-test + (add-after 'link-depot 'skip-failing-test (lambda _ (substitute* "test/runtests.jl" ((".*RPLE.*") ""))))))) @@ -1844,7 +1845,7 @@ update step.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-test-suite + (add-after 'link-depot 'adjust-test-suite (lambda _ (substitute* "test/runtests.jl" ((".*lapack.*") ""))))))) @@ -1875,7 +1876,7 @@ algebra routines written in Julia (except for optimized BLAS).") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'adjust-test-suite + (add-after 'link-depot 'adjust-test-suite (lambda _ (substitute* "test/complex.jl" ;; expected Array{Int32,1}, got a value of type Array{Int64,1} @@ -1912,13 +1913,13 @@ matrices the Schur form is often more useful.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-earcut + (add-after 'link-depot 'remove-earcut (lambda _ (substitute* '("Project.toml" "src/GeometryBasics.jl") ((".*EarCut.*") "")) #t)) - (add-after 'unpack 'skip-incompatible-test + (add-after 'link-depot 'skip-incompatible-test (lambda _ (substitute* "test/runtests.jl" (("@testset.*MetaT and heterogeneous data.*" all) @@ -2268,7 +2269,7 @@ be downscaled to fit into the size of your active terminal session.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-failing-test + (add-after 'link-depot 'skip-failing-test (lambda _ ;; These tests try to download from the imagemagick.org (substitute* "test/runtests.jl" @@ -2465,7 +2466,7 @@ indexed images, sometimes called \"colormap images\" or \"paletted images.\"") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-timezones.jl + (add-after 'link-depot 'remove-timezones.jl (lambda _ (substitute* "test/runtests.jl" (("using TimeZones.*") "") @@ -2864,7 +2865,7 @@ comes from the fact that @code{M == map(f, A)}.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-failing-test + (add-after 'link-depot 'skip-failing-test (lambda _ ;; Tests with math functions are hard. (substitute* "test/test_ul.jl" @@ -2981,7 +2982,8 @@ resolving them into absolute units.") (build-system julia-build-system) ;; Package without Project.toml (arguments - '(#:julia-package-name "Media")) + '(#:julia-package-name "Media" + #:julia-package-uuid "e89f7d12-3494-54d1-8411-f7d8b9ae1f27")) (propagated-inputs `(("julia-macrotools" ,julia-macrotools))) (home-page "https://github.com/JunoLab/Media.jl") @@ -3202,7 +3204,7 @@ interface to interact with these types.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-cuda-tests + (add-after 'link-depot 'skip-cuda-tests (lambda _ (substitute* "test/runtests.jl" (("using CUDA") "") @@ -3238,7 +3240,8 @@ doesn't provide any other \"high-level\" functionality like layers or AD.") (base32 "10h47x5ws42pkqjccimaz0yxfvz41w0yazq6inamfk4lg5g2g3d9")))) (build-system julia-build-system) (arguments - `(#:julia-package-name "OptimTestProblems")) + `(#:julia-package-name "OptimTestProblems" + #:julia-package-uuid "cec144fc-5a64-5bc6-99fb-dde8f63e154c")) (home-page "https://github.com/JuliaNLSolvers/OptimTestProblems.jl") (synopsis "Collection of optimization test problems") (description "The purpose of this package is to provide test problems for @@ -3528,7 +3531,7 @@ everything from run time algorithm choice to code generation at compile time.") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-color-tests + (add-after 'link-depot 'skip-color-tests (lambda _ (substitute* "test/text_backend.jl" ((".*colors\\.jl.*") "")) @@ -3567,7 +3570,7 @@ human-readable format.") ((guix build python-build-system) #:prefix python:)) #:phases (modify-phases %standard-phases - (add-after 'unpack 'remove-conda + (add-after 'link-depot 'remove-conda (lambda _ (substitute* "Project.toml" ((".*Conda.*") "")) @@ -3577,7 +3580,7 @@ human-readable format.") (substitute* "deps/depsutils.jl" (("Conda.PYTHONDIR") "\"/\"")) #t)) - (add-after 'unpack 'set-python + (add-after 'link-depot 'set-python (lambda* (#:key inputs outputs #:allow-other-keys) (let ((python (assoc-ref inputs "python"))) (setenv "PYCALL_JL_RUNTIME_PYTHON" @@ -3690,7 +3693,7 @@ arbitrary normed vector spaces (e.g. matrix-valued integrands).") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'hardcode-libmath-location + (add-after 'link-depot 'hardcode-libmath-location (lambda* (#:key inputs #:allow-other-keys) (let ((gcclib (assoc-ref inputs "gcc:lib"))) (substitute* "src/Quadmath.jl" @@ -4082,7 +4085,8 @@ through matrix-vector multiplication.") (base32 "1fb1dfdmiw2ggx60hf70954xlps0r48fcb3k3dvxynlz7ylphp96")))) (build-system julia-build-system) (arguments - `(#:julia-package-name "SafeTestsets")) + `(#:julia-package-name "SafeTestsets" + #:julia-package-uuid "1bc83da4-3b8d-516f-aca4-4fe02f6d838f")) (native-inputs `(("julia-staticarrays" ,julia-staticarrays))) (home-page "https://github.com/YingboMa/SafeTestsets.jl") @@ -4308,7 +4312,7 @@ some performance improvements).") (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'skip-doctest + (add-after 'link-depot 'skip-doctest (lambda _ (substitute* "test/runtests.jl" ((".*doctest.*") "")) @@ -4811,6 +4815,7 @@ types, modules, and dictionaries.") (build-system julia-build-system) (arguments '(#:julia-package-name "URIs" ;required to run tests + #:julia-package-uuid "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" #:phases (modify-phases %standard-phases (add-before 'check 'change-dir @@ -4818,7 +4823,7 @@ types, modules, and dictionaries.") (lambda* (#:key source outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (chdir - (string-append out "/share/julia/packages/URIs/test"))) + (string-append out "/share/julia/loadpath/URIs/test"))) #t))))) ;; required for tests (inputs `(("julia-json" ,julia-json))) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 411f2e2e10..5b9bf91ed6 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -673,7 +673,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (native-search-paths (list (search-path-specification (variable "JULIA_LOAD_PATH") - (files (list "share/julia/packages/"))) + (files (list "share/julia/loadpath/"))) (search-path-specification (variable "JULIA_DEPOT_PATH") (files (list "share/julia/"))))) diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index 63cb7cd864..8ceac090c7 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Nicolò Balzarotti +;;; Copyright © 2021 Jean-Baptiste Volatier ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,6 +84,7 @@ (system (%current-system)) (guile #f) (julia-package-name #f) + (julia-package-uuid #f) (imported-modules %julia-build-system-modules) (modules '((guix build julia-build-system) (guix build utils)))) @@ -105,7 +107,8 @@ #:search-paths ',(map search-path-specification->sexp search-paths) #:inputs %build-inputs - #:julia-package-name ,julia-package-name))) + #:julia-package-name ,julia-package-name + #:julia-package-uuid ,julia-package-uuid))) (define guile-for-build (match guile diff --git a/guix/build/julia-build-system.scm b/guix/build/julia-build-system.scm index d74acf2a05..41c69665c6 100644 --- a/guix/build/julia-build-system.scm +++ b/guix/build/julia-build-system.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020 Nicolò Balzarotti +;;; Copyright © 2021 Jean-Baptiste Volatier ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,9 +21,11 @@ (define-module (guix build julia-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) + #:use-module (rnrs io ports) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) + #:use-module (ice-9 popen) #:export (%standard-phases julia-create-package-toml julia-build)) @@ -37,7 +40,7 @@ (invoke "julia" "-e" code)) ;; subpath where we store the package content -(define %package-path "/share/julia/packages/") +(define %package-path "/share/julia/loadpath/") (define (project.toml->name file) "Look for Julia package name in the TOML file FILE (usually named @@ -51,6 +54,18 @@ Project.toml)." (if m (match:substring m 1) (loop (read-line in 'concat))))))))) +(define (project.toml->uuid file) + "Look for Julia package uuid in the TOML file FILE (usually named +Project.toml)." + (call-with-input-file file + (lambda (in) + (let loop ((line (read-line in 'concat))) + (if (eof-object? line) + #f + (let ((m (string-match "uuid\\s*=\\s*\"(.*)\"" line))) + (if m (match:substring m 1) + (loop (read-line in 'concat))))))))) + (define* (install #:key source inputs outputs julia-package-name #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -73,7 +88,7 @@ Project.toml)." (setenv "JULIA_DEPOT_PATH" builddir) ;; Add new package dir to the load path. (setenv "JULIA_LOAD_PATH" - (string-append builddir "packages/" ":" + (string-append builddir "loadpath/" ":" (or (getenv "JULIA_LOAD_PATH") ""))) ;; Actual precompilation: @@ -97,15 +112,36 @@ Project.toml)." (setenv "SOURCE_DATE_EPOCH" "1") (setenv "JULIA_DEPOT_PATH" builddir) (setenv "JULIA_LOAD_PATH" - (string-append builddir "packages/" ":" + (string-append builddir "loadpath/" ":" (or (getenv "JULIA_LOAD_PATH") ""))) (setenv "HOME" "/tmp") (invoke "julia" "--depwarn=yes" - (string-append builddir "packages/" + (string-append builddir "loadpath/" package "/test/runtests.jl")))) #t) +(define* (link-depot #:key source inputs outputs julia-package-name julia-package-uuid + #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (package-name (or + julia-package-name + (project.toml->name "Project.toml"))) + (package-dir (string-append out %package-path package-name)) + (uuid (or julia-package-uuid (project.toml->uuid "Project.toml"))) + (pipe (open-pipe* OPEN_READ "julia" "-e" + (format #f "using Pkg; +println(Base.version_slug(Base.UUID(\"~a\"), + Base.SHA1(Pkg.GitTools.tree_hash(\".\"))))" uuid))) + (slug (string-trim-right (get-string-all pipe)))) + ;; When installing a package, julia looks first at in the JULIA_DEPOT_PATH + ;; for a path like packages/PACKAGE/XXXX + ;; Where XXXX is a slug encoding the package UUID and SHA1 of the files + ;; Here we create a link with the correct path to enable julia to find the package + (mkdir-p (string-append out "/share/julia/packages/" package-name)) + (symlink package-dir (string-append out "/share/julia/packages/" package-name "/" slug))) + #t) + (define (julia-create-package-toml outputs source name uuid version deps) @@ -138,6 +174,7 @@ version = \"" version "\" (delete 'check) ; tests must be run after installation (replace 'install install) (add-after 'install 'precompile precompile) + (add-after 'unpack 'link-depot link-depot) (add-after 'install 'check check) ;; TODO: In the future we could add a "system-image-generation" phase ;; where we use PackageCompiler.jl to speed up package loading times @@ -146,11 +183,12 @@ version = \"" version "\" (delete 'patch-usr-bin-file) (delete 'build))) -(define* (julia-build #:key inputs julia-package-name +(define* (julia-build #:key inputs julia-package-name julia-package-uuid (phases %standard-phases) #:allow-other-keys #:rest args) "Build the given Julia package, applying all of PHASES in order." (apply gnu:gnu-build #:inputs inputs #:phases phases #:julia-package-name julia-package-name + #:julia-package-uuid julia-package-uuid args)) -- cgit 1.4.1 From 11446953baabef5174731bbec42b5ece9645c474 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Nov 2021 12:02:14 +0200 Subject: gnu: julia-pycall: Update to 1.92.5. * gnu/packages/julia-xyz.scm (julia-pycall): Update to 1.92.5. --- gnu/packages/julia-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 73768317b8..547d2bf81e 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -3550,7 +3550,7 @@ human-readable format.") (define-public julia-pycall (package (name "julia-pycall") - (version "1.92.3") + (version "1.92.5") (source (origin (method git-fetch) @@ -3560,7 +3560,7 @@ human-readable format.") (file-name (git-file-name name version)) (sha256 (base32 - "07r99ni6nkxpyrp3wsb5qg4jxz7i2r08dyqbiffy2zm3g0bn88jq")))) + "1fj5d1ihnhnm0pl4hbx6hcd2bpdyhm8jiaqah2axsbd069j70saf")))) (build-system julia-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit 1.4.1 From e9a5fb7ad96072cd46623c87909f3a724c2e209d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Nov 2021 15:06:54 +0200 Subject: Revert "gnu: Add cl-https-everywhere." With thanks to jlicht on IRC: sbcl-package->cl-source-package assumes all inputs are packages which isn't the case here. This reverts commit e31d48d8db09e723727eeadbeea22d677f5d1d52. --- gnu/packages/lisp-xyz.scm | 82 ----------------------------------------------- 1 file changed, 82 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index da1a08edd7..4b17c173c9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19264,85 +19264,3 @@ Vernacular builds on Overlord and is inspired by Racket.") (define-public cl-vernacular (sbcl-package->cl-source-package sbcl-vernacular)) - -(define-public sbcl-cl-https-everywhere - ;; No release. - (let ((commit "cbcc73b985a5b1c0ce0d4ec38bc982a0538d4bd8")) - (package - (name "sbcl-cl-https-everywhere") - (version (git-version "0.0.0" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ruricolist/cl-https-everywhere/") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1wcvx1icwym1ncd6wl1wxzkyyndrm796caalbklvjd4a2cbl3xxi")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("global-vars" ,sbcl-global-vars) - ("parenscript" ,sbcl-parenscript) - ("cl-markdown" ,sbcl-cl-markdown) - ("cl-tld" ,sbcl-cl-tld) - ("fxml" ,sbcl-fxml) - ("overlord" ,sbcl-overlord) - ("ppcre" ,sbcl-cl-ppcre) - ("serapeum" ,sbcl-serapeum) - ("trivial-gray-streams" ,sbcl-trivial-gray-streams) - ("vernacular" ,sbcl-vernacular))) - (native-inputs - `(("fiveam" ,sbcl-fiveam) - ("https-everywhere" - ,(let ((commit "78d3425aef62d79da2c63c0fcd89ae9837af9a09")) - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/EFForg/https-everywhere") - (commit commit))) - (file-name (git-file-name "https-everywhere" - (git-version "2021.7.13" "1" commit))) - (sha256 - (base32 - "1bx5895lbsddx449mcvvss4dlvi07xsh4d2qnajsdvais6fpckh8"))))))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'link-https-everywhere-repo - (lambda* (#:key inputs #:allow-other-keys) - (let ((https-everywhere (assoc-ref inputs "https-everywhere"))) - (symlink https-everywhere "https-everywhere")))) - (add-after 'unpack 'fix-overlord-build - ;; Upstream bugs? See - ;; https://github.com/ruricolist/cl-https-everywhere/issues/1. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (rulesets.xml (string-append out "/share/common-lisp/" (%lisp-type) - "/cl-https-everywhere/rulesets.xml"))) - (substitute* "build.lisp" - (("\\(depends-on https-everywhere-version\\)") "") - ;; Don't rebuild the rulesets just because the timestamp is epoch. - (("\\(vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"\\)") - (format #f "(if (uiop:file-exists-p ~s) - (compile-rulesets ~s) - (vernacular:require-default :cl-https-everywhere/rulesets-file \"rulesets.xml\"))" - rulesets.xml - rulesets.xml)) - (("\\(uiop:parse-unix-namestring \"https-everywhere/src/chrome/content/rules/\\*\\.xml\")") - "\"https-everywhere/src/chrome/content/rules/*.xml\"") - (("\\(out temp :external-format :utf-8\\)") - "(out temp :external-format :utf-8 :if-exists :supersede)"))) - #t))))) - (home-page "https://github.com/ruricolist/cl-https-everywhere/") - (synopsis "Use HTTPS Everywhere rules from Lisp") - (description - "CL-HTTPS-EVERYWHERE parses HTTPS Everywhere rulesets and makes them -available for use in Lisp programs.") - (license (list license:expat - ;; For the ruleset - license:gpl2+))))) - -(define-public cl-https-everywhere - (sbcl-package->cl-source-package sbcl-cl-https-everywhere)) -- cgit 1.4.1 From 546f8537aad3ac03fef43e036d3cab3abc943915 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Volatier Date: Fri, 12 Nov 2021 14:24:05 +0000 Subject: gnu: Add julia-sundials-jull * gnu/packages/julia-jll.scm (julia-sundials-jll): New variable. * gnu/packages/maths.scm (sundials-julia): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/julia-jll.scm | 39 +++++++++++++++++++++++++++++++++++++++ gnu/packages/maths.scm | 25 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index d8cf5b9eaf..3f2b0c1dec 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Efraim Flashner +;;; Copyright © 2021 Jean-Baptiste Volatier ;;; ;;; This file is part of GNU Guix. ;;; @@ -2759,3 +2760,41 @@ build tree Yggdrasil.") (synopsis "Zstd library wrappers") (description "This package provides a wrapper for the zstd library.") (license license:expat))) + +(define-public julia-sundials-jll + (package + (name "julia-sundials-jll") + (version "5.2.1+0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/Sundials_jll.jl") + (commit (string-append "Sundials-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0cijb9frq8gj8bjpqf2lr5d0jxlj262y6h6xi4z3536dingrvffc")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; no runtests + #:phases + (modify-phases %standard-phases + (add-after 'link-depot 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + (("global artifact_dir.*") + (string-append + "global artifact_dir = \"" + (assoc-ref inputs "sundials") "\"\n")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (inputs + `(("sundials" ,sundials-julia))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers))) + (home-page "https://github.com/JuliaBinaryWrappers/Sundials_jll.jl") + (synopsis "SUndials library wrappers") + (description "This package provides a wrapper for the sundials library.") + (license license:expat))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 5152fe6942..a6fe2b5f49 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -6159,6 +6159,31 @@ easily be incorporated into existing simulation codes.") ,%openmpi-setup))))) (synopsis "SUNDIALS with OpenMPI support"))) +(define-public sundials-julia + (package + (inherit sundials) + (name "sundials-julia") + (version "5.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LLNL/sundials") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nx4sqhmi126m14myzm7syv2053harav9snl0a247wnkcgs5rxrv")))) + (inputs + `(("lapack" ,lapack) + ,@(package-inputs sundials))) + (arguments + (substitute-keyword-arguments (package-arguments sundials) + ((#:configure-flags flags '()) + `(cons* "-DLAPACK_ENABLE:BOOL=ON" + ,flags)))) + (synopsis "SUNDIALS with lapack support as required by julia-sundials-jll"))) + (define-public combinatorial-blas (package (name "combinatorial-blas") -- cgit 1.4.1 From b2f81865905e87f859ca82ca40877623cda38a69 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 16 Nov 2021 15:31:07 +0200 Subject: Revert "home-services: Demonadify 'on-first-login' handling." This commit breaks building guix home guix home: error: reference to invalid output 'out' of derivation \ '/gnu/store/86zc4rijsswmfqnaq8rwixcxjl2zyl1c-on-first-login.drv' This reverts commit 4dcec60fa6a93dbc93bef2cdb91e3633c705579e. --- gnu/home/services.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 992e522fa2..7f5cda1cfb 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -275,7 +275,7 @@ directory containing FILES." will be put in @file{~/.guix-home/files}."))) (define (compute-on-first-login-script _ gexps) - (computed-file + (gexp->script "on-first-login" #~(let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR") (format #f "/run/user/~a" (getuid)))) @@ -294,11 +294,11 @@ won't execute anything. You can check if xdg runtime directory exists, XDG_RUNTIME_DIR variable is set to apropriate value and manually execute the script by running '$HOME/.guix-home/on-first-login'"))))) -(define (on-first-login-script-entry on-first-login) +(define (on-first-login-script-entry m-on-first-login) "Return, as a monadic value, an entry for the on-first-login script in the home environment directory." - (with-monad %store-monad - (return `(("on-first-login" ,on-first-login))))) + (mlet %store-monad ((on-first-login m-on-first-login)) + (return `(("on-first-login" ,on-first-login))))) (define home-run-on-first-login-service-type (service-type (name 'home-run-on-first-login) -- cgit 1.4.1 From b4b2bbf4fb74c9f3e93d64863ab9b38957494b49 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 29 Oct 2021 18:25:24 +0200 Subject: services: openssh: Collect all keys for all users. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes * gnu/services/ssh.scm (extend-openssh-authorized-keys): ensure that no key is forgotten. Co-authored-by: Ludovic Courtès --- gnu/services/ssh.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/services/ssh.scm b/gnu/services/ssh.scm index a018052eeb..e7bc6100f6 100644 --- a/gnu/services/ssh.scm +++ b/gnu/services/ssh.scm @@ -39,6 +39,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 match) + #:use-module (ice-9 vlist) #:export (lsh-configuration lsh-configuration? lsh-service @@ -535,7 +536,15 @@ of user-name/file-like tuples." (openssh-configuration (inherit config) (authorized-keys - (append (openssh-authorized-keys config) keys)))) + (match (openssh-authorized-keys config) + (((users _ ...) ...) + ;; Build a user/key-list mapping. + (let ((user-keys (alist->vhash (openssh-authorized-keys config)))) + ;; Coalesce the key lists associated with each user. + (map (lambda (user) + `(,user + ,@(concatenate (vhash-fold* cons '() user user-keys)))) + users))))))) (define openssh-service-type (service-type (name 'openssh) -- cgit 1.4.1 From f39397b21041fe418247239f27473aff49a203c9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Nov 2021 16:11:25 +0100 Subject: tests: Factorize 'file=?'. * guix/tests.scm (file=?): Add optional 'stat' parameter. Add fast patch comparing inode numbers. * tests/gexp.scm ("imported-files with file-like objects"): Remove 'file=?' procedure and use the one from (guix tests). --- guix/tests.scm | 30 +++++++++++++++++------------- tests/gexp.scm | 11 +++-------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/guix/tests.scm b/guix/tests.scm index fc3d521163..e1c194340c 100644 --- a/guix/tests.scm +++ b/guix/tests.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2013-2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -182,18 +182,22 @@ too expensive to build entirely in the test store." (loop (1+ i))) bv)))) -(define (file=? a b) - "Return true if files A and B have the same type and same content." - (and (eq? (stat:type (lstat a)) (stat:type (lstat b))) - (case (stat:type (lstat a)) - ((regular) - (equal? - (call-with-input-file a get-bytevector-all) - (call-with-input-file b get-bytevector-all))) - ((symlink) - (string=? (readlink a) (readlink b))) - (else - (error "what?" (lstat a)))))) +(define* (file=? a b #:optional (stat lstat)) + "Return true if files A and B have the same type and same content. Call +STAT to obtain file metadata." + (let ((sta (stat a)) (stb (stat b))) + (and (eq? (stat:type sta) (stat:type stb)) + (case (stat:type sta) + ((regular) + (or (and (= (stat:ino sta) (stat:ino stb)) + (= (stat:dev sta) (stat:dev stb))) + (equal? + (call-with-input-file a get-bytevector-all) + (call-with-input-file b get-bytevector-all)))) + ((symlink) + (string=? (readlink a) (readlink b))) + (else + (error "what?" (stat a))))))) (define (canonical-file? file) "Return #t if FILE is in the store, is read-only, and its mtime is 1." diff --git a/tests/gexp.scm b/tests/gexp.scm index 39a47d4e8c..0758a49f5f 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014-2021 Ludovic Courtès ;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. @@ -827,19 +827,14 @@ (files -> `(("a/b/c" . ,q-scm) ("p/q" . ,plain))) (drv (imported-files files))) - (define (file=? file1 file2) - ;; Assume deduplication is in place. - (= (stat:ino (stat file1)) - (stat:ino (stat file2)))) - (mbegin %store-monad (built-derivations (list (pk 'drv drv))) (mlet %store-monad ((dir -> (derivation->output-path drv)) (plain* (text-file "foo" "bar!")) (q-scm* (interned-file q-scm "c"))) (return - (and (file=? (string-append dir "/a/b/c") q-scm*) - (file=? (string-append dir "/p/q") plain*))))))) + (and (file=? (string-append dir "/a/b/c") q-scm* stat) + (file=? (string-append dir "/p/q") plain* stat))))))) (test-equal "gexp-modules & ungexp" '((bar) (foo)) -- cgit 1.4.1 From 472a0e82a52a3d5d841e1dfad6b13e26082a5750 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 13 Nov 2021 21:47:15 +0100 Subject: daemon: Do not deduplicate files smaller than 8 KiB. Files smaller than 8 KiB typically represent ~70% of the entries in /gnu/store/.links but only contribute to ~4% of the space savings afforded by deduplication. Not considering these files for deduplication speeds up file insertion in the store and, more importantly, leaves 'removeUnusedLinks' with fewer entries to traverse, thereby speeding it up proportionally. Partly fixes . * config-daemon.ac: Remove symlink hard link check and CAN_LINK_SYMLINK definition. * guix/store/deduplication.scm (%deduplication-minimum-size): New variable. (deduplicate)[loop]: Do not recurse when FILE's size is below %DEDUPLICATION-MINIMUM-SIZE. (dump-port): New procedure. (dump-file/deduplicate)[hash]: Turn into... [dump-and-compute-hash]: ... this thunk. Call 'deduplicate' only when SIZE is greater than %DEDUPLICATION-MINIMUM-SIZE; otherwise call 'dump-port'. * nix/libstore/gc.cc (LocalStore::removeUnusedLinks): Drop files where st.st_size < deduplicationMinSize. * nix/libstore/local-store.hh (deduplicationMinSize): New declaration. * nix/libstore/optimise-store.cc (deduplicationMinSize): New variable. (LocalStore::optimisePath_): Return when PATH is a symlink or smaller than 'deduplicationMinSize'. * tests/derivations.scm ("identical files are deduplicated"): Produce files bigger than %DEDUPLICATION-MINIMUM-SIZE. * tests/nar.scm ("restore-file-set with directories (signed, valid)"): Likewise. * tests/store-deduplication.scm ("deduplicate, below %deduplication-minimum-size"): New test. ("deduplicate", "deduplicate, ENOSPC"): Produce files bigger than %DEDUPLICATION-MINIMUM-SIZE. * tests/store.scm ("substitute, deduplication"): Likewise. --- config-daemon.ac | 11 ------- guix/store/deduplication.scm | 69 ++++++++++++++++++++++++++++++++++++------ nix/libstore/gc.cc | 4 ++- nix/libstore/local-store.hh | 3 ++ nix/libstore/optimise-store.cc | 15 +++++---- tests/derivations.scm | 14 ++++++--- tests/nar.scm | 7 +++-- tests/store-deduplication.scm | 41 +++++++++++++++++++++---- tests/store.scm | 4 ++- 9 files changed, 126 insertions(+), 42 deletions(-) diff --git a/config-daemon.ac b/config-daemon.ac index 5ddc740600..86306effe1 100644 --- a/config-daemon.ac +++ b/config-daemon.ac @@ -94,17 +94,6 @@ if test "x$guix_build_daemon" = "xyes"; then AC_CHECK_FUNCS([lutimes lchown posix_fallocate sched_setaffinity \ statvfs nanosleep strsignal statx]) - dnl Check whether the store optimiser can optimise symlinks. - AC_MSG_CHECKING([whether it is possible to create a link to a symlink]) - ln -s bla tmp_link - if ln tmp_link tmp_link2 2> /dev/null; then - AC_MSG_RESULT(yes) - AC_DEFINE(CAN_LINK_SYMLINK, 1, [Whether link() works on symlinks.]) - else - AC_MSG_RESULT(no) - fi - rm -f tmp_link tmp_link2 - dnl Check for . AC_LANG_PUSH(C++) AC_CHECK_HEADERS([locale]) diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm index cd9660174c..370df4a74c 100644 --- a/guix/store/deduplication.scm +++ b/guix/store/deduplication.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017 Caleb Ristvedt -;;; Copyright © 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2018-2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,12 +22,13 @@ (define-module (guix store deduplication) #:use-module (gcrypt hash) - #:use-module (guix build utils) + #:use-module ((guix build utils) #:hide (dump-port)) #:use-module (guix build syscalls) #:use-module (guix base32) #:use-module (srfi srfi-11) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) #:use-module (ice-9 ftw) #:use-module (ice-9 match) @@ -37,6 +38,31 @@ dump-file/deduplicate copy-file/deduplicate)) +;; TODO: Remove once 'dump-port' in (guix build utils) has an optional 'len' +;; parameter. +(define* (dump-port in out + #:optional len + #:key (buffer-size 16384)) + "Read LEN bytes from IN (or as much as possible if LEN is #f) and write it +to OUT, using chunks of BUFFER-SIZE bytes." + (define buffer + (make-bytevector buffer-size)) + + (let loop ((total 0) + (bytes (get-bytevector-n! in buffer 0 + (if len + (min len buffer-size) + buffer-size)))) + (or (eof-object? bytes) + (and len (= total len)) + (let ((total (+ total bytes))) + (put-bytevector out buffer 0 bytes) + (loop total + (get-bytevector-n! in buffer 0 + (if len + (min (- len total) buffer-size) + buffer-size))))))) + (define (nar-sha256 file) "Gives the sha256 hash of a file and the size of the file in nar form." (let-values (((port get-hash) (open-sha256-port))) @@ -127,11 +153,27 @@ Note: TARGET, TO-REPLACE, and SWAP-DIRECTORY must be on the same file system." (unless (= EMLINK (system-error-errno args)) (apply throw args))))))) +(define %deduplication-minimum-size + ;; Size below which files are not deduplicated. This avoids adding too many + ;; entries to '.links', which would slow down 'removeUnusedLinks' while + ;; saving little space. Keep in sync with optimize-store.cc. + 8192) + (define* (deduplicate path hash #:key (store (%store-directory))) "Check if a store item with sha256 hash HASH already exists. If so, replace PATH with a hardlink to the already-existing one. If not, register PATH so that future duplicates can hardlink to it. PATH is assumed to be under STORE." + ;; Lightweight promises. + (define-syntax-rule (delay exp) + (let ((value #f)) + (lambda () + (unless value + (set! value exp)) + value))) + (define-syntax-rule (force promise) + (promise)) + (define links-directory (string-append store "/.links")) @@ -144,13 +186,18 @@ under STORE." ((file . properties) (unless (member file '("." "..")) (let* ((file (string-append path "/" file)) + (st (delay (lstat file))) (type (match (assoc-ref properties 'type) ((or 'unknown #f) - (stat:type (lstat file))) + (stat:type (force st))) (type type)))) - (loop file type - (and (not (eq? 'directory type)) - (nar-sha256 file))))))) + (when (or (eq? 'directory type) + (and (eq? 'regular type) + (>= (stat:size (force st)) + %deduplication-minimum-size))) + (loop file type + (and (not (eq? 'directory type)) + (nar-sha256 file)))))))) (scandir* path)) (let ((link-file (string-append links-directory "/" (bytevector->nix-base32-string hash)))) @@ -222,9 +269,9 @@ OUTPUT as it goes." This procedure is suitable as a #:dump-file argument to 'restore-file'. When used that way, it deduplicates files on the fly as they are restored, thereby -removing the need to a deduplication pass that would re-read all the files +removing the need for a deduplication pass that would re-read all the files down the road." - (define hash + (define (dump-and-compute-hash) (call-with-output-file file (lambda (output) (let-values (((hash-port get-hash) @@ -236,7 +283,11 @@ down the road." (close-port hash-port) (get-hash))))) - (deduplicate file hash #:store store)) + (if (>= size %deduplication-minimum-size) + (deduplicate file (dump-and-compute-hash) #:store store) + (call-with-output-file file + (lambda (output) + (dump-port input output size))))) (define* (copy-file/deduplicate source target #:key (store (%store-directory))) diff --git a/nix/libstore/gc.cc b/nix/libstore/gc.cc index e1d0765154..16519116e4 100644 --- a/nix/libstore/gc.cc +++ b/nix/libstore/gc.cc @@ -606,7 +606,9 @@ void LocalStore::removeUnusedLinks(const GCState & state) throw SysError(format("statting `%1%'") % path); #endif - if (st.st_nlink != 1) { + /* Drop links for files smaller than 'deduplicationMinSize', even if + they have more than one hard link. */ + if (st.st_nlink != 1 && st.st_size >= deduplicationMinSize) { actualSize += st.st_size; unsharedSize += (st.st_nlink - 1) * st.st_size; continue; diff --git a/nix/libstore/local-store.hh b/nix/libstore/local-store.hh index 9ba37219da..20d3c3c893 100644 --- a/nix/libstore/local-store.hh +++ b/nix/libstore/local-store.hh @@ -292,4 +292,7 @@ void canonicaliseTimestampAndPermissions(const Path & path); MakeError(PathInUse, Error); +/* Size below which a file is not considered for deduplication. */ +extern const size_t deduplicationMinSize; + } diff --git a/nix/libstore/optimise-store.cc b/nix/libstore/optimise-store.cc index eb303ab4c3..9fd6f3cb35 100644 --- a/nix/libstore/optimise-store.cc +++ b/nix/libstore/optimise-store.cc @@ -15,6 +15,9 @@ namespace nix { +/* Any file smaller than this is not considered for deduplication. + Keep in sync with (guix store deduplication). */ +const size_t deduplicationMinSize = 8192; static void makeWritable(const Path & path) { @@ -105,12 +108,12 @@ void LocalStore::optimisePath_(OptimiseStats & stats, const Path & path, InodeHa return; } - /* We can hard link regular files and maybe symlinks. */ - if (!S_ISREG(st.st_mode) -#if CAN_LINK_SYMLINK - && !S_ISLNK(st.st_mode) -#endif - ) return; + /* We can hard link regular files (and maybe symlinks), but do that only + for files larger than some threshold. This avoids adding too many + entries to '.links', which would slow down 'removeUnusedLinks' while + saving little space. */ + if (!S_ISREG(st.st_mode) || ((size_t) st.st_size) < deduplicationMinSize) + return; /* Sometimes SNAFUs can cause files in the store to be modified, in particular when running programs as root under diff --git a/tests/derivations.scm b/tests/derivations.scm index cd165d1be6..0775719ea3 100644 --- a/tests/derivations.scm +++ b/tests/derivations.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-2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -170,11 +170,15 @@ #f)))) (test-assert "identical files are deduplicated" - (let* ((build1 (add-text-to-store %store "one.sh" - "echo hello, world > \"$out\"\n" + ;; Note: DATA must be longer than %DEDUPLICATION-MINIMUM-SIZE. + (let* ((data (make-string 9000 #\a)) + (build1 (add-text-to-store %store "one.sh" + (string-append "echo -n " data + " > \"$out\"\n") '())) (build2 (add-text-to-store %store "two.sh" - "# Hey!\necho hello, world > \"$out\"\n" + (string-append "# Hey!\necho -n " + data " > \"$out\"\n") '())) (drv1 (derivation %store "foo" %bash `(,build1) @@ -187,7 +191,7 @@ (file2 (derivation->output-path drv2))) (and (valid-path? %store file1) (valid-path? %store file2) (string=? (call-with-input-file file1 get-string-all) - "hello, world\n") + data) (= (stat:ino (lstat file1)) (stat:ino (lstat file2)))))))) diff --git a/tests/nar.scm b/tests/nar.scm index ba4881caaa..98752f2088 100644 --- a/tests/nar.scm +++ b/tests/nar.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-2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -486,8 +486,9 @@ ;; their mtime and permissions were not reset. Ensure that this bug is ;; gone. (with-store store - (let* ((text1 (random-text)) - (text2 (random-text)) + ;; Note: TEXT1 and TEXT2 must be longer than %DEDUPLICATION-MINIMUM-SIZE. + (let* ((text1 (string-concatenate (make-list 200 (random-text)))) + (text2 (string-concatenate (make-list 200 (random-text)))) (tree `("tree" directory ("a" regular (data ,text1)) ("b" directory diff --git a/tests/store-deduplication.scm b/tests/store-deduplication.scm index b1c2d93bbd..2950fbc1a3 100644 --- a/tests/store-deduplication.scm +++ b/tests/store-deduplication.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018, 2020 Ludovic Courtès +;;; Copyright © 2018, 2020-2021 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,13 +30,40 @@ (test-begin "store-deduplication") +(test-equal "deduplicate, below %deduplication-minimum-size" + (list #t (make-list 5 1)) + + (call-with-temporary-directory + (lambda (store) + ;; Note: DATA must be longer than %DEDUPLICATION-MINIMUM-SIZE. + (let ((data "Hello, world!") + (identical (map (lambda (n) + (string-append store "/" (number->string n) + "/a/b/c")) + (iota 5)))) + (for-each (lambda (file) + (mkdir-p (dirname file)) + (call-with-output-file file + (lambda (port) + (put-bytevector port (string->utf8 data))))) + identical) + + (deduplicate store (nar-sha256 store) #:store store) + + ;; (system (string-append "ls -lRia " store)) + (list (= (length (delete-duplicates + (map (compose stat:ino stat) identical))) + (length identical)) + (map (compose stat:nlink stat) identical)))))) + (test-equal "deduplicate" (cons* #t #f ;inode comparisons 2 (make-list 5 6)) ;'nlink' values (call-with-temporary-directory (lambda (store) - (let ((data (string->utf8 "Hello, world!")) + ;; Note: DATA must be longer than %DEDUPLICATION-MINIMUM-SIZE. + (let ((data (string-concatenate (make-list 1000 "Hello, world!"))) (identical (map (lambda (n) (string-append store "/" (number->string n) "/a/b/c")) @@ -46,7 +73,7 @@ (mkdir-p (dirname file)) (call-with-output-file file (lambda (port) - (put-bytevector port data)))) + (put-bytevector port (string->utf8 data))))) identical) ;; Make the parent of IDENTICAL read-only. This should not prevent ;; deduplication from inserting its hard link. @@ -54,7 +81,7 @@ (call-with-output-file unique (lambda (port) - (put-bytevector port (string->utf8 "This is unique.")))) + (put-bytevector port (string->utf8 (string-reverse data))))) (deduplicate store (nar-sha256 store) #:store store) @@ -77,8 +104,10 @@ (lambda (store) (let ((true-link link) (links 0) - (data1 (string->utf8 "Hello, world!")) - (data2 (string->utf8 "Hi, world!")) + (data1 (string->utf8 + (string-concatenate (make-list 1000 "Hello, world!")))) + (data2 (string->utf8 + (string-concatenate (make-list 1000 "Hi, world!")))) (identical (map (lambda (n) (string-append store "/" (number->string n) "/a/b/c")) diff --git a/tests/store.scm b/tests/store.scm index 2150a0048c..5c9f651d6c 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -759,7 +759,9 @@ (test-assert "substitute, deduplication" (with-store s - (let* ((c (random-text)) ; contents of the output + ;; Note: C must be longer than %DEDUPLICATION-MINIMUM-SIZE. + (let* ((c (string-concatenate + (make-list 200 (random-text)))) ; contents of the output (g (package-derivation s %bootstrap-guile)) (d1 (build-expression->derivation s "substitute-me" `(begin ,c (exit 1)) -- cgit 1.4.1 From e5d8302b2ce596a0518ea5bd79b338f68a3246eb Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 13:19:21 +0100 Subject: home: services: Fix typo. Reinstates 4dcec60fa6a93dbc93bef2cdb91e3633c705579e, minus the regression it introduced. * gnu/home/services.scm (compute-on-first-login-script): Use 'program-file', not 'gexp->script'. --- gnu/home/services.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/home/services.scm b/gnu/home/services.scm index 7f5cda1cfb..04f4ec34d1 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -275,7 +275,7 @@ directory containing FILES." will be put in @file{~/.guix-home/files}."))) (define (compute-on-first-login-script _ gexps) - (gexp->script + (program-file "on-first-login" #~(let* ((xdg-runtime-dir (or (getenv "XDG_RUNTIME_DIR") (format #f "/run/user/~a" (getuid)))) @@ -294,11 +294,11 @@ won't execute anything. You can check if xdg runtime directory exists, XDG_RUNTIME_DIR variable is set to apropriate value and manually execute the script by running '$HOME/.guix-home/on-first-login'"))))) -(define (on-first-login-script-entry m-on-first-login) +(define (on-first-login-script-entry on-first-login) "Return, as a monadic value, an entry for the on-first-login script in the home environment directory." - (mlet %store-monad ((on-first-login m-on-first-login)) - (return `(("on-first-login" ,on-first-login))))) + (with-monad %store-monad + (return `(("on-first-login" ,on-first-login))))) (define home-run-on-first-login-service-type (service-type (name 'home-run-on-first-login) -- cgit 1.4.1 From c322d97832081e6e1913c6311616030d1fad4ee2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 13:23:08 +0100 Subject: home: services: bash: Emit 'extra-content' first again. Fixes a regression introduced in 4b96998292442ec03024481c911d88f86c7c36b5 that would less to a 'tests/guix-home.sh' failure. * gnu/home/services/shells.scm (add-bash-configuration)[file-if-not-empty]: Move EXTRA-CONTENT first. --- gnu/home/services/shells.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 6b9ebe42e9..80f13a31b7 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -420,9 +420,9 @@ alias grep='grep --color=auto'\n") (not (null? ((configuration-field-getter field-obj) config)))) `(,(object->snake-case-string file-name) ,(apply mixed-text-file - (object->snake-case-string file-name) - (cons (serialize-field field) - (if extra-content extra-content '())))) + (object->snake-case-string file-name) + (append (or extra-content '()) + (list (serialize-field field))))) '()))) (filter -- cgit 1.4.1 From f35976584cce09e3e857f75caa812daedc8cc07e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 13:31:40 +0100 Subject: home: Adjust 'guix home import' test for shell aliases. This is a followup to 4b96998292442ec03024481c911d88f86c7c36b5. * tests/home-import.scm (match-home-environment-bash-service): Match the 'aliases' field. --- tests/home-import.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/home-import.scm b/tests/home-import.scm index abd3cec43d..0bcdf8a469 100644 --- a/tests/home-import.scm +++ b/tests/home-import.scm @@ -151,6 +151,7 @@ corresponding file." ('list ('service 'home-bash-service-type ('home-bash-configuration + ('aliases ('quote ())) ('bashrc ('list ('local-file "/tmp/guix-config/.bashrc" "bashrc")))))))))) -- cgit 1.4.1 From e699eb3bccab17cd24ca57ce27e3544c9a8927fc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 13:39:39 +0100 Subject: gnu: Add texlive-translator. * gnu/packages/tex.scm (texlive-translator): New variable. Co-authored-by: Ricardo Wurmus --- gnu/packages/tex.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 3c174a3f80..ba959b8191 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8829,6 +8829,28 @@ are valid as arguments for the macros. The package may be used under LaTeX and plain TeX.") (license (license:fsf-free "file:/binhex.dtx")))) +(define-public texlive-translator + (package + (inherit (simple-texlive-package + "texlive-translator" + (list "doc/latex/translator/" + "tex/latex/translator/") + (base32 + "1pac03qghaw9q98skfrgzgk4wnz04pgizw59c4k5ydphw1vpsvcz") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/macros/latex/contrib/translator") + (synopsis "Easy translation of strings in LaTeX") + (description + "This LaTeX package provides a flexible mechanism for translating +individual words into different languages. For example, it can be used to +translate a word like \"figure\" into, say, the German word \"Abbildung\". +Such a translation mechanism is useful when the author of some package would +like to localize the package such that texts are correctly translated into the +language preferred by the user. This package is not intended to be used to +automatically translate more than a few words.") + (license (list license:lppl license:gpl1+)))) + (define-public bibtool (package (name "bibtool") -- cgit 1.4.1 From 9bbbac6783bcdace17d967e85c8ae8d14cbf1ef9 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 14:06:41 +0100 Subject: gnu: Add texlive-latex-textpos. * gnu/packages/tex.scm (texlive-latex-textpos): New variable. --- gnu/packages/tex.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ba959b8191..ed171475ab 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8851,6 +8851,30 @@ language preferred by the user. This package is not intended to be used to automatically translate more than a few words.") (license (list license:lppl license:gpl1+)))) +(define-public texlive-latex-textpos + (package + (inherit (simple-texlive-package + "texlive-latex-textpos" + (list "doc/latex/textpos/" + "tex/latex/textpos/") + (base32 + "1g208dx853xg7g72jggkh13934r49yypksvalm5pk6snh0s0k86c") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/textpos") + (synopsis "Absolute positioning of text on the LaTeX page") + (description + "This package facilitates placing boxes at absolute positions on the +LaTeX page. There are several reasons why this might be useful, but the main +one (or at least my motivating one) is to help produce a large-format +conference poster. + +This package provides a single environment, plus a starred variant, which +contains the text (or graphics, or table, or whatever) which is to be placed +on the page, and which specifies where it is to be placed. The environment is +accompanied by various configuration commands.") + (license license:lppl))) + (define-public bibtool (package (name "bibtool") -- cgit 1.4.1 From 8000fc4fa022c3053574b580639f67edd8321c31 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 15:22:11 +0200 Subject: gnu: Add ocaml4.07-re. * gnu/packages/ocaml.scm (ocaml4.07-re): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/ocaml.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index b04ca1d287..932220d188 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3353,6 +3353,7 @@ standard iterator type starting from 4.07.") `(("ocaml-seq" ,ocaml-seq))) (native-inputs `(("ounit" ,ocaml-ounit))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-re)))) (home-page "https://github.com/ocaml/ocaml-re/") (synopsis "Regular expression library for OCaml") (description "Pure OCaml regular expressions with: @@ -3365,6 +3366,19 @@ standard iterator type starting from 4.07.") @end enumerate") (license license:expat))) +(define-public ocaml4.07-re + (package-with-ocaml4.07 + (package + (inherit ocaml-re) + (arguments + `(#:test-target "." + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dune-version + (lambda _ + (delete-file "dune-project")))))) + (properties '())))) + (define-public ocaml-ocplib-endian (package (name "ocaml-ocplib-endian") -- cgit 1.4.1 From b531ba43043936ea6a59bd33486ef7e6ad709473 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 15:26:54 +0200 Subject: gnu: Add ocaml4.07-alcotest. * gnu/packages/ocaml.scm (ocaml4.07-alcotest): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/ocaml.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 932220d188..767cacfb3e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2268,6 +2268,7 @@ immutability.") ("ocaml-stdlib-shims" ,ocaml-stdlib-shims) ("ocaml-uuidm" ,ocaml-uuidm) ("ocaml-uutf" ,ocaml-uutf))) + (properties `((ocaml4.07-variant . ,(delay ocaml4.07-alcotest)))) (home-page "https://github.com/mirage/alcotest") (synopsis "Lightweight OCaml test framework") (description "Alcotest exposes simple interface to perform unit tests. It @@ -2278,6 +2279,22 @@ displayed at the end of the run (with the full logs ready to inspect), with a simple (yet expressive) query language to select the tests to run.") (license license:isc))) +(define-public ocaml4.07-alcotest + (package-with-ocaml4.07 + (package + (inherit ocaml-alcotest) + (version "1.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mirage/alcotest") + (commit version))) + (file-name (git-file-name "ocaml-alcotest" version)) + (sha256 + (base32 + "1frwi185z4aadmaf0vp8xk5227nyg7nmh28ijj5l7ncjr5slvhz8")))) + (properties '())))) + (define-public ocaml-ppx-tools (package (name "ocaml-ppx-tools") -- cgit 1.4.1 From c10ba562be86ff29612372b4d70bec75368eb0e8 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 16:07:46 +0200 Subject: gnu: ocaml-lwt: Remove unneeded input. * gnu/packages/ocaml.scm (ocaml-lwt)[native-inputs]: Remove ocaml-bisect-ppx. Signed-off-by: Efraim Flashner --- gnu/packages/ocaml.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 767cacfb3e..f25189c3db 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2419,8 +2419,7 @@ for mapping files in memory. This function is the same as the (arguments `(#:package "lwt")) (native-inputs - `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) - ("ocaml-cppo" ,ocaml-cppo) + `(("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs `(("glib" ,glib))) -- cgit 1.4.1 From 6347ac8e407fff377e2b5810e0b1b850b3bfcc1d Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 15:27:56 +0200 Subject: gnu: Add ocaml4.07-bisect-ppx. * gnu/packages/ocaml.scm (ocaml4.07-bisect-ppx): New variable. Signed-off-by: Efraim Flashner --- gnu/packages/ocaml.scm | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f25189c3db..2aeffcf9ac 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6617,7 +6617,8 @@ combinators.") (arguments ;; Tests require ocamlformat which would lead to circular dependencies '(#:tests? #f)) - (properties '((upstream-name . "bisect_ppx"))) + (properties `((upstream-name . "bisect_ppx") + (ocaml4.07-variant . ,(delay ocaml4.07-bisect-ppx)))) (home-page "https://github.com/aantron/bisect_ppx") (synopsis "Code coverage for OCaml") (description "Bisect_ppx helps you test thoroughly. It is a small @@ -6629,6 +6630,33 @@ Usage is simple - add package bisect_ppx when building tests, run your tests, then run the Bisect_ppx report tool on the generated visitation files.") (license license:mpl2.0))) +(define-public ocaml4.07-bisect-ppx + (package-with-ocaml4.07 + (package + (inherit ocaml-bisect-ppx) + (version "2.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aantron/bisect_ppx") + (commit version))) + (file-name (git-file-name "ocaml-bisect-ppx" version)) + (sha256 + (base32 + "1njs8xc108rrpx5am5zhhcn6vjva7rsphm8034qp5lgyvnhfgh7q")))) + (propagated-inputs + `(("ocaml-migrate-parsetree" ,ocaml-migrate-parsetree) + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) + ,@(package-propagated-inputs ocaml-bisect-ppx))) + (native-inputs + `(("ocaml-ounit2" ,ocaml-ounit2))) + (arguments + `(#:test-target "." + ;; tests require git and network + #:tests? #f)) + (properties '((upstream-name . "bisect_ppx")))))) + (define-public ocaml-odoc (package (name "ocaml-odoc") -- cgit 1.4.1 From fd9b7f837697f38913feab339641d60803475910 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 15:28:54 +0200 Subject: gnu: ocaml4.07-odoc: Fix inputs. * gnu/packages/ocaml.scm (ocaml4.07-odoc): Fix inputs. Signed-off-by: Efraim Flashner --- gnu/packages/ocaml.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 2aeffcf9ac..d559b0141f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -6743,6 +6743,12 @@ language understood by ocamldoc.") (file-name (git-file-name name version)) (sha256 (base32 "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2")))) + (inputs + `(("ocaml-alcotest" ,ocaml-alcotest) + ("ocaml-markup" ,ocaml-markup) + ("ocaml-sexplib" ,ocaml-sexplib) + ("ocaml-re" ,ocaml-re) + ("ocaml-uutf" ,ocaml-uutf))) (properties '())))) (define-public ocaml4.07-fftw3 -- cgit 1.4.1 From 0a9a00b34c3bdbc07dce720b8568fd61a3f92cac Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 23 Oct 2021 15:30:04 +0200 Subject: gnu: pplacer: Fix build. * gnu/packages/bioinformatics.scm (pplacer): Add missing input. Signed-off-by: Efraim Flashner --- gnu/packages/bioinformatics.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 2ffe7f7f9f..6c9c1af33d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -143,6 +143,7 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) @@ -13676,7 +13677,8 @@ let before_space s = ("ocaml-sqlite3" ,(package-with-ocaml4.07 ocaml-sqlite3)) ("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) ("ocaml-mcl" ,(package-with-ocaml4.07 ocaml-mcl)) - ("ocaml-gsl" ,ocaml4.07-gsl-1))) + ("ocaml-gsl" ,ocaml4.07-gsl-1) + ("sqlite:static" ,sqlite "static"))) (native-inputs `(("cddlib-src" ,(package-source cddlib)) ("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild)) -- cgit 1.4.1 From 206f2693fd219b8b61d268056e37d3961559cbaf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 16:11:46 +0100 Subject: gnu: guix: Update to 9bbbac6. * gnu/packages/package-management.scm (guix): Update to 9bbbac6. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 6f2b2fd61c..b15298019b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -142,8 +142,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.3.0") - (commit "014f1b607f1d88a8e733017afaca006545b7d99b") - (revision 11)) + (commit "9bbbac6783bcdace17d967e85c8ae8d14cbf1ef9") + (revision 12)) (package (name "guix") @@ -159,7 +159,7 @@ (commit commit))) (sha256 (base32 - "0mmq0ypkxj6dc1r9j1mdgih87h6fc0mk05hp481cjp8shdc1w6gw")) + "1p0my0gfshdhm1dpqf6j68iipnigmpb23l8p81kwpw5w50x0hfda")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments -- cgit 1.4.1 From cf48bf8607ae1a1b8c4771c4db016614a00eb8db Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 13:12:07 +0000 Subject: gnu: s2n: Update to 1.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tls.scm (s2n): Update to 1.1.0. Signed-off-by: Ludovic Courtès --- gnu/packages/tls.scm | 53 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index b0a0128140..905197525d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -1157,39 +1157,38 @@ derived from Mozilla's collection.") (license license:mpl2.0)))) (define-public s2n - (let* ((commit "7f43b102def1d52422f6c3e48d5cb3e6dd26c646") - (revision "1")) - (package - (name "s2n") - (version (git-version "1.0.10" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/aws/s2n-tls") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06rqg0vcispi63cmcza9j7ix80l0w6wmbw81qlg4fq8l1lg9nyvl")))) - (build-system cmake-build-system) - (arguments - '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) - (propagated-inputs - `(("openssl" ,openssl) - ("openssl:static" ,openssl "static"))) - (synopsis "SSL/TLS implementation in C99") - (description - "This library provides a C99 implementation of SSL/TLS. It is designed -to be familiar to users of the widely-used POSIX I/O APIs. It supports -blocking, non-blocking, and full-duplex I/O. There are no locks or mutexes. + (package + (name "s2n") + ; Update only when updating aws-crt-cpp. + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aws/s2n-tls") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "14dhdddlph36nshdkh0v33718hxjx5vxqxmkw7707393q0qrgipw")))) + (build-system cmake-build-system) + (arguments + '(#:configure-flags + '("-DBUILD_SHARED_LIBS=ON"))) + (propagated-inputs + `(("openssl" ,openssl) + ("openssl:static" ,openssl "static"))) + (synopsis "SSL/TLS implementation in C99") + (description + "This library provides a C99 implementation of SSL/TLS. It is designed to +be familiar to users of the widely-used POSIX I/O APIs. It supports blocking, +non-blocking, and full-duplex I/O. There are no locks or mutexes. As it can be difficult to keep track of which encryption algorithms and protocols are best to use, s2n-tls features a simple API to use the latest default set of preferences. Remaining on a specific version for backwards compatibility is also supported.") (home-page "https://github.com/aws/s2n-tls") - (license license:asl2.0)))) + (license license:asl2.0))) (define-public wolfssl (package -- cgit 1.4.1 From 5715a07af32880ce0bac3f693b8e7ff6f50f1beb Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:32:36 +0000 Subject: gnu: aws-c-common: Update to 0.6.11. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-common): Update to 0.6.11. Signed-off-by: Ludovic Courtès --- gnu/packages/c.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 97c6818bfd..0b9830a5f3 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -553,7 +553,8 @@ portability.") (define-public aws-c-common (package (name "aws-c-common") - (version "0.6.2") + ; Update only when updating aws-crt-cpp. + (version "0.6.11") (source (origin (method git-fetch) (uri (git-reference @@ -562,7 +563,7 @@ portability.") (file-name (git-file-name name version)) (sha256 (base32 - "17iknzqs6dl0ixajplc47ylkyynwpi3x2dxh56wa8ylhgy53d09x")))) + "1v4dhygiynl75y3702lbp9j8kph88j4f2sq39s4lkhn6lmbz5f0f")))) (build-system cmake-build-system) (arguments '(#:configure-flags -- cgit 1.4.1 From 2a32dedfbfa262ad782421064e5be6f1403bcb9f Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:32:57 +0000 Subject: gnu: aws-c-io: Update to 0.10.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-io): Update to 0.10.9. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Remove patches. * gnu/packages/patches/aws-c-io-cmake-prefix.patch, gnu/packages/patches/aws-c-io-disable-networking-tests.patch: Delete files. * gnu/local.mk: Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/c.scm | 14 +-- gnu/packages/patches/aws-c-io-cmake-prefix.patch | 13 --- .../aws-c-io-disable-networking-tests.patch | 103 --------------------- 4 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-io-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-c-io-disable-networking-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5b21a6ee1b..9986b01537 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -878,8 +878,6 @@ dist_patch_DATA = \ %D%/packages/patches/aws-c-http-cmake-prefix.patch \ %D%/packages/patches/aws-c-http-disable-networking-tests.patch\ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ - %D%/packages/patches/aws-c-io-cmake-prefix.patch \ - %D%/packages/patches/aws-c-io-disable-networking-tests.patch \ %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-disable-networking-tests.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 0b9830a5f3..1479cf847d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -638,7 +638,8 @@ communication.") (define-public aws-c-io (package (name "aws-c-io") - (version "0.10.5") + ; Update only when updating aws-crt-cpp. + (version "0.10.9") (source (origin (method git-fetch) (uri (git-reference @@ -647,15 +648,14 @@ communication.") (file-name (git-file-name name version)) (sha256 (base32 - "1jrnzs803jqprnvbw6rqr834qld5sd7flaqzgssp3099m189szpq")) - (patches - (search-patches - "aws-c-io-cmake-prefix.patch" - "aws-c-io-disable-networking-tests.patch")))) + "14rxa3k842fgk43702nz7z9y3clfhvax8j0k93i0c5vg14wj38yp")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common")) + "-DENABLE_NET_TESTS=OFF"))) (propagated-inputs `(("aws-c-cal" ,aws-c-cal) ("aws-c-common" ,aws-c-common) diff --git a/gnu/packages/patches/aws-c-io-cmake-prefix.patch b/gnu/packages/patches/aws-c-io-cmake-prefix.patch deleted file mode 100644 index da3e4eb4a5..0000000000 --- a/gnu/packages/patches/aws-c-io-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() diff --git a/gnu/packages/patches/aws-c-io-disable-networking-tests.patch b/gnu/packages/patches/aws-c-io-disable-networking-tests.patch deleted file mode 100644 index e2e3afea13..0000000000 --- a/gnu/packages/patches/aws-c-io-disable-networking-tests.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -52,8 +52,8 @@ add_test_case(local_socket_communication) - add_net_test_case(tcp_socket_communication) - add_net_test_case(udp_socket_communication) - add_test_case(udp_bind_connect_communication) --add_net_test_case(connect_timeout) --add_net_test_case(connect_timeout_cancelation) -+#add_net_test_case(connect_timeout) -+#add_net_test_case(connect_timeout_cancelation) - if (USE_VSOCK) - add_test_case(vsock_loopback_socket_communication) - endif () -@@ -64,7 +64,7 @@ add_test_case(incoming_tcp_sock_errors) - add_test_case(incoming_duplicate_tcp_bind_errors) - add_test_case(incoming_udp_sock_errors) - add_test_case(wrong_thread_read_write_fails) --add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) -+#add_net_test_case(cleanup_before_connect_or_timeout_doesnt_explode) - add_test_case(cleanup_in_accept_doesnt_explode) - add_test_case(cleanup_in_write_cb_doesnt_explode) - add_test_case(sock_write_cb_is_async) -@@ -81,21 +81,21 @@ add_test_case(channel_tasks_run) - add_test_case(channel_rejects_post_shutdown_tasks) - add_test_case(channel_cancels_pending_tasks) - add_test_case(channel_duplicate_shutdown) --add_net_test_case(channel_connect_some_hosts_timeout) -+#add_net_test_case(channel_connect_some_hosts_timeout) - --add_net_test_case(test_default_with_ipv6_lookup) -+#add_net_test_case(test_default_with_ipv6_lookup) - add_test_case(test_resolver_ipv6_address_lookup) --add_net_test_case(test_default_with_multiple_lookups) -+#add_net_test_case(test_default_with_multiple_lookups) - add_test_case(test_resolver_ipv4_address_lookup) --add_net_test_case(test_default_with_ipv4_only_lookup) -+#add_net_test_case(test_default_with_ipv4_only_lookup) - add_test_case(test_resolver_ttls) - add_test_case(test_resolver_connect_failure_recording) - add_test_case(test_resolver_ttl_refreshes_on_resolve) - - add_net_test_case(test_resolver_listener_create_destroy) --add_net_test_case(test_resolver_add_listener_before_host) --add_net_test_case(test_resolver_add_listener_after_host) --add_net_test_case(test_resolver_add_multiple_listeners_fn) -+#add_net_test_case(test_resolver_add_listener_before_host) -+#add_net_test_case(test_resolver_add_listener_after_host) -+#add_net_test_case(test_resolver_add_multiple_listeners_fn) - add_net_test_case(test_resolver_listener_host_re_add_fn) - add_net_test_case(test_resolver_listener_multiple_results) - add_net_test_case(test_resolver_listener_address_expired_fn) -@@ -121,11 +121,11 @@ add_test_case(socket_handler_close) - if (NOT BYO_CRYPTO) - add_net_test_case(test_concurrent_cert_import) - add_test_case(tls_channel_echo_and_backpressure_test) -- add_net_test_case(tls_client_channel_negotiation_error_expired) -- add_net_test_case(tls_client_channel_negotiation_error_wrong_host) -- add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override) -- add_net_test_case(tls_client_channel_negotiation_error_self_signed) -- add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) -+ #add_net_test_case(tls_client_channel_negotiation_error_expired) -+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host) -+ #add_net_test_case(tls_client_channel_negotiation_error_wrong_host_with_ca_override) -+ #add_net_test_case(tls_client_channel_negotiation_error_self_signed) -+ #add_net_test_case(tls_client_channel_negotiation_error_untrusted_root) - #track these down in s2n and find out why that aren't failing. - #add_net_test_case(tls_client_channel_negotiation_error_revoked) - #add_net_test_case(tls_client_channel_negotiation_error_pinning) -@@ -133,23 +133,23 @@ if (NOT BYO_CRYPTO) - # once done, add these tests as well - #add_net_test_case(tls_client_channel_negotiation_no_verify_revoked) - #add_net_test_case(tls_client_channel_negotiation_no_verify_pinning) -- add_net_test_case(tls_client_channel_negotiation_no_verify_expired) -- add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host) -- add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed) -- add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root) -- -- add_net_test_case(tls_client_channel_negotiation_error_socket_closed) -- add_net_test_case(tls_client_channel_negotiation_success) -- add_net_test_case(tls_client_channel_negotiation_success_ecc256) -- add_net_test_case(tls_client_channel_negotiation_success_ecc384) -+ #add_net_test_case(tls_client_channel_negotiation_no_verify_expired) -+ #add_net_test_case(tls_client_channel_negotiation_no_verify_wrong_host) -+ #add_net_test_case(tls_client_channel_negotiation_no_verify_self_signed) -+ #add_net_test_case(tls_client_channel_negotiation_no_verify_untrusted_root) -+ -+ #add_net_test_case(tls_client_channel_negotiation_error_socket_closed) -+ #add_net_test_case(tls_client_channel_negotiation_success) -+ #add_net_test_case(tls_client_channel_negotiation_success_ecc256) -+ #add_net_test_case(tls_client_channel_negotiation_success_ecc384) - add_net_test_case(tls_server_multiple_connections) - add_net_test_case(tls_server_hangup_during_negotiation) -- add_net_test_case(tls_client_channel_no_verify) -+ #add_net_test_case(tls_client_channel_no_verify) - add_net_test_case(test_tls_negotiation_timeout) - add_net_test_case(tls_double_channel) - add_net_test_case(alpn_successfully_negotiates) - add_net_test_case(alpn_no_protocol_message) -- add_net_test_case(test_ecc_cert_import) -+ #add_net_test_case(test_ecc_cert_import) - add_test_case(alpn_error_creating_handler) - add_test_case(tls_destroy_null_context) - add_test_case(tls_channel_statistics_test) -- cgit 1.4.1 From 4ff5cd6b0645a06a6542834f6ff83d725ce61b5c Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:33:03 +0000 Subject: gnu: aws-c-cal: Update to 0.5.12. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-cal): Update to 0.5.12. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-c-cal-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/c.scm | 10 ++++++---- gnu/packages/patches/aws-c-cal-cmake-prefix.patch | 13 ------------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-cal-cmake-prefix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9986b01537..a1cc397f3b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -872,7 +872,6 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-cmake-prefix.patch \ %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\ - %D%/packages/patches/aws-c-cal-cmake-prefix.patch \ %D%/packages/patches/aws-c-compression-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-http-cmake-prefix.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 1479cf847d..a537988abe 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -669,7 +669,8 @@ event-driven, asynchronous network application protocols.") (define-public aws-c-cal (package (name "aws-c-cal") - (version "0.5.11") + ; Update only when updating aws-crt-cpp. + (version "0.5.12") (source (origin (method git-fetch) (uri (git-reference @@ -678,12 +679,13 @@ event-driven, asynchronous network application protocols.") (file-name (git-file-name name version)) (sha256 (base32 - "0rqqk4n56h8sf4q070rhgjwas04j8h0vq4wl1alq5l1rqq72qqdf")) - (patches (search-patches "aws-c-cal-cmake-prefix.patch")))) + "09zqf610x4g2mcjcaf9nh88k6dkw14pi721yr8hxb5rmsx7rlfrb")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-common" ,aws-c-common))) (inputs diff --git a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch b/gnu/packages/patches/aws-c-cal-cmake-prefix.patch deleted file mode 100644 index 1ee7aa851d..0000000000 --- a/gnu/packages/patches/aws-c-cal-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,6 +10,10 @@ endif() - - option(BYO_CRYPTO "Set this if you want to provide your own cryptography implementation. This will cause the defaults to not be compiled." OFF) - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() -- cgit 1.4.1 From 1a0ed46097dfc41e74354c44bd410a97e41df785 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:33:07 +0000 Subject: gnu: aws-c-http: Update to 0.6.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-http): Update to 0.6.7. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Remove patches. * gnu/packages/patches/aws-c-http-cmake-prefix.patch, gnu/packages/patches/aws-c-http-disable-networking-tests.patch: Delete files. * gnu/local.mk: Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/c.scm | 14 +++---- gnu/packages/patches/aws-c-http-cmake-prefix.patch | 13 ------ .../aws-c-http-disable-networking-tests.patch | 48 ---------------------- 4 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-http-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-c-http-disable-networking-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index a1cc397f3b..654d7d6c40 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -874,8 +874,6 @@ dist_patch_DATA = \ %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\ %D%/packages/patches/aws-c-compression-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ - %D%/packages/patches/aws-c-http-cmake-prefix.patch \ - %D%/packages/patches/aws-c-http-disable-networking-tests.patch\ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-disable-networking-tests.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index a537988abe..2b80303170 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -719,7 +719,8 @@ low level functionality for coroutines.") (define-public aws-c-http (package (name "aws-c-http") - (version "0.6.4") + ; Update only when updating aws-crt-cpp. + (version "0.6.7") (source (origin (method git-fetch) (uri (git-reference @@ -728,15 +729,14 @@ low level functionality for coroutines.") (file-name (git-file-name name version)) (sha256 (base32 - "18xlgz68zizkcp784bs6hkyx0gvp0f1p076i46z653bcd3qa87b4")) - (patches - (search-patches - "aws-c-http-cmake-prefix.patch" - "aws-c-http-disable-networking-tests.patch")))) + "1s06bz6w7355ldyhwjidcpbff7591ch4lwwjcj47a6k2kczdmiz4")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common")) + "-DENABLE_NET_TESTS=OFF"))) (propagated-inputs `(("aws-c-compression" ,aws-c-compression) ("aws-c-io" ,aws-c-io))) diff --git a/gnu/packages/patches/aws-c-http-cmake-prefix.patch b/gnu/packages/patches/aws-c-http-cmake-prefix.patch deleted file mode 100644 index ec650a7e82..0000000000 --- a/gnu/packages/patches/aws-c-http-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,10 @@ endif() - - option(ENABLE_PROXY_INTEGRATION_TESTS "Whether to run the proxy integration tests that rely on a proxy server installed and running locally" OFF) - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() diff --git a/gnu/packages/patches/aws-c-http-disable-networking-tests.patch b/gnu/packages/patches/aws-c-http-disable-networking-tests.patch deleted file mode 100644 index 9bfd422341..0000000000 --- a/gnu/packages/patches/aws-c-http-disable-networking-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -136,8 +136,8 @@ add_test_case(strutil_trim_http_whitespace) - add_test_case(strutil_is_http_token) - add_test_case(strutil_is_lowercase_http_token) - --add_net_test_case(tls_download_medium_file_h1) --add_net_test_case(tls_download_medium_file_h2) -+#add_net_test_case(tls_download_medium_file_h1) -+#add_net_test_case(tls_download_medium_file_h2) - - add_test_case(websocket_decoder_sanity_check) - add_test_case(websocket_decoder_simplest_frame) -@@ -438,21 +438,21 @@ add_test_case(connection_setup_shutdown) - - # connection manager tests - # unit tests where connections are mocked --add_net_test_case(test_connection_manager_setup_shutdown) --add_net_test_case(test_connection_manager_acquire_release_mix_synchronous) --add_net_test_case(test_connection_manager_connect_callback_failure) --add_net_test_case(test_connection_manager_connect_immediate_failure) --add_net_test_case(test_connection_manager_proxy_setup_shutdown) --add_net_test_case(test_connection_manager_idle_culling_single) --add_net_test_case(test_connection_manager_idle_culling_many) --add_net_test_case(test_connection_manager_idle_culling_mixture) -+#add_net_test_case(test_connection_manager_setup_shutdown) -+#add_net_test_case(test_connection_manager_acquire_release_mix_synchronous) -+#add_net_test_case(test_connection_manager_connect_callback_failure) -+#add_net_test_case(test_connection_manager_connect_immediate_failure) -+#add_net_test_case(test_connection_manager_proxy_setup_shutdown) -+#add_net_test_case(test_connection_manager_idle_culling_single) -+#add_net_test_case(test_connection_manager_idle_culling_many) -+#add_net_test_case(test_connection_manager_idle_culling_mixture) - - # tests where we establish real connections --add_net_test_case(test_connection_manager_single_connection) --add_net_test_case(test_connection_manager_many_connections) --add_net_test_case(test_connection_manager_acquire_release) --add_net_test_case(test_connection_manager_close_and_release) --add_net_test_case(test_connection_manager_acquire_release_mix) -+#add_net_test_case(test_connection_manager_single_connection) -+#add_net_test_case(test_connection_manager_many_connections) -+#add_net_test_case(test_connection_manager_acquire_release) -+#add_net_test_case(test_connection_manager_close_and_release) -+#add_net_test_case(test_connection_manager_acquire_release_mix) - - - add_test_case(h1_server_sanity_check) -- cgit 1.4.1 From cff8a12a0a23f09fe1bc0d55f8d7e35ca6054ba0 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:36:24 +0000 Subject: gnu: aws-c-compression: Update to 0.2.14. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-compression): Update to 0.2.14. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-c-compression-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/c.scm | 10 ++++++---- gnu/packages/patches/aws-c-compression-cmake-prefix.patch | 13 ------------- 3 files changed, 6 insertions(+), 18 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-compression-cmake-prefix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 654d7d6c40..b8361728fa 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -872,7 +872,6 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-cmake-prefix.patch \ %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\ - %D%/packages/patches/aws-c-compression-cmake-prefix.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 2b80303170..753b145497 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -750,7 +750,8 @@ specifications.") (define-public aws-c-compression (package (name "aws-c-compression") - (version "0.2.13") + ; Update only when updating aws-crt-cpp. + (version "0.2.14") (source (origin (method git-fetch) (uri (git-reference @@ -759,12 +760,13 @@ specifications.") (file-name (git-file-name name version)) (sha256 (base32 - "0zqfxi0fdgapfsfgvsindv63pq7vyl1s376qkpv4jgflyb1v6gp5")) - (patches (search-patches "aws-c-compression-cmake-prefix.patch")))) + "0fs3zhhzxsb9nfcjpvfbcq79hal7si2ia1c09scab9a8m264f4vd")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-common" ,aws-c-common))) (synopsis "Amazon Web Services compression library") diff --git a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch b/gnu/packages/patches/aws-c-compression-cmake-prefix.patch deleted file mode 100644 index eefae19c4a..0000000000 --- a/gnu/packages/patches/aws-c-compression-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,6 +5,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() -- cgit 1.4.1 From 05be89ac5b592c798976d97dce920734b7e7fa55 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:43:35 +0000 Subject: gnu: aws-c-auth: Update to 0.6.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-auth): Update to 0.6.4. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Add and remove patches. * gnu/packages/patches/aws-c-auth-install-private-headers.patch: New file. * gnu/packages/patches/aws-c-auth-cmake-prefix.patch, gnu/packages/patches/aws-c-auth-disable-networking-tests.patch: Delete files. * gnu/local.mk: Add and remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 3 +- gnu/packages/c.scm | 13 +++-- gnu/packages/patches/aws-c-auth-cmake-prefix.patch | 13 ----- .../aws-c-auth-disable-networking-tests.patch | 64 ---------------------- .../aws-c-auth-install-private-headers.patch | 19 +++++++ 5 files changed, 28 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-auth-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-c-auth-disable-networking-tests.patch create mode 100644 gnu/packages/patches/aws-c-auth-install-private-headers.patch diff --git a/gnu/local.mk b/gnu/local.mk index b8361728fa..20bf432947 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -870,8 +870,7 @@ dist_patch_DATA = \ %D%/packages/patches/avahi-localstatedir.patch \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ - %D%/packages/patches/aws-c-auth-cmake-prefix.patch \ - %D%/packages/patches/aws-c-auth-disable-networking-tests.patch\ + %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 753b145497..9a4f7a304d 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -779,7 +779,8 @@ currently limited to Huffman encoding and decoding.") (define-public aws-c-auth (package (name "aws-c-auth") - (version "0.6.0") + ; Update only when updating aws-crt-cpp. + (version "0.6.4") (source (origin (method git-fetch) (uri (git-reference @@ -788,15 +789,17 @@ currently limited to Huffman encoding and decoding.") (file-name (git-file-name name version)) (sha256 (base32 - "0yh9s6q3ahq39xgvihp2a5cn9h39qlq8wfjc32m0ayi9x739rbqg")) + "120p69lj279yq3d2b81f45kgfrvf32j6m7s03m8hh27w8yd4vbfp")) (patches (search-patches - "aws-c-auth-cmake-prefix.patch" - "aws-c-auth-disable-networking-tests.patch")))) + "aws-c-auth-install-private-headers.patch")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common")) + "-DENABLE_NET_TESTS=OFF"))) (propagated-inputs `(("aws-c-cal" ,aws-c-cal) ("aws-c-common" ,aws-c-common) diff --git a/gnu/packages/patches/aws-c-auth-cmake-prefix.patch b/gnu/packages/patches/aws-c-auth-cmake-prefix.patch deleted file mode 100644 index da3e4eb4a5..0000000000 --- a/gnu/packages/patches/aws-c-auth-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() diff --git a/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch b/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch deleted file mode 100644 index 905247f528..0000000000 --- a/gnu/packages/patches/aws-c-auth-disable-networking-tests.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -19,8 +19,8 @@ add_test_case(profile_credentials_provider_environment_test) - add_test_case(credentials_provider_first_in_chain_test) - add_test_case(credentials_provider_second_in_chain_test) - add_test_case(credentials_provider_null_chain_test) --add_test_case(credentials_provider_default_basic_test) --add_test_case(credentials_provider_default_manual_tls_test) -+#add_test_case(credentials_provider_default_basic_test) -+#add_test_case(credentials_provider_default_manual_tls_test) - add_test_case(credentials_provider_imds_new_destroy) - add_test_case(credentials_provider_imds_connect_failure) - add_test_case(credentials_provider_imds_token_request_failure) -@@ -58,28 +58,28 @@ add_test_case(credentials_provider_x509_basic_success) - add_test_case(credentials_provider_x509_success_multi_part_doc) - add_test_case(credentials_provider_x509_real_new_destroy) - --add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env) --add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config) --add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config) --add_net_test_case(credentials_provider_sts_web_identity_connect_failure) --add_net_test_case(credentials_provider_sts_web_identity_request_failure) --add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure) --add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1) --add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2) --add_net_test_case(credentials_provider_sts_web_identity_basic_success_env) --add_net_test_case(credentials_provider_sts_web_identity_basic_success_config) --add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc) --add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy) -- --add_net_test_case(credentials_provider_sts_direct_config_succeeds) --add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry) --add_net_test_case(credentials_provider_sts_direct_config_invalid_doc) --add_net_test_case(credentials_provider_sts_direct_config_connection_failed) --add_net_test_case(credentials_provider_sts_direct_config_service_fails) --add_net_test_case(credentials_provider_sts_from_profile_config_succeeds) --add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds) --add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds) --add_net_test_case(credentials_provider_sts_cache_expiration_conflict) -+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_env) -+#add_net_test_case(credentials_provider_sts_web_identity_new_destroy_from_config) -+#add_net_test_case(credentials_provider_sts_web_identity_new_failed_without_env_and_config) -+#add_net_test_case(credentials_provider_sts_web_identity_connect_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_request_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_bad_document_failure) -+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error1) -+#add_net_test_case(credentials_provider_sts_web_identity_test_retry_error2) -+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_env) -+#add_net_test_case(credentials_provider_sts_web_identity_basic_success_config) -+#add_net_test_case(credentials_provider_sts_web_identity_success_multi_part_doc) -+#add_net_test_case(credentials_provider_sts_web_identity_real_new_destroy) -+ -+#add_net_test_case(credentials_provider_sts_direct_config_succeeds) -+#add_net_test_case(credentials_provider_sts_direct_config_succeeds_after_retry) -+#add_net_test_case(credentials_provider_sts_direct_config_invalid_doc) -+#add_net_test_case(credentials_provider_sts_direct_config_connection_failed) -+#add_net_test_case(credentials_provider_sts_direct_config_service_fails) -+#add_net_test_case(credentials_provider_sts_from_profile_config_succeeds) -+#add_net_test_case(credentials_provider_sts_from_profile_config_manual_tls_succeeds) -+#add_net_test_case(credentials_provider_sts_from_profile_config_environment_succeeds) -+#add_net_test_case(credentials_provider_sts_cache_expiration_conflict) - - add_test_case(credentials_provider_process_new_destroy_from_config) - add_test_case(credentials_provider_process_new_failed) diff --git a/gnu/packages/patches/aws-c-auth-install-private-headers.patch b/gnu/packages/patches/aws-c-auth-install-private-headers.patch new file mode 100644 index 0000000000..990fd6f2eb --- /dev/null +++ b/gnu/packages/patches/aws-c-auth-install-private-headers.patch @@ -0,0 +1,19 @@ +aws-sdk-cpp depends on the private headers from aws-c-auth. This dependency was +added to aws-sdk-cpp in commit 23cca02c2df on 2021-06-04. + +The following error is generated when building aws-sdk-cpp when the private +aws-c-auth headers are not installed: + +/tmp/guix-build-aws-sdk-cpp-1.9.121.drv-0/aws-sdk-cpp-1.9.121-checkout/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp:17:10: fatal error: aws/auth/private/aws_signing.h: No such file or directory + #include + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,6 +114,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS} ${PLATFORM_LIBS}) + aws_prepare_shared_lib_exports(${PROJECT_NAME}) + + install(FILES ${AWS_AUTH_ROOT_HEADERS} DESTINATION "include/aws/auth" COMPONENT Development) ++install(FILES ${AWS_AUTH_PRIVATE_HEADERS} DESTINATION "include/aws/auth/private" COMPONENT Development) + + if (BUILD_SHARED_LIBS) + set (TARGET_DIR "shared") -- cgit 1.4.1 From 2d613547888c7578d56b7920e8b31946cd324c49 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:47:41 +0000 Subject: gnu: aws-c-s3: Update to 0.1.26. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-s3): Update to 0.1.26. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Remove patches. * gnu/packages/patches/aws-c-s3-cmake-prefix.patch, gnu/packages/patches/aws-c-s3-disable-networking-tests.patch: Delete files. * gnu/local.mk: Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/c.scm | 14 +- gnu/packages/patches/aws-c-s3-cmake-prefix.patch | 13 -- .../aws-c-s3-disable-networking-tests.patch | 153 --------------------- 4 files changed, 7 insertions(+), 175 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-s3-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-c-s3-disable-networking-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 20bf432947..b24fd01e10 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,8 +873,6 @@ dist_patch_DATA = \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ - %D%/packages/patches/aws-c-s3-cmake-prefix.patch \ - %D%/packages/patches/aws-c-s3-disable-networking-tests.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/aws-crt-cpp-cmake-prefix.patch \ %D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 9a4f7a304d..ecf79bd2cf 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -815,7 +815,8 @@ authentication.") (define-public aws-c-s3 (package (name "aws-c-s3") - (version "0.1.19") + ; Update only when updating aws-crt-cpp. + (version "0.1.26") (source (origin (method git-fetch) (uri (git-reference @@ -824,15 +825,14 @@ authentication.") (file-name (git-file-name name version)) (sha256 (base32 - "1vkjd8dh99d8qsl7irnbkcdf9vjmcznx0jz186la0472z4h48wjj")) - (patches - (search-patches - "aws-c-s3-cmake-prefix.patch" - "aws-c-s3-disable-networking-tests.patch")))) + "0gaxnwwk0jbvkgjnxcgchq13xmn7jk5vjvjsps6b0vaz6bf12wv8")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common")) + "-DENABLE_NET_TESTS=OFF"))) (propagated-inputs `(("aws-c-auth" ,aws-c-auth) ("aws-c-http" ,aws-c-http))) diff --git a/gnu/packages/patches/aws-c-s3-cmake-prefix.patch b/gnu/packages/patches/aws-c-s3-cmake-prefix.patch deleted file mode 100644 index da3e4eb4a5..0000000000 --- a/gnu/packages/patches/aws-c-s3-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() diff --git a/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch b/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch deleted file mode 100644 index e8a3d8ed6a..0000000000 --- a/gnu/packages/patches/aws-c-s3-disable-networking-tests.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -23,8 +23,8 @@ add_test_case(test_s3_upload_part_message_new) - add_test_case(test_s3_complete_multipart_message_new) - add_test_case(test_s3_abort_multipart_upload_message_new) - --add_net_test_case(test_s3_client_create_destroy) --add_net_test_case(test_s3_client_max_active_connections_override) -+#add_net_test_case(test_s3_client_create_destroy) -+#add_net_test_case(test_s3_client_max_active_connections_override) - add_test_case(test_s3_client_get_max_active_connections) - add_test_case(test_s3_request_create_destroy) - add_test_case(test_s3_client_queue_requests) -@@ -37,75 +37,75 @@ add_test_case(test_s3_client_update_connections_too_many_conns) - add_test_case(test_s3_client_update_connections_finish_result) - add_test_case(test_s3_client_update_connections_clean_up) - --add_net_test_case(test_s3_vip_create_destroy) --add_net_test_case(test_s3_client_add_remove_vips) --add_net_test_case(test_s3_client_resolve_vips) -+#add_net_test_case(test_s3_vip_create_destroy) -+#add_net_test_case(test_s3_client_add_remove_vips) -+#add_net_test_case(test_s3_client_resolve_vips) - add_test_case(test_s3_client_set_vip_connection_warm) - add_test_case(test_s3_client_set_vip_connection_active) - --add_net_test_case(test_s3_client_exceed_retries) --add_net_test_case(test_s3_client_acquire_connection_fail) --add_net_test_case(test_s3_meta_request_fail_prepare_request) --add_net_test_case(test_s3_meta_request_sign_request_fail) --add_net_test_case(test_s3_meta_request_send_request_finish_fail) --add_net_test_case(test_s3_auto_range_put_missing_upload_id) -+#add_net_test_case(test_s3_client_exceed_retries) -+#add_net_test_case(test_s3_client_acquire_connection_fail) -+#add_net_test_case(test_s3_meta_request_fail_prepare_request) -+#add_net_test_case(test_s3_meta_request_sign_request_fail) -+#add_net_test_case(test_s3_meta_request_send_request_finish_fail) -+#add_net_test_case(test_s3_auto_range_put_missing_upload_id) - --add_net_test_case(test_s3_cancel_mpu_create_not_sent) --add_net_test_case(test_s3_cancel_mpu_create_completed) --add_net_test_case(test_s3_cancel_mpu_one_part_completed) --add_net_test_case(test_s3_cancel_mpu_all_parts_completed) --add_net_test_case(test_s3_cancel_mpd_nothing_sent) --add_net_test_case(test_s3_cancel_mpd_one_part_sent) --add_net_test_case(test_s3_cancel_mpd_one_part_completed) --add_net_test_case(test_s3_cancel_mpd_two_parts_completed) --add_net_test_case(test_s3_cancel_mpd_head_object_sent) --add_net_test_case(test_s3_cancel_mpd_head_object_completed) --add_net_test_case(test_s3_cancel_mpd_get_without_range_sent) --add_net_test_case(test_s3_cancel_mpd_get_without_range_completed) -+#add_net_test_case(test_s3_cancel_mpu_create_not_sent) -+#add_net_test_case(test_s3_cancel_mpu_create_completed) -+#add_net_test_case(test_s3_cancel_mpu_one_part_completed) -+#add_net_test_case(test_s3_cancel_mpu_all_parts_completed) -+#add_net_test_case(test_s3_cancel_mpd_nothing_sent) -+#add_net_test_case(test_s3_cancel_mpd_one_part_sent) -+#add_net_test_case(test_s3_cancel_mpd_one_part_completed) -+#add_net_test_case(test_s3_cancel_mpd_two_parts_completed) -+#add_net_test_case(test_s3_cancel_mpd_head_object_sent) -+#add_net_test_case(test_s3_cancel_mpd_head_object_completed) -+#add_net_test_case(test_s3_cancel_mpd_get_without_range_sent) -+#add_net_test_case(test_s3_cancel_mpd_get_without_range_completed) - --add_net_test_case(test_s3_get_object_tls_disabled) --add_net_test_case(test_s3_get_object_tls_enabled) --add_net_test_case(test_s3_get_object_tls_default) --add_net_test_case(test_s3_get_object_less_than_part_size) --add_net_test_case(test_s3_get_object_empty_object) --add_net_test_case(test_s3_get_object_multiple) --add_net_test_case(test_s3_get_object_sse_kms) --add_net_test_case(test_s3_get_object_sse_aes256) --add_net_test_case(test_s3_no_signing) --add_net_test_case(test_s3_signing_override) --add_net_test_case(test_s3_put_object_tls_disabled) --add_net_test_case(test_s3_put_object_tls_enabled) --add_net_test_case(test_s3_put_object_tls_default) --add_net_test_case(test_s3_multipart_put_object_with_acl) --add_net_test_case(test_s3_put_object_multiple) --add_net_test_case(test_s3_put_object_less_than_part_size) --add_net_test_case(test_s3_put_object_empty_object) --add_net_test_case(test_s3_put_object_with_part_remainder) --add_net_test_case(test_s3_put_object_sse_kms) --add_net_test_case(test_s3_put_object_sse_kms_multipart) --add_net_test_case(test_s3_put_object_sse_aes256) --add_net_test_case(test_s3_put_object_sse_aes256_multipart) --add_net_test_case(test_s3_put_object_double_slashes) --add_net_test_case(test_s3_meta_request_default) --add_net_test_case(test_s3_put_object_fail_headers_callback) --add_net_test_case(test_s3_put_object_fail_body_callback) --add_net_test_case(test_s3_get_object_fail_headers_callback) --add_net_test_case(test_s3_get_object_fail_body_callback) --add_net_test_case(test_s3_default_fail_headers_callback) --add_net_test_case(test_s3_default_fail_body_callback) --add_net_test_case(test_s3_error_missing_file) --add_net_test_case(test_s3_existing_host_entry) --add_net_test_case(test_s3_put_fail_object_invalid_request) --add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading) --add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading) --add_net_test_case(test_s3_bad_endpoint) --add_net_test_case(test_s3_put_object_clamp_part_size) --add_net_test_case(test_s3_different_endpoints) --add_net_test_case(test_s3_auto_ranged_get_sending_user_agent) --add_net_test_case(test_s3_auto_ranged_put_sending_user_agent) --add_net_test_case(test_s3_default_sending_meta_request_user_agent) --add_net_test_case(test_s3_range_requests) --add_net_test_case(test_s3_not_satisfiable_range) -+#add_net_test_case(test_s3_get_object_tls_disabled) -+#add_net_test_case(test_s3_get_object_tls_enabled) -+#add_net_test_case(test_s3_get_object_tls_default) -+#add_net_test_case(test_s3_get_object_less_than_part_size) -+#add_net_test_case(test_s3_get_object_empty_object) -+#add_net_test_case(test_s3_get_object_multiple) -+#add_net_test_case(test_s3_get_object_sse_kms) -+#add_net_test_case(test_s3_get_object_sse_aes256) -+#add_net_test_case(test_s3_no_signing) -+#add_net_test_case(test_s3_signing_override) -+#add_net_test_case(test_s3_put_object_tls_disabled) -+#add_net_test_case(test_s3_put_object_tls_enabled) -+#add_net_test_case(test_s3_put_object_tls_default) -+#add_net_test_case(test_s3_multipart_put_object_with_acl) -+#add_net_test_case(test_s3_put_object_multiple) -+#add_net_test_case(test_s3_put_object_less_than_part_size) -+#add_net_test_case(test_s3_put_object_empty_object) -+#add_net_test_case(test_s3_put_object_with_part_remainder) -+#add_net_test_case(test_s3_put_object_sse_kms) -+#add_net_test_case(test_s3_put_object_sse_kms_multipart) -+#add_net_test_case(test_s3_put_object_sse_aes256) -+#add_net_test_case(test_s3_put_object_sse_aes256_multipart) -+#add_net_test_case(test_s3_put_object_double_slashes) -+#add_net_test_case(test_s3_meta_request_default) -+#add_net_test_case(test_s3_put_object_fail_headers_callback) -+#add_net_test_case(test_s3_put_object_fail_body_callback) -+#add_net_test_case(test_s3_get_object_fail_headers_callback) -+#add_net_test_case(test_s3_get_object_fail_body_callback) -+#add_net_test_case(test_s3_default_fail_headers_callback) -+#add_net_test_case(test_s3_default_fail_body_callback) -+#add_net_test_case(test_s3_error_missing_file) -+#add_net_test_case(test_s3_existing_host_entry) -+#add_net_test_case(test_s3_put_fail_object_invalid_request) -+#add_net_test_case(test_s3_put_fail_object_inputstream_fail_reading) -+#add_net_test_case(test_s3_put_single_part_fail_object_inputstream_fail_reading) -+#add_net_test_case(test_s3_bad_endpoint) -+#add_net_test_case(test_s3_put_object_clamp_part_size) -+#add_net_test_case(test_s3_different_endpoints) -+#add_net_test_case(test_s3_auto_ranged_get_sending_user_agent) -+#add_net_test_case(test_s3_auto_ranged_put_sending_user_agent) -+#add_net_test_case(test_s3_default_sending_meta_request_user_agent) -+#add_net_test_case(test_s3_range_requests) -+#add_net_test_case(test_s3_not_satisfiable_range) - - add_test_case(test_s3_replace_quote_entities) - add_test_case(test_s3_parse_content_range_response_header) -- cgit 1.4.1 From d5c9f52a37ee782888f6db2e5a7e5f34153a2054 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:53:16 +0000 Subject: gnu: aws-c-mqtt: Replace patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-mqtt): Replace patch. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/c.scm | 8 +++++--- gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch | 13 ------------- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch diff --git a/gnu/local.mk b/gnu/local.mk index b24fd01e10..1bbe6bcf39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -872,7 +872,6 @@ dist_patch_DATA = \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ - %D%/packages/patches/aws-c-mqtt-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/aws-crt-cpp-cmake-prefix.patch \ %D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index ecf79bd2cf..3b10579ee7 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -846,6 +846,7 @@ Service (S3) protocol for object storage.") (define-public aws-c-mqtt (package (name "aws-c-mqtt") + ; Update only when updating aws-crt-cpp. (version "0.7.8") (source (origin (method git-fetch) @@ -855,12 +856,13 @@ Service (S3) protocol for object storage.") (file-name (git-file-name name version)) (sha256 (base32 - "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c")) - (patches (search-patches "aws-c-mqtt-cmake-prefix.patch")))) + "19j6nw2v36c4yff4p0fbf0748s06fd5r9cp2yakry9ybn1ada99c")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-http" ,aws-c-http) ("aws-c-io" ,aws-c-io))) diff --git a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch b/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch deleted file mode 100644 index 987024b57c..0000000000 --- a/gnu/packages/patches/aws-c-mqtt-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,6 +7,10 @@ if (POLICY CMP0069) - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() -- cgit 1.4.1 From 37db6db2841e7e5c9be54dd198964046a53d2c71 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 17:57:53 +0000 Subject: gnu: aws-crt-cpp: Update to 0.17.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-crt-cpp): Update to 0.17.1. [arguments]: Fix CMAKE_PREFIX_PATH, disable network tests. [source]: Remove patches. * gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch, gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch: Delete files. * gnu/local.mk: Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 2 - gnu/packages/cpp.scm | 20 ++++----- .../patches/aws-crt-cpp-cmake-prefix.patch | 13 ------ .../aws-crt-cpp-disable-networking-tests.patch | 47 ---------------------- 4 files changed, 11 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1bbe6bcf39..a43e1a2d7b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,8 +873,6 @@ dist_patch_DATA = \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ - %D%/packages/patches/aws-crt-cpp-cmake-prefix.patch \ - %D%/packages/patches/aws-crt-cpp-disable-networking-tests.patch \ %D%/packages/patches/aws-sdk-cpp-cmake-prefix.patch \ %D%/packages/patches/aws-sdk-cpp-disable-networking-tests.patch \ %D%/packages/patches/aws-sdk-cpp-disable-werror.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index d7a83ae727..53fa11beca 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -900,11 +900,14 @@ of C++14 components that complements @code{std} and Boost.") (license license:asl2.0))) (define-public aws-crt-cpp - (let* ((commit "c2d6ffa5597825111cc76ad71ffc6aef664d0f25") + (let* ((commit "b6d311d76b504bf8ace5134d3fca0e672c36c9c3") (revision "1")) (package (name "aws-crt-cpp") - (version (git-version "0.14.2" revision commit)) + ; Update only when updating aws-sdk-cpp, and when updating also update + ; versions of library dependencies linked from from + ; https://github.com/awslabs/aws-crt-cpp/tree/{aws-crt-cpp commit}/crt + (version (git-version "0.17.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -913,16 +916,15 @@ of C++14 components that complements @code{std} and Boost.") (file-name (git-file-name name version)) (sha256 (base32 - "0l7iwynk2rgzjnr1hi1raazghmk4m7pj47vdq2kf2cfz0b6v9jf5")) - (patches - (search-patches - "aws-crt-cpp-cmake-prefix.patch" - "aws-crt-cpp-disable-networking-tests.patch")))) + "1n0nlbz91j3ycwwrh9652f0h5qr2sj5b1l0i5sg40ajzs7wvzd32")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_DEPS=OFF"))) + (list "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common")) + "-DENABLE_NET_TESTS=OFF"))) (propagated-inputs `(("aws-c-auth" ,aws-c-auth) ("aws-c-cal" ,aws-c-cal) diff --git a/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch b/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch deleted file mode 100644 index b45818875f..0000000000 --- a/gnu/packages/patches/aws-crt-cpp-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") - include(AwsCheckHeadersCxx) - include(CTest) - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() diff --git a/gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch b/gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch deleted file mode 100644 index 4c1be7d028..0000000000 --- a/gnu/packages/patches/aws-crt-cpp-disable-networking-tests.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -13,9 +13,9 @@ add_test_case(ApiMultiDefaultCreateDestroy) - add_test_case(EventLoopResourceSafety) - add_test_case(ClientBootstrapResourceSafety) - if (NOT BYO_CRYPTO) -- add_net_test_case(MqttClientResourceSafety) -+ #add_net_test_case(MqttClientResourceSafety) - add_net_test_case(MqttClientNewConnectionUninitializedTlsContext) -- add_net_test_case(TLSContextResourceSafety) -+ #add_net_test_case(TLSContextResourceSafety) - add_net_test_case(TLSContextUninitializedNewConnectionOptions) - endif () - add_test_case(Base64RoundTrip) -@@ -29,15 +29,15 @@ add_test_case(SHA256ResourceSafety) - add_test_case(MD5ResourceSafety) - add_test_case(SHA256HMACResourceSafety) - if (NOT BYO_CRYPTO) -- add_net_test_case(HttpDownloadNoBackPressureHTTP1_1) -- add_net_test_case(HttpDownloadNoBackPressureHTTP2) -- add_net_test_case(HttpStreamUnActivated) -+ #add_net_test_case(HttpDownloadNoBackPressureHTTP1_1) -+ #add_net_test_case(HttpDownloadNoBackPressureHTTP2) -+ #add_net_test_case(HttpStreamUnActivated) - add_net_test_case(HttpCreateConnectionInvalidTlsConnectionOptions) - add_net_test_case(IotPublishSubscribe) -- add_net_test_case(HttpClientConnectionManagerResourceSafety) -+ #add_net_test_case(HttpClientConnectionManagerResourceSafety) - add_net_test_case(HttpClientConnectionManagerInvalidTlsConnectionOptions) -- add_net_test_case(HttpClientConnectionWithPendingAcquisitions) -- add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections) -+ #add_net_test_case(HttpClientConnectionWithPendingAcquisitions) -+ #add_net_test_case(HttpClientConnectionWithPendingAcquisitionsAndClosedConnections) - endif () - add_test_case(DefaultResolution) - add_test_case(OptionalCopySafety) -@@ -55,8 +55,8 @@ add_test_case(TestProviderEnvironmentGet) - add_test_case(TestProviderProfileGet) - add_test_case(TestProviderImdsGet) - if (NOT BYO_CRYPTO) -- add_net_test_case(TestProviderDefaultChainGet) -- add_net_test_case(TestProviderDefaultChainManualTlsContextGet) -+ #add_net_test_case(TestProviderDefaultChainGet) -+ #add_net_test_case(TestProviderDefaultChainManualTlsContextGet) - endif () - add_test_case(TestProviderDelegateGet) - add_test_case(HttpRequestTestCreateDestroy) -- cgit 1.4.1 From c769b8c2b5bf97cf9aaaa9b151012763355b1f66 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 18:08:57 +0000 Subject: gnu: aws-sdk-cpp: Update to 1.9.136. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (aws-sdk-cpp): Update to 1.9.136. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patches. * gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch, gnu/packages/patches/aws-sdk-cpp-disable-network-tests.patch, gnu/packages/patches/aws-sdk-cpp-disable-werror.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 3 -- gnu/packages/cpp.scm | 17 ++++----- .../patches/aws-sdk-cpp-cmake-prefix.patch | 18 --------- .../aws-sdk-cpp-disable-networking-tests.patch | 44 ---------------------- .../patches/aws-sdk-cpp-disable-werror.patch | 11 ------ 5 files changed, 8 insertions(+), 85 deletions(-) delete mode 100644 gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch delete mode 100644 gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch delete mode 100644 gnu/packages/patches/aws-sdk-cpp-disable-werror.patch diff --git a/gnu/local.mk b/gnu/local.mk index a43e1a2d7b..8f57eba56a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -873,9 +873,6 @@ dist_patch_DATA = \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ - %D%/packages/patches/aws-sdk-cpp-cmake-prefix.patch \ - %D%/packages/patches/aws-sdk-cpp-disable-networking-tests.patch \ - %D%/packages/patches/aws-sdk-cpp-disable-werror.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 53fa11beca..72bb5bcda5 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -943,7 +943,9 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.") (define-public aws-sdk-cpp (package (name "aws-sdk-cpp") - (version "1.9.92") + ; When updating also check for a tagged update to aws-crt-cpp from + ; https://github.com/aws/aws-sdk-cpp/tree/main/crt + (version "1.9.136") (source (origin (method git-fetch) (uri (git-reference @@ -952,19 +954,16 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.") (file-name (git-file-name name version)) (sha256 (base32 - "0nbq1qivykfg8jmrn8d0k6fcfa5dw9s90wnwddh7ia4zafmby7pd")) - (patches - (search-patches - "aws-sdk-cpp-cmake-prefix.patch" - "aws-sdk-cpp-disable-networking-tests.patch" - "aws-sdk-cpp-disable-werror.patch")))) + "0ap7g7nmbnrcajy3b788bnpqd87dwmg83dhll1q8qzli04bcg47i")))) (build-system cmake-build-system) (arguments '(;; Tests are run during the build phase. #:tests? #f #:configure-flags - '("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_DEPS=OFF"))) + (list "-DBUILD_DEPS=OFF" + "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-crt-cpp" ,aws-crt-cpp))) (inputs diff --git a/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch b/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch deleted file mode 100644 index efc1218834..0000000000 --- a/gnu/packages/patches/aws-sdk-cpp-cmake-prefix.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -98,9 +98,13 @@ set(PYTHON_CMD "python") - # CMAKE_MODULE_PATH is a CMAKE variable. It contains a list of paths - # which could be used to search CMAKE modules by "include()" or "find_package()", but the default value is empty. - # Add ${CMAKE_INSTALL_LIBDIR}/cmake and ${CMAKE_PREFIX_PATH}/lib/cmake to search list -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") --set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake") --string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}") -+set(AWS_MODULE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake") -+string(REPLACE ":" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}") - list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH}) - - # include() will "load and run" cmake script diff --git a/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch b/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch deleted file mode 100644 index 3b582d9628..0000000000 --- a/gnu/packages/patches/aws-sdk-cpp-disable-networking-tests.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp -+++ b/aws-cpp-sdk-core-tests/http/HttpClientTest.cpp -@@ -92,12 +92,12 @@ TEST(HttpClientTest, TestRandomURLWithNoProxy) - makeRandomHttpRequest(httpClient, false); - } - --TEST(HttpClientTest, TestRandomURLWithProxy) --{ -- ClientConfiguration configuration = makeClientConfigurationWithProxy(); -- auto httpClient = CreateHttpClient(configuration); -- makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid --} -+//TEST(HttpClientTest, TestRandomURLWithProxy) -+//{ -+// ClientConfiguration configuration = makeClientConfigurationWithProxy(); -+// auto httpClient = CreateHttpClient(configuration); -+// makeRandomHttpRequest(httpClient, true); // we expect it to try to use proxy that is invalid -+//} - - TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredAsNonProxyHost) - { -@@ -119,14 +119,14 @@ TEST(HttpClientTest, TestRandomURLWithProxyAndDeclaredParentDomainAsNonProxyHost - makeRandomHttpRequest(httpClient, false); - } - --TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost) --{ -- ClientConfiguration configuration = makeClientConfigurationWithProxy(); -- configuration.nonProxyHosts = Aws::Utils::Array(1); -- configuration.nonProxyHosts[0] = "http://test.non.filtered.aws"; -- auto httpClient = CreateHttpClient(configuration); -- makeRandomHttpRequest(httpClient, true); --} -+//TEST(HttpClientTest, TestRandomURLWithProxyAndOtherDeclaredAsNonProxyHost) -+//{ -+// ClientConfiguration configuration = makeClientConfigurationWithProxy(); -+// configuration.nonProxyHosts = Aws::Utils::Array(1); -+// configuration.nonProxyHosts[0] = "http://test.non.filtered.aws"; -+// auto httpClient = CreateHttpClient(configuration); -+// makeRandomHttpRequest(httpClient, true); -+//} - - // TODO: Pending Fix on Windows. - #if ENABLE_CURL_CLIENT diff --git a/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch b/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch deleted file mode 100644 index 249c299239..0000000000 --- a/gnu/packages/patches/aws-sdk-cpp-disable-werror.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/compiler_settings.cmake -+++ b/cmake/compiler_settings.cmake -@@ -53,7 +53,7 @@ macro(set_gcc_flags) - endmacro() - - macro(set_gcc_warnings) -- list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-Werror" "-pedantic" "-Wextra") -+ list(APPEND AWS_COMPILER_WARNINGS "-Wall" "-pedantic" "-Wextra") - if(COMPILER_CLANG) - if(PLATFORM_ANDROID) - # when using clang with libc and API lower than 21 we need to include Android support headers and ignore the gnu-include-next warning. -- cgit 1.4.1 From 963ebbc62c1b2eee49f5b00ecd5fb8e11dbbdced Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 18:35:11 +0000 Subject: gnu: aws-c-event-stream: Replace patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-c-event-stream): Replace patch. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/c.scm | 8 +++++--- gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch | 13 ------------- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f57eba56a..5f035aae8e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,7 +871,6 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ - %D%/packages/patches/aws-c-event-stream-cmake-prefix.patch \ %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 3b10579ee7..34c87c2d4b 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -605,6 +605,7 @@ with fallback to efficient C99 software implementations.") (define-public aws-c-event-stream (package (name "aws-c-event-stream") + ; Update only when updating aws-crt-cpp. (version "0.2.7") (source (origin (method git-fetch) @@ -614,12 +615,13 @@ with fallback to efficient C99 software implementations.") (file-name (git-file-name name version)) (sha256 (base32 - "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh")) - (patches (search-patches "aws-c-event-stream-cmake-prefix.patch")))) + "0xwwr7gdgfrphk6j7vk12rgimfim6m4qnj6hg8hgg16cplhvsfzh")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (propagated-inputs `(("aws-c-common" ,aws-c-common) ("aws-c-io" ,aws-c-io) diff --git a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch b/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch deleted file mode 100644 index 79655a910b..0000000000 --- a/gnu/packages/patches/aws-c-event-stream-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,6 +3,10 @@ - cmake_minimum_required (VERSION 3.1) - project (aws-c-event-stream C) - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() -- cgit 1.4.1 From 14f540593bd95bb78ea68373babdc04a862dd561 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Mon, 18 Oct 2021 18:39:15 +0000 Subject: gnu: aws-checksums: Replace patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (aws-checksums): Replace patch. [arguments]: Fix CMAKE_PREFIX_PATH. [source]: Remove patch. * gnu/packages/patches/aws-checksums-cmake-prefix.patch: Delete file. * gnu/local.mk: Remove it. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/c.scm | 8 +++++--- gnu/packages/patches/aws-checksums-cmake-prefix.patch | 13 ------------- 3 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 gnu/packages/patches/aws-checksums-cmake-prefix.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5f035aae8e..6aada7326b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -871,7 +871,6 @@ dist_patch_DATA = \ %D%/packages/patches/avidemux-install-to-lib.patch \ %D%/packages/patches/awesome-reproducible-png.patch \ %D%/packages/patches/aws-c-auth-install-private-headers.patch \ - %D%/packages/patches/aws-checksums-cmake-prefix.patch \ %D%/packages/patches/azr3.patch \ %D%/packages/patches/bash-reproducible-linux-pgrp-pipe.patch \ %D%/packages/patches/bash-completion-directories.patch \ diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index 34c87c2d4b..e37c173fc0 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -578,6 +578,7 @@ portability.") (define-public aws-checksums (package (name "aws-checksums") + ; Update only when updating aws-crt-cpp. (version "0.1.12") (source (origin (method git-fetch) @@ -587,12 +588,13 @@ portability.") (file-name (git-file-name name version)) (sha256 (base32 - "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k")) - (patches (search-patches "aws-checksums-cmake-prefix.patch")))) + "054f2hkmkxhw83q7zsz349k82xk6bkrvlsab088pf7kn9wd4hy4k")))) (build-system cmake-build-system) (arguments '(#:configure-flags - '("-DBUILD_SHARED_LIBS=ON"))) + (list "-DBUILD_SHARED_LIBS=ON" + (string-append "-DCMAKE_PREFIX_PATH=" + (assoc-ref %build-inputs "aws-c-common"))))) (inputs `(("aws-c-common" ,aws-c-common))) (synopsis "Amazon Web Services checksum library") diff --git a/gnu/packages/patches/aws-checksums-cmake-prefix.patch b/gnu/packages/patches/aws-checksums-cmake-prefix.patch deleted file mode 100644 index f6a5c9ad9c..0000000000 --- a/gnu/packages/patches/aws-checksums-cmake-prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,10 @@ - cmake_policy(SET CMP0069 NEW) # Enable LTO/IPO if available in the compiler, see AwsCFlags - endif() - -+if (DEFINED ENV{CMAKE_PREFIX_PATH}) -+ set(CMAKE_PREFIX_PATH $ENV{CMAKE_PREFIX_PATH}) -+endif() -+ - if (DEFINED CMAKE_PREFIX_PATH) - file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH) - endif() -- cgit 1.4.1 From 912cb917b87f0cb938bab2141a04c6fae3cc9b33 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Fri, 15 Oct 2021 13:43:27 +0000 Subject: gnu: aws-sdk-cpp: Enable text-to-speech library. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm (aws-sdk-cpp)[inputs]: Add pulseaudio dependency so that text-to-speech library is included in the build. Signed-off-by: Ludovic Courtès --- gnu/packages/cpp.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 72bb5bcda5..9520a164f1 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml)) @@ -969,6 +970,7 @@ aws-c-http, aws-c-io, aws-c-mqtt, aws-checksums, and s2n.") (inputs `(("curl" ,curl) ("openssl" ,openssl) + ("pulseaudio" ,pulseaudio) ("zlib" ,zlib))) (synopsis "Amazon Web Services SDK for C++") (description -- cgit 1.4.1 From 7dce1df34b5838f8d8915dab3127a27bbb8a430f Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 16 Nov 2021 16:59:29 +0100 Subject: gnu: Add texlive-xifthen. * gnu/packages/tex.scm (texlive-xifthen): New variable. --- gnu/packages/tex.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ed171475ab..bfca91310a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8875,6 +8875,27 @@ on the page, and which specifies where it is to be placed. The environment is accompanied by various configuration commands.") (license license:lppl))) +(define-public texlive-xifthen + (package + (inherit (simple-texlive-package + "texlive-xifthen" + (list "doc/latex/xifthen/" + "tex/latex/xifthen/") + (base32 + "0b33mlmnxsj5mi06v2w2zgamk51mgv1lxdr1cax8nkpn9g7n9axw") + #:trivial? #t)) + (build-system texlive-build-system) + (home-page "https://ctan.org/pkg/xifthen") + (synopsis "Extended conditional commands") + (description + "This package extends the @code{ifthen} package by implementing new +commands to go within the first argument of @code{\\\\ifthenelse}: to test +whether a string is void or not, if a command is defined or equivalent to +another. The package also enables use of complex expressions as introduced by +the package @code{calc}, together with the ability of defining new commands to +handle complex tests.") + (license license:lppl))) + (define-public bibtool (package (name "bibtool") -- cgit 1.4.1 From eb4edd7fde2e596bc2ec36ee773873722df46234 Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Tue, 16 Nov 2021 17:36:14 +0100 Subject: gnu: emacs-flymake-kondor: Update to 0.1.1-0.389b513. * gnu/packages/emacs-xyz.scm (emacs-flymake-kondor): Update to 0.1.1-0.389b513. [propagated-inputs]: Remove emacs-flymake-quickdef. --- gnu/packages/emacs-xyz.scm | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dddf0588d5..113471ae14 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1634,25 +1634,26 @@ boilerplate code from defining new Flymake backend functions.") (license license:gpl3+)))) (define-public emacs-flymake-kondor - (package - (name "emacs-flymake-kondor") - (version "0.0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/turbo-cafe/flymake-kondor") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy")))) - (build-system emacs-build-system) - (propagated-inputs - `(("emacs-flymake-quickdef" ,emacs-flymake-quickdef))) - (home-page "https://github.com/turbo-cafe/flymake-kondor") - (synopsis "Linter with clj-kondo") - (description "This package adds Clojure syntax checker clj-kondo.") - (license license:gpl3+))) + ;; No tag, version grabbed from source .el file. + (let ((commit "389b513c7287ede7a996a3d0db2e84b00772fef5") + (revision "0")) + (package + (name "emacs-flymake-kondor") + (version (git-version "0.1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/turbo-cafe/flymake-kondor") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1by6p1j091xk5bfdpbqp7fifjn4rknrbm8r3xjfvpb4xcb19nmig")))) + (build-system emacs-build-system) + (home-page "https://github.com/turbo-cafe/flymake-kondor") + (synopsis "Linter with clj-kondo") + (description "This package adds Clojure syntax checker clj-kondo.") + (license license:gpl3+)))) (define-public emacs-flymake-shellcheck ;; No tag, version grabbed from source .el file. -- cgit 1.4.1 From 6ed2c5e2a414181af88793dc01d17e16914fb0dd Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 15 Nov 2021 00:56:32 -0500 Subject: gnu: fennel: Update to 1.0.0. * gnu/packages/lua.scm (fennel): Update to 1.0.0. [origin]: Remove unneeded snippet. [arguments]: Remove custom 'patch-lua-calls, 'install-manpage phases. Signed-off-by: Efraim Flashner --- gnu/packages/lua.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index e40d28a473..2d43bc979c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1171,7 +1171,7 @@ enabled.") (define-public fennel (package (name "fennel") - (version "0.9.1") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -1180,11 +1180,7 @@ enabled.") (file-name (git-file-name name version)) (sha256 (base32 - "07qgycf5cxm9zcc4fgpgvplg95ndavh3ynpdjpvzkikzbnyj7xia")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file "fennelview.lua") #t)))) + "0d4rpf0f2aqxlca3kxrbhjjhf1knhiz8ccwlx8xid05mc16la70y")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) @@ -1193,28 +1189,14 @@ enabled.") #:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'build 'patch-lua-calls - (lambda* (#:key inputs #:allow-other-keys) - (let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua"))) - (setenv "LUA" lua) - (substitute* "old/launcher.lua" - (("/usr/bin/env lua") lua)) - #t))) (add-after 'build 'patch-fennel (lambda* (#:key inputs #:allow-other-keys) (substitute* "fennel" (("/usr/bin/env .*lua") - (string-append (assoc-ref inputs "lua") "/bin/lua"))) - #t)) + (string-append (assoc-ref inputs "lua") "/bin/lua"))))) (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (add-after 'install 'install-manpage - (lambda* (#:key outputs #:allow-other-keys) - (install-file "fennel.1" - (string-append (assoc-ref outputs "out") - "/share/man/man1")) - #t))))) + (assoc-ref %standard-phases 'check))))) (inputs `(("lua" ,lua))) (home-page "https://fennel-lang.org/") (synopsis "Lisp that compiles to Lua") -- cgit 1.4.1 From 02a67810e566e8402e0b927c81ae39391762767d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Nov 2021 00:45:32 +0100 Subject: gnu: git: Update to 2.34.0. * gnu/packages/version-control.scm (git): Update to 2.34.0. --- gnu/packages/version-control.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 00a8be49f9..c8b5861068 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -217,14 +217,14 @@ Python 3.3 and later, rather than on Python 2.") (define-public git (package (name "git") - (version "2.33.1") + (version "2.34.0") (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/software/scm/git/git-" version ".tar.xz")) (sha256 (base32 - "0bqz401dyp8wnjj3k5ahrniwk4dalndysqazzwdvv25hqbkacm70")))) + "07s1c9lzlm4kpbb5lmxy0869phg7037pv4faz5hlqyb5csrbjv7x")))) (build-system gnu-build-system) (native-inputs `(("native-perl" ,perl) @@ -244,7 +244,7 @@ Python 3.3 and later, rather than on Python 2.") version ".tar.xz")) (sha256 (base32 - "11xb0n1ckkm2g7r3sxsknkhsak739xg925zbz3aalv7mr7qijln7")))) + "0wic95h0i1bm66hxnc38pfj31n74lvk2xb8lx6kcfpzg2wszmsj7")))) ;; For subtree documentation. ("asciidoc" ,asciidoc) ("docbook-xsl" ,docbook-xsl) -- cgit 1.4.1 From 62e707d67caf1dab2af411a69ff8cec4b2dc686e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 17 Nov 2021 08:44:55 +0200 Subject: gnu: julia: Update to 1.6.3. * gnu/packages/julia.scm (julia): Update to 1.6.3. --- gnu/packages/julia.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 5b9bf91ed6..33242a08a4 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -275,7 +275,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (define-public julia (package (name "julia") - (version "1.6.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append @@ -283,7 +283,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") version "/julia-" version ".tar.gz")) (sha256 (base32 - "0plbj4laifzz8ppk889iv3gaxj1mdddzv7yad6ghml6bfnn24r6m")) + "1515x8fs25l3f9csbmd1v4nm041zvjnvigy6s5iidy4yrkwdx4r5")) (patches (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) (build-system gnu-build-system) -- cgit 1.4.1